From 644bfebe226ec0d1f573c436e2a2e7587c810ceb Mon Sep 17 00:00:00 2001 From: CarlNation Date: Fri, 7 Oct 2022 10:49:50 -0400 Subject: [PATCH 1/3] CSR-752 renamed save and load endpoints --- src/constants/endpoints.js | 8 +-- src/constants/store-actions.js | 8 +-- src/constants/store-mutations.js | 4 +- src/global-methods.js | 6 +- .../heritage-integration/navigation-helper.js | 8 +-- .../navigation-helper.spec.js | 26 ++++----- .../heritage-integration/order-helper.js | 58 +++++++++---------- .../heritage-integration/order-helper.spec.js | 38 ++++++------ src/mixins/vin-pages-mixin.js | 4 +- src/mixins/vin-pages-mixin.spec.js | 2 +- src/router/index.js | 14 ++--- src/store/index.js | 32 +++++----- src/store/store.spec.js | 20 +++---- 13 files changed, 116 insertions(+), 112 deletions(-) diff --git a/src/constants/endpoints.js b/src/constants/endpoints.js index 7545f38b0..26be43031 100644 --- a/src/constants/endpoints.js +++ b/src/constants/endpoints.js @@ -67,12 +67,12 @@ const endpoints = { url: "/parts/api/v1/parts/part-from-capability-answer", method: "POST" }, - SaveOrder: { - url: "/order/api/v1/order/save", + SaveSession: { + url: "/order/api/v1/order/save-session", method: "POST", }, - LoadOrder: { - url: "/order/api/v1/order/load", + LoadSession: { + url: "/order/api/v1/order/load-session", method: "POST", }, ValidateZip: { diff --git a/src/constants/store-actions.js b/src/constants/store-actions.js index b77b1456f..8f5891a3d 100644 --- a/src/constants/store-actions.js +++ b/src/constants/store-actions.js @@ -24,9 +24,9 @@ const storeActions = { GET_CAPABILITY_QUESTIONS: "getCapabilityQuestions", GET_PART_FROM_CAPABILITY_QUESTION_ANSWER: "getPartFromCapabilityQuestionAnswer", GET_MOLDING_QUESTIONS: "getMoldingQuestions", - SAVE_ORDER: "saveOrder", - LOAD_ORDER: "loadOrder", - UPDATE_STORE_WITH_SAVE_ORDER_RESPONSE: "updateStoreWithSaveOrderResponse", + SAVE_SESSION: "saveSession", + LOAD_SESSION: "loadSession", + UPDATE_STORE_WITH_SAVE_SESSION_RESPONSE: "updateStoreWithSaveSessionResponse", VALIDATE_ZIP: "validateZip", LOG_EXPERIMENT_EXPOSURE: "logExperimentExposure", LOG_PAGE_VIEW: "logPageView", @@ -35,7 +35,7 @@ const storeActions = { GET_EXPERIMENTS_BY_USER: "GetExperimentsByUser", RUN_EXPERIMENTS_FOR_TRIGGER: "runExperimentsForTrigger", CLEAR_VIN: "clearVin", - RESET_SAVE_ORDER_PROMISE: "resetSaveOrderPromise", + RESET_SAVE_SESSION_PROMISE: "resetSaveSessionPromise", // DEPENDENCY MUTATIONS RESET_VEHICLE_STATE_AND_DEPENDENCIES: "resetVehicleAndDependencies", diff --git a/src/constants/store-mutations.js b/src/constants/store-mutations.js index 51574f08d..0a8990b41 100644 --- a/src/constants/store-mutations.js +++ b/src/constants/store-mutations.js @@ -56,12 +56,12 @@ const storeMutations = { RESET_REGISTRATION_STATE: "resetRegistrationState", RESET_GLASS_PARTS_STATE: "resetGlassPartsState", RESET_STATE: "resetState", - RESET_SAVE_ORDER_PROMISE: "resetSaveOrderPromise", + RESET_SAVE_SESSION_PROMISE: "resetSaveSessionPromise", // OTHER MUTATIONS UPDATE_PAGE_DATA: "updatePageData", UPDATE_STATE_WITH_ORDER_INFORMATION: "updateStateWithOrderInformation", - UPDATE_SAVE_ORDER_PROMISE: "updateSaveOrderPromise", + UPDATE_SAVE_SESSION_PROMISE: "updateSaveSessionPromise", UPDATE_LAST_PAGE_VISITED: "updateLastPageVisited", // EXPERIMENT MUTATIONS diff --git a/src/global-methods.js b/src/global-methods.js index ffda1e77f..080dd8458 100644 --- a/src/global-methods.js +++ b/src/global-methods.js @@ -9,12 +9,16 @@ import { headerKeys } from "@/constants/header-keys"; export default { callHttpClient({ method, endpoint, payload, logApiCall = true }) { return new Promise((resolve, reject) => { - const cfDistroUrl = applicationConfig.CONSUMER_CF_DISTRO; + var cfDistroUrl = applicationConfig.CONSUMER_CF_DISTRO; const payloadAndAnalyticsData = Object.assign({}, payload, { AppName: "FixMyGlass" }); const headers = { [headerKeys.EXPERIMENT]: JSON.stringify(store.getters.experimentSettings) } + if (endpoint.toLowerCase().includes("/order/")){ + cfDistroUrl = "https://localhost:44346"; + } + axios({ method: method, url: cfDistroUrl + endpoint, data: payloadAndAnalyticsData, crossDomain: true, responseType: {}, headers: headers }) .then((response) => { diff --git a/src/helpers/heritage-integration/navigation-helper.js b/src/helpers/heritage-integration/navigation-helper.js index 9720598eb..bd7c3dcf4 100644 --- a/src/helpers/heritage-integration/navigation-helper.js +++ b/src/helpers/heritage-integration/navigation-helper.js @@ -1,7 +1,7 @@ import { queryStrings } from "@/constants/query-strings"; import { externalUrls } from "@/router/router-constants/externalUrl-values"; import { lazyLoadComponent } from "@/router/dynamic-routing/component-loader.js"; -import { saveOrder } from "@/helpers/heritage-integration/order-helper.js"; +import { saveSession } from "@/helpers/heritage-integration/order-helper.js"; import { fmgPageValues } from "@/router/router-constants/fmgPage-values"; import store from "@/store"; import router from "@/router"; @@ -39,10 +39,10 @@ export async function getPageToRouteExistingOrderTo(toRoute = {}, existingHerita Used to navigate to the heritage funnel with the correct query string and url. */ -export async function navigateToHeritageFunnel(shouldSaveOrder = true) { +export async function navigateToHeritageFunnel(shouldSaveSession = true) { // Create the order (or save existing order) when navigating to Heritage Funnel. - if (shouldSaveOrder) { - await saveOrder(); + if (shouldSaveSession) { + await saveSession(); } router.navigateToExternalUrl( diff --git a/src/helpers/heritage-integration/navigation-helper.spec.js b/src/helpers/heritage-integration/navigation-helper.spec.js index eba5f5f49..3281f53c2 100644 --- a/src/helpers/heritage-integration/navigation-helper.spec.js +++ b/src/helpers/heritage-integration/navigation-helper.spec.js @@ -295,7 +295,7 @@ describe("getPageToRouteExistingOrderTo", () => { }); describe("navigateToHeritageFunnel", () => { - test("should save order", async () => { + test("should save session", async () => { // Arrange const mockReferralNumber = "2"; const mockCorrelationId = "55"; @@ -308,26 +308,26 @@ describe("navigateToHeritageFunnel", () => { const mockData = { actionList: [{ - actionName: storeActions.SAVE_ORDER, + actionName: storeActions.SAVE_SESSION, data: mockOrderInfo, }] } setupMocksForJsFiles(mockData); - const saveOrderFunction = jest.spyOn(orderHelper, "saveOrder"); + const saveSessionFunction = jest.spyOn(orderHelper, "saveSession"); router.navigateToExternalUrl = jest.fn(); // Act await navigateToHeritageFunnel(); // Assert - expect(saveOrderFunction).toHaveBeenCalled(); + expect(saveSessionFunction).toHaveBeenCalled(); // Should save before we navigate to heritage by default - const saveOrderFunctionCallOrder = saveOrderFunction.mock.invocationCallOrder[0]; + const saveSessionFunctionCallOrder = saveSessionFunction.mock.invocationCallOrder[0]; const routerNavigateFunctionCallOrder = router.navigateToExternalUrl.mock.invocationCallOrder[0]; - expect(saveOrderFunctionCallOrder).toBeLessThan(routerNavigateFunctionCallOrder); - saveOrderFunction.mockRestore(); + expect(saveSessionFunctionCallOrder).toBeLessThan(routerNavigateFunctionCallOrder); + saveSessionFunction.mockRestore(); }); test("should go to heritage funnel", async () => { @@ -343,7 +343,7 @@ describe("navigateToHeritageFunnel", () => { const mockData = { actionList: [{ - actionName: storeActions.SAVE_ORDER, + actionName: storeActions.SAVE_SESSION, data: mockOrderInfo, }] } @@ -366,7 +366,7 @@ describe("navigateToHeritageFunnel", () => { ); }); - test("should not save order, but should still navigate", async () => { + test("should not save session, but should still navigate", async () => { // Arrange const mockReferralNumber = "2"; const mockCorrelationId = "55"; @@ -376,22 +376,22 @@ describe("navigateToHeritageFunnel", () => { const mockData = { actionList: [{ - actionName: storeActions.SAVE_ORDER, + actionName: storeActions.SAVE_SESSION, data: mockOrderInfo, }] } setupMocksForJsFiles(mockData); - const saveOrderFunction = jest.spyOn(orderHelper, "saveOrder"); + const saveSessionFunction = jest.spyOn(orderHelper, "saveSession"); router.navigateToExternalUrl = jest.fn(); // Act await navigateToHeritageFunnel(false); // Assert - expect(saveOrderFunction).not.toHaveBeenCalled(); + expect(saveSessionFunction).not.toHaveBeenCalled(); expect(router.navigateToExternalUrl).toHaveBeenCalled(); - saveOrderFunction.mockRestore(); + saveSessionFunction.mockRestore(); }); }); diff --git a/src/helpers/heritage-integration/order-helper.js b/src/helpers/heritage-integration/order-helper.js index 870ee190b..0a8bc0100 100644 --- a/src/helpers/heritage-integration/order-helper.js +++ b/src/helpers/heritage-integration/order-helper.js @@ -10,7 +10,7 @@ import { storeMutations } from "@/constants/store-mutations"; it will reset the state and go back to the start of the funnel. */ -export async function loadOrderIfPresent() { +export async function loadSessionIfPresent() { const funnelCookie = getFunnelCookie(); // Do nothing if there is no cookie, correlation id, or referral number. @@ -27,7 +27,7 @@ export async function loadOrderIfPresent() { // Load referral if there is a cookie, and it doesn't indicate it needs a state reset. - return (await loadOrder(funnelCookie.ReferralNumber, funnelCookie.ReferralDate, funnelCookie.ReferralCorrelationId, funnelCookie.ReferralParentAccountNumber)).data; + return (await loadSession(funnelCookie.ReferralNumber, funnelCookie.ReferralDate, funnelCookie.ReferralCorrelationId, funnelCookie.ReferralParentAccountNumber)).data; } /* @@ -35,34 +35,34 @@ export async function loadOrderIfPresent() { This will also set Referral information in the store after saving, and then update the cookie. */ -export async function saveOrder() { - var saveOrderPromise; - if (store.getters.applicationUser.saveOrderPromise) { - // queue newest request after current saveOrderPromise resolves - saveOrderPromise = store.getters.applicationUser.saveOrderPromise.then(() => { - // get a new saveOrderPromise - return saveOrderHelper(); +export async function saveSession() { + var saveSessionPromise; + if (store.getters.applicationUser.saveSessionPromise) { + // queue newest request after current saveSessionPromise resolves + saveSessionPromise = store.getters.applicationUser.saveSessionPromise.then(() => { + // get a new saveSessionPromise + return saveSessionHelper(); }); } else { - // create an initial saveOrderPromise - saveOrderPromise = saveOrderHelper(); + // create an initial saveSessionPromise + saveSessionPromise = saveSessionHelper(); } - store.commit(storeMutations.UPDATE_SAVE_ORDER_PROMISE, saveOrderPromise); + store.commit(storeMutations.UPDATE_SAVE_SESSION_PROMISE, saveSessionPromise); // await here to allow for a caller to await and make the function synchronous - await saveOrderPromise; + await saveSessionPromise; } // PRIVATE FUNCTIONS // /* - Calls API to load order given the referral number, referralDate, and referralCorrelationId + Calls API to load session given the referral number, referralDate, and referralCorrelationId and returns the response. */ -async function loadOrder(referralNumber, referralDate, referralCorrelationId, accountNumber) { - // await the saveOrderPromise in the store to make sure we're loading up to date information - await store.getters.applicationUser.saveOrderPromise; - const response = await baseMixin.methods.dispatchStoreAction(storeActions.LOAD_ORDER, +async function loadSession(referralNumber, referralDate, referralCorrelationId, accountNumber) { + // await the saveSessionPromise in the store to make sure we're loading up to date information + await store.getters.applicationUser.saveSessionPromise; + const response = await baseMixin.methods.dispatchStoreAction(storeActions.LOAD_SESSION, { referralNumber: referralNumber.toString(), referralDate: referralDate, @@ -74,18 +74,18 @@ async function loadOrder(referralNumber, referralDate, referralCorrelationId, ac } /* - Encapsulates asynchronous Save Order logic inside a promise to allow for Save Order queuing + Encapsulates asynchronous Save Session logic inside a promise to allow for Save Session queuing */ -async function saveOrderHelper() { - const savedOrderInfo = await baseMixin.methods.dispatchStoreAction(storeActions.SAVE_ORDER); - // Update the store with information received from the saveOrder response - await baseMixin.methods.dispatchStoreAction(storeActions.UPDATE_STORE_WITH_SAVE_ORDER_RESPONSE, { - referralNumber: savedOrderInfo.data.referralNumber.toString(), - referralCorrelationId: savedOrderInfo.data.referralCorrelationId, - referralDate: savedOrderInfo.data.referralDate, - accountNumber: savedOrderInfo.data.accountNumber.toString(), - savedSessionId: savedOrderInfo.data.savedSessionId, - crmCustomerId: savedOrderInfo.data.crmCustomerId.toString(), +async function saveSessionHelper() { + const savedSessionInfo = await baseMixin.methods.dispatchStoreAction(storeActions.SAVE_SESSION); + // Update the store with information received from the saveSession response + await baseMixin.methods.dispatchStoreAction(storeActions.UPDATE_STORE_WITH_SAVE_SESSION_RESPONSE, { + referralNumber: savedSessionInfo.data.referralNumber.toString(), + referralCorrelationId: savedSessionInfo.data.referralCorrelationId, + referralDate: savedSessionInfo.data.referralDate, + accountNumber: savedSessionInfo.data.accountNumber.toString(), + savedSessionId: savedSessionInfo.data.savedSessionId, + crmCustomerId: savedSessionInfo.data.crmCustomerId.toString(), }, false); // Update the cookie with the referral information when saved. diff --git a/src/helpers/heritage-integration/order-helper.spec.js b/src/helpers/heritage-integration/order-helper.spec.js index 400ab46e4..5e181a402 100644 --- a/src/helpers/heritage-integration/order-helper.spec.js +++ b/src/helpers/heritage-integration/order-helper.spec.js @@ -1,11 +1,11 @@ import * as cookieHelper from "@/helpers/heritage-integration/cookie-helper"; -import { loadOrderIfPresent, saveOrder } from "@/helpers/heritage-integration/order-helper"; +import { loadSessionIfPresent, saveSession } from "@/helpers/heritage-integration/order-helper"; import { cookieNames } from "@/constants/cookie-names"; import { setupMocksForJsFiles, removeAllTestCookies, getMockOrderInfo, setupCookies } from "@/helpers/unit-test-helper.js"; import { storeActions } from "@/constants/store-actions"; import router from "@/router"; -describe("loadOrderIfPresent", () => { +describe("loadSessionIfPresent", () => { afterEach(() => { removeAllTestCookies(); @@ -25,7 +25,7 @@ describe("loadOrderIfPresent", () => { document.cookie = `${cookieNames.FUNNEL_SESSION_INFO}=${JSON.stringify(testCookieValue)}; path=/; ${cookieHelper.getCookieDomainValue()}`; // Act - loadOrderIfPresent(); + loadSessionIfPresent(); // Assert expect(cookieHelper.deleteFunnelCookie).toHaveBeenCalled(); @@ -49,7 +49,7 @@ describe("loadOrderIfPresent", () => { var mocks = setupMocksForJsFiles(mockData); // Act - loadOrderIfPresent(); + loadSessionIfPresent(); // Assert expect(cookieHelper.getFunnelCookie).toHaveBeenCalled(); @@ -69,21 +69,21 @@ describe("loadOrderIfPresent", () => { var mocks = setupMocksForJsFiles(mockData); // Act - loadOrderIfPresent(); + loadSessionIfPresent(); // Assert expect(cookieHelper.getFunnelCookie).toHaveBeenCalled(); expect(mocks.baseMixin.methods.dispatchStoreAction).not.toHaveBeenCalledWith(storeActions.RESET_STATE); }); - test("Funnel cookie valid, should call loadOrder", async () => { + test("Funnel cookie valid, should call loadSession", async () => { // Arrange cookieHelper.getFunnelCookie = jest.spyOn(cookieHelper, "getFunnelCookie") .mockReturnValueOnce({ ShouldResetState: false, ReferralNumber: 123456, ReferralCorrelationId: "yyy-yyy-yyyy", ReferralDate: new Date()}); const mockData = { actionList: [{ - actionName: storeActions.LOAD_ORDER, + actionName: storeActions.LOAD_SESSION, data: { ReferralNumber: 123456, vehicle: { year: 2010 } } }], } @@ -91,22 +91,22 @@ describe("loadOrderIfPresent", () => { var mocks = setupMocksForJsFiles(mockData); // Act - const result = await loadOrderIfPresent(); + const result = await loadSessionIfPresent(); // Assert expect(cookieHelper.getFunnelCookie).toHaveBeenCalled(); - expect(mocks.baseMixin.methods.dispatchStoreAction).not.toHaveBeenCalledWith(storeActions.LOAD_ORDER); + expect(mocks.baseMixin.methods.dispatchStoreAction).not.toHaveBeenCalledWith(storeActions.LOAD_SESSION); expect(result.ReferralNumber).toBe(123456); expect(result.vehicle.year).toBe(2010); }); }); -describe("saveOrder", () => { +describe("saveSession", () => { afterEach(() => { removeAllTestCookies(); }); - test("saveOrder => should set state order values", async () => { + test("saveSession => should set state order values", async () => { // Arrange const mockReferralNumber = "2"; const mockCorrelationId = "55"; @@ -120,11 +120,11 @@ describe("saveOrder", () => { const mockData = { actionList: [ { - actionName: storeActions.SAVE_ORDER, + actionName: storeActions.SAVE_SESSION, data: mockOrderInfo, }, { - actionName: storeActions.UPDATE_STORE_WITH_SAVE_ORDER_RESPONSE + actionName: storeActions.UPDATE_STORE_WITH_SAVE_SESSION_RESPONSE } ] } @@ -132,11 +132,11 @@ describe("saveOrder", () => { const mocks = setupMocksForJsFiles(mockData); // Act - await saveOrder(); + await saveSession(); // Assert - expect(mocks.baseMixin.methods.dispatchStoreAction).toHaveBeenCalledWith(storeActions.SAVE_ORDER); - expect(mocks.baseMixin.methods.dispatchStoreAction).toHaveBeenCalledWith(storeActions.UPDATE_STORE_WITH_SAVE_ORDER_RESPONSE, { + expect(mocks.baseMixin.methods.dispatchStoreAction).toHaveBeenCalledWith(storeActions.SAVE_SESSION); + expect(mocks.baseMixin.methods.dispatchStoreAction).toHaveBeenCalledWith(storeActions.UPDATE_STORE_WITH_SAVE_SESSION_RESPONSE, { referralNumber: mockReferralNumber, referralDate: mockReferralDate, referralCorrelationId: mockCorrelationId, @@ -146,7 +146,7 @@ describe("saveOrder", () => { }, false); }); - test("saveOrder => should update DidHeritageFunnelUpdateLast cookie value to false", async () => { + test("saveSession => should update DidHeritageFunnelUpdateLast cookie value to false", async () => { // Arrange const mockReferralNumber = 1566818; const mockReferralDate = "2022-03-15T10:56:24.597"; @@ -159,7 +159,7 @@ describe("saveOrder", () => { const mockData = { actionList: [{ - actionName: storeActions.SAVE_ORDER, + actionName: storeActions.SAVE_SESSION, data: mockOrderInfo, }], router: router @@ -178,7 +178,7 @@ describe("saveOrder", () => { setupCookies({ funnelCookieValue: JSON.stringify(testCookieValue) }); // Act - await saveOrder(); + await saveSession(); // Assert expect(cookieHelper.getFunnelCookie().DidHeritageFunnelUpdateLast).toEqual(false); diff --git a/src/mixins/vin-pages-mixin.js b/src/mixins/vin-pages-mixin.js index a7c585b77..00ef6ab05 100644 --- a/src/mixins/vin-pages-mixin.js +++ b/src/mixins/vin-pages-mixin.js @@ -1,14 +1,14 @@ import { storeActions } from "@/constants/store-actions.js"; import store from "@/store"; import vehicleQuestionsMixin from "@/mixins/vehicle-questions-mixin"; -import { saveOrder } from "@/helpers/heritage-integration/order-helper.js"; +import { saveSession } from "@/helpers/heritage-integration/order-helper.js"; export default { methods: { async navigateForwardWithSingleCarMatch() { // If we have not already saved a session, we need to save one now before the lengthy call to getPartsOrQuestions if (!store.getters.applicationUser.savedSessionId) { - saveOrder(); + saveSession(); } const result = await this.dispatchStoreAction(storeActions.GET_PARTS_OR_QUESTIONS); diff --git a/src/mixins/vin-pages-mixin.spec.js b/src/mixins/vin-pages-mixin.spec.js index 0ac493b42..13c376c35 100644 --- a/src/mixins/vin-pages-mixin.spec.js +++ b/src/mixins/vin-pages-mixin.spec.js @@ -10,7 +10,7 @@ jest.mock("@/helpers/heritage-integration/navigation-helper", () => ({ })); jest.mock("@/helpers/heritage-integration/order-helper.js", () => ({ - saveOrder: jest.fn() + saveSession: jest.fn() })); describe("vin-pages-mixin", () => { diff --git a/src/router/index.js b/src/router/index.js index b09df2a17..c9e0a4a52 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -11,7 +11,7 @@ import { getDeviceIdValue } from "@/helpers/heritage-integration/cookie-helper"; // Heritage integration import { isSavedSessionStillActive } from "@/helpers/heritage-integration/session-helper"; import { updateOrCreateFunnelCookie, getFunnelCookie, updateSessionIdCookie } from "@/helpers/heritage-integration/cookie-helper"; -import { loadOrderIfPresent, saveOrder } from "@/helpers/heritage-integration/order-helper"; +import { loadSessionIfPresent, saveSession } from "@/helpers/heritage-integration/order-helper"; import { getPageToRouteExistingOrderTo, navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper"; import baseMixin from "@/mixins/base-mixin"; @@ -62,11 +62,11 @@ const routes = [ // On entering the funnel "fresh", read cookie information, decide what to do next. if (from.redirectedFrom === undefined) { - // clear the saveOrderPromise - if it exists in the vuex store but a new instance was created - // the saveOrderPromise will no longer point to a valid promise - baseMixin.methods.dispatchStoreAction(storeActions.RESET_SAVE_ORDER_PROMISE); - const loadOrderResponse = await loadOrderIfPresent(); - const pageToRedirectTo = await getPageToRouteExistingOrderTo(to, loadOrderResponse); + // clear the saveSessionPromise - if it exists in the vuex store but a new instance was created + // the saveSessionPromise will no longer point to a valid promise + baseMixin.methods.dispatchStoreAction(storeActions.RESET_SAVE_SESSION_PROMISE); + const loadSessionResponse = await loadSessionIfPresent(); + const pageToRedirectTo = await getPageToRouteExistingOrderTo(to, loadSessionResponse); // If getPageToRouteExistingOrderTo determines that the return user needs to // go back to heritage funnel, send them there and stop our current navigation. @@ -149,7 +149,7 @@ router.afterEach((to, from) => { // If saving on navigation is requested, check for saved SessionId or EmailAddress to determine if saving is appropriate if (eval(to.params.isSavingNavigation)) { if (store.getters.applicationUser.savedSessionId || store.getters.order.customer?.emailAddress) { - saveOrder(); + saveSession(); } } diff --git a/src/store/index.js b/src/store/index.js index 7791b91de..0d664c09f 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -71,7 +71,7 @@ const getDefaultState = () => { eventBus: [], pageData: {}, savedSessionTimeout: getDateForSavedSessionTimeout(), - saveOrderPromise: null, + saveSessionPromise: null, savedSessionId: null, crmCustomerId: null, lastPageVisited: null, @@ -225,8 +225,8 @@ export const mutations = { }, // applicationUser MUTATIONS - updateSaveOrderPromise(state, saveOrderPromise) { - state.applicationUser.saveOrderPromise = saveOrderPromise; + updateSaveSessionPromise(state, saveSessionPromise) { + state.applicationUser.saveSessionPromise = saveSessionPromise; }, updateSavedSessionId(state, savedSessionId) { state.applicationUser.savedSessionId = savedSessionId; @@ -295,8 +295,8 @@ export const mutations = { resetState(state) { Object.assign(state, getDefaultState()); }, - resetSaveOrderPromise(state) { - state.applicationUser.saveOrderPromise = null; + resetSaveSessionPromise(state) { + state.applicationUser.saveSessionPromise = null; }, // Misc Mutations updateStateWithOrderInformation(state, orderInformation) { @@ -530,8 +530,8 @@ export const actions = { resetState(context) { context.commit(storeMutations.RESET_STATE); }, - resetSaveOrderPromise(context) { - context.commit(storeMutations.RESET_SAVE_ORDER_PROMISE); + resetSaveSessionPromise(context) { + context.commit(storeMutations.RESET_SAVE_SESSION_PROMISE); }, // Content API Actions @@ -584,7 +584,7 @@ export const actions = { }, // Misc Actions - updateStoreWithSaveOrderResponse(context, { referralNumber, referralDate, referralCorrelationId, eon, accountNumber, savedSessionId, crmCustomerId }) { + updateStoreWithSaveSessionResponse(context, { referralNumber, referralDate, referralCorrelationId, eon, accountNumber, savedSessionId, crmCustomerId }) { context.commit(storeMutations.UPDATE_REFERRAL_NUMBER, referralNumber); context.commit(storeMutations.UPDATE_REFERRAL_DATE, referralDate); context.commit(storeMutations.UPDATE_REFERRAL_CORRELATION_ID, referralCorrelationId); @@ -773,8 +773,8 @@ export const actions = { }) }, - // Order API Actions - saveOrder(context) { + // Session API Actions + saveSession(context) { const vehicle = context.getters.vehicle; const damage = context.getters.damage; const order = context.state.order; @@ -782,8 +782,8 @@ export const actions = { const lineItems = context.state.order.lineItems; return globalMethods.callHttpClient({ - method: endpoints.SaveOrder.method, - endpoint: endpoints.SaveOrder.url, + method: endpoints.SaveSession.method, + endpoint: endpoints.SaveSession.url, payload: { vehicle: { carId: vehicle.carId, @@ -830,10 +830,10 @@ export const actions = { }, }); }, - loadOrder(context, { referralNumber, referralDate, referralCorrelationId, accountNumber }) { + loadSession(context, { referralNumber, referralDate, referralCorrelationId, accountNumber }) { return globalMethods.callHttpClient({ - method: endpoints.LoadOrder.method, - endpoint: endpoints.LoadOrder.url, + method: endpoints.LoadSession.method, + endpoint: endpoints.LoadSession.url, payload: { referralNumber: referralNumber?.toString(), referralDate: referralDate, @@ -841,7 +841,7 @@ export const actions = { accountNumber: accountNumber?.toString() }, }).then((response) => { - // clear the state if the existing EON does not equal what is returned from loadOrder + // clear the state if the existing EON does not equal what is returned from loadSession if (context.state.order.eon && context.state.order.eon != response.data.eon) { context.commit(storeMutations.RESET_STATE); } diff --git a/src/store/store.spec.js b/src/store/store.spec.js index 4abe96a4f..6ad366989 100644 --- a/src/store/store.spec.js +++ b/src/store/store.spec.js @@ -595,7 +595,7 @@ describe("Actions", () => { expect(response.data).toEqual({ imageUrl: "https://test.com" }); }); - it("saveOrder action, returns order information", async () => { + it("saveSession action, returns order information", async () => { // Arrange const context = state; @@ -623,14 +623,14 @@ describe("Actions", () => { }); // Act - const response = await actions.saveOrder(context); + const response = await actions.saveSession(context); // Assert expect(response.data).toEqual({ referralNumber: 123 }); }); - it("loadOrder action, returns order information, calls mutation", async () => { + it("loadSession action, returns order information, calls mutation", async () => { // Arrange const context = state; @@ -643,14 +643,14 @@ describe("Actions", () => { context.commit = commit; // Act - const response = await actions.loadOrder(context, { referralNumber: "123", referralDate: new Date().toUTCString(), referralCorrelationId: "xxx-xxx-xxx" }); + const response = await actions.loadSession(context, { referralNumber: "123", referralDate: new Date().toUTCString(), referralCorrelationId: "xxx-xxx-xxx" }); // Assert expect(response.data).toEqual({ referralNumber: 123 }); expect(commit).toBeCalledWith(storeMutations.UPDATE_STATE_WITH_ORDER_INFORMATION, { "referralNumber": 123 }); }); - it("loadOrder: state doesn't have EON => do not reset state", async () => { + it("loadSession: state doesn't have EON => do not reset state", async () => { // Arrange const context = state; @@ -665,14 +665,14 @@ describe("Actions", () => { } // Act - const response = await actions.loadOrder(context, { referralNumber: "123", referralDate: new Date().toUTCString(), referralCorrelationId: "xxx-xxx-xxx" }); + const response = await actions.loadSession(context, { referralNumber: "123", referralDate: new Date().toUTCString(), referralCorrelationId: "xxx-xxx-xxx" }); // Assert expect(response.data.eon).toEqual("123"); expect(context.commit).not.toBeCalledWith(storeMutations.RESET_STATE); }); - it("loadOrder eon doesn't match eon in state => reset state", async () => { + it("loadSession eon doesn't match eon in state => reset state", async () => { // Arrange const context = state; @@ -688,14 +688,14 @@ describe("Actions", () => { } // Act - const response = await actions.loadOrder(context, { referralNumber: "123", referralDate: new Date().toUTCString(), referralCorrelationId: "xxx-xxx-xxx" }); + const response = await actions.loadSession(context, { referralNumber: "123", referralDate: new Date().toUTCString(), referralCorrelationId: "xxx-xxx-xxx" }); // Assert expect(response.data.eon).toEqual("123"); expect(context.commit).toBeCalledWith(storeMutations.RESET_STATE); }); - it("updateStoreWithSaveOrderResponse, should call commit six times", () => { + it("updateStoreWithSaveSessionResponse, should call commit six times", () => { // Arrange const context = state; const commit = jest.fn(); @@ -703,7 +703,7 @@ describe("Actions", () => { context.commit = commit; // Act - actions.updateStoreWithSaveOrderResponse(context, + actions.updateStoreWithSaveSessionResponse(context, { referralNumber: "123", referralDate: new Date().toUTCString(), From 1968d5dc1e03f764170a91919359805499355fa8 Mon Sep 17 00:00:00 2001 From: FrankRua Date: Fri, 7 Oct 2022 12:56:35 -0400 Subject: [PATCH 2/3] Change DNS --- vue.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vue.config.js b/vue.config.js index 1b9cf7b00..64c83dd9e 100644 --- a/vue.config.js +++ b/vue.config.js @@ -1,5 +1,5 @@ process.env.VUE_APP_CONSUMER_CF_DISTRO = - "https://digitalapi.dev.sagaws.net"; + "https://digitalapi.dev.safelite.io"; process.env.VUE_APP_HERITAGE_FUNNEL = "http://localhost:38000/default.aspx"; process.env.VUE_APP_GOOGLE_PLACES_API_KEY = From 180fdb3e7d8333c39655411dff9e4b733bb16d43 Mon Sep 17 00:00:00 2001 From: CarlNation Date: Fri, 7 Oct 2022 13:45:25 -0400 Subject: [PATCH 3/3] CSR-752 remove localhost --- src/global-methods.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/global-methods.js b/src/global-methods.js index 080dd8458..ffda1e77f 100644 --- a/src/global-methods.js +++ b/src/global-methods.js @@ -9,16 +9,12 @@ import { headerKeys } from "@/constants/header-keys"; export default { callHttpClient({ method, endpoint, payload, logApiCall = true }) { return new Promise((resolve, reject) => { - var cfDistroUrl = applicationConfig.CONSUMER_CF_DISTRO; + const cfDistroUrl = applicationConfig.CONSUMER_CF_DISTRO; const payloadAndAnalyticsData = Object.assign({}, payload, { AppName: "FixMyGlass" }); const headers = { [headerKeys.EXPERIMENT]: JSON.stringify(store.getters.experimentSettings) } - if (endpoint.toLowerCase().includes("/order/")){ - cfDistroUrl = "https://localhost:44346"; - } - axios({ method: method, url: cfDistroUrl + endpoint, data: payloadAndAnalyticsData, crossDomain: true, responseType: {}, headers: headers }) .then((response) => {