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 stopISODate = moment(stopDate, "DD-MMM-YYYY - HH:mm").toDate();
+    const start = moment(startDate, "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";
-
-      // Query the MotorData collection
-      const motorDataDocs = await MotorData.find({
+      const motordatas = await MotorData.find({
         customerId,
-        $or: [
-          {
-            startTime: { $gte: startISODate, $lte: stopISODate }, // Date-based comparison
-          },
-          {
-            startTime: { $gte: startStringDate, $lte: stopStringDate }, // String-based comparison
-          },
-        ],
-      }).exec();
+       
+      });
+  
+
+      const filtereddatas = motordatas.filter((record) => {
+        const recordTime = moment(record.startTime, "DD-MMM-YYYY - HH:mm").toDate();
+        return recordTime >= start && recordTime <= end;
+      });
+
 
       reply.send({
         status_code: 200,
-        data: motorDataDocs,
-        count: motorDataDocs.length,
+        data: filtereddatas,
+        count: filtereddatas.length,
         customerName: userName,
       });
     } else {

src/controllers/userController.js

@@ -645,6 +645,76 @@ exports.forgotPassword = async (req, reply) => {
 };
 
 
+
+
+exports.changePassword = async (req, reply) => {
+  try {
+    const {phone, oldPassword, newPassword } = req.body;
+   
+
+    if (!oldPassword || !newPassword) {
+      return reply.send({
+        armintatankdata: {
+          error: true,
+          code: 10008,
+          message: "10008 - Old password and new password are required",
+        },
+      });
+    }
+
+    // Find user by phone
+    const user = await User.findOne({ phone });
+
+    if (!user) {
+      return reply.send({
+        armintatankdata: {
+          error: true,
+          code: 10006,
+          message: "10006 - User not found. Please check the phone number.",
+        },
+      });
+    }
+
+    // Verify old password
+    const isMatch = await bcrypt.compare(oldPassword, user.services.password.bcrypt);
+    
+    if (!isMatch) {
+      return reply.send({
+        armintatankdata: {
+          error: true,
+          code: 10009,
+          message: "10009 - Incorrect old password",
+        },
+      });
+    }
+
+    // Hash new password
+    const hashedPassword = await bcrypt.hash(newPassword, 10);
+
+    // Update password
+    await User.updateOne(
+      { phone },
+      {
+        $set: {
+          "services.password.bcrypt": hashedPassword,
+          oneTimePasswordSetFlag: false, // Reset OTP flag after password change
+        },
+      }
+    );
+
+    reply.send({
+      armintatankdata: {
+        error: false,
+        message: "Password changed successfully",
+      },
+    });
+  } catch (err) {
+    throw boom.boomify(err);
+  }
+};
+
+
+
 exports.forgotPasswordSupplier = async (req, reply) => {
   try {
     // Create a new Supplier object from the request body

src/handlers/userHandler.js

@@ -462,74 +462,74 @@ exports.changePassword = async (req, reply) => {
 };
 
 
-exports.verifyOldNewPassword = async (req, reply) => {
-  try {
-    const { phone, oldPassword, newPassword } = req.body;
-
-    // Check if the user exists with the provided mobile number
-    const user = await User.findOne({ phone });
-    if (!user) {
-      return reply.send({
-        armintatankdata: {
-          error: true,
-          code: 10009,
-          message: "User not found.",
-        },
-      });
-    }
-
-    // Verify the old password
-    const isOldPasswordCorrect = await bcrypt.compare(oldPassword, user.services.password.bcrypt);
-    if (!isOldPasswordCorrect) {
-      return reply.send({
-        armintatankdata: {
-          error: true,
-          code: 10012,
-          message: "Old password is incorrect.",
-        },
-      });
-    }
-
-    // Hash the new password
-    const hashedNewPassword = await bcrypt.hash(newPassword, 10); // Ensure you use bcrypt.hash here
-
-    // Update the password in the database
-    const updateResult = await User.updateOne(
-      { phone },
-      {
-        $set: {
-          "services.password.bcrypt": hashedNewPassword,
-          oneTimePasswordSetFlag: false,
-        },
-      }
-    );
-
-    // Check if the update was successful
-    if (updateResult.nModified > 0) {
-      // Fetch the updated user details to send back in the response
-      const updatedUser = await User.findOne({ phone }).select('-services.password.bcrypt'); // Exclude the password
-
-      return reply.send({
-        armintatankdata: {
-          error: false,
-          message: "Password changed successfully.",
-          updatedUser, // Include the updated user details
-        },
-      });
-    } else {
-      return reply.send({
-        armintatankdata: {
-          error: true,
-          code: 10011,
-          message: "Failed to update the password. Try again.",
-        },
-      });
-    }
-  } catch (err) {
-    console.error("Error in changePassword:", err);
-    throw boom.boomify(err);
-  }
-};
+// exports.verifyOldNewPassword = async (req, reply) => {
+//   try {
+//     const { phone, oldPassword, newPassword } = req.body;
+
+//     // Check if the user exists with the provided mobile number
+//     const user = await User.findOne({ phone });
+//     if (!user) {
+//       return reply.send({
+//         armintatankdata: {
+//           error: true,
+//           code: 10009,
+//           message: "User not found.",
+//         },
+//       });
+//     }
+
+//     // Verify the old password
+//     const isOldPasswordCorrect = await bcrypt.compare(oldPassword, user.services.password.bcrypt);
+//     if (!isOldPasswordCorrect) {
+//       return reply.send({
+//         armintatankdata: {
+//           error: true,
+//           code: 10012,
+//           message: "Old password is incorrect.",
+//         },
+//       });
+//     }
+
+//     // Hash the new password
+//     const hashedNewPassword = await bcrypt.hash(newPassword, 10); // Ensure you use bcrypt.hash here
+
+//     // Update the password in the database
+//     const updateResult = await User.updateOne(
+//       { phone },
+//       {
+//         $set: {
+//           "services.password.bcrypt": hashedNewPassword,
+//           oneTimePasswordSetFlag: false,
+//         },
+//       }
+//     );
+
+//     // Check if the update was successful
+//     if (updateResult.nModified > 0) {
+//       // Fetch the updated user details to send back in the response
+//       const updatedUser = await User.findOne({ phone }).select('-services.password.bcrypt'); // Exclude the password
+
+//       return reply.send({
+//         armintatankdata: {
+//           error: false,
+//           message: "Password changed successfully.",
+//           updatedUser, // Include the updated user details
+//         },
+//       });
+//     } else {
+//       return reply.send({
+//         armintatankdata: {
+//           error: true,
+//           code: 10011,
+//           message: "Failed to update the password. Try again.",
+//         },
+//       });
+//     }
+//   } catch (err) {
+//     console.error("Error in changePassword:", err);
+//     throw boom.boomify(err);
+//   }
+// };
 
 
 

src/routes/usersRoute.js

@@ -241,26 +241,26 @@ module.exports = function (fastify, opts, next) {
   });
   
 
-  fastify.route({
-    method: "POST",
-    url: "/api/change-password",
-    schema: {
-      tags: ["User"],
-      description: "Users to change their password using mobile number, old password, and new password.",
-      summary: "Users to change their password using mobile number, old password, and new password.",
-      body: {
-        type: "object",
-        required: ["phone", "oldPassword", "newPassword"],
-        properties: {
-          phone: { type: "string"},
-          oldPassword: { type: "string"},
-          newPassword: { type: "string" },
-          //confirmPassword: { type: "string", minLength: 6 },
-        },
-      },
-    },
-    handler: validationHandler.verifyOldNewPassword, // Adjust the path to your handler
-  });
+  // fastify.route({
+  //   method: "POST",
+  //   url: "/api/change-password",
+  //   schema: {
+  //     tags: ["User"],
+  //     description: "Users to change their password using mobile number, old password, and new password.",
+  //     summary: "Users to change their password using mobile number, old password, and new password.",
+  //     body: {
+  //       type: "object",
+  //       required: ["phone", "oldPassword", "newPassword"],
+  //       properties: {
+  //         phone: { type: "string"},
+  //         oldPassword: { type: "string"},
+  //         newPassword: { type: "string" },
+  //         //confirmPassword: { type: "string", minLength: 6 },
+  //       },
+  //     },
+  //   },
+  //   handler: validationHandler.verifyOldNewPassword, // Adjust the path to your handler
+  // });
   
 
   // fastify.route({
@@ -342,6 +342,35 @@ module.exports = function (fastify, opts, next) {
     },
   });
 
+
+  
+  fastify.route({
+    method: "POST",
+    url: "/api/changePassword",
+    schema: {
+      tags: ["User"],
+      description: "This is to change password of user",
+      summary: "This is to change password of user",
+      body: {
+        type: "object",
+        required: ["phone"],
+        properties: {
+          phone: { type: "string" },
+          oldPassword: { type: "string" },
+          newPassword: { type: "string" },
+        },
+      },
+      security: [
+        {
+          basicAuth: [],
+        },
+      ],
+    },
+    // preHandler: [validationHandler.],
+    handler: userController.changePassword,
+
+  });
+
   fastify.route({
     method: "POST",
     url: "/api/resetpassword",