diff --git a/controller/save.controller.js b/controller/save.controller.js index ad428a8..938204d 100644 --- a/controller/save.controller.js +++ b/controller/save.controller.js @@ -15,7 +15,6 @@ const save = async ( ) => { if (token === configs.verifyToken) { try { - const date = new Date(); // Önce kaydı bulalım const existingDevice = await DeviceModel.findOne({ device_name, @@ -35,7 +34,7 @@ const save = async ( model, firmware_version, device_ip_address, - update_time: date, + update_time: new Date(Date.now()), device_log: { sensor_value, battery_life @@ -54,16 +53,27 @@ const save = async ( firmware_version }; - const update = { - $set: { - device_ip_address, - update_time: date, - device_log: { - sensor_value, - battery_life + let update; + + if (sensor_value === undefined && battery_life === undefined) { + update = { + $set: { + device_ip_address, + update_time: new Date(Date.now()), } - } - }; + }; + } else { + update = { + $set: { + device_ip_address, + update_time: new Date(Date.now()), + device_log: { + sensor_value, + battery_life + } + } + }; + } const result = await DeviceModel.updateOne(filter, update); diff --git a/library/index.js b/library/index.js index f8b267b..269c589 100644 --- a/library/index.js +++ b/library/index.js @@ -19,7 +19,7 @@ const saveDeviceLog = async ( remote_name, remote_type, operating_type, - log_time: Date.now() + log_time: new Date(Date.now()) } } }; diff --git a/models/device.model.js b/models/device.model.js index 7c29683..4afd1a5 100644 --- a/models/device.model.js +++ b/models/device.model.js @@ -13,8 +13,7 @@ const deviceLogSchema = new Schema({ type: String // Toggle - Homekit Reset - Reset }, log_time: { - type: Date, - default: Date.now() + type: String }, sensor_value: { type: Number @@ -50,8 +49,7 @@ const deviceSchema = new Schema({ unique: true }, update_time: { - type: Date, - default: Date.now() + type: String }, device_log: [deviceLogSchema] });