jason/DigitalConsumer.FixMyGlass
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1196 from Safelite/defect/CSR-1489

Browse source 
CSR-1489 | Resolving Vuex Model Discrepencies
This commit is contained in:
chloeherdsafelite 2023-06-29 15:57:26 -04:00 committed by GitHub
commit 47987def10
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 45 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/layouts/schedule/schedule.vue
View file

@ -215,7 +215,7 @@ export default {
const alertReasonsPromise = locationAlerts.methods.loadInitialData( const alertReasonsPromise = locationAlerts.methods.loadInitialData(
store.getters.order.serviceLocation.zipCodeCtu, store.getters.order.serviceLocation.zipCodeCtu,
store.getters.order.serviceLocation.provider?.address?.zipCtu store.getters.order.serviceLocation.provider?.address?.zipCodeCtu
); );
// Settle promises and get results // Settle promises and get results
const promiseResultMap = [ const promiseResultMap = [

3
src/layouts/service-location/helpers/service-location-helper/service-location-helper.spec.js
View file

@ -42,7 +42,8 @@ jest.mock("@/store", () => ({
streetAddress: null, streetAddress: null,
city: null, city: null,
state: null, state: null,
zip: null, zipCode: null,
zipCodeCtu: null,
}, },
}, },
}, },

4
src/layouts/service-location/service-location.vue
View file

@ -393,8 +393,8 @@ export default {
streetAddress: this.selectedProvider?.address?.streetAddress, streetAddress: this.selectedProvider?.address?.streetAddress,
city: this.selectedProvider?.address?.city, city: this.selectedProvider?.address?.city,
state: this.selectedProvider?.address?.state, state: this.selectedProvider?.address?.state,
zip: this.selectedProvider?.address?.zipCode, zipCode: this.selectedProvider?.address?.zipCode,
zipCtu: this.selectedProvider?.address?.zipCodeCtu, zipCodeCtu: this.selectedProvider?.address?.zipCodeCtu,
}, },
}, },
}, },

32
src/store/index.js
View file

@ -54,7 +54,8 @@ const getDefaultState = () => {
streetAddress: null, streetAddress: null,
city: null, city: null,
state: null, state: null,
zip: null, zipCode: null,
zipCodeCtu: null,
}, },
}, },
}, },
@ -265,7 +266,8 @@ export const mutations = {
streetAddress: serviceLocationInfo.provider?.address?.streetAddress, streetAddress: serviceLocationInfo.provider?.address?.streetAddress,
city: serviceLocationInfo.provider?.address?.city, city: serviceLocationInfo.provider?.address?.city,
state: serviceLocationInfo.provider?.address?.state, state: serviceLocationInfo.provider?.address?.state,
zip: serviceLocationInfo.provider?.address?.zip, zipCode: serviceLocationInfo.provider?.address?.zipCode,
zipCodeCtu: serviceLocationInfo.provider?.address?.zipCodeCtu,
}, },
}; };
}, },
@ -380,7 +382,8 @@ export const mutations = {
streetAddress: null, streetAddress: null,
city: null, city: null,
state: null, state: null,
zip: null, zipCode: null,
zipCodeCtu: null,
}, },
}; };
}, },
@ -469,8 +472,10 @@ export const mutations = {
sessionInformation.order.serviceLocation.provider?.address?.city; sessionInformation.order.serviceLocation.provider?.address?.city;
state.order.serviceLocation.provider.address.state = state.order.serviceLocation.provider.address.state =
sessionInformation.order.serviceLocation.provider?.address?.state; sessionInformation.order.serviceLocation.provider?.address?.state;
state.order.serviceLocation.provider.address.zip = state.order.serviceLocation.provider.address.zipCode =
sessionInformation.order.serviceLocation.provider?.address?.zip; sessionInformation.order.serviceLocation.provider?.address?.zipCode;
state.order.serviceLocation.provider.address.zipCodeCtu =
sessionInformation.order.serviceLocation.provider?.address?.zipCodeCtu;
state.order.payment.isInsurance = sessionInformation.order.payment.isInsurance; state.order.payment.isInsurance = sessionInformation.order.payment.isInsurance;
state.order.payment.insuranceCoverage.isVerified = state.order.payment.insuranceCoverage.isVerified =
@ -1406,8 +1411,8 @@ export const actions = {
order.serviceLocation.provider?.address?.streetAddress, order.serviceLocation.provider?.address?.streetAddress,
city: order.serviceLocation.provider?.address?.city, city: order.serviceLocation.provider?.address?.city,
state: order.serviceLocation.provider?.address?.state, state: order.serviceLocation.provider?.address?.state,
zip: order.serviceLocation.provider?.address?.zip, zipCode: order.serviceLocation.provider?.address?.zipCode,
zipCtu: order.serviceLocation.provider?.address?.zipCtu, zipCodeCtu: order.serviceLocation.provider?.address?.zipCodeCtu,
}, },
}, },
}, },
@ -1917,7 +1922,7 @@ export const actions = {
if (context.state.order.serviceLocation) { if (context.state.order.serviceLocation) {
if ( if (
serviceLocationInfo.zipCode !== context.state.order.serviceLocation.zipCode || serviceLocationInfo.zipCode !== context.state.order.serviceLocation.zipCode ||
!deepEqual( !providersEqual(
serviceLocationInfo.provider, serviceLocationInfo.provider,
context.state.order.serviceLocation.provider context.state.order.serviceLocation.provider
) || ) ||
@ -2147,6 +2152,17 @@ function convertGlassPieceToBackEndCompatibleFormat(glassPieces) {
}); });
} }
function providersEqual(providerA, providerB) {
return (
providerA.providerNumber === providerB.providerNumber &&
providerA.address?.city === providerB.address?.city &&
providerA.address?.state === providerB.address?.state &&
providerA.address?.streetAddress === providerB.address?.streetAddress &&
providerA.address?.zipCode === providerB.address?.zipCode
);
//TODO: Change back to deepEqual once zipCodeCtu is added to saveSession.
}
// This function will verify schedule info is still valid. // This function will verify schedule info is still valid.
// check to see if we have an appointment date on the order object. // check to see if we have an appointment date on the order object.
// if so, make sure it's not in the past. if in the past, clear schedule info in store. // if so, make sure it's not in the past. if in the past, clear schedule info in store.

24
src/store/store.spec.js
View file

@ -1071,7 +1071,8 @@ describe("Actions", () => {
streetAddress: "123 Test Lane", streetAddress: "123 Test Lane",
city: "Columbus", city: "Columbus",
state: "OH", state: "OH",
zip: "43212", zipCode: "43212",
zipCodeCtu: "01820",
}, },
}, },
}, },
@ -1099,7 +1100,8 @@ describe("Actions", () => {
streetAddress: "123 Test Lane", streetAddress: "123 Test Lane",
city: "Columbus", city: "Columbus",
state: "OH", state: "OH",
zip: "43212", zipCode: "43212",
zipCodeCtu: "01820",
}, },
}, },
}; };
@ -1130,7 +1132,8 @@ describe("Actions", () => {
streetAddress: "123 Test Lane", streetAddress: "123 Test Lane",
city: "Columbus", city: "Columbus",
state: "OH", state: "OH",
zip: "43212", zipCode: "43212",
zipCodeCtu: "01820",
}, },
}, },
}, },
@ -1158,7 +1161,8 @@ describe("Actions", () => {
streetAddress: "321 Test Lane", streetAddress: "321 Test Lane",
city: "Columbus", city: "Columbus",
state: "OH", state: "OH",
zip: "43212", zipCode: "43212",
zipCodeCtu: "01820",
}, },
}, },
}; };
@ -1189,7 +1193,8 @@ describe("Actions", () => {
streetAddress: "123 Test Lane", streetAddress: "123 Test Lane",
city: "Columbus", city: "Columbus",
state: "OH", state: "OH",
zip: "43212", zipCode: "43212",
zipCodeCtu: "01820",
}, },
}, },
}, },
@ -1217,7 +1222,8 @@ describe("Actions", () => {
streetAddress: "123 Test Lane", streetAddress: "123 Test Lane",
city: "Columbus", city: "Columbus",
state: "OH", state: "OH",
zip: "43212", zipCode: "43212",
zipCodeCtu: "01820",
}, },
}, },
}; };
@ -1248,7 +1254,8 @@ describe("Actions", () => {
streetAddress: "123 Test Lane", streetAddress: "123 Test Lane",
city: "Columbus", city: "Columbus",
state: "OH", state: "OH",
zip: "43212", zipCode: "43212",
zipCodeCtu: "01820",
}, },
}, },
}, },
@ -1276,7 +1283,8 @@ describe("Actions", () => {
streetAddress: "123 Test Lane", streetAddress: "123 Test Lane",
city: "Columbus", city: "Columbus",
state: "OH", state: "OH",
zip: "43212", zipCode: "43212",
zipCodeCtu: "01820",
}, },
}, },
}; };