fix: add items to basket with common shipping method (#1419)

* fix: add items to basket with common shipping method * test: fix e2e test due to shipping restrictions
intershop · Apr 24, 2023 · 6ee9909 · 6ee9909
1 parent 61c4b0f
commit 6ee9909
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 18 deletions.
diff --git a/e2e/cypress/e2e/specs/extras/order-templates-shopping.b2b.e2e-spec.ts b/e2e/cypress/e2e/specs/extras/order-templates-shopping.b2b.e2e-spec.ts
@@ -17,7 +17,7 @@ const _ = {
   },
   category: 'networks',
   subcategory: 'networks.firewalls',
-  product1: '859910',
+  product1: '1451744',
   product2: '3459777',
   product3: '3542794',
 };

diff --git a/src/app/core/services/basket/basket.service.spec.ts b/src/app/core/services/basket/basket.service.spec.ts
@@ -10,7 +10,7 @@ import { LineItemData } from 'ish-core/models/line-item/line-item.interface';
 import { LineItem } from 'ish-core/models/line-item/line-item.model';
 import { ApiService } from 'ish-core/services/api/api.service';
 import { OrderService } from 'ish-core/services/order/order.service';
-import { getBasketIdOrCurrent } from 'ish-core/store/customer/basket';
+import { getBasketIdOrCurrent, getCurrentBasket } from 'ish-core/store/customer/basket';
 import { makeHttpError } from 'ish-core/utils/dev/api-service-utils';
 import { BasketMockData } from 'ish-core/utils/dev/basket-mock-data';
 
@@ -59,7 +59,10 @@ describe('Basket Service', () => {
         { provide: ApiService, useFactory: () => instance(apiService) },
         { provide: OrderService, useFactory: () => instance(orderService) },
         provideMockStore({
-          selectors: [{ selector: getBasketIdOrCurrent, value: 'current' }],
+          selectors: [
+            { selector: getBasketIdOrCurrent, value: 'current' },
+            { selector: getCurrentBasket, value: { id: '123' } },
+          ],
         }),
       ],
     });

diff --git a/src/app/core/services/basket/basket.service.ts b/src/app/core/services/basket/basket.service.ts
@@ -2,7 +2,7 @@ import { HttpHeaders, HttpParams } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { Store, select } from '@ngrx/store';
 import { EMPTY, Observable, forkJoin, iif, of, throwError } from 'rxjs';
-import { catchError, concatMap, map, take } from 'rxjs/operators';
+import { catchError, concatMap, first, map, take } from 'rxjs/operators';
 
 import { AddressMapper } from 'ish-core/models/address/address.mapper';
 import { Address } from 'ish-core/models/address/address.model';
@@ -27,7 +27,7 @@ import { ShippingMethodMapper } from 'ish-core/models/shipping-method/shipping-m
 import { ShippingMethod } from 'ish-core/models/shipping-method/shipping-method.model';
 import { ApiService, AvailableOptions, unpackEnvelope } from 'ish-core/services/api/api.service';
 import { OrderService } from 'ish-core/services/order/order.service';
-import { getBasketIdOrCurrent } from 'ish-core/store/customer/basket';
+import { getBasketIdOrCurrent, getCurrentBasket } from 'ish-core/store/customer/basket';
 
 export type BasketUpdateType =
   | { invoiceToAddress: string }
@@ -341,26 +341,38 @@ export class BasketService {
     if (!items) {
       return throwError(() => new Error('addItemsToBasket() called without items'));
     }
+    return this.store.pipe(select(getCurrentBasket)).pipe(
+      first(),
+      concatMap(basket =>
+        this.currentBasketEndpoint()
+          .post<{ data: LineItemData[]; infos: BasketInfo[]; errors?: ErrorFeedback[] }>(
+            'items',
+            this.mapItemsToAdd(basket, items),
+            {
+              headers: this.basketHeaders,
+            }
+          )
+          .pipe(
+            map(payload => ({
+              lineItems: payload.data.map(item => LineItemMapper.fromData(item)),
+              info: BasketInfoMapper.fromInfo({ infos: payload.infos }),
+              errors: payload.errors,
+            }))
+          )
+      )
+    );
+  }
 
-    const body = items.map(item => ({
+  private mapItemsToAdd(basket: Basket, items: SkuQuantityType[]) {
+    return items.map(item => ({
       product: item.sku,
       quantity: {
         value: item.quantity,
         unit: item.unit,
       },
+      // ToDo: if multi buckets will be supported setting the shipping method to the common shipping method has to be reworked
+      shippingMethod: basket?.commonShippingMethod?.id,
     }));
-
-    return this.currentBasketEndpoint()
-      .post<{ data: LineItemData[]; infos: BasketInfo[]; errors?: ErrorFeedback[] }>('items', body, {
-        headers: this.basketHeaders,
-      })
-      .pipe(
-        map(payload => ({
-          lineItems: payload.data.map(item => LineItemMapper.fromData(item)),
-          info: BasketInfoMapper.fromInfo({ infos: payload.infos }),
-          errors: payload.errors,
-        }))
-      );
   }
 
   /**