move mergedTemplate to utils

Author: alexnuttall

utils/entity-update-command-builder/src/template-update-builder.ts

@@ -1,7 +1,7 @@
 import type { TemplateStatus } from 'nhs-notify-backend-client';
 import { EntityUpdateBuilder } from './domain/entity-update-builder';
 import { BuilderOptionalArgs } from './types/builders';
-import { MergedTemplate } from './types/template';
+import { MergedTemplate } from 'nhs-notify-web-template-management-utils';
 
 export class TemplateUpdateBuilder extends EntityUpdateBuilder<MergedTemplate> {
   constructor(

utils/entity-update-command-builder/src/types/template.ts

@@ -3,10 +3,15 @@ import {
   CreateUpdateLetterProperties,
   CreateUpdateTemplate,
   EmailProperties,
+  Language,
+  LetterFiles,
   LetterProperties,
+  LetterType,
   NhsAppProperties,
   SmsProperties,
   TemplateDto,
+  TemplateStatus,
+  TemplateType,
 } from 'nhs-notify-backend-client';
 
 export type FormId =
@@ -28,39 +33,43 @@ export type FormState = {
   validationError?: FormErrorState;
 };
 
-type NhsAppType = {
+type NhsAppTemplateType = {
   templateType: 'NHS_APP';
 };
 
-type EmailType = {
+type EmailTemplateType = {
   templateType: 'EMAIL';
 };
 
-type SmsType = {
+type SmsTemplateType = {
   templateType: 'SMS';
 };
 
-type LetterType = {
+type LetterTemplateType = {
   templateType: 'LETTER';
 };
 
 export type CreateUpdateNHSAppTemplate = CreateUpdateTemplate &
   NhsAppProperties &
-  NhsAppType;
+  NhsAppTemplateType;
 export type CreateUpdateEmailTemplate = CreateUpdateTemplate &
   EmailProperties &
-  EmailType;
+  EmailTemplateType;
 export type CreateUpdateSMSTemplate = CreateUpdateTemplate &
   SmsProperties &
-  SmsType;
+  SmsTemplateType;
 export type CreateUpdateLetterTemplate = CreateUpdateTemplate &
   CreateUpdateLetterProperties &
-  LetterType;
+  LetterTemplateType;
 
-export type NHSAppTemplate = TemplateDto & NhsAppProperties & NhsAppType;
-export type EmailTemplate = TemplateDto & EmailProperties & EmailType;
-export type SMSTemplate = TemplateDto & SmsProperties & SmsType;
-export type LetterTemplate = TemplateDto & LetterProperties & LetterType;
+export type NHSAppTemplate = TemplateDto &
+  NhsAppProperties &
+  NhsAppTemplateType;
+export type EmailTemplate = TemplateDto & EmailProperties & EmailTemplateType;
+export type SMSTemplate = TemplateDto & SmsProperties & SmsTemplateType;
+export type LetterTemplate = TemplateDto &
+  LetterProperties &
+  LetterTemplateType;
 
 export type TemplateFormState<T = CreateUpdateTemplate | TemplateDto> =
   FormState & T;
@@ -102,3 +111,28 @@ export type GuardDutyMalwareScanStatusPassed = Extract<
   GuardDutyMalwareScanStatus,
   'NO_THREATS_FOUND'
 >;
+
+export type MergedTemplate = {
+  createdAt: string;
+  files?: LetterFiles;
+  id: string;
+  language?: Language;
+  letterType?: LetterType;
+  sftpSendLockTime?: number;
+  message?: string;
+  name: string;
+  subject?: string;
+  templateStatus: TemplateStatus;
+  templateType: TemplateType;
+  updatedAt: string;
+  // owner: string;
+  // version: number;
+};
+
+type AssertExtendsMerged<T extends MergedTemplate> = T;
+
+// assigned only for the purpose of the assertion
+type _Asserted = AssertExtendsMerged<LetterTemplate> &
+  AssertExtendsMerged<NHSAppTemplate> &
+  AssertExtendsMerged<EmailTemplate> &
+  AssertExtendsMerged<SMSTemplate>;