Skip to content

Commit 42dbc5a

Browse files
chris-elliott-nhsdchris-elliott-nhsd
committed
CCM-10283: Fix CI
1 parent 5be40fc commit 42dbc5a

File tree

14 files changed

+143
-100
lines changed

14 files changed

+143
-100
lines changed

‎frontend/src/__tests__/components/molecules/PreviewTemplateDetails.test.tsx‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,9 +149,21 @@ describe('PreviewTemplateDetailsLetter', () => {
149149
virusScanStatus: 'PASSED',
150150
},
151151
proofs: {
152-
'a.pdf': { fileName: 'a.pdf', virusScanStatus: 'PASSED' },
153-
'b.pdf': { fileName: 'b.pdf', virusScanStatus: 'PASSED' },
154-
'c.pdf': { fileName: 'c.pdf', virusScanStatus: 'FAILED' },
152+
'a.pdf': {
153+
fileName: 'a.pdf',
154+
virusScanStatus: 'PASSED',
155+
supplier: 'MBA',
156+
},
157+
'b.pdf': {
158+
fileName: 'b.pdf',
159+
virusScanStatus: 'PASSED',
160+
supplier: 'MBA',
161+
},
162+
'c.pdf': {
163+
fileName: 'c.pdf',
164+
virusScanStatus: 'FAILED',
165+
supplier: 'MBA',
166+
},
155167
},
156168
},
157169
createdAt: '2025-01-13T10:19:25.579Z',

‎frontend/src/__tests__/components/molecules/ViewLetterTemplate.test.tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ describe('ViewLetterTemplate component', () => {
2626
'supplier-proof.pdf': {
2727
fileName: 'supplier-proof.pdf',
2828
virusScanStatus: 'PASSED',
29+
supplier: 'MBA',
2930
},
3031
},
3132
},

‎frontend/src/__tests__/components/organisms/PreviewLetterTemplate.test.tsx‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ describe('PreviewLetterTemplate component', () => {
101101
'your-proof.pdf': {
102102
fileName: 'your-proof.pdf',
103103
virusScanStatus: 'PASSED',
104+
supplier: 'MBA',
104105
},
105106
},
106107
},
@@ -133,6 +134,7 @@ describe('PreviewLetterTemplate component', () => {
133134
'your-proof.pdf': {
134135
fileName: 'your-proof.pdf',
135136
virusScanStatus: 'PASSED',
137+
supplier: 'MBA',
136138
},
137139
},
138140
},

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ test.each([
1212
expect(
1313
letterFileRepository.copyFromQuarantineToInternal
1414
).toHaveBeenCalledWith(
15-
'proofs/template-id/proof.pdf',
15+
'proofs/supplier/template-id/proof.pdf',
1616
'version-id',
1717
'proofs/template-owner/template-id/proof.pdf'
1818
);
1919
expect(
2020
letterFileRepository.copyFromQuarantineToDownload
2121
).toHaveBeenCalledWith(
22-
'proofs/template-id/proof.pdf',
22+
'proofs/supplier/template-id/proof.pdf',
2323
'version-id',
2424
'template-owner/proofs/template-id/proof.pdf'
2525
);
@@ -54,7 +54,7 @@ test.each([
5454
await handler({
5555
detail: {
5656
s3ObjectDetails: {
57-
objectKey: 'proofs/template-id/proof.pdf',
57+
objectKey: 'proofs/supplier/template-id/proof.pdf',
5858
versionId: 'version-id',
5959
},
6060
scanResultDetails: { scanResultStatus },
@@ -71,7 +71,8 @@ test.each([
7171
'template-owner',
7272
'template-id',
7373
'proof.pdf',
74-
virusScanStatus
74+
virusScanStatus,
75+
'supplier'
7576
);
7677
}
7778
);

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
import type { APIGatewayProxyEvent, Context } from 'aws-lambda';
2-
import { mock } from 'jest-mock-extended';
2+
import { mock, mockDeep } from 'jest-mock-extended';
33
import { ITemplateClient, TemplateDto } from 'nhs-notify-backend-client';
44
import { createHandler } from '@backend-api/templates/api/submit';
5+
import { EmailClient } from '@backend-api/templates/infra/email-client';
56

67
const setup = () => {
78
const templateClient = mock<ITemplateClient>();
9+
const emailClient = mockDeep<EmailClient>();
810

9-
const handler = createHandler({ templateClient });
11+
const handler = createHandler({ templateClient, emailClient });
1012

1113
return { handler, mocks: { templateClient } };
1214
};

‎lambdas/backend-api/src/__tests__/templates/infra/letter-proof-repository.test.ts‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,37 +3,42 @@ import { LetterProofRepository } from '../../../templates/infra/letter-proof-rep
33
describe('parseQuarantineKey', () => {
44
test('parses key', () => {
55
const parsedKey = LetterProofRepository.parseQuarantineKey(
6-
'proofs/template-id/proof.pdf'
6+
'proofs/supplier/template-id/proof.pdf'
77
);
88

99
expect(parsedKey).toEqual({
1010
templateId: 'template-id',
1111
fileName: 'proof.pdf',
12+
supplier: 'supplier',
1213
});
1314
});
1415

1516
test('errors on wrong file extension', () => {
1617
expect(() =>
17-
LetterProofRepository.parseQuarantineKey('proofs/template-id/proof.txt')
18-
).toThrow('Unexpected object key "proofs/template-id/proof.txt"');
18+
LetterProofRepository.parseQuarantineKey(
19+
'proofs/supplier/template-id/proof.txt'
20+
)
21+
).toThrow('Unexpected object key "proofs/supplier/template-id/proof.txt"');
1922
});
2023

2124
test('errors on wrong number of path segments', () => {
2225
expect(() =>
2326
LetterProofRepository.parseQuarantineKey(
24-
'proofs/template-id/extra-folder/proof.pdf'
27+
'proofs/supplier/template-id/extra-folder/proof.pdf'
2528
)
2629
).toThrow(
27-
'Unexpected object key "proofs/template-id/extra-folder/proof.pdf"'
30+
'Unexpected object key "proofs/supplier/template-id/extra-folder/proof.pdf"'
2831
);
2932
});
3033

3134
test('errors on wrong path prefix', () => {
3235
expect(() =>
3336
LetterProofRepository.parseQuarantineKey(
34-
'not-proofs/template-id/proof.pdf'
37+
'not-proofs/supplier/template-id/proof.pdf'
3538
)
36-
).toThrow('Unexpected object key "not-proofs/template-id/proof.pdf"');
39+
).toThrow(
40+
'Unexpected object key "not-proofs/supplier/template-id/proof.pdf"'
41+
);
3742
});
3843
});
3944

‎lambdas/backend-api/src/__tests__/templates/infra/template-repository.test.ts‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -851,7 +851,8 @@ describe('templateRepository', () => {
851851
'template-owner',
852852
'template-id',
853853
'pdf-template.pdf',
854-
'PASSED'
854+
'PASSED',
855+
'MBA'
855856
);
856857

857858
expect(mocks.ddbDocClient).toHaveReceivedCommandWith(UpdateCommand, {
@@ -871,6 +872,7 @@ describe('templateRepository', () => {
871872
':virusScanResult': {
872873
fileName: 'pdf-template.pdf',
873874
virusScanStatus: 'PASSED',
875+
supplier: 'MBA',
874876
},
875877
},
876878
});
@@ -901,7 +903,8 @@ describe('templateRepository', () => {
901903
'template-owner',
902904
'template-id',
903905
'pdf-template.pdf',
904-
'FAILED'
906+
'FAILED',
907+
'MBA'
905908
);
906909

907910
expect(mocks.ddbDocClient).toHaveReceivedCommandWith(UpdateCommand, {
@@ -921,6 +924,7 @@ describe('templateRepository', () => {
921924
':virusScanResult': {
922925
fileName: 'pdf-template.pdf',
923926
virusScanStatus: 'FAILED',
927+
supplier: 'MBA',
924928
},
925929
},
926930
});
@@ -942,7 +946,8 @@ describe('templateRepository', () => {
942946
'template-owner',
943947
'template-id',
944948
'pdf-template',
945-
'PASSED'
949+
'PASSED',
950+
'MBA'
946951
)
947952
).resolves.not.toThrow();
948953
});
@@ -969,7 +974,8 @@ describe('templateRepository', () => {
969974
'template-owner',
970975
'template-id',
971976
'pdf-template',
972-
'PASSED'
977+
'PASSED',
978+
'MBA'
973979
)
974980
).resolves.not.toThrow();
975981
});
@@ -985,7 +991,8 @@ describe('templateRepository', () => {
985991
'template-owner',
986992
'template-id',
987993
'pdf-template',
988-
'PASSED'
994+
'PASSED',
995+
'MBA'
989996
)
990997
).rejects.toThrow('Something went wrong');
991998
});
@@ -1006,7 +1013,8 @@ describe('templateRepository', () => {
10061013
'template-owner',
10071014
'template-id',
10081015
'pdf-template',
1009-
'PASSED'
1016+
'PASSED',
1017+
'MBA'
10101018
)
10111019
).rejects.toThrow('Something went wrong');
10121020
});

‎lambdas/backend-api/src/templates/api/process-proof.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,6 @@ export const createHandler =
6666
templateId,
6767
fileName,
6868
virusScanResult,
69-
supplier,
69+
supplier
7070
);
7171
};

‎lambdas/backend-api/src/templates/container.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ export function createContainer() {
5353
sesClient,
5454
config.templateSubmittedSenderEmailAddress,
5555
config.supplierRecipientEmailAddresses,
56-
logger,
56+
logger
5757
);
5858

5959
return {

‎lambdas/backend-api/src/templates/infra/config.ts‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ const $Env = z.object({
1616
export function loadConfig() {
1717
const env = $Env.parse(process.env);
1818

19-
const supplierRecipientEmailAddresses = z.record(z.array(z.string())).parse(env.SUPPLIER_RECIPIENT_EMAILS);
19+
const supplierRecipientEmailAddresses = z
20+
.record(z.array(z.string()))
21+
.parse(env.SUPPLIER_RECIPIENT_EMAIL_ADDRESSES);
2022

2123
return {
2224
defaultLetterSupplier: env.DEFAULT_LETTER_SUPPLIER,
@@ -27,7 +29,8 @@ export function loadConfig() {
2729
downloadBucket: env.TEMPLATES_DOWNLOAD_BUCKET_NAME,
2830
requestProofQueueUrl: env.REQUEST_PROOF_QUEUE_URL,
2931
templatesTableName: env.TEMPLATES_TABLE_NAME,
30-
templateSubmittedSenderEmailAddress: env.TEMPLATE_SUBMITTED_SENDER_EMAIL,
32+
templateSubmittedSenderEmailAddress:
33+
env.TEMPLATE_SUBMITTED_SENDER_EMAIL_ADDRESS,
3134
supplierRecipientEmailAddresses,
3235
};
3336
}

0 commit comments

Comments
 (0)