fix(get-lineitem.spec.ts): add support for ownerCustomerId in Custome…

…rOrderServiceGetLineItem fix(get-lineitem.ts): add support for ownerCustomerId in CustomerOrderServiceGetLineItem fix(get.ts): add support for ownerCustomerId in CustomerOrderServiceGet fix(list.ts): add support for ownerCustomerId in CustomerOrderServiceList fix(order.schema.ts): add indexes for ownerCustomerId in OrdreMongooseSchema
jamalsoueidan · Dec 14, 2023 · de70e13 · de70e13
1 parent 70bd3e2
commit de70e13
Show file tree

Hide file tree

Showing 5 changed files with 83 additions and 14 deletions.
diff --git a/src/functions/customer/services/order/get-lineitem.spec.ts b/src/functions/customer/services/order/get-lineitem.spec.ts
@@ -11,15 +11,26 @@ describe("CustomerOrderServiceGetLineItem", () => {
 
     const lineItemId = response.line_items[0].id;
 
+    // both the beauty professional and customer can see the order
+    const ownerCustomerId = response.customer.id;
     const customerId = response.line_items[0].properties?.customerId || 0;
 
-    const order = await CustomerOrderServiceGetLineItem({
+    let order = await CustomerOrderServiceGetLineItem({
       customerId,
       lineItemId,
     });
 
     expect(order.line_items.id).toEqual(lineItemId);
     expect(order.fulfillments.length).toBe(1);
     expect(order.refunds.length).toBe(1);
+
+    order = await CustomerOrderServiceGetLineItem({
+      customerId: ownerCustomerId,
+      lineItemId,
+    });
+
+    expect(order.line_items.id).toEqual(lineItemId);
+    expect(order.fulfillments.length).toBe(1);
+    expect(order.refunds.length).toBe(1);
   });
 });
diff --git a/src/functions/customer/services/order/get-lineitem.ts b/src/functions/customer/services/order/get-lineitem.ts
@@ -16,7 +16,14 @@ export const CustomerOrderServiceGetLineItem = async ({
       $match: {
         $and: [
           {
-            "line_items.properties.customerId": customerId,
+            $or: [
+              {
+                "line_items.properties.customerId": customerId,
+              },
+              {
+                "customer.id": customerId,
+              },
+            ],
           },
           {
             line_items: {
@@ -31,7 +38,14 @@ export const CustomerOrderServiceGetLineItem = async ({
       $match: {
         $and: [
           {
-            "line_items.properties.customerId": customerId,
+            $or: [
+              {
+                "line_items.properties.customerId": customerId,
+              },
+              {
+                "customer.id": customerId,
+              },
+            ],
           },
           {
             "line_items.id": lineItemId,

diff --git a/src/functions/customer/services/order/get.ts b/src/functions/customer/services/order/get.ts
@@ -21,7 +21,14 @@ export const CustomerOrderServiceGet = async ({
       $match: {
         $and: [
           {
-            "customer.id": customerId,
+            $or: [
+              {
+                "line_items.properties.customerId": customerId,
+              },
+              {
+                "customer.id": customerId,
+              },
+            ],
           },
           {
             id: orderId,

diff --git a/src/functions/customer/services/order/list.ts b/src/functions/customer/services/order/list.ts
@@ -42,7 +42,14 @@ export const CustomerOrderServiceList = async ({
       $match: {
         $and: [
           {
-            "line_items.properties.customerId": customerId,
+            $or: [
+              {
+                "line_items.properties.customerId": customerId,
+              },
+              {
+                "customer.id": customerId,
+              },
+            ],
           },
           {
             "line_items.properties.from": {
@@ -58,7 +65,14 @@ export const CustomerOrderServiceList = async ({
       $match: {
         $and: [
           {
-            "line_items.properties.customerId": customerId,
+            $or: [
+              {
+                "line_items.properties.customerId": customerId,
+              },
+              {
+                "customer.id": customerId,
+              },
+            ],
           },
           {
             "line_items.properties.from": {

diff --git a/src/functions/order/order.schema.ts b/src/functions/order/order.schema.ts
@@ -124,7 +124,10 @@ const LineItemSchema = new Schema(
     product_exists: Boolean,
     product_id: Number,
     properties: {
-      from: Date,
+      from: {
+        type: Date,
+        index: true,
+      },
       to: Date,
       customerId: { type: Number, index: true },
       locationId: String,
@@ -148,13 +151,6 @@ const LineItemSchema = new Schema(
   }
 );
 
-LineItemSchema.index({ id: 1, "properties.customerId": 1 }, { unique: true });
-
-LineItemSchema.index(
-  { "properties.from": 1, "properties.customerId": 1 },
-  { unique: false }
-);
-
 const FulfillmentSchema = new Schema(
   {
     id: {
@@ -343,3 +339,30 @@ export const OrdreMongooseSchema = new Schema<IOrderDocument, IOrderModel>({
   shipping_address: AddressSchema,
   shipping_lines: [ShippingLineSchema],
 });
+
+// orders/get-line-item
+OrdreMongooseSchema.index(
+  { "customer.id": 1, "line_items.id": 1 },
+  { unique: false }
+);
+OrdreMongooseSchema.index(
+  { "line_items.properties.customerId": 1, "line_items.id": 1 },
+  { unique: false }
+);
+
+// orders/get
+OrdreMongooseSchema.index({ "customer.id": 1, id: 1 }, { unique: false });
+OrdreMongooseSchema.index(
+  { "line_items.properties.customerId": 1, id: 1 },
+  { unique: false }
+);
+
+// order/list
+OrdreMongooseSchema.index(
+  { "customer.id": 1, "line_items.properties.from": 1 },
+  { unique: false }
+);
+OrdreMongooseSchema.index(
+  { "line_items.properties.customerId": 1, "line_items.properties.from": 1 },
+  { unique: false }
+);