From a3a54a0d83ed358c949ba4886d0655109fbd486a Mon Sep 17 00:00:00 2001
From: Mr Swift <amirshayan1381@yahoo.com>
Date: Tue, 6 Aug 2024 19:28:55 +0330
Subject: [PATCH] Fix bug and DB string

---
 server/_env.js                            | 3 ++-
 server/controllers/GPS.Device.js          | 5 +++++
 server/controllers/GPS.InstalledDevice.js | 7 -------
 server/database.js                        | 3 ++-
 server/models/GPS.score.js                | 5 ++++-
 server/routes/admin.js                    | 5 ++++-
 server/routes/gps.js                      | 4 ++++
 7 files changed, 21 insertions(+), 11 deletions(-)
 create mode 100644 server/controllers/GPS.Device.js

diff --git a/server/_env.js b/server/_env.js
index f2fea60..1d75de1 100644
--- a/server/_env.js
+++ b/server/_env.js
@@ -1,6 +1,7 @@
 const EnvirementVariables = {
   // node envirements
-  isDev: process.env.NODE_ENV === 'development',
+  // isDev: process.env.NODE_ENV === 'development',
+  isDev: true,
   isProduction: process.env.NODE_ENV === 'production',
 
   // server ports
diff --git a/server/controllers/GPS.Device.js b/server/controllers/GPS.Device.js
new file mode 100644
index 0000000..a6c779f
--- /dev/null
+++ b/server/controllers/GPS.Device.js
@@ -0,0 +1,5 @@
+const { body, param, validationResult } = require('express-validator');
+const { _sr } = require('../plugins/serverResponses');
+const { checkValidations } = require('../plugins/controllersHelperFunctions');
+const User = require('../models/User');
+const Device = require('../models/GPS.Device');
diff --git a/server/controllers/GPS.InstalledDevice.js b/server/controllers/GPS.InstalledDevice.js
index 53f8391..392200b 100644
--- a/server/controllers/GPS.InstalledDevice.js
+++ b/server/controllers/GPS.InstalledDevice.js
@@ -5,13 +5,6 @@ const User = require('../models/User');
 const InstalledDevice = require('../models/GPS.InstalledDevice');
 const Device = require('../models/GPS.Device');
 
-/**
- * get all installed device for user
- * get all installed device for admin
- * patch a installed device by id and type
- */
-
-
 module.exports.deviceRegistration = [
     [
         body('IMEI').notEmpty().isString().withMessage('لطفا IMEI را وارد یا تصحیح کنید')
diff --git a/server/database.js b/server/database.js
index 0c3f7b5..d59a6d9 100644
--- a/server/database.js
+++ b/server/database.js
@@ -2,9 +2,10 @@
 const mongoose = require('mongoose')
 // mongodb database connection string. change it as per your needs. here "mydb" is the name of the database. You don't need to create DB from mongodb terminal. mongoose create the database automatically.
 const inHostUrl = 'mongodb://root:KPTt76tImNBBMm4Kor8QA9gB@asan-service:27017/asanserv_database?authSource=admin'
+const outHostUrl = 'mongodb://root:KPTt76tImNBBMm4Kor8QA9gB@hotaka.liara.cloud:33794/asanserv_database?authSource=admin'
 const init = ()=>{
   try {
-    mongoose.connect(inHostUrl, {
+    mongoose.connect(outHostUrl, {
       useNewUrlParser: true,
       useUnifiedTopology: true,
       useFindAndModify: false,
diff --git a/server/models/GPS.score.js b/server/models/GPS.score.js
index ef608d9..e887512 100644
--- a/server/models/GPS.score.js
+++ b/server/models/GPS.score.js
@@ -15,7 +15,10 @@ const ScoreSchema = mongoose.Schema({
     },
     profit:{
         type:Number,
-        min:0
+        min:0,
+        unique:true,
+        default:0,
+        required:true
     },
     dollarProfit:{
         type:Number,
diff --git a/server/routes/admin.js b/server/routes/admin.js
index 51fb949..4a9ee2d 100644
--- a/server/routes/admin.js
+++ b/server/routes/admin.js
@@ -28,6 +28,7 @@ const complaintController = require('../controllers/complaintController')
 const brandController = require('../controllers/brandController')
 const requestController = require('../controllers/GPS.Request')
 const withdraw = require('../controllers/GPS.Withdraw')
+const installedDevice = require('../controllers/GPS.InstalledDevice')
 
 
 /// //////////////////////////////////////////////////////// routes
@@ -44,7 +45,9 @@ router.patch('/gps/request/:id/:status',hasPermission('gps'), requestController.
 router.get('/gps/withdraw',hasPermission('gps'), withdraw.getAllForAdmin)
 router.patch('/gps/withdraw/:id/:type',hasPermission('gps'), withdraw.updateReq)
 
-/// //////////////
+/// ////////////// Installed device
+router.patch('/register-device/:id/:type', installedDevice.updateInstalled)
+router.get('/register-device', installedDevice.getAllForAdmin)
 
 /// /////////////////////////////////////////////////////////
 /// ///////////// survey
diff --git a/server/routes/gps.js b/server/routes/gps.js
index 941bff0..78d6817 100644
--- a/server/routes/gps.js
+++ b/server/routes/gps.js
@@ -2,6 +2,7 @@ const { Router } = require('express')
 const router = Router()
 const bankAccount = require('../controllers/GPS.BankAccount')
 const withdraw = require('../controllers/GPS.Withdraw')
+const installedDevice = require('../controllers/GPS.InstalledDevice')
 
 /// ///////////////// Bank card
 router.post('/bank-card', bankAccount.addCard)
@@ -11,5 +12,8 @@ router.delete('/bank-card/:id', bankAccount.deleteCard)
 router.post('/withdraw', withdraw.createRequest)
 router.get('/withdraw', withdraw.getAllForUser)
 
+/// //////////////// Installed device
+router.post('/register-device', installedDevice.deviceRegistration)
+router.get('/register-device', installedDevice.getAllForUser)
 
 module.exports = router