diff --git a/server/controllers/userController.js b/server/controllers/userController.js index 49c8d9d..99a1b53 100644 --- a/server/controllers/userController.js +++ b/server/controllers/userController.js @@ -250,7 +250,7 @@ module.exports.delete_admin = [ module.exports.permissions = [ (req, res) => { - return res.json(permissions) + return res.status(200).json(permissions) } ] diff --git a/server/models/Device.js b/server/models/GPS.Device.js similarity index 100% rename from server/models/Device.js rename to server/models/GPS.Device.js diff --git a/server/models/InstalledDevice.js b/server/models/GPS.InstalledDevice.js similarity index 66% rename from server/models/InstalledDevice.js rename to server/models/GPS.InstalledDevice.js index 50a4e1f..e349cfe 100644 --- a/server/models/InstalledDevice.js +++ b/server/models/GPS.InstalledDevice.js @@ -13,8 +13,20 @@ const InstalledDeviceSchema = mongoose.Schema({ 2, // Rejected ] }, + dollarProfit:{ + type:Number, + min:0 + }, + score:{ + type:Number, + min:0 + }, registerDate:Date, - installationDate:Date + installationDate:Date, + userId:{ + type:String, + ref:'User' + }, }) module.exports = mongoose.model('InstalledDevice', InstalledDeviceSchema) diff --git a/server/models/Withdraw.js b/server/models/GPS.Withdraw.js similarity index 100% rename from server/models/Withdraw.js rename to server/models/GPS.Withdraw.js diff --git a/server/models/GPS.score.js b/server/models/GPS.score.js new file mode 100644 index 0000000..ef608d9 --- /dev/null +++ b/server/models/GPS.score.js @@ -0,0 +1,26 @@ +const mongoose = require('mongoose') + +const ScoreSchema = mongoose.Schema({ + deviceId:{ + type:String, + ref:'Device' + }, + renewDate:Date, + renewType:{ + type:String, + }, + price:{ + type:Number, + min:0 + }, + profit:{ + type:Number, + min:0 + }, + dollarProfit:{ + type:Number, + min:0 + }, +}) + +module.exports = mongoose.model('Score', ScoreSchema)