chore: generic data handling for updates

intershop · Nov 14, 2023 · 3e4eb77 · 3e4eb77
1 parent d1f8ddd
commit 3e4eb77
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 25 deletions.
diff --git a/src/app/core/services/basket/basket.service.ts b/src/app/core/services/basket/basket.service.ts
@@ -40,12 +40,9 @@ export type BasketUpdateType =
   | { messageToMerchant: string };
 
 export type BasketItemUpdateType =
-  | {
-      quantity?: { value: number; unit: string };
-      product?: string;
-      partialOrderNo?: string;
-      customerProductID?: string;
-    }
+  | { quantity?: { value: number; unit: string }; product?: string }
+  | { customerProductID?: string }
+  | { partialOrderNo?: string }
   | { shippingMethod?: { id: string } }
   | { desiredDelivery?: string }
   | { calculated: boolean };

diff --git a/src/app/core/store/customer/basket/basket-items.effects.spec.ts b/src/app/core/store/customer/basket/basket-items.effects.spec.ts
@@ -290,21 +290,19 @@ describe('Basket Items Effects', () => {
     });
 
     it('should call the basketService for updateBasketItem if quantity > 0', done => {
+      const itemId = 'BIID';
       const payload = {
         lineItemUpdates: [
           {
-            customerProductID: 'testProductID',
-            partialOrderNo: 'partialTestOrderID',
-            itemId: 'BIID',
+            itemId,
             quantity: 2,
           },
           {
-            customerProductID: 'testProductID',
-            itemId: 'BIID',
+            itemId,
             quantity: 3,
           },
           {
-            itemId: 'BIID',
+            itemId,
             quantity: 4,
           },
         ],
@@ -313,13 +311,11 @@ describe('Basket Items Effects', () => {
       actions$ = of(action);
 
       effects.updateBasketItems$.subscribe(() => {
-        verify(basketServiceMock.updateBasketItem(payload.lineItemUpdates[1].itemId, anything())).thrice();
+        verify(basketServiceMock.updateBasketItem(itemId, anything())).thrice();
         expect(capture(basketServiceMock.updateBasketItem).first()).toMatchInlineSnapshot(`
           [
             "BIID",
             {
-              "customerProductID": "testProductID",
-              "partialOrderNo": "partialTestOrderID",
               "product": undefined,
               "quantity": {
                 "unit": undefined,
@@ -332,8 +328,6 @@ describe('Basket Items Effects', () => {
           [
             "BIID",
             {
-              "customerProductID": "testProductID",
-              "partialOrderNo": undefined,
               "product": undefined,
               "quantity": {
                 "unit": undefined,
@@ -346,8 +340,6 @@ describe('Basket Items Effects', () => {
           [
             "BIID",
             {
-              "customerProductID": undefined,
-              "partialOrderNo": undefined,
               "product": undefined,
               "quantity": {
                 "unit": undefined,
@@ -360,6 +352,41 @@ describe('Basket Items Effects', () => {
       });
     });
 
+    it('should call the basketService for updateBasketItem with special attributes', done => {
+      const itemId = 'BIID';
+      const payload = {
+        lineItemUpdates: [
+          {
+            customerProductID: 'testProductID',
+            partialOrderNo: 'partialTestOrderID',
+            itemId,
+            quantity: 2,
+          },
+        ],
+      };
+      const action = updateBasketItems(payload);
+      actions$ = of(action);
+
+      effects.updateBasketItems$.subscribe(() => {
+        verify(basketServiceMock.updateBasketItem(itemId, anything())).once();
+        expect(capture(basketServiceMock.updateBasketItem).last()).toMatchInlineSnapshot(`
+          [
+            "BIID",
+            {
+              "customerProductID": "testProductID",
+              "partialOrderNo": "partialTestOrderID",
+              "product": undefined,
+              "quantity": {
+                "unit": undefined,
+                "value": 2,
+              },
+            },
+          ]
+        `);
+        done();
+      });
+    });
+
     it('should call the basketService for deleteBasketItem if quantity = 0', done => {
       when(basketServiceMock.deleteBasketItem(anyString())).thenReturn(of());
 

diff --git a/src/app/core/store/customer/basket/basket-items.effects.ts b/src/app/core/store/customer/basket/basket-items.effects.ts
@@ -23,6 +23,7 @@ import {
 } from 'ish-core/models/line-item-update/line-item-update.helper';
 import { BasketService } from 'ish-core/services/basket/basket.service';
 import { getProductEntities, loadProduct } from 'ish-core/store/shopping/products';
+import { omit } from 'ish-core/utils/functions';
 import { mapErrorToAction, mapToPayload, mapToPayloadProperty } from 'ish-core/utils/operators';
 
 import {
@@ -120,8 +121,7 @@ export class BasketItemsEffects {
           .updateBasketItem(lineItem.itemId, {
             quantity: lineItem.quantity > 0 ? { value: lineItem.quantity, unit: lineItem.unit } : undefined,
             product: lineItem.sku,
-            customerProductID: lineItem.customerProductID,
-            partialOrderNo: lineItem.partialOrderNo,
+            ...omit(lineItem, 'itemId', 'quantity', 'sku', 'unit'),
           })
           .pipe(
             map(payload => updateBasketItemSuccess(payload)),
@@ -154,8 +154,7 @@ export class BasketItemsEffects {
               return this.basketService.updateBasketItem(update.itemId, {
                 quantity: update.quantity > 0 ? { value: update.quantity, unit: update.unit } : undefined,
                 product: update.sku,
-                customerProductID: update.customerProductID,
-                partialOrderNo: update.partialOrderNo,
+                ...omit(update, 'itemId', 'quantity', 'sku', 'unit'),
               });
             }
           })

diff --git a/src/app/core/utils/dev/basket-mock-data.ts b/src/app/core/utils/dev/basket-mock-data.ts
@@ -36,8 +36,6 @@ export class BasketMockData {
           displayName: 'test',
         },
       ],
-      customerProductID: 'testCustomerProductID',
-      partialOrderNo: 'testPartialOrderNo',
       totals: {},
     } as LineItemView;
   }