Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend

src/controllers/tanksController.js

@@ -394,36 +394,34 @@ exports.getTankmotordata = async (req, reply) => {
     }
 
     // Convert input dates to ISO 8601 format for Date comparison
-    const startISODate = moment(startDate, "DD-MMM-YYYY - HH:mm").toDate();
+    const start = moment(startDate, "DD-MMM-YYYY - HH:mm").toDate();
-    const stopISODate = moment(stopDate, "DD-MMM-YYYY - HH:mm").toDate();
+    const end = moment(stopDate, "DD-MMM-YYYY - HH:mm").toDate();
+
 
     // Convert input dates to string format for string-based comparison
-    const startStringDate = moment(startDate, "DD-MMM-YYYY - HH:mm").format("DD-MMM-YYYY - HH:mm");
+    
-    const stopStringDate = moment(stopDate, "DD-MMM-YYYY - HH:mm").format("DD-MMM-YYYY - HH:mm");
 
     // Fetch the username based on customerId
     const user = await User.findOne({ customerId }).select("username");
 
     if (user) {
       const userName = user.username || "N/A";
-
+      const motordatas = await MotorData.find({
-      // Query the MotorData collection
-      const motorDataDocs = await MotorData.find({
         customerId,
-        $or: [
+       
-          {
+      });
-            startTime: { $gte: startISODate, $lte: stopISODate }, // Date-based comparison
+  
-          },
+
-          {
+      const filtereddatas = motordatas.filter((record) => {
-            startTime: { $gte: startStringDate, $lte: stopStringDate }, // String-based comparison
+        const recordTime = moment(record.startTime, "DD-MMM-YYYY - HH:mm").toDate();
-          },
+        return recordTime >= start && recordTime <= end;
-        ],
+      });
-      }).exec();
+
 
       reply.send({
         status_code: 200,
-        data: motorDataDocs,
+        data: filtereddatas,
-        count: motorDataDocs.length,
+        count: filtereddatas.length,
         customerName: userName,
       });
     } else {