Merge

server/controllers/GPS.InstalledDevice.js

@@ -44,71 +44,97 @@ module.exports.deviceRegistration = [
 module.exports.getAllForUser = async (req, res) => {
     let page;
     let rows;
+
     if (!req.query?.rows || req.query?.rows <= 5) {
-        rows = 10
+        rows = 10;
     } else {
-        rows = parseInt(req.query.rows)
+        rows = parseInt(req.query.rows);
     }
 
-    if (!req.query?.page) {
-        page = 0
-        // eslint-disable-next-line eqeqeq
-    } else if (req.query.page <= 1) {
-        page = 0
+    if (!req.query?.page || req.query.page <= 1) {
+        page = 0;
     } else {
-        page = req.query.page
-        page = page * rows - rows
+        page = (req.query.page - 1) * rows;
     }
 
-    const search = req.query?.search ?  req.query.search : null
-    let sort
-    if(req.query?.sort){
-        sort= req.query?.sort
-    }else{
-        sort= { created_at: -1 }
+    const search = req.query?.search || null;
+
+    let sort = {};
+
+    if (req.query?.deviceId_dollarProfit) {
+        sort.dollarProfit = parseInt(req.query.deviceId_dollarProfit);
     }
+    if (req.query?.status) {
+        sort.status = parseInt(req.query.status);
+    }
+    if (req.query?.registerDate) {
+        sort.registerDate = parseInt(req.query.registerDate);
+    }
+
+    if (Object.keys(sort).length === 0) {
+        sort = { 'created_at': -1 };
+    }
+
     const filter = {
         userId: req.user_id,
-    }
-    if(search){
-        filter.$or =  [
-            { IMEI: { $regex: search } },
-        ]
+    };
+
+    if (search) {
+        filter.$or = [
+            { IMEI: { $regex: search, $options: 'i' } },
+        ];
     }
 
-    const data = await InstalledDevice.find(filter).skip(page).limit(rows).sort(sort).populate('deviceId')
+    try {
+        const data = await InstalledDevice.find(filter)
+          .skip(page)
+          .limit(rows)
+          .sort(sort)
+          .populate('deviceId');
 
-    const total = Math.ceil((await InstalledDevice.countDocuments(filter)))
-    res.status(200).json({ data, total })
+        const total = await InstalledDevice.countDocuments(filter);
 
-}
+        res.status(200).json({ data, total });
+    } catch (error) {
+        res.status(500).json({ message: 'An error occurred', error });
+    }
+};
 
 module.exports.getAllForAdmin = async (req, res) => {
-    // let page;
-    // let rows;
-    // if (!req.query?.rows || req.query?.rows <= 5) {
-    //     rows = 10
-    // } else {
-    //     rows = parseInt(req.query.rows)
-    // }
+    try {
+        const page = parseInt(req.query.page) || 1;
+        const rows = parseInt(req.query.rows) || 10;
+        const search = req.query.search || "";
+        const sortField = req.query.sortField || "status";
+        const sortOrder = req.query.sortOrder === "desc" ? -1 : 1;
 
-    // if (!req.query?.page) {
-    //     page = 0
-    //     // eslint-disable-next-line eqeqeq
-    // } else if (req.query.page <= 1) {
-    //     page = 0
-    // } else {
-    //     page = req.query.page
-    //     page = page * rows - rows
-    // }
-    // const search = req.query?.search ? req.query.search : ""
+        const skip     = (page - 1) * rows;
 
-    const data = await InstalledDevice.find({}).sort({ status: 1 })
-        .populate('deviceId')
-        .populate('userId', 'shopName national_code first_name last_name mobile_number city_name province_name')
-    const total = Math.ceil((await InstalledDevice.estimatedDocumentCount()))
-    res.status(200).json({ data, total })
-}
+        const filter = {};
+        if (search) {
+            filter.$or = [
+                { IMEI: new RegExp(search, 'i') },
+                { 'userId.shopName': new RegExp(search, 'i') },
+                { 'userId.national_code': new RegExp(search, 'i') },
+            ];
+        }
+
+        const data = await InstalledDevice.find(filter)
+          .sort({ [sortField]: sortOrder })
+          .populate('deviceId')
+          .populate('userId', 'shopName national_code first_name last_name mobile_number city_name province_name')
+          .skip(skip)
+          .limit(rows);
+
+        const totalDocuments = await InstalledDevice.countDocuments(filter);
+        const totalPages = Math.ceil(totalDocuments / rows);
+
+        res.status(200).json({ data, totalDocuments, totalPages });
+    } catch (error) {
+        console.error('Error:', error.message);
+        res.status(500).json({ message: "Server Error", error: error.message });
+    }
+};
 
 
 
@@ -127,10 +153,8 @@ module.exports.updateInstalled = [
             const device = await Device.findById(installedDevice.deviceId)
             switch (req.params.type) {
                 case "accept": {
-
                     installedDevice.status = 1;
                     installedDevice.installationDate = new Date();
-
                     device.status = 1;
 
                     user.walletBalance += device.profit
@@ -167,7 +191,7 @@ module.exports.updateInstalled = [
                     break;
                 }
                 default: {
-                    res.status(404).json({ msg: "استاتوس اشتباه است" })
+                    res.status(404).json({ msg: "وضعیت اشتباه است" })
                     break;
                 }
             }