diff --git a/controller/save.controller.js b/controller/save.controller.js index ecb607e..1e97d63 100644 --- a/controller/save.controller.js +++ b/controller/save.controller.js @@ -1,5 +1,6 @@ const configs = require("../configs"); const DeviceModel = require("../models/device.model"); +const date = new Date(); const save = async ( token, @@ -9,7 +10,9 @@ const save = async ( serial_number, model, firmware_version, - device_ip_address + device_ip_address, + sensor_value, + battery_life ) => { if (token === configs.verifyToken) { try { @@ -32,7 +35,11 @@ const save = async ( model, firmware_version, device_ip_address, - update_time: Date.now() + update_time: date, + device_log: { + sensor_value, + battery_life + } }); const result = await newDevice.save(); return "Cihaz kaydedildi."; @@ -50,7 +57,11 @@ const save = async ( const update = { $set: { device_ip_address, - update_time: Date.now() + update_time: date, + device_log: { + sensor_value, + battery_life + } } }; diff --git a/models/device.model.js b/models/device.model.js index 9aa3ba8..b00d7d0 100644 --- a/models/device.model.js +++ b/models/device.model.js @@ -9,11 +9,17 @@ const deviceLogSchema = new Schema({ remote_type: { type: String }, - operating_type:{ + operating_type: { type: String // Toggle - Homekit Reset - Reset }, log_time: { type: Date + }, + sensor_value: { + type: Number + }, + battery_life: { + type: Number } }); diff --git a/route/device.get.route.js b/route/device.get.route.js new file mode 100644 index 0000000..082fc53 --- /dev/null +++ b/route/device.get.route.js @@ -0,0 +1,28 @@ +const express = require("express"); +const router = express.Router(); +const DeviceGetController = require("../controller/device.get.controller"); + +router.use(express.urlencoded({ extended: false })); +router.use(express.json()); + +// Device Log Save route +router.get("/:token/:device_id?", async (req, res) => { + try { + const { token, device_id } = req.params; + + // Token Control Middleware + const result = await DeviceGetController.get(token, device_id); + + return res.status(200).json({ + error: false, + result + }); + } catch (error) { + res.status(400).json({ + error: true, + result: error.message + }); + } +}); + +module.exports = router; diff --git a/route/device.set.route.js b/route/device.set.route.js index f0156b8..1ae4a73 100644 --- a/route/device.set.route.js +++ b/route/device.set.route.js @@ -13,6 +13,8 @@ router.get( const { token, device_id, remote_name, remote_type, operating_type } = req.params; + console.log(req.params); + // Token Control Middleware const result = await DeviceSetController.set( token, diff --git a/route/save.route.js b/route/save.route.js index 7b163b4..2270841 100644 --- a/route/save.route.js +++ b/route/save.route.js @@ -3,10 +3,11 @@ const router = express.Router(); const SaveController = require("../controller/save.controller"); router.use(express.urlencoded({ extended: false })); -router.use(express.json()); +router.use(express.json()) // Save route router.post("/", async (req, res) => { + console.log(req.body); try { // Token Control Middleware const result = await SaveController.save( @@ -17,7 +18,9 @@ router.post("/", async (req, res) => { req.body.serial_number, req.body.model, req.body.firmware_version, - req.body.device_ip_address + req.body.device_ip_address, + req.body.sensor_value, + req.body.battery_life, ); return res.status(200).json({