Skip to content

Commit c346543

Browse files
alexnuttallalexnuttall
authored
CCM-10385: fix error logging (#582)
1 parent 52ced5c commit c346543

34 files changed

+658
-364
lines changed

‎frontend/src/__tests__/utils/form-actions.test.ts‎

Lines changed: 32 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,10 @@ describe('form-actions', () => {
6969
test('createTemplate - should throw error when saving unexpectedly fails', async () => {
7070
mockedTemplateClient.createTemplate.mockResolvedValueOnce({
7171
error: {
72-
code: 400,
73-
message: 'Bad request',
72+
errorMeta: {
73+
code: 400,
74+
description: 'Bad request',
75+
},
7476
},
7577
});
7678

@@ -222,8 +224,10 @@ describe('form-actions', () => {
222224
test('createLetterTemplate - should throw error when saving unexpectedly fails', async () => {
223225
mockedTemplateClient.createLetterTemplate.mockResolvedValueOnce({
224226
error: {
225-
code: 400,
226-
message: 'Bad request',
227+
errorMeta: {
228+
code: 400,
229+
description: 'Bad request',
230+
},
227231
},
228232
});
229233

@@ -318,8 +322,10 @@ describe('form-actions', () => {
318322
test('saveTemplate - should throw error when saving unexpectedly fails', async () => {
319323
mockedTemplateClient.updateTemplate.mockResolvedValueOnce({
320324
error: {
321-
code: 400,
322-
message: 'Bad request',
325+
errorMeta: {
326+
code: 400,
327+
description: 'Bad request',
328+
},
323329
},
324330
});
325331

@@ -395,8 +401,10 @@ describe('form-actions', () => {
395401
mockedTemplateClient.getTemplate.mockResolvedValueOnce({
396402
data: undefined,
397403
error: {
398-
code: 404,
399-
message: 'Not found',
404+
errorMeta: {
405+
code: 404,
406+
description: 'Not found',
407+
},
400408
},
401409
});
402410

@@ -448,8 +456,10 @@ describe('form-actions', () => {
448456
mockedTemplateClient.listTemplates.mockResolvedValueOnce({
449457
data: undefined,
450458
error: {
451-
code: 500,
452-
message: 'Internal server error',
459+
errorMeta: {
460+
code: 500,
461+
description: 'Internal server error',
462+
},
453463
},
454464
});
455465

@@ -534,8 +544,10 @@ describe('form-actions', () => {
534544
test('submitTemplate - should throw error when saving unexpectedly fails', async () => {
535545
mockedTemplateClient.submitTemplate.mockResolvedValueOnce({
536546
error: {
537-
code: 400,
538-
message: 'Bad request',
547+
errorMeta: {
548+
code: 400,
549+
description: 'Bad request',
550+
},
539551
},
540552
});
541553

@@ -581,8 +593,10 @@ describe('form-actions', () => {
581593
test('deleteTemplate - should throw error when saving unexpectedly fails', async () => {
582594
mockedTemplateClient.deleteTemplate.mockResolvedValueOnce({
583595
error: {
584-
code: 400,
585-
message: 'Bad request',
596+
errorMeta: {
597+
code: 400,
598+
description: 'Bad request',
599+
},
586600
},
587601
});
588602

@@ -646,8 +660,10 @@ describe('form-actions', () => {
646660
test('requestTemplateProof - should throw error when request unexpectedly fails', async () => {
647661
mockedTemplateClient.requestProof.mockResolvedValueOnce({
648662
error: {
649-
code: 400,
650-
message: 'Bad request',
663+
errorMeta: {
664+
code: 400,
665+
description: 'Bad request',
666+
},
651667
},
652668
});
653669

‎frontend/src/__tests__/utils/server-features.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ describe('serverIsFeatureEnabled', () => {
5353
});
5454

5555
clientConfigurationApiClientMock.fetch.mockResolvedValueOnce({
56-
error: { code: 500, message: 'server error' },
56+
error: { errorMeta: { code: 500, description: 'server error' } },
5757
});
5858

5959
const enabled = await serverIsFeatureEnabled('proofing');

‎lambdas/backend-api/src/__tests__/templates/api/create-letter.test.ts‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -415,8 +415,10 @@ describe('create-letter', () => {
415415

416416
mocks.templateClient.createLetterTemplate.mockResolvedValueOnce({
417417
error: {
418-
code: 500,
419-
message: 'Internal server error',
418+
errorMeta: {
419+
code: 500,
420+
description: 'Internal server error',
421+
},
420422
},
421423
});
422424

‎lambdas/backend-api/src/__tests__/templates/api/create.test.ts‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,12 @@ describe('Template API - Create', () => {
4141

4242
mocks.templateClient.createTemplate.mockResolvedValueOnce({
4343
error: {
44-
code: 400,
45-
message: 'Validation failed',
46-
details: {
47-
templateType: 'Invalid input: expected string, received undefined',
44+
errorMeta: {
45+
code: 400,
46+
description: 'Validation failed',
47+
details: {
48+
templateType: 'Invalid input: expected string, received undefined',
49+
},
4850
},
4951
},
5052
data: undefined,
@@ -81,8 +83,10 @@ describe('Template API - Create', () => {
8183

8284
mocks.templateClient.createTemplate.mockResolvedValueOnce({
8385
error: {
84-
code: 500,
85-
message: 'Internal server error',
86+
errorMeta: {
87+
code: 500,
88+
description: 'Internal server error',
89+
},
8690
},
8791
});
8892

‎lambdas/backend-api/src/__tests__/templates/api/delete.test.ts‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,10 @@ describe('Template API - Delete', () => {
6464

6565
mocks.templateClient.deleteTemplate.mockResolvedValueOnce({
6666
error: {
67-
code: 500,
68-
message: 'Internal server error',
67+
errorMeta: {
68+
code: 500,
69+
description: 'Internal server error',
70+
},
6971
},
7072
});
7173

‎lambdas/backend-api/src/__tests__/templates/api/get-client-configuration.test.ts‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,10 @@ describe('Template API - get client configuration', () => {
4242

4343
mocks.templateClient.getClientConfiguration.mockResolvedValueOnce({
4444
error: {
45-
code: 404,
46-
message: 'Could not retrieve client configuration',
45+
errorMeta: {
46+
code: 404,
47+
description: 'Could not retrieve client configuration',
48+
},
4749
},
4850
});
4951

‎lambdas/backend-api/src/__tests__/templates/api/get.test.ts‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,10 @@ describe('Template API - Get', () => {
6666

6767
mocks.templateClient.getTemplate.mockResolvedValueOnce({
6868
error: {
69-
code: 500,
70-
message: 'Internal server error',
69+
errorMeta: {
70+
code: 500,
71+
description: 'Internal server error',
72+
},
7173
},
7274
});
7375

‎lambdas/backend-api/src/__tests__/templates/api/list.test.ts‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,10 @@ describe('Template API - List', () => {
4242

4343
mocks.templateClient.listTemplates.mockResolvedValueOnce({
4444
error: {
45-
code: 500,
46-
message: 'Internal server error',
45+
errorMeta: {
46+
code: 500,
47+
description: 'Internal server error',
48+
},
4749
},
4850
});
4951

‎lambdas/backend-api/src/__tests__/templates/api/submit.test.ts‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,10 @@ describe('Template API - Submit', () => {
6767

6868
mocks.templateClient.submitTemplate.mockResolvedValueOnce({
6969
error: {
70-
code: 500,
71-
message: 'Internal server error',
70+
errorMeta: {
71+
code: 500,
72+
description: 'Internal server error',
73+
},
7274
},
7375
});
7476

‎lambdas/backend-api/src/__tests__/templates/api/update.test.ts‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,12 @@ describe('Template API - Update', () => {
4242

4343
mocks.templateClient.updateTemplate.mockResolvedValueOnce({
4444
error: {
45-
code: 400,
46-
message: 'Validation failed',
47-
details: {
48-
templateType: 'Invalid input: expected string, received undefined',
45+
errorMeta: {
46+
code: 400,
47+
description: 'Validation failed',
48+
details: {
49+
templateType: 'Invalid input: expected string, received undefined',
50+
},
4951
},
5052
},
5153
data: undefined,
@@ -108,8 +110,10 @@ describe('Template API - Update', () => {
108110

109111
mocks.templateClient.updateTemplate.mockResolvedValueOnce({
110112
error: {
111-
code: 500,
112-
message: 'Internal server error',
113+
errorMeta: {
114+
code: 500,
115+
description: 'Internal server error',
116+
},
113117
},
114118
});
115119

0 commit comments

Comments
 (0)