CHG: Major changes on the Address.

routes/profileUpdate.js

@@ -74,147 +74,121 @@ router.post('/', upload.single('file'), async (req, res) => {
     }
 });
 
-// Adress section
-
-// Middleware for async error handling
-const asyncHandler = fn => (req, res, next) =>
-    Promise.resolve(fn(req, res, next)).catch(next);
-
-// Validation middleware
-// const validateAddressData = (req, res, next) => {
-//     const requiredFields = ['name', 'mobileNumber', 'pinCode', 'address'];
-//     const missingFields = requiredFields.filter(field => !req.body[field]);
-//     console.log("validateAddressData: " + missingFields)
-//     if (missingFields.length > 0) {
-//         return res.status(400).json(failedResponse(
-//             `Missing required fields: ${missingFields.join(', ')}`
-//         ));
-//     }
-//     next();
-// };
-
-// Create address (add to user's address array)
-router.post("/:userId/addresses", asyncHandler(async (req, res) => {
-    const userId = parseInt(req.params.userId);
-
-    // Validate userId
-    if (isNaN(userId)) {
-        return res.status(400).json({
-            status: 400,
-            message: "Invalid user ID",
-            data: null
-        });
-    }
-
-    // Validate request body
-    const { name, mobileNumber, pinCode, address, area, landMark, alterMobileNumber } = req.body;
-    if (!name || !mobileNumber || !pinCode || !address || !area) {
-        return res.status(400).json({
-            status: 400,
-            message: "Missing required fields in the address",
-            data: null
-        });
+// Replace the "// Adress section" comment and subsequent code with:
+
+// Address Section
+const validateAddress = (address) => {
+    const requiredFields = ['name', 'mobileNumber', 'pinCode', 'address', 'area'];
+    const missingFields = requiredFields.filter(field => !address[field]);
+    
+    if (missingFields.length > 0) {
+        throw new Error(`Missing required fields: ${missingFields.join(', ')}`);
     }
+};
 
+// Create new address
+router.post("/address", asyncHandler(async (req, res) => {
     try {
-        // Find the user by unique_id and update the addresses array
+        const { userId } = req.body;
+        if (!userId) {
+            return res.status(400).json({
+                status: false,
+                message: "User ID is required",
+                data: null
+            });
+        }
+
+        validateAddress(req.body);
+
+        const addressData = {
+            name: req.body.name,
+            mobileNumber: req.body.mobileNumber,
+            pinCode: req.body.pinCode,
+            address: req.body.address,
+            area: req.body.area,
+            landMark: req.body.landMark || '',
+            alterMobileNumber: req.body.alterMobileNumber || ''
+        };
+
         const updatedUser = await User.findOneAndUpdate(
-            { unique_id: userId }, // Filter by unique_id
-            { $push: { addresses: req.body } }, // Push new address into the addresses array
-            { new: true, runValidators: true } // Return updated document and run schema validators
+            { unique_id: userId },
+            { $push: { addresses: addressData } },
+            { new: true }
         );
 
-        // If user not found, return 404
         if (!updatedUser) {
             return res.status(404).json({
-                status: 404,
+                status: false,
                 message: "User not found",
                 data: null
             });
         }
 
-        // Extract the newly added address
-        const addressesArray = updatedUser.addresses || [];
-        const newAddress = addressesArray[addressesArray.length - 1];
-
-        // If newAddress is missing, return 500
-        if (!newAddress) {
-            return res.status(500).json({
-                status: 500,
-                message: "Failed to retrieve new address",
-                data: null
-            });
-        }
+        const newAddress = updatedUser.addresses[updatedUser.addresses.length - 1];
 
-        // Return success response with the new address
-        res.status(200).json({
-            status: 201,
-            message: "Address created successfully",
+        return res.status(200).json({
+            status: true,
+            message: "Address added successfully",
             data: newAddress
         });
     } catch (error) {
-        console.error("Error updating user address:", error);
+        return res.status(400).json({
+            status: false,
+            message: error.message,
+            data: null
+        });
+    }
+}));
 
-        // Handle specific MongoDB errors
-        if (error.name === "ValidationError") {
-            return res.status(400).json({
-                status: 400,
-                message: "Validation error: " + error.message,
-                data: null
-            });
-        }
+// Get all addresses
+router.get("/address/:userId", asyncHandler(async (req, res) => {
+    try {
+        const { userId } = req.params;
+        const user = await User.findOne({ unique_id: userId }).select('addresses');
 
-        if (error.name === "MongoError" && error.code === 11000) {
-            return res.status(400).json({
-                status: 400,
-                message: "Duplicate key error: " + error.message,
+        if (!user) {
+            return res.status(404).json({
+                status: false,
+                message: "User not found",
                 data: null
             });
         }
 
-        // Generic server error
-        res.status(500).json({
-            status: 500,
-            message: "Internal server error",
+        return res.status(200).json({
+            status: true,
+            message: "Addresses retrieved successfully",
+            data: user.addresses || []
+        });
+    } catch (error) {
+        return res.status(400).json({
+            status: false,
+            message: error.message,
             data: null
         });
     }
 }));
 
-// Get addresses by user
-router.get("/:userId/addresses", asyncHandler(async (req, res) => {
-    const user = await User.findOne({ unique_id: req.params.userId }).select('addresses');
-
-    if (!user) {
-        return res.status(404).json(failedResponse("User not found", 404));
-    }
-
-    res.status(200).json(successResponse("Success!", user.addresses));
-}));
-
-// Update Adress
-router.put("/:userId/addresses/:addressId", asyncHandler(async (req, res) => {
+// Update address
+router.put("/address", asyncHandler(async (req, res) => {
     try {
-        const userId = Number(req.params.userId); // Convert userId to a Number
-        const addressId = new mongoose.Types.ObjectId(req.params.addressId); // Convert addressId to ObjectId
-
-        console.log("Converted Address ID:", addressId);
-
-        // Check if the address exists first
-        const user = await User.findOne({
-            unique_id: userId,
-            "addresses._id": addressId
-        });
-
-        if (!user) {
-            return res.status(404).json(failedResponse("User or address not found", 404));
+        const { userId, addressId } = req.body;
+        if (!userId || !addressId) {
+            return res.status(400).json({
+                status: false,
+                message: "User ID and Address ID are required",
+                data: null
+            });
         }
 
-        // Update only fields that are provided in req.body
+        validateAddress(req.body);
+
         const updateFields = {};
-        Object.keys(req.body).forEach(key => {
-            updateFields[`addresses.$.${key}`] = req.body[key];
-        });
+        ['name', 'mobileNumber', 'pinCode', 'address', 'area', 'landMark', 'alterMobileNumber']
+            .forEach(field => {
+                if (req.body[field] !== undefined) {
+                    updateFields[`addresses.$.${field}`] = req.body[field];
+                }
+            });
 
         const updatedUser = await User.findOneAndUpdate(
             {
@@ -222,50 +196,73 @@ router.put("/:userId/addresses/:addressId", asyncHandler(async (req, res) => {
                 "addresses._id": addressId
             },
             { $set: updateFields },
-            { new: true, runValidators: true }
+            { new: true }
         );
 
         if (!updatedUser) {
-            return res.status(404).json(failedResponse("Address update failed", 404));
+            return res.status(404).json({
+                status: false,
+                message: "Address not found",
+                data: null
+            });
         }
 
-        const updatedAddress = updatedUser.addresses.find(a => a._id.equals(addressId));
+        const updatedAddress = updatedUser.addresses.find(
+            addr => addr._id.toString() === addressId
+        );
 
-        res.status(200).json(successResponse("Address updated successfully", updatedAddress));
+        return res.status(200).json({
+            status: true,
+            message: "Address updated successfully",
+            data: updatedAddress
+        });
     } catch (error) {
-        console.error("Error updating address:", error);
-        return res.status(500).json(failedResponse(error.message || "Internal server error", 500));
+        return res.status(400).json({
+            status: false,
+            message: error.message,
+            data: null
+        });
     }
 }));
 
 // Delete address
-router.delete("/:userId/addresses/:addressId", asyncHandler(async (req, res) => {
-    // Convert userId to number
-    const userId = parseInt(req.params.userId);
+router.delete("/address", asyncHandler(async (req, res) => {
+    try {
+        const { userId, addressId } = req.body;
+        if (!userId || !addressId) {
+            return res.status(400).json({
+                status: false,
+                message: "User ID and Address ID are required",
+                data: null
+            });
+        }
 
-    // Simple validation
-    if (isNaN(userId)) {
-        return res.status(400).json(failedResponse("Invalid user ID", 400));
-    }
+        const updatedUser = await User.findOneAndUpdate(
+            { unique_id: userId },
+            { $pull: { addresses: { _id: addressId } } },
+            { new: true }
+        );
 
-    const updatedUser = await User.findOneAndUpdate(
-        { unique_id: userId },
-        { $pull: { addresses: { _id: req.params.addressId } } },
-        { new: true }
-    );
+        if (!updatedUser) {
+            return res.status(404).json({
+                status: false,
+                message: "Address not found",
+                data: null
+            });
+        }
 
-    if (!updatedUser) {
-        return res.status(404).json(failedResponse("User not found", 404));
+        return res.status(200).json({
+            status: true,
+            message: "Address deleted successfully",
+            data: null
+        });
+    } catch (error) {
+        return res.status(400).json({
+            status: false,
+            message: error.message,
+            data: null
+        });
     }
-
-    res.status(200).json(successResponse("Address deleted successfully"));
 }));
 
-// Remove the GET all addresses endpoint as it's no longer relevant
-// Update error handling middleware
-// router.use((err, req, res, next) => {
-//     console.error(err.stack);
-//     res.status(500).json(failedResponse("Internal server error", 500));
-// });
-
 module.exports = router;