Skip to content

Commit 901a27d

Browse files
chris-elliott-nhsdchris-elliott-nhsd
committed
CCM-9247: Changes in response to review comments
1 parent fc0221d commit 901a27d

File tree

6 files changed

+48
-42
lines changed

6 files changed

+48
-42
lines changed

‎infrastructure/terraform/modules/backend-api/module_lambda_process_proof.tf‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ data "aws_iam_policy_document" "process_proof" {
9191
effect = "Allow"
9292

9393
actions = [
94+
"s3:ListBucket",
9495
"s3:GetObject",
9596
"s3:GetObjectVersion",
9697
"s3:GetObjectTagging",

‎tests/test-team/.eslintignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
playwright-report

‎tests/test-team/helpers/db/template-storage-helper.ts‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,8 @@ export class TemplateStorageHelper {
141141
/**
142142
* Retrieves a letter template pdf file from the internal bucket
143143
*/
144-
async getScannedPdfTemplateFile(key: TemplateKey, version: string) {
145-
return await this.getLetterTemplateFile(
144+
async getScannedPdfTemplateMetadata(key: TemplateKey, version: string) {
145+
return await this.getLetterTemplateMetadata(
146146
process.env.TEMPLATES_INTERNAL_BUCKET_NAME,
147147
'pdf-template',
148148
key,
@@ -154,8 +154,8 @@ export class TemplateStorageHelper {
154154
/**
155155
* Retrieves a letter template test data csv file from the internal bucket
156156
*/
157-
async getScannedCsvTestDataFile(key: TemplateKey, version: string) {
158-
return await this.getLetterTemplateFile(
157+
async getScannedCsvTestDataMetadata(key: TemplateKey, version: string) {
158+
return await this.getLetterTemplateMetadata(
159159
process.env.TEMPLATES_INTERNAL_BUCKET_NAME,
160160
'test-data',
161161
key,
@@ -203,8 +203,8 @@ export class TemplateStorageHelper {
203203
/**
204204
* Retrieves a letter template pdf file from the quarantine bucket
205205
*/
206-
async getQuarantinePdfTemplateFile(key: TemplateKey, version: string) {
207-
return await this.getLetterTemplateFile(
206+
async getQuarantinePdfTemplateMetadata(key: TemplateKey, version: string) {
207+
return await this.getLetterTemplateMetadata(
208208
process.env.TEMPLATES_QUARANTINE_BUCKET_NAME,
209209
'pdf-template',
210210
key,
@@ -216,8 +216,8 @@ export class TemplateStorageHelper {
216216
/**
217217
* Retrieves a letter template test data csv file from the quarantine bucket
218218
*/
219-
async getQuarantineCsvTestDataFile(key: TemplateKey, version: string) {
220-
return await this.getLetterTemplateFile(
219+
async getQuarantineCsvTestDataMetadata(key: TemplateKey, version: string) {
220+
return await this.getLetterTemplateMetadata(
221221
process.env.TEMPLATES_QUARANTINE_BUCKET_NAME,
222222
'test-data',
223223
key,
@@ -251,7 +251,7 @@ export class TemplateStorageHelper {
251251
/**
252252
* Retrieves a letter template file from s3
253253
*/
254-
async getLetterTemplateFile(
254+
async getLetterTemplateMetadata(
255255
bucket: string,
256256
prefix: string,
257257
key: TemplateKey,
@@ -275,7 +275,7 @@ export class TemplateStorageHelper {
275275
}
276276
}
277277

278-
async getLetterProofFile(
278+
async getLetterProofMetadata(
279279
bucket: string,
280280
prefix: string,
281281
templateId: string,

‎tests/test-team/template-mgmt-e2e-tests/template-mgmt-letter-file-validation.e2e.spec.ts‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ test.describe('letter file validation', () => {
8787
'contact_telephone_number',
8888
]);
8989

90-
const pdf = await templateStorageHelper.getScannedPdfTemplateFile(
90+
const pdf = await templateStorageHelper.getScannedPdfTemplateMetadata(
9191
key,
9292
template.files?.pdfTemplate?.currentVersion as string
9393
);
@@ -96,7 +96,7 @@ test.describe('letter file validation', () => {
9696
pdfUploadFixtures.withPersonalisation.pdf.checksumSha256()
9797
);
9898

99-
const csv = await templateStorageHelper.getScannedCsvTestDataFile(
99+
const csv = await templateStorageHelper.getScannedCsvTestDataMetadata(
100100
key,
101101
template.files?.testDataCsv?.currentVersion as string
102102
);
@@ -166,7 +166,7 @@ test.describe('letter file validation', () => {
166166

167167
expect(template.testDataCsvHeaders).toEqual([]);
168168

169-
const pdf = await templateStorageHelper.getScannedPdfTemplateFile(
169+
const pdf = await templateStorageHelper.getScannedPdfTemplateMetadata(
170170
key,
171171
template.files?.pdfTemplate?.currentVersion as string
172172
);
@@ -228,22 +228,23 @@ test.describe('letter file validation', () => {
228228
expect(template.files?.testDataCsv?.virusScanStatus).toBe('FAILED');
229229
expect(template.templateStatus).toBe('VIRUS_SCAN_FAILED');
230230

231-
const csvInternal = await templateStorageHelper.getScannedCsvTestDataFile(
232-
key,
233-
template.files?.testDataCsv?.currentVersion as string
234-
);
231+
const csvInternal =
232+
await templateStorageHelper.getScannedCsvTestDataMetadata(
233+
key,
234+
template.files?.testDataCsv?.currentVersion as string
235+
);
235236

236237
expect(csvInternal).toBe(null);
237238

238239
const csvQuarantine =
239-
await templateStorageHelper.getQuarantineCsvTestDataFile(
240+
await templateStorageHelper.getQuarantineCsvTestDataMetadata(
240241
key,
241242
template.files?.testDataCsv?.currentVersion as string
242243
);
243244

244245
expect(csvQuarantine).toBe(null);
245246

246-
const pdf = await templateStorageHelper.getScannedPdfTemplateFile(
247+
const pdf = await templateStorageHelper.getScannedPdfTemplateMetadata(
247248
key,
248249
template.files?.pdfTemplate?.currentVersion as string
249250
);
@@ -302,22 +303,23 @@ test.describe('letter file validation', () => {
302303
expect(template.files?.testDataCsv?.virusScanStatus).toBe('PASSED');
303304
expect(template.templateStatus).toBe('VIRUS_SCAN_FAILED');
304305

305-
const pdfInternal = await templateStorageHelper.getScannedPdfTemplateFile(
306-
key,
307-
template.files?.pdfTemplate?.currentVersion as string
308-
);
306+
const pdfInternal =
307+
await templateStorageHelper.getScannedPdfTemplateMetadata(
308+
key,
309+
template.files?.pdfTemplate?.currentVersion as string
310+
);
309311

310312
expect(pdfInternal).toBe(null);
311313

312314
const pdfQuarantine =
313-
await templateStorageHelper.getQuarantinePdfTemplateFile(
315+
await templateStorageHelper.getQuarantinePdfTemplateMetadata(
314316
key,
315317
template.files?.pdfTemplate?.currentVersion as string
316318
);
317319

318320
expect(pdfQuarantine).toBe(null);
319321

320-
const csv = await templateStorageHelper.getScannedCsvTestDataFile(
322+
const csv = await templateStorageHelper.getScannedCsvTestDataMetadata(
321323
key,
322324
template.files?.testDataCsv?.currentVersion as string
323325
);

‎tests/test-team/template-mgmt-e2e-tests/template-mgmt-letter-full.e2e.spec.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ test.describe('letter complete e2e journey', () => {
9090
'contact_telephone_number',
9191
]);
9292

93-
const pdf = await templateStorageHelper.getScannedPdfTemplateFile(
93+
const pdf = await templateStorageHelper.getScannedPdfTemplateMetadata(
9494
key,
9595
template.files?.pdfTemplate?.currentVersion as string
9696
);
@@ -99,7 +99,7 @@ test.describe('letter complete e2e journey', () => {
9999
pdfUploadFixtures.withPersonalisation.pdf.checksumSha256()
100100
);
101101

102-
const csv = await templateStorageHelper.getScannedCsvTestDataFile(
102+
const csv = await templateStorageHelper.getScannedCsvTestDataMetadata(
103103
key,
104104
template.files?.testDataCsv?.currentVersion as string
105105
);

‎tests/test-team/template-mgmt-e2e-tests/template-mgmt-proofing.e2e.spec.ts‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -92,25 +92,27 @@ test.describe('Letter Proofing', () => {
9292
expect(template.templateStatus).toEqual('PROOF_AVAILABLE');
9393

9494
for (const fileName of ['proof-1', 'proof-2', 'proof-3']) {
95-
const quarantinePdf = await templateStorageHelper.getLetterProofFile(
96-
process.env.TEMPLATES_QUARANTINE_BUCKET_NAME,
97-
'proofs',
98-
templateId,
99-
fileName,
100-
'pdf'
101-
);
95+
const quarantinePdf =
96+
await templateStorageHelper.getLetterProofMetadata(
97+
process.env.TEMPLATES_QUARANTINE_BUCKET_NAME,
98+
'proofs',
99+
templateId,
100+
fileName,
101+
'pdf'
102+
);
102103

103104
expect(quarantinePdf?.ChecksumSHA256).toEqual(
104105
pdfUploadFixtures.noCustomPersonalisation.pdf.checksumSha256()
105106
);
106107

107-
const internalPdf = await templateStorageHelper.getLetterTemplateFile(
108-
process.env.TEMPLATES_INTERNAL_BUCKET_NAME,
109-
'proofs',
110-
{ owner: user.userId, id: templateId },
111-
fileName,
112-
'pdf'
113-
);
108+
const internalPdf =
109+
await templateStorageHelper.getLetterTemplateMetadata(
110+
process.env.TEMPLATES_INTERNAL_BUCKET_NAME,
111+
'proofs',
112+
{ owner: user.userId, id: templateId },
113+
fileName,
114+
'pdf'
115+
);
114116

115117
expect(internalPdf?.ChecksumSHA256).toEqual(
116118
pdfUploadFixtures.noCustomPersonalisation.pdf.checksumSha256()
@@ -169,7 +171,7 @@ test.describe('Letter Proofing', () => {
169171

170172
expect(template.templateStatus).toEqual('WAITING_FOR_PROOF');
171173

172-
const pdf = await templateStorageHelper.getLetterProofFile(
174+
const pdf = await templateStorageHelper.getLetterProofMetadata(
173175
process.env.TEMPLATES_QUARANTINE_BUCKET_NAME,
174176
'proofs',
175177
templateId,

0 commit comments

Comments
 (0)