CCM-9973: remove audio cd and braille letter options (#469)

harrim91 · web-flow · commit 596828296da7 · 2025-05-15T09:32:38.000+01:00
diff --git a/frontend/src/__tests__/components/forms/LetterTemplateForm.test.tsx/LetterTemplateForm.test.tsx b/frontend/src/__tests__/components/forms/LetterTemplateForm.test.tsx/LetterTemplateForm.test.tsx
@@ -29,7 +29,7 @@ test('renders page with preloaded field values', () => {
       initialState={mockDeep<TemplateFormState<LetterTemplate>>({
         validationError: undefined,
         name: 'template-name',
-        letterType: 'q1',
+        letterType: 'x1',
         language: 'ar',
       })}
     />
diff --git a/frontend/src/__tests__/components/forms/LetterTemplateForm.test.tsx/__snapshots__/LetterTemplateForm.test.tsx.snap b/frontend/src/__tests__/components/forms/LetterTemplateForm.test.tsx/__snapshots__/LetterTemplateForm.test.tsx.snap
@@ -190,16 +190,6 @@ exports[`Client-side validation triggers 1`] = `
               id="letterTemplateLetterType"
               name="letterTemplateLetterType"
             >
-              <option
-                value="x3"
-              >
-                Audio CD
-              </option>
-              <option
-                value="q1"
-              >
-                Braille
-              </option>
               <option
                 value="q4"
               >
@@ -690,16 +680,6 @@ exports[`renders page one error 1`] = `
               id="letterTemplateLetterType"
               name="letterTemplateLetterType"
             >
-              <option
-                value="x3"
-              >
-                Audio CD
-              </option>
-              <option
-                value="q1"
-              >
-                Braille
-              </option>
               <option
                 value="q4"
               >
@@ -1200,16 +1180,6 @@ exports[`renders page with multiple errors 1`] = `
               id="letterTemplateLetterType"
               name="letterTemplateLetterType"
             >
-              <option
-                value="x3"
-              >
-                Audio CD
-              </option>
-              <option
-                value="q1"
-              >
-                Braille
-              </option>
               <option
                 value="q4"
               >
@@ -1653,23 +1623,13 @@ exports[`renders page with preloaded field values 1`] = `
               id="letterTemplateLetterType"
               name="letterTemplateLetterType"
             >
-              <option
-                value="x3"
-              >
-                Audio CD
-              </option>
-              <option
-                selected=""
-                value="q1"
-              >
-                Braille
-              </option>
               <option
                 value="q4"
               >
                 British Sign Language
               </option>
               <option
+                selected=""
                 value="x1"
               >
                 Large print
diff --git a/frontend/src/__tests__/components/forms/LetterTemplateForm.test.tsx/server-action.test.ts b/frontend/src/__tests__/components/forms/LetterTemplateForm.test.tsx/server-action.test.ts
@@ -48,7 +48,7 @@ describe('CreateLetterTemplate server actions', () => {
       id: 'new-template-id',
       templateStatus: 'NOT_YET_SUBMITTED',
       name: 'template-name',
-      letterType: 'q1',
+      letterType: 'x1',
       language: 'ar',
       files: {
         pdfTemplate: {
@@ -77,7 +77,7 @@ describe('CreateLetterTemplate server actions', () => {
       initialState,
       getMockFormData({
         letterTemplateName: 'template-name',
-        letterTemplateLetterType: 'q1',
+        letterTemplateLetterType: 'x1',
         letterTemplateLanguage: 'ar',
         letterTemplatePdf,
         letterTemplateCsv,
@@ -88,7 +88,7 @@ describe('CreateLetterTemplate server actions', () => {
       {
         ...initialState,
         name: 'template-name',
-        letterType: 'q1',
+        letterType: 'x1',
         language: 'ar',
       },
       letterTemplatePdf,
@@ -107,7 +107,7 @@ describe('CreateLetterTemplate server actions', () => {
       id: 'new-template-id',
       templateStatus: 'NOT_YET_SUBMITTED',
       name: 'template-name',
-      letterType: 'q1',
+      letterType: 'x1',
       language: 'ar',
       files: {
         pdfTemplate: {
@@ -137,7 +137,7 @@ describe('CreateLetterTemplate server actions', () => {
         { ...initialState, id: 'existing-id' },
         getMockFormData({
           letterTemplateName: 'template-name',
-          letterTemplateLetterType: 'q1',
+          letterTemplateLetterType: 'x1',
           letterTemplateLanguage: 'ar',
           letterTemplatePdf,
           letterTemplateCsv,
diff --git a/frontend/src/__tests__/components/organisms/PreviewLetterTemplate.test.tsx b/frontend/src/__tests__/components/organisms/PreviewLetterTemplate.test.tsx
@@ -11,7 +11,7 @@ describe('PreviewLetterTemplate component', () => {
           id: 'template-id',
           templateStatus: 'VIRUS_SCAN_FAILED',
           language: 'en',
-          letterType: 'q1',
+          letterType: 'x1',
           files: {
             pdfTemplate: {
               fileName: 'file.pdf',
@@ -90,7 +90,7 @@ describe('PreviewLetterTemplate component', () => {
           id: 'template-id',
           templateStatus: 'VALIDATION_FAILED',
           language: 'en',
-          letterType: 'q1',
+          letterType: 'x1',
           files: {
             pdfTemplate: {
               fileName: 'file.pdf',
@@ -121,7 +121,7 @@ describe('PreviewLetterTemplate component', () => {
           id: 'template-id',
           templateStatus: 'PENDING_UPLOAD',
           language: 'en',
-          letterType: 'q1',
+          letterType: 'x1',
           files: {
             pdfTemplate: {
               fileName: 'file.pdf',
@@ -147,7 +147,7 @@ describe('PreviewLetterTemplate component', () => {
           id: 'template-id',
           templateStatus: 'PENDING_VALIDATION',
           language: 'en',
-          letterType: 'q1',
+          letterType: 'x1',
           files: {
             pdfTemplate: {
               fileName: 'file.pdf',
diff --git a/frontend/src/__tests__/components/organisms/__snapshots__/PreviewLetterTemplate.test.tsx.snap b/frontend/src/__tests__/components/organisms/__snapshots__/PreviewLetterTemplate.test.tsx.snap
@@ -383,7 +383,7 @@ exports[`PreviewLetterTemplate component matches snapshot when template status i
               <dd
                 class="nhsuk-summary-list__value"
               >
-                Braille letter
+                Large print letter
               </dd>
             </div>
             <div
@@ -527,7 +527,7 @@ exports[`PreviewLetterTemplate component matches snapshot when template status i
               <dd
                 class="nhsuk-summary-list__value"
               >
-                Braille letter
+                Large print letter
               </dd>
             </div>
             <div
@@ -705,7 +705,7 @@ exports[`PreviewLetterTemplate component matches snapshot when template status i
               <dd
                 class="nhsuk-summary-list__value"
               >
-                Braille letter
+                Large print letter
               </dd>
             </div>
             <div
@@ -918,7 +918,7 @@ exports[`PreviewLetterTemplate component matches snapshot when template status i
               <dd
                 class="nhsuk-summary-list__value"
               >
-                Braille letter
+                Large print letter
               </dd>
             </div>
             <div
diff --git a/frontend/src/__tests__/utils/form-actions.test.ts b/frontend/src/__tests__/utils/form-actions.test.ts
@@ -108,7 +108,7 @@ describe('form-actions', () => {
       id: 'new-template-id',
       templateStatus: 'NOT_YET_SUBMITTED',
       name: 'template-name',
-      letterType: 'q1',
+      letterType: 'x1',
       language: 'ar',
       files: {
         pdfTemplate: {
@@ -166,7 +166,7 @@ describe('form-actions', () => {
       id: 'new-template-id',
       templateStatus: 'NOT_YET_SUBMITTED',
       name: 'template-name',
-      letterType: 'q1',
+      letterType: 'x1',
       language: 'ar',
       files: {
         pdfTemplate: {
@@ -592,7 +592,7 @@ describe('form-actions', () => {
         id: 'new-template-id',
         templateStatus: 'NOT_YET_SUBMITTED',
         name: 'template-name',
-        letterType: 'q1',
+        letterType: 'x1',
         language: 'ar',
         files: {
           pdfTemplate: {
diff --git a/infrastructure/terraform/modules/backend-api/spec.tmpl.json b/infrastructure/terraform/modules/backend-api/spec.tmpl.json
@@ -227,11 +227,9 @@
       },
       "LetterType": {
         "enum": [
-          "q1",
           "q4",
           "x0",
-          "x1",
-          "x3"
+          "x1"
         ],
         "type": "string"
       },
diff --git a/lambdas/backend-api/src/__tests__/templates/app/template-client.test.ts b/lambdas/backend-api/src/__tests__/templates/app/template-client.test.ts
@@ -916,7 +916,7 @@ describe('templateClient', () => {
         name: 'name',
         templateType: 'LETTER',
         language: 'it',
-        letterType: 'q1',
+        letterType: 'x1',
       };
 
       const result = await templateClient.updateTemplate(
@@ -1567,7 +1567,7 @@ describe('templateClient', () => {
         createdAt: new Date().toISOString(),
         updatedAt: new Date().toISOString(),
         personalisationParameters,
-        letterType: 'q1',
+        letterType: 'x1',
         language: 'en',
         files: {
           pdfTemplate: {
@@ -1632,7 +1632,7 @@ describe('templateClient', () => {
         createdAt: new Date().toISOString(),
         updatedAt: new Date().toISOString(),
         personalisationParameters,
-        letterType: 'q1',
+        letterType: 'x1',
         language: 'en',
         files: {
           pdfTemplate: {
diff --git a/lambdas/backend-client/src/__tests__/schemas/template-schema.test.ts b/lambdas/backend-client/src/__tests__/schemas/template-schema.test.ts
@@ -164,7 +164,7 @@ describe('Template schemas', () => {
   test('$CreateUpdateNonLetter should fail when input is a letter', () => {
     const letter: CreateUpdateTemplate = {
       templateType: 'LETTER',
-      letterType: 'q1',
+      letterType: 'x1',
       language: 'ar',
       name: 'letter',
     };
diff --git a/lambdas/backend-client/src/__tests__/template-api-client.test.ts b/lambdas/backend-client/src/__tests__/template-api-client.test.ts
@@ -92,7 +92,7 @@ describe('TemplateAPIClient', () => {
         name: 'test',
         templateType: 'LETTER',
         language: 'de',
-        letterType: 'q1',
+        letterType: 'x1',
       },
       testToken,
       new File(['pdf'], 'template.pdf', { type: 'application/pdf' })
@@ -119,7 +119,7 @@ describe('TemplateAPIClient', () => {
         name: 'test',
         templateType: 'LETTER',
         language: 'de',
-        letterType: 'q1',
+        letterType: 'x1',
         files: {
           pdfTemplate: {
             fileName: 'template.pdf',
@@ -142,7 +142,7 @@ describe('TemplateAPIClient', () => {
         name: 'test',
         templateType: 'LETTER',
         language: 'de',
-        letterType: 'q1',
+        letterType: 'x1',
       },
       testToken,
       new File(['pdf'], 'template.pdf', { type: 'application/pdf' }),
@@ -154,7 +154,7 @@ describe('TemplateAPIClient', () => {
       name: 'test',
       templateType: 'LETTER',
       language: 'de',
-      letterType: 'q1',
+      letterType: 'x1',
       files: {
         pdfTemplate: {
           fileName: 'template.pdf',
diff --git a/lambdas/backend-client/src/schemas/union-lists.ts b/lambdas/backend-client/src/schemas/union-lists.ts
@@ -81,13 +81,7 @@ export const LANGUAGE_LIST = arrayOfAll<Language>()([
   'zh',
 ]);
 
-export const LETTER_TYPE_LIST = arrayOfAll<LetterType>()([
-  'x3',
-  'q1',
-  'q4',
-  'x0',
-  'x1',
-]);
+export const LETTER_TYPE_LIST = arrayOfAll<LetterType>()(['q4', 'x0', 'x1']);
 
 export const VIRUS_SCAN_STATUS_LIST = arrayOfAll<VirusScanStatus>()([
   'PENDING',
diff --git a/lambdas/backend-client/src/types/generated/types.gen.ts b/lambdas/backend-client/src/types/generated/types.gen.ts
@@ -82,7 +82,7 @@ export type LetterProperties = CreateLetterProperties & {
   personalisationParameters?: Array<string>;
 };
 
-export type LetterType = 'q1' | 'q4' | 'x0' | 'x1' | 'x3';
+export type LetterType = 'q4' | 'x0' | 'x1';
 
 export type NhsAppProperties = {
   message: string;
diff --git a/utils/utils/src/__tests__/enum.test.ts b/utils/utils/src/__tests__/enum.test.ts
@@ -39,12 +39,8 @@ describe('letterTypeDisplayMappings', () => {
     ['x0', 'en', 'Standard letter'],
     ['x0', 'bn', 'Standard letter - Bengali'],
     ['x0', 'el', 'Standard letter - Greek'],
-    ['q1', 'en', 'Braille letter'],
-    ['x3', 'en', 'Audio CD letter'],
     ['x1', 'en', 'Large print letter'],
     ['q4', 'en', 'British Sign Language letter'],
-    ['q1', 'fr', 'Braille letter - French'],
-    ['x3', 'it', 'Audio CD letter - Italian'],
     ['x1', 'de', 'Large print letter - German'],
     ['q4', 'es', 'British Sign Language letter - Spanish'],
   ];
@@ -60,8 +56,6 @@ describe('letterTypeDisplayMappings', () => {
 describe('alphabeticalLetterTypeList', () => {
   test('Alphabetical letter type list produced', () => {
     expect(alphabeticalLetterTypeList).toEqual([
-      ['x3', 'Audio CD'],
-      ['q1', 'Braille'],
       ['q4', 'British Sign Language'],
       ['x1', 'Large print'],
       ['x0', 'Standard'],
diff --git a/utils/utils/src/enum.ts b/utils/utils/src/enum.ts
@@ -42,8 +42,6 @@ export const alphabeticalLanguageList = Object.entries(languageMap).sort(
 );
 
 const letterTypeMap: Record<LetterType, string> = {
-  x3: 'Audio CD',
-  q1: 'Braille',
   q4: 'British Sign Language',
   x0: 'Standard',
   x1: 'Large print',
