From f846e37a743d5ce993e085f3f70c34c2a9a6d2ad Mon Sep 17 00:00:00 2001
From: Mr Swift <amirshayan1381@yahoo.com>
Date: Mon, 5 Aug 2024 19:17:25 +0330
Subject: [PATCH] fix

---
 server/controllers/GPS.Request.js | 32 ++++++++++++++++---------------
 server/models/User.js             | 10 ++++++++++
 2 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/server/controllers/GPS.Request.js b/server/controllers/GPS.Request.js
index bb4db34..d225a63 100644
--- a/server/controllers/GPS.Request.js
+++ b/server/controllers/GPS.Request.js
@@ -63,28 +63,30 @@ module.exports.changeStatus = [
             case "accept": {
                 const data = await RequestGPS.findByIdAndUpdate(req.params.id,
                     {
-                        status:1
+                        status: 1
                     },
                     { new: true })
-                    const userPreData = await User.findById(data.userId)
-                    const userData = await User.findByIdAndUpdate(
-                        data.userId,
-                        {
-                            shopName:  data.shopName,
-                            shopNumber:  data.shopNumber,
-                            shopAddress:  data.shopAddress,
-                            birthDate:  data.birthDate,
-                            walletBalance:userPreData?.walletBalance | 0
-                        },
-                        { new: true }
-                    )
-                res.status(200).json({ msg: 'با موفقیت به روز شد', data:userData })
+                const userPreData = await User.findById(data.userId).select('walletBalance dollarBalance score')
+                const userData = await User.findByIdAndUpdate(
+                    data.userId,
+                    {
+                        shopName: data.shopName,
+                        shopNumber: data.shopNumber,
+                        shopAddress: data.shopAddress,
+                        birthDate: data.birthDate,
+                        walletBalance: userPreData?.walletBalance | 0,
+                        dollarBalance: userPreData?.dollarBalance | 0,
+                        score: userPreData?.score | 0
+                    },
+                    { new: true }
+                )
+                res.status(200).json({ msg: 'با موفقیت به روز شد', data: userData })
                 break;
             }
             case "reject": {
                 const data = await RequestGPS.findByIdAndUpdate(req.params.id,
                     {
-                        status:2
+                        status: 2
                     },
                     { new: true })
 
diff --git a/server/models/User.js b/server/models/User.js
index a628e71..85627bb 100644
--- a/server/models/User.js
+++ b/server/models/User.js
@@ -67,6 +67,16 @@ const UserSchema = mongoose.Schema({
     type:Number,
     min:0,
     default:0
+  }, 
+  dollarBalance:{
+    type:Number,
+    min:0,
+    default:0
+  },
+  score:{
+    type:Number,
+    min:0,
+    default:0
   },
   cardBank:[BankSchema],