Merge pull request hiteshchoudhary#114 from Sarthak-ONS/fix/Address-N…

…ot-Found-after-deleting-it-in-orders Bug Fix: address not found issue
Jawad-Ali2 · Apr 2, 2024 · 1fe3447 · 1fe3447
2 parents a9d639b + 0821be7
commit 1fe3447
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 32 deletions.
diff --git a/src/controllers/apps/ecommerce/order.controllers.js b/src/controllers/apps/ecommerce/order.controllers.js
@@ -199,11 +199,21 @@ const generateRazorpayOrder = asyncHandler(async (req, res) => {
           );
       }
 
+      const { addressLine1, addressLine2, city, country, pincode, state } =
+        address;
+
       // Create an order while we generate razorpay session
       // In case payment is done and there is some network issue in the payment verification api
       // We will at least have a record of the order
       const unpaidOrder = await EcomOrder.create({
-        address: addressId,
+        address: {
+          addressLine1,
+          addressLine2,
+          city,
+          country,
+          pincode,
+          state,
+        },
         customer: req.user._id,
         items: orderItems,
         orderPrice: totalPrice ?? 0,
@@ -298,11 +308,20 @@ const generatePaypalOrder = asyncHandler(async (req, res) => {
   const paypalOrder = await response.json();
 
   if (paypalOrder?.id) {
+    const { addressLine1, addressLine2, city, country, pincode, state } =
+      address;
     // Create an order while we generate paypal session
     // In case payment is done and there is some network issue in the payment verification api
     // We will at least have a record of the order
     const unpaidOrder = await EcomOrder.create({
-      address: addressId,
+      address: {
+        addressLine1,
+        addressLine2,
+        city,
+        country,
+        pincode,
+        state,
+      },
       customer: req.user._id,
       items: orderItems,
       orderPrice: totalPrice ?? 0,
@@ -393,15 +412,6 @@ const getOrderById = asyncHandler(async (req, res) => {
         _id: new mongoose.Types.ObjectId(orderId),
       },
     },
-    // lookup for an address associated with the order
-    {
-      $lookup: {
-        from: "addresses",
-        localField: "address",
-        foreignField: "_id",
-        as: "address",
-      },
-    },
     // lookup for a customer associated with the order
     {
       $lookup: {
@@ -441,7 +451,6 @@ const getOrderById = asyncHandler(async (req, res) => {
     {
       $addFields: {
         customer: { $first: "$customer" },
-        address: { $first: "$address" },
         coupon: { $ifNull: [{ $first: "$coupon" }, null] },
       },
     },
@@ -517,14 +526,6 @@ const getOrderListAdmin = asyncHandler(async (req, res) => {
             }
           : {},
     },
-    {
-      $lookup: {
-        from: "addresses",
-        localField: "address",
-        foreignField: "_id",
-        as: "address",
-      },
-    },
     // lookup for a customer associated with the order
     {
       $lookup: {
@@ -562,7 +563,6 @@ const getOrderListAdmin = asyncHandler(async (req, res) => {
     {
       $addFields: {
         customer: { $first: "$customer" },
-        address: { $first: "$address" },
         coupon: { $ifNull: [{ $first: "$coupon" }, null] },
         totalOrderItems: { $size: "$items" },
       },

diff --git a/src/controllers/apps/ecommerce/profile.controllers.js b/src/controllers/apps/ecommerce/profile.controllers.js
@@ -44,14 +44,6 @@ const getMyOrders = asyncHandler(async (req, res) => {
         customer: req.user._id,
       },
     },
-    {
-      $lookup: {
-        from: "addresses",
-        localField: "address",
-        foreignField: "_id",
-        as: "address",
-      },
-    },
     // lookup for a customer associated with the order
     {
       $lookup: {
@@ -90,7 +82,6 @@ const getMyOrders = asyncHandler(async (req, res) => {
     {
       $addFields: {
         customer: { $first: "$customer" },
-        address: { $first: "$address" },
         coupon: { $ifNull: [{ $first: "$coupon" }, null] },
         totalOrderItems: { $size: "$items" },
       },

diff --git a/src/models/apps/ecommerce/order.models.js b/src/models/apps/ecommerce/order.models.js
@@ -48,8 +48,29 @@ const orderSchema = new Schema(
       default: [],
     },
     address: {
-      type: Schema.Types.ObjectId,
-      ref: "Address",
+      addressLine1: {
+        required: true,
+        type: String,
+      },
+      addressLine2: {
+        type: String,
+      },
+      city: {
+        required: true,
+        type: String,
+      },
+      country: {
+        required: true,
+        type: String,
+      },
+      pincode: {
+        required: true,
+        type: String,
+      },
+      state: {
+        required: true,
+        type: String,
+      },
     },
     status: {
       type: String,