From e09248e98b9f634df2b534c8bee1c69fd0e2de8f Mon Sep 17 00:00:00 2001 From: Sneha Date: Tue, 10 Sep 2024 19:17:57 +0530 Subject: [PATCH 1/5] CSR-2201 --- src/constants/header-keys.js | 1 + src/global-methods.js | 1 + 2 files changed, 2 insertions(+) diff --git a/src/constants/header-keys.js b/src/constants/header-keys.js index 2cfbba367..13722fb6d 100644 --- a/src/constants/header-keys.js +++ b/src/constants/header-keys.js @@ -1,3 +1,4 @@ export const headerKeys = { EXPERIMENT: "X-Experiment-Data", + APPLICATION_NAME: "AppName", }; diff --git a/src/global-methods.js b/src/global-methods.js index c286ede9b..2d7e53262 100644 --- a/src/global-methods.js +++ b/src/global-methods.js @@ -60,6 +60,7 @@ export default { const payloadAndAnalyticsData = Object.assign({}, payload, { AppName: "FixMyGlass" }); const headers = { [headerKeys.EXPERIMENT]: JSON.stringify(store.getters.experimentSettings), + [headerKeys.APPLICATION_NAME]: applicationConfig.APPLICATION_NAME, }; axios({ From eda4d7a149f55886a3b4d98df854c7ecce9ec97d Mon Sep 17 00:00:00 2001 From: Sneha Date: Fri, 13 Sep 2024 11:51:58 +0530 Subject: [PATCH 2/5] CSR-2201 extra headers --- src/constants/header-keys.js | 6 +++++- src/global-methods.js | 4 ++++ src/global-methods.spec.js | 1 + src/layouts/estimate/estimate.spec.js | 1 + 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/constants/header-keys.js b/src/constants/header-keys.js index 13722fb6d..4c509f47b 100644 --- a/src/constants/header-keys.js +++ b/src/constants/header-keys.js @@ -1,4 +1,8 @@ export const headerKeys = { EXPERIMENT: "X-Experiment-Data", - APPLICATION_NAME: "AppName", + APPLICATION_NAME: "Application-Name", + REFERRAL_SEQUENCE_NUMBER: "referral-Sequence-Number", + SESSION_SEQUENCE_NUMBER: "session-Sequence-Number", + TRANSACTION_ID: "transaction-Id", + EON: "eon", }; diff --git a/src/global-methods.js b/src/global-methods.js index 2d7e53262..19d899887 100644 --- a/src/global-methods.js +++ b/src/global-methods.js @@ -61,6 +61,10 @@ export default { const headers = { [headerKeys.EXPERIMENT]: JSON.stringify(store.getters.experimentSettings), [headerKeys.APPLICATION_NAME]: applicationConfig.APPLICATION_NAME, + [headerKeys.SESSION_SEQUENCE_NUMBER]: store.getters.applicationUser?.savedSessionId, + [headerKeys.REFERRAL_SEQUENCE_NUMBER]: store.getters.order?.referralSequenceNumber, + [headerKeys.TRANSACTION_ID]: crypto.randomUUID(), + [headerKeys.EON]: store.getters.order?.eon, }; axios({ diff --git a/src/global-methods.spec.js b/src/global-methods.spec.js index 93aafea81..e6c0e4858 100644 --- a/src/global-methods.spec.js +++ b/src/global-methods.spec.js @@ -13,6 +13,7 @@ global.$logger = { logError: jest.fn(), logCritical: jest.fn(), }; +global.crypto = { randomUUID: jest.fn() }; it("Global Methods - Call Http Client - Should Resolve Promise", () => { //Arrange diff --git a/src/layouts/estimate/estimate.spec.js b/src/layouts/estimate/estimate.spec.js index 7a66a197c..3487116f0 100644 --- a/src/layouts/estimate/estimate.spec.js +++ b/src/layouts/estimate/estimate.spec.js @@ -24,6 +24,7 @@ jest.mock("@/helpers/cms-content-helper", () => ({ fetchCmsContentForPage: jest.fn(), })); +global.crypto = { randomUUID: jest.fn() }; describe("estimate.vue", () => { test("Selected vin option is emitted upon selection.", async () => { //Arrange From e47f6e26df4ad2590be305b6f73f7c03d59f993b Mon Sep 17 00:00:00 2001 From: Sneha Date: Mon, 16 Sep 2024 12:48:28 +0530 Subject: [PATCH 3/5] Updating submittedOrder --- src/global-methods.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/global-methods.js b/src/global-methods.js index 19d899887..6afeef53d 100644 --- a/src/global-methods.js +++ b/src/global-methods.js @@ -1,5 +1,6 @@ import axios from "axios"; import analyticsMixIn from "@/mixins/analytics-mixin.js"; +import baseMixin from "@/mixins/base-mixin.js"; import router from "@/router"; import store from "@/store"; @@ -57,14 +58,17 @@ export default { }) { return new Promise((resolve, reject) => { const cfDistroUrl = applicationConfig.CONSUMER_CF_DISTRO; + const submittedOrder = baseMixin.methods.getSubmittedOrder(); + const hasSubmittedOrder = baseMixin.methods.hasSubmittedOrder(); + const order = hasSubmittedOrder ? submittedOrder : store.getters.order; const payloadAndAnalyticsData = Object.assign({}, payload, { AppName: "FixMyGlass" }); const headers = { [headerKeys.EXPERIMENT]: JSON.stringify(store.getters.experimentSettings), [headerKeys.APPLICATION_NAME]: applicationConfig.APPLICATION_NAME, [headerKeys.SESSION_SEQUENCE_NUMBER]: store.getters.applicationUser?.savedSessionId, - [headerKeys.REFERRAL_SEQUENCE_NUMBER]: store.getters.order?.referralSequenceNumber, + [headerKeys.REFERRAL_SEQUENCE_NUMBER]: order?.referralSequenceNumber, [headerKeys.TRANSACTION_ID]: crypto.randomUUID(), - [headerKeys.EON]: store.getters.order?.eon, + [headerKeys.EON]: order?.eon, }; axios({ From d1b4d4e1f130f2dffe95d3164212fe9ca6a5c6b7 Mon Sep 17 00:00:00 2001 From: Sneha Date: Mon, 16 Sep 2024 18:11:14 +0530 Subject: [PATCH 4/5] Update header-keys.js --- src/constants/header-keys.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/constants/header-keys.js b/src/constants/header-keys.js index 4c509f47b..03b88b5cb 100644 --- a/src/constants/header-keys.js +++ b/src/constants/header-keys.js @@ -1,8 +1,8 @@ export const headerKeys = { EXPERIMENT: "X-Experiment-Data", - APPLICATION_NAME: "Application-Name", - REFERRAL_SEQUENCE_NUMBER: "referral-Sequence-Number", - SESSION_SEQUENCE_NUMBER: "session-Sequence-Number", - TRANSACTION_ID: "transaction-Id", - EON: "eon", + APPLICATION_NAME: "X-Application-Name", + REFERRAL_SEQUENCE_NUMBER: "X-Referral-Sequence-Number", + SESSION_SEQUENCE_NUMBER: "X-Session-Sequence-Number", + TRANSACTION_ID: "X-Transaction-Id", + EON: "X-Eon", }; From eeea9c3c7a3b52fc96a1c93bfbe9fe5327a4374e Mon Sep 17 00:00:00 2001 From: Sneha Date: Mon, 16 Sep 2024 18:17:00 +0530 Subject: [PATCH 5/5] Update EON --- src/constants/header-keys.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/constants/header-keys.js b/src/constants/header-keys.js index 03b88b5cb..7caaef65c 100644 --- a/src/constants/header-keys.js +++ b/src/constants/header-keys.js @@ -4,5 +4,5 @@ export const headerKeys = { REFERRAL_SEQUENCE_NUMBER: "X-Referral-Sequence-Number", SESSION_SEQUENCE_NUMBER: "X-Session-Sequence-Number", TRANSACTION_ID: "X-Transaction-Id", - EON: "X-Eon", + EON: "X-EON", };