@nuskin/ns-shop 6.7.2 → 6.7.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuskin/ns-shop",
-  "version": "6.7.2",
+  "version": "6.7.3",
   "description": "The description that will amaze and astound your audience when they read it",
   "main": "src/shop.js",
   "scripts": {

package/src/cart/cartService.js

@@ -7,8 +7,7 @@ import {UserService, AccountManager}  from '@nuskin/ns-account';
 import ProductService from './productService';
 import Cart from './cart.js';
 import AdrEditService from '../adr/AdrEditService.js';
-import OldQualificationService from '../qualification/qualificationService';
-import { default as NewQualificationService } from '@nuskin/exclusive-offer-sdk';
+import QualificationService from '../qualification/qualificationService';
 import {ProductStatus} from '@nuskin/ns-product-lib';
 import webLoyalty from '@nuskin/ns-loyalty-web';
 import axios from 'axios';
@@ -106,22 +105,6 @@ const checkFlag = async (flag) => {
 }
 checkFlag()
 
-const getQualificationService = async () => {
-    try {
-        const [
-            flagSet,
-            configEnabled
-        ] = await Promise.all([
-            checkFlag('cx15_use_new_exclusive_offer_api'),
-            getConfiguration(['Equinox_Markets']).then(configuration => configuration.Equinox_Markets.active)
-        ])
-        return flagSet || configEnabled ? NewQualificationService : OldQualificationService;
-    } catch (e) {
-        console.error('error retrieving configuration. Defaulting to Legacy exclusive offer service', e)
-        return OldQualificationService
-    }
-}
-
 /**
  *
  * @memberof CartService
@@ -474,7 +457,7 @@ async function addSkuToCart(options) {
 
 async function getBaseSkuCartQuantity(baseSku) {
     await awaitForConfig();
-    const cartContents = await (await getQualificationService()).convertCartDataToBaseSkus(_getCart().getItemData(), true) || {}
+    const cartContents = await QualificationService.convertCartDataToBaseSkus(_getCart().getItemData(), true) || {}
     const baseSkuData = cartContents[baseSku] || {}
     const quantity = baseSkuData.qty || 0
     return quantity
@@ -504,8 +487,7 @@ async function getAddToCartQty(product) {
         retVal = product.maxQuantity - cartQty;
         if (product.isExclusive) {
             try {
-                const QualificationService = await getQualificationService()
-                const qual = await QualificationService.getQualification(product.sku)
+                const qual = QualificationService.getQualification(product.sku)
                 const productIdentifier = qual.productId || qual.sku;
                 cartQty = await getBaseSkuCartQuantity(productIdentifier)
                 retVal = product.maxQuantity - cartQty;
@@ -823,7 +805,6 @@ async function checkItemAvailability() {
             // get qualifications for product
             const response = await ProductService.getProductBySku({sku: item.product.sku});
             const productInfo = response.success && response.product;
-            const QualificationService = await getQualificationService()
             let qual = null
             if (productInfo.equinoxProductId) {
                 qual = await QualificationService.getQualification(productInfo.equinoxProductId)
@@ -864,7 +845,7 @@ async function checkItemAvailability() {
  * @private
  */
 async function _checkQualification(sku, newQty) {
-    let isQualified = await (await getQualificationService()).isQualified(sku, newQty, _getCart().getItemData());
+    let isQualified = await QualificationService.isQualified(sku, newQty, _getCart().getItemData());
 
     if (!isQualified) {
         let str = 'You are not qualified to purchase this product';
@@ -878,7 +859,7 @@ async function _checkQualification(sku, newQty) {
 }
 
 async function _adjustToQualificationQuantity(options, origQty) {
-    const qualQty = await (await getQualificationService()).getQualifiedQty(options.product.sku);
+    const qualQty = await QualificationService.getQualifiedQty(options.product.sku);
 
     if (qualQty < origQty + options.qty) {
         if (qualQty < origQty) {

package/src/qualification/qualificationService.js

@@ -1,6 +1,7 @@
 import $ from '@nuskin/nuskinjquery';
 import {UserService} from '@nuskin/ns-account';
 import {retrieveTogglesBasedOnEnvironment} from '@nuskin/ns-feature-flags';
+import { getCachedConfigField, getConfiguration } from '@nuskin/configuration-sdk';
 import {
     events,
     StringService,
@@ -10,8 +11,9 @@ import {
     UrlService
 } from '@nuskin/ns-util';
 import {CartService} from '@nuskin/ns-shop';
-import {getCachedConfigField} from '@nuskin/configuration-sdk';
 import {ProductDataService} from '@nuskin/ns-product'
+import { default as NewQualificationService } from '@nuskin/exclusive-offer-sdk';
+
 import axios from 'axios';
 
 const QUALIFICATION_URL = "/qualification/v1";
@@ -23,14 +25,19 @@ let _activeEvents = [];
 let getPromise = {promise: null};
 let managePromise = {promise: null};
 
-let featureFlags = false
-
 let variantMappings = {}
 
+let flagsPromise = null
+let featureFlags = false
 const checkFlag = async (flag) => {
+    if (!featureFlags && !flagsPromise) {
+        flagsPromise = retrieveTogglesBasedOnEnvironment().then(flagsFromServer => featureFlags = flagsFromServer)
+    }
+
     if (!featureFlags) {
-        featureFlags = await retrieveTogglesBasedOnEnvironment()
+        await flagsPromise
     }
+
     return featureFlags.has(flag)
 }
 
@@ -686,7 +693,7 @@ const getEarlyAccessQualificationModal = () => {
 
 $(document).ready(_setListeners);
 
-const qualificationService = {
+const OldQualificationService = {
     _clearQualifications,   // exposed for unit testing
     _setListeners,          // Only exposed for unit testing purposes this is called above in the jquery ready function
     claimQualifications,
@@ -706,4 +713,42 @@ const qualificationService = {
     transferQualifications
 };
 
-export default qualificationService;
+/*
+    The code below will globally switch this service over to the new exclusive offer service in markets where that is appropriate
+
+    For each method in the service, it will switch between old and new service based on the equinox configuration and feature flag.
+    If the method isn't in the new service or if there is an error fetching, it will default to the old one
+*/
+const getQualificationService = async () => {
+    try {
+        const [
+            flagSet,
+            configEnabled
+        ] = await Promise.all([
+            checkFlag('cx15_use_new_exclusive_offer_api'),
+            getConfiguration(['Equinox_Markets']).then(configuration => configuration.Equinox_Markets.active)
+        ])
+        return flagSet || configEnabled ? NewQualificationService : OldQualificationService;
+    } catch (e) {
+        console.error('error retrieving configuration. Defaulting to Legacy exclusive offer service', e)
+        return OldQualificationService
+    }
+}
+
+const invokeQualificationServiceMethod = async (params, functionName) => {
+    const qualificationService = await getQualificationService()
+    return qualificationService[functionName](...params)
+}
+
+const QualificationService = Object.keys(OldQualificationService)
+    .reduce((QualificationService, functionName) => {
+        if (NewQualificationService[functionName]) {
+            QualificationService[functionName] = (...params) => invokeQualificationServiceMethod(params, functionName)
+        } else {
+            QualificationService[functionName] = OldQualificationService[functionName]
+        }
+
+        return QualificationService
+    }, {})
+
+export default QualificationService;