From b3f0ec905df868a91a4b8d8fba424aec0bc4392f Mon Sep 17 00:00:00 2001
From: morteza-mortezai <mrtz.mrtzi.1989@gmail.com-at-003669155861>
Date: Sun, 14 Dec 2025 14:41:15 +0330
Subject: [PATCH] improvcement in device registration

---
 server/controllers/GPS.InstalledDevice.js | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/server/controllers/GPS.InstalledDevice.js b/server/controllers/GPS.InstalledDevice.js
index e239609..d3a3ab2 100644
--- a/server/controllers/GPS.InstalledDevice.js
+++ b/server/controllers/GPS.InstalledDevice.js
@@ -16,10 +16,13 @@ module.exports.deviceRegistration = [
     const IMEI = req.body.IMEI
     console.log('IMEI ******************', IMEI)
 
-    const existingInstalledDevice = await InstalledDevice.findOne({ IMEI, status: 1 }).catch(err => {
+    let existingInstalledDevice
+    try{
+      existingInstalledDevice = await InstalledDevice.findOne({ IMEI, status: 1 })
+    }catch(err){
       console.log('err in findOne InstalledDevice', err?.message)
       return res.status(500).json({ msg: 'خطا در دریافت اطلاعات از دیتابیس ثبت دستگاه' })
-    })
+    }
     if (existingInstalledDevice) {
       return res.status(400).json({ msg: 'این IMEI قبلا ثبت شده ' })
     }
@@ -40,13 +43,15 @@ module.exports.deviceRegistration = [
     let scoreData = null
     let walletUpdated = false
     try {
-      const fee = await Settings.findOne({ title: 'install_fee' })
-      if (!fee) {
-        return res.status(400).json({ msg: 'هزینه نصب یافت نشد' })
-      }
-      const score = await Settings.findOne({ title: 'install_score' })
-      if (!score) {
-        return res.status(400).json({ msg: 'امتیاز نصب یافت نشد' })
+      const settings = await Settings.find({
+        title: { $in: ['install_fee', 'install_score'] }
+      });
+      
+      const fee = settings.find(s => s.title === 'install_fee');
+      const score = settings.find(s => s.title === 'install_score');
+
+      if (!fee || !score) {
+        return res.status(400).json({ msg: 'هزینه نصب یا امتیاز نصب یافت نشد' })
       }
       const data = {
         // deviceId: RegisteredDevice.deviceId,