From 73c231dc8968cc96cf9581a8902a56b4b028fb77 Mon Sep 17 00:00:00 2001 From: Jason Lin Date: Wed, 23 Aug 2023 11:35:11 -0400 Subject: [PATCH] Fix some tests. --- .../updateHealthPlanFormData.test.ts | 24 ++++++++++--------- .../updateHealthPlanFormData.ts | 4 ++-- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/services/app-api/src/resolvers/healthPlanPackage/updateHealthPlanFormData.test.ts b/services/app-api/src/resolvers/healthPlanPackage/updateHealthPlanFormData.test.ts index bdde5549ca..b0f14c18e9 100644 --- a/services/app-api/src/resolvers/healthPlanPackage/updateHealthPlanFormData.test.ts +++ b/services/app-api/src/resolvers/healthPlanPackage/updateHealthPlanFormData.test.ts @@ -342,10 +342,6 @@ describe.each(flagValueTestParameters)( }) it('errors if the id doesnt match the db', async () => { - // id is wrong - // createdAt is wrong? or just overwrite - // - const server = await constructTestPostgresServer({ ldService: mockLDService, }) @@ -353,7 +349,7 @@ describe.each(flagValueTestParameters)( const formData = latestFormData(createdDraft) - formData.id = uuidv4() + formData.updatedAt = new Date(Date.UTC(2025, 5, 1)) const b64 = domainToBase64(formData) @@ -375,9 +371,12 @@ describe.each(flagValueTestParameters)( expect(updateResult.errors[0].extensions?.code).toBe( 'BAD_USER_INPUT' ) - expect(updateResult.errors[0].message).toBe( - 'Transient server error: attempted to modify un-modifiable field(s): id. Please refresh the page to continue.' - ) + + const expectedErrorMsg = flagValue + ? 'Transient server error: Concurrent editing occurred. Please refresh the page to continue.' + : 'Transient server error: attempted to modify un-modifiable field(s): updatedAt. Please refresh the page to continue.' + + expect(updateResult.errors[0].message).toBe(expectedErrorMsg) }) it('errors if the other payload values dont match the db', async () => { @@ -413,9 +412,12 @@ describe.each(flagValueTestParameters)( expect(updateResult.errors[0].extensions?.code).toBe( 'BAD_USER_INPUT' ) - expect(updateResult.errors[0].message).toBe( - 'Transient server error: attempted to modify un-modifiable field(s): stateCode,stateNumber,createdAt,updatedAt. Please refresh the page to continue.' - ) + + const expectedErrorMsg = flagValue + ? 'Transient server error: Concurrent editing occurred. Please refresh the page to continue.' + : 'Transient server error: attempted to modify un-modifiable field(s): stateCode,stateNumber,createdAt,updatedAt. Please refresh the page to continue.' + + expect(updateResult.errors[0].message).toBe(expectedErrorMsg) }) it('errors if the update call to the db fails', async () => { diff --git a/services/app-api/src/resolvers/healthPlanPackage/updateHealthPlanFormData.ts b/services/app-api/src/resolvers/healthPlanPackage/updateHealthPlanFormData.ts index 1a5604f1f1..bf2c2f7e28 100644 --- a/services/app-api/src/resolvers/healthPlanPackage/updateHealthPlanFormData.ts +++ b/services/app-api/src/resolvers/healthPlanPackage/updateHealthPlanFormData.ts @@ -185,8 +185,8 @@ export function updateHealthPlanFormDataResolver( // If updatedAt does not match concurrent editing occurred. if ( - contractWithHistory.draftRevision.updatedAt !== - unlockedFormData.updatedAt + contractWithHistory.draftRevision.updatedAt.getTime() !== + unlockedFormData.updatedAt.getTime() ) { const errMessage = `Transient server error: Concurrent editing occurred. Please refresh the page to continue.` logError('updateHealthPlanFormData', errMessage)