Merge branch 'main' of https://git.cnapp.co.in/gitadmin/api

resources/RetailDistributor/RetailDistributorController.js

@@ -1,6 +1,10 @@
 import mongoose from "mongoose";
 import RetailDistributor from "./RetailDistributorModel.js";
 import validator from "validator";
+import password from "secure-random-password";
+import crypto from "crypto";
+
+import sendEmail, { sendOtp } from "../../Utils/sendEmail.js";
 export const loginRD = async (req, res) => {
   const { email, password } = req.body;
 
@@ -87,7 +91,7 @@ export const ChangePasswordRD = async (req, res) => {
   }
 };
 
-export const forgotPassword = async (req, res) => {
+export const forgotPasswordRD = async (req, res) => {
   try {
     // Check if email is provided
     const { email } = req.body;
@@ -137,15 +141,10 @@ export const forgotPassword = async (req, res) => {
   }
 };
 
-export const UpdateProfile = async (req, res) => {
+export const UpdateProfileRD = async (req, res) => {
-  const { name, email } = req.body;
+  const { name, mobile_number } = req.body; // Only expecting name from the request body
 
-  const userId = req.user._id; // Use the ID from params or authenticated user
+  const userId = req.user._id; // User ID from authenticated user
-
-  // Validate email if provided
-  if (email && !validator.isEmail(email)) {
-    return res.status(400).json({ message: "Invalid email address" });
-  }
 
   try {
     // Find the RetailDistributor by user ID
@@ -156,27 +155,15 @@ export const UpdateProfile = async (req, res) => {
     }
 
     // Assuming you have an 'isVerified' field in your RetailDistributor schema
-    if (!retailDistributor.isVerified) {
-      return res
-        .status(400)
-        .json({ message: "Retail Distributor not verified" });
-    }
-
-    // Check if email is being changed and if it's already in use
-    if (email && email !== retailDistributor.email) {
-      const emailExists = await RetailDistributor.findOne({ email });
-      if (emailExists && emailExists._id.toString() !== userId) {
-        return res.status(400).json({
-          message:
-            "This Email ID is already in use by another Retail Distributor",
-        });
-      }
-      retailDistributor.email = email;
-    }
 
     // Update name if provided
     if (name) {
       retailDistributor.name = name;
+      retailDistributor.mobile_number = mobile_number
+        ? mobile_number
+        : retailDistributor.mobile_number;
+    } else {
+      return res.status(400).json({ message: "Name is required" });
     }
 
     // Save the updated RetailDistributor
@@ -193,7 +180,7 @@ export const UpdateProfile = async (req, res) => {
   }
 };
 
-export const getmyProfile = async (req, res) => {
+export const getmyProfileRD = async (req, res) => {
   try {
     // Fetch the profile data using the authenticated user's ID
     const myData = await RetailDistributor.findById(req.user?._id);

resources/user/userController.js

@@ -851,7 +851,7 @@ export const resetPassword = catchAsyncErrors(async (req, res, next) => {
 
 //6.Get User Detail
 export const getUserDetails = catchAsyncErrors(async (req, res, next) => {
-  const user = await User.findById(req.user.id);
+  const user = await User.findById(req.user?._id);
 
   res.status(200).json({
     success: true,