feat(shopper): CHECKOUT-3277 Remove cart dependency from customer mapper

Author: Luis Sanchez

src/checkout/checkout-store-selector.spec.ts

@@ -71,7 +71,7 @@ describe('CheckoutStoreSelector', () => {
     });
 
     it('returns customer', () => {
-        expect(selector.getCustomer()).toEqual(getCustomer()) ;
+        expect(selector.getCustomer()).toEqual(internalSelectors.customer.getCustomer());
     });
 
     it('returns billing address', () => {

src/checkout/checkout-store-selector.ts

@@ -5,7 +5,7 @@ import { selector } from '../common/selector';
 import { ConfigSelector } from '../config';
 import { StoreConfig } from '../config/config';
 import { Coupon, CouponSelector, GiftCertificate, GiftCertificateSelector } from '../coupon';
-import { mapToInternalCustomer, CustomerSelector, InternalCustomer } from '../customer';
+import { Customer, CustomerSelector } from '../customer';
 import { FormField, FormSelector } from '../form';
 import { Country, CountrySelector } from '../geography';
 import { Order, OrderSelector } from '../order';
@@ -259,17 +259,8 @@ export default class CheckoutStoreSelector {
      * @returns The current customer object if it is loaded, otherwise
      * undefined.
      */
-    getCustomer(): InternalCustomer | undefined {
-        const customer = this._customer.getCustomer();
-        const checkout = this._checkout.getCheckout();
-        const cart = checkout && checkout.cart;
-        const billingAddress = checkout && checkout.billingAddress;
-
-        if (!customer || !billingAddress || !cart) {
-            return;
-        }
-
-        return mapToInternalCustomer(customer, cart, billingAddress);
+    getCustomer(): Customer | undefined {
+        return this._customer.getCustomer();
     }
 
     /**

src/customer/customer.ts

@@ -1,6 +1,7 @@
 import { Address } from '../address';
 
 export default interface Customer {
+    id: number;
     addresses: Address[];
     storeCredit: number;
     email: string;

src/customer/customers.mock.ts

@@ -4,6 +4,7 @@ import Customer from './customer';
 
 export function getGuestCustomer(): Customer {
     return {
+        id: 0,
         addresses: [],
         email: '',
         firstName: '',
@@ -16,6 +17,7 @@ export function getGuestCustomer(): Customer {
 
 export function getCustomer(): Customer {
     return {
+        id: 4,
         email: 'test@bigcommerce.com',
         firstName: 'Foo',
         fullName: 'Foo Bar',

src/customer/map-to-internal-customer.spec.ts

@@ -9,14 +9,19 @@ import mapToInternalCustomer from './map-to-internal-customer';
 
 describe('mapToInternalCustomer', () => {
     it('maps to internal guest customer', () => {
-        expect(mapToInternalCustomer(getGuestCustomer(), { ...getCart(), customerId: 0 }, getBillingAddress()))
+        expect(mapToInternalCustomer(getGuestCustomer(), getBillingAddress()))
             .toEqual(getInternalGuestCustomer());
     });
 
+    it('maps to internal guest customer', () => {
+        expect(mapToInternalCustomer(getGuestCustomer()))
+            .toEqual({ ...getInternalGuestCustomer(), email: '' });
+    });
+
     it('maps to internal customer', () => {
         const checkout = getCheckout();
 
-        expect(mapToInternalCustomer(checkout.customer, checkout.cart, checkout.billingAddress))
+        expect(mapToInternalCustomer(checkout.customer, checkout.billingAddress))
             .toEqual(getInternalCustomer());
     });
 });

src/customer/map-to-internal-customer.ts

@@ -1,16 +1,15 @@
 import { mapToInternalAddress, Address } from '../address';
-import { Cart } from '../cart';
 
 import { Customer } from '.';
 import InternalCustomer from './internal-customer';
 
-export default function mapToInternalCustomer(customer: Customer, cart: Cart, billingAddress: Address): InternalCustomer {
+export default function mapToInternalCustomer(customer: Customer, billingAddress?: Address): InternalCustomer {
     return {
         addresses: (customer.addresses || []).map(address => mapToInternalAddress(address)),
-        customerId: cart.customerId,
+        customerId: customer.id,
         isGuest: customer.isGuest,
         storeCredit: customer.storeCredit,
-        email: customer.email || billingAddress.email || '',
+        email: customer.email || (billingAddress && billingAddress.email) || '',
         firstName: customer.firstName,
         name: customer.fullName,
     };

src/payment/payment-action-creator.ts

@@ -79,8 +79,7 @@ export default class PaymentActionCreator {
         const config = state.config.getStoreConfig();
         const instrumentMeta = state.instruments.getInstrumentsMeta();
         const paymentMeta = state.paymentMethods.getPaymentMethodsMeta();
-        const internalCustomer = customer && billingAddress && checkout && checkout.cart &&
-            mapToInternalCustomer(customer, checkout.cart, billingAddress);
+        const internalCustomer = customer && mapToInternalCustomer(customer, billingAddress);
 
         const authToken = instrumentMeta && isVaultedInstrument(payment.paymentData) ?
             `${state.payment.getPaymentToken()}, ${instrumentMeta.vaultAccessToken}` :