Skip to content

Commit 40b560c

Browse files
alexnuttallalexnuttall
committed
fix DatabaseTemplate post rebase
1 parent 39ab01e commit 40b560c

File tree

4 files changed

+33
-33
lines changed

4 files changed

+33
-33
lines changed

‎lambdas/backend-api/src/__tests__/templates/app/template-client.test.ts‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { TemplateRepository } from '@backend-api/templates/infra';
1010
import { TemplateClient } from '@backend-api/templates/app/template-client';
1111
import { LetterUploadRepository } from '@backend-api/templates/infra/letter-upload-repository';
1212
import { DatabaseTemplate } from 'nhs-notify-web-template-management-utils';
13-
import { MergedTemplate } from 'nhs-notify-web-template-management-utils';
13+
import { DatabaseTemplate } from 'nhs-notify-web-template-management-utils';
1414
import { ProofingQueue } from '@backend-api/templates/infra/proofing-queue';
1515

1616
jest.mock('node:crypto');
@@ -145,7 +145,7 @@ describe('templateClient', () => {
145145
templateStatus: 'NOT_YET_SUBMITTED',
146146
};
147147

148-
const template: MergedTemplate = {
148+
const template: DatabaseTemplate = {
149149
...expectedTemplateDto,
150150
owner,
151151
version: 1,
@@ -189,7 +189,7 @@ describe('templateClient', () => {
189189
templateStatus: 'NOT_YET_SUBMITTED',
190190
};
191191

192-
const template: MergedTemplate = {
192+
const template: DatabaseTemplate = {
193193
...expectedTemplateDto,
194194
owner,
195195
version: 1,
@@ -256,7 +256,7 @@ describe('templateClient', () => {
256256

257257
const creationTime = '2025-03-12T08:41:08.805Z';
258258

259-
const initialCreatedTemplate: MergedTemplate = {
259+
const initialCreatedTemplate: DatabaseTemplate = {
260260
...dataWithFiles,
261261
id: templateId,
262262
createdAt: creationTime,
@@ -268,7 +268,7 @@ describe('templateClient', () => {
268268

269269
const updateTime = '2025-03-12T08:41:33.666Z';
270270

271-
const finalTemplate: MergedTemplate = {
271+
const finalTemplate: DatabaseTemplate = {
272272
...initialCreatedTemplate,
273273
templateStatus: 'PENDING_VALIDATION',
274274
updatedAt: updateTime,
@@ -549,7 +549,7 @@ describe('templateClient', () => {
549549
});
550550

551551
mocks.templateRepository.create.mockResolvedValueOnce({
552-
data: {} as unknown as MergedTemplate,
552+
data: {} as unknown as DatabaseTemplate,
553553
});
554554

555555
const result = await templateClient.createLetterTemplate(
@@ -607,7 +607,7 @@ describe('templateClient', () => {
607607
templateStatus: 'PENDING_VALIDATION',
608608
};
609609

610-
const initialCreatedTemplate: MergedTemplate = {
610+
const initialCreatedTemplate: DatabaseTemplate = {
611611
...expectedTemplateDto,
612612
templateStatus: 'PENDING_UPLOAD',
613613
owner,
@@ -698,7 +698,7 @@ describe('templateClient', () => {
698698
templateStatus: 'PENDING_VALIDATION',
699699
};
700700

701-
const initialCreatedTemplate: MergedTemplate = {
701+
const initialCreatedTemplate: DatabaseTemplate = {
702702
...expectedTemplateDto,
703703
templateStatus: 'PENDING_UPLOAD',
704704
owner,
@@ -792,7 +792,7 @@ describe('templateClient', () => {
792792

793793
const creationTime = '2025-03-12T08:41:08.805Z';
794794

795-
const initialCreatedTemplate: MergedTemplate = {
795+
const initialCreatedTemplate: DatabaseTemplate = {
796796
...dataWithFiles,
797797
id: templateId,
798798
createdAt: creationTime,
@@ -804,7 +804,7 @@ describe('templateClient', () => {
804804

805805
const updateTime = '2025-03-12T08:41:33.666Z';
806806

807-
const finalTemplate: MergedTemplate = {
807+
const finalTemplate: DatabaseTemplate = {
808808
...initialCreatedTemplate,
809809
templateStatus: 'PENDING_VALIDATION',
810810
updatedAt: updateTime,
@@ -981,7 +981,7 @@ describe('templateClient', () => {
981981
templateStatus: 'NOT_YET_SUBMITTED',
982982
};
983983

984-
const template: MergedTemplate = {
984+
const template: DatabaseTemplate = {
985985
...expectedTemplateDto,
986986
owner,
987987
version: 1,
@@ -1093,7 +1093,7 @@ describe('templateClient', () => {
10931093
templateStatus: 'NOT_YET_SUBMITTED',
10941094
};
10951095

1096-
const template: MergedTemplate = {
1096+
const template: DatabaseTemplate = {
10971097
...templateDTO,
10981098
owner,
10991099
version: 1,
@@ -1365,7 +1365,7 @@ describe('templateClient', () => {
13651365
templateType: 'SMS',
13661366
};
13671367

1368-
const template: MergedTemplate = {
1368+
const template: DatabaseTemplate = {
13691369
...expectedTemplateDto,
13701370
owner,
13711371
version: 1,
@@ -1460,7 +1460,7 @@ describe('templateClient', () => {
14601460
templateType: 'SMS',
14611461
};
14621462

1463-
const template: MergedTemplate = {
1463+
const template: DatabaseTemplate = {
14641464
...expectedTemplateDto,
14651465
owner,
14661466
version: 1,
@@ -1499,7 +1499,7 @@ describe('templateClient', () => {
14991499
templateType: 'SMS',
15001500
};
15011501

1502-
const template: MergedTemplate = {
1502+
const template: DatabaseTemplate = {
15031503
...expectedTemplateDto,
15041504
owner,
15051505
version: 1,

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -80,25 +80,25 @@ const databaseTemplateProperties = {
8080
updatedAt: '2024-12-27T00:00:00.000Z',
8181
};
8282

83-
const emailTemplate: MergedTemplate = {
83+
const emailTemplate: DatabaseTemplate = {
8484
templateType: 'EMAIL',
8585
...emailProperties,
8686
...databaseTemplateProperties,
8787
};
8888

89-
const smsTemplate: MergedTemplate = {
89+
const smsTemplate: DatabaseTemplate = {
9090
templateType: 'SMS',
9191
...smsProperties,
9292
...databaseTemplateProperties,
9393
};
9494

95-
const nhsAppTemplate: MergedTemplate = {
95+
const nhsAppTemplate: DatabaseTemplate = {
9696
templateType: 'NHS_APP',
9797
...nhsAppProperties,
9898
...databaseTemplateProperties,
9999
};
100100

101-
const letterTemplate: MergedTemplate = {
101+
const letterTemplate: DatabaseTemplate = {
102102
templateType: 'LETTER',
103103
...letterProperties,
104104
...databaseTemplateProperties,
@@ -570,7 +570,7 @@ describe('templateRepository', () => {
570570
const id = 'abc-def-ghi-jkl-123';
571571
const owner = 'real-owner';
572572

573-
const databaseTemplate: MergedTemplate = {
573+
const databaseTemplate: DatabaseTemplate = {
574574
id,
575575
owner,
576576
version: 1,
@@ -681,7 +681,7 @@ describe('templateRepository', () => {
681681
const id = 'abc-def-ghi-jkl-123';
682682
const owner = 'real-owner';
683683

684-
const databaseTemplate: MergedTemplate = {
684+
const databaseTemplate: DatabaseTemplate = {
685685
id,
686686
owner,
687687
version: 1,
@@ -798,7 +798,7 @@ describe('templateRepository', () => {
798798
const id = 'abc-def-ghi-jkl-123';
799799
const owner = 'real-owner';
800800

801-
const databaseTemplate: MergedTemplate = {
801+
const databaseTemplate: DatabaseTemplate = {
802802
id,
803803
owner,
804804
version: 1,

‎lambdas/backend-api/src/templates/app/template-client.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@ export class TemplateClient implements ITemplateClient {
394394
}
395395

396396
private mapDatabaseObjectToDTO(
397-
databaseTemplate: MergedTemplate
397+
databaseTemplate: DatabaseTemplate
398398
): TemplateDto | undefined {
399399
const { owner: _1, version: _2, ...templateDTO } = databaseTemplate;
400400

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ export class TemplateRepository {
5959
async get(
6060
templateId: string,
6161
owner: string
62-
): Promise<ApplicationResult<MergedTemplate>> {
62+
): Promise<ApplicationResult<DatabaseTemplate>> {
6363
try {
6464
const response = await this.client.send(
6565
new GetCommand({
@@ -72,7 +72,7 @@ export class TemplateRepository {
7272
return failure(ErrorCase.TEMPLATE_NOT_FOUND, 'Template not found');
7373
}
7474

75-
const item = response.Item as MergedTemplate;
75+
const item = response.Item as DatabaseTemplate;
7676

7777
if (item.templateStatus === 'DELETED') {
7878
return failure(ErrorCase.TEMPLATE_NOT_FOUND, 'Template not found');
@@ -88,9 +88,9 @@ export class TemplateRepository {
8888
template: WithAttachments<ValidatedCreateUpdateTemplate>,
8989
owner: string,
9090
initialStatus: TemplateStatus = 'NOT_YET_SUBMITTED'
91-
): Promise<ApplicationResult<MergedTemplate>> {
91+
): Promise<ApplicationResult<DatabaseTemplate>> {
9292
const date = new Date().toISOString();
93-
const entity: MergedTemplate = {
93+
const entity: DatabaseTemplate = {
9494
...template,
9595
id: randomUUID(),
9696
owner,
@@ -116,7 +116,7 @@ export class TemplateRepository {
116116
template: ValidatedCreateUpdateTemplate,
117117
owner: string,
118118
expectedStatus: TemplateStatus
119-
): Promise<ApplicationResult<MergedTemplate>> {
119+
): Promise<ApplicationResult<DatabaseTemplate>> {
120120
const updateExpression = [
121121
'#name = :name',
122122
...this.getChannelAttributeExpressions(template),
@@ -242,7 +242,7 @@ export class TemplateRepository {
242242
templateId: string,
243243
owner: string,
244244
status: Exclude<TemplateStatus, 'SUBMITTED' | 'DELETED'>
245-
): Promise<ApplicationResult<MergedTemplate>> {
245+
): Promise<ApplicationResult<DatabaseTemplate>> {
246246
const updateExpression = ['#templateStatus = :newStatus'];
247247

248248
const expressionAttributeValues: Record<string, string | number> = {
@@ -264,7 +264,7 @@ export class TemplateRepository {
264264
}
265265
}
266266

267-
async list(owner: string): Promise<ApplicationResult<MergedTemplate[]>> {
267+
async list(owner: string): Promise<ApplicationResult<DatabaseTemplate[]>> {
268268
try {
269269
const input: QueryCommandInput = {
270270
TableName: this.templatesTableName,
@@ -280,7 +280,7 @@ export class TemplateRepository {
280280
FilterExpression: '#status <> :deletedStatus',
281281
};
282282

283-
const items: MergedTemplate[] = [];
283+
const items: DatabaseTemplate[] = [];
284284

285285
do {
286286
// eslint-disable-next-line no-await-in-loop
@@ -290,7 +290,7 @@ export class TemplateRepository {
290290

291291
input.ExclusiveStartKey = LastEvaluatedKey;
292292

293-
items.push(...(Items as MergedTemplate[]));
293+
items.push(...(Items as DatabaseTemplate[]));
294294
} while (input.ExclusiveStartKey);
295295

296296
return success(items);
@@ -397,7 +397,7 @@ export class TemplateRepository {
397397
try {
398398
const response = await this.client.send(new UpdateCommand(input));
399399

400-
return success(response.Attributes as MergedTemplate);
400+
return success(response.Attributes as DatabaseTemplate);
401401
} catch (error) {
402402
if (error instanceof ConditionalCheckFailedException) {
403403
if (!error.Item || error.Item.templateStatus.S === 'DELETED') {

0 commit comments

Comments
 (0)