CCM-8962: remove status from update options

Author: bhansell1

.vscode/settings.json

@@ -10,6 +10,4 @@
     "source.fixAll.eslint": "explicit"
   },
   "eslint.codeActionsOnSave.mode": "problems",
-  "jestrunner.jestPath": "/Users/benjamin.hansell/projects/nhs-notify-web-template-management/node_modules/jest/bin/jest.js",
-  "jestrunner.projectPath": "/Users/benjamin.hansell/projects/nhs-notify-web-template-management/frontend"
-}
+}

infrastructure/terraform/modules/backend-api/spec.tmpl.json

@@ -714,17 +714,6 @@
           {
             "$ref": "#/components/schemas/BaseTemplate"
           },
-          {
-            "type": "object",
-            "required": [
-              "templateStatus"
-            ],
-            "properties": {
-              "templateStatus": {
-                "$ref": "#/components/schemas/TemplateStatus"
-              }
-            }
-          },
           {
             "oneOf": [
               {

lambdas/backend-api/src/__tests__/templates/api/update.test.ts

@@ -141,13 +141,13 @@ describe('Template API - Update', () => {
     const update: UpdateTemplate = {
       name: 'updated-name',
       message: 'message',
-      templateStatus: 'NOT_YET_SUBMITTED',
       templateType: 'SMS',
     };
     const response: TemplateDto = {
       ...update,
       id: '1-2-3',
       templateType: 'SMS',
+      templateStatus: 'NOT_YET_SUBMITTED',
       createdAt: new Date().toISOString(),
       updatedAt: new Date().toISOString(),
     };

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

@@ -908,7 +908,6 @@ describe('templateClient', () => {
 
       const data: UpdateTemplate = {
         name: 'name',
-        templateStatus: 'NOT_YET_SUBMITTED',
         templateType: 'LETTER',
         language: 'it',
         letterType: 'q1',
@@ -938,7 +937,6 @@ describe('templateClient', () => {
       const data: UpdateTemplate = {
         name: 'name',
         message: 'message',
-        templateStatus: 'NOT_YET_SUBMITTED',
         templateType: 'SMS',
       };
 
@@ -976,7 +974,6 @@ describe('templateClient', () => {
       const data: UpdateTemplate = {
         name: 'name',
         message: 'message',
-        templateStatus: 'NOT_YET_SUBMITTED',
         templateType: 'SMS',
       };
 
@@ -1025,13 +1022,13 @@ describe('templateClient', () => {
       const data: UpdateTemplate = {
         name: 'name',
         message: 'message',
-        templateStatus: 'NOT_YET_SUBMITTED',
         templateType: 'SMS',
       };
 
       const template: TemplateDto = {
         ...data,
         id: templateId,
+        templateStatus: 'NOT_YET_SUBMITTED',
         templateType: 'SMS',
         createdAt: new Date().toISOString(),
         updatedAt: new Date().toISOString(),

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

@@ -400,7 +400,6 @@ describe('templateRepository', () => {
             name: 'name',
             message: 'message',
             subject: 'subject',
-            templateStatus: 'SUBMITTED',
             templateType: 'EMAIL',
           },
           'real-owner',
@@ -431,7 +430,6 @@ describe('templateRepository', () => {
           name: 'name',
           message: 'message',
           subject: 'subject',
-          templateStatus: 'NOT_YET_SUBMITTED',
           templateType: 'EMAIL',
         },
         'real-owner',
@@ -461,7 +459,6 @@ describe('templateRepository', () => {
           ...channelProperties,
           ...updateTemplateProperties,
           name: 'updated-name',
-          templateStatus: 'SUBMITTED',
         };
 
         mocks.ddbDocClient

lambdas/backend-api/src/templates/api/delete.ts

@@ -1,5 +1,5 @@
 import type { APIGatewayProxyHandler } from 'aws-lambda';
-import { apiFailure, apiSuccess } from './responses';
+import { apiFailure } from './responses';
 import { ITemplateClient } from 'nhs-notify-backend-client';
 
 export function createHandler({
@@ -16,15 +16,17 @@ export function createHandler({
       return apiFailure(400, 'Invalid request');
     }
 
-    const { data, error } = await templateClient.deleteTemplate(
-      templateId,
-      user
-    );
+    const { error } = await templateClient.deleteTemplate(templateId, user);
 
     if (error) {
       return apiFailure(error.code, error.message, error.details);
     }
 
-    return apiSuccess(204, data);
+    return {
+      statusCode: 204,
+      body: JSON.stringify({
+        statusCode: 204,
+      }),
+    };
   };
 }

lambdas/backend-client/src/__tests__/schemas/template-schema.test.ts

@@ -251,7 +251,6 @@ describe('Template schemas', () => {
   describe('$UpdateTemplateSchema', () => {
     const commonFields = {
       name: 'Test Template',
-      templateStatus: 'SUBMITTED',
     };
 
     test.each([
@@ -319,7 +318,6 @@ describe('Template schemas', () => {
       name: 'Test Template',
       message: 'This is a test template',
       templateType: 'NHS_APP',
-      templateStatus: 'NOT_YET_SUBMITTED',
     };
 
     test('Should return template on pass', async () => {

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

@@ -188,7 +188,6 @@ describe('TemplateAPIClient', () => {
       {
         name: 'test',
         message: '<html></html>',
-        templateStatus: 'SUBMITTED',
         templateType: 'NHS_APP',
       },
       testToken
@@ -228,7 +227,6 @@ describe('TemplateAPIClient', () => {
       {
         name: 'name',
         message: 'message',
-        templateStatus: 'SUBMITTED',
         templateType: 'NHS_APP',
       },
       testToken

lambdas/backend-client/src/schemas/template-schema.ts

@@ -164,20 +164,14 @@ export const $CreateTemplateSchema = schemaFor<
   ])
 );
 
-const $UpdateTemplateFields = z
-  .object({
-    templateStatus: z.enum(TEMPLATE_STATUS_LIST),
-  })
-  .merge($BaseTemplateSchema);
-
 export const $UpdateNonLetter = schemaFor<
   Exclude<UpdateTemplate, { templateType: 'LETTER' }>,
   Exclude<ValidatedUpdateTemplate, { templateType: 'LETTER' }>
 >()(
   z.discriminatedUnion('templateType', [
-    $UpdateTemplateFields.merge($NhsAppPropertiesWithType),
-    $UpdateTemplateFields.merge($EmailPropertiesWithType),
-    $UpdateTemplateFields.merge($SmsPropertiesWithType),
+    $BaseTemplateSchema.merge($NhsAppPropertiesWithType),
+    $BaseTemplateSchema.merge($EmailPropertiesWithType),
+    $BaseTemplateSchema.merge($SmsPropertiesWithType),
   ])
 );
 
@@ -186,10 +180,10 @@ export const $UpdateTemplateSchema = schemaFor<
   ValidatedUpdateTemplate
 >()(
   z.discriminatedUnion('templateType', [
-    $UpdateTemplateFields.merge($NhsAppPropertiesWithType),
-    $UpdateTemplateFields.merge($EmailPropertiesWithType),
-    $UpdateTemplateFields.merge($SmsPropertiesWithType),
-    $UpdateTemplateFields.merge($LetterPropertiesWithType),
+    $BaseTemplateSchema.merge($NhsAppPropertiesWithType),
+    $BaseTemplateSchema.merge($EmailPropertiesWithType),
+    $BaseTemplateSchema.merge($SmsPropertiesWithType),
+    $BaseTemplateSchema.merge($LetterPropertiesWithType),
   ])
 );
 
@@ -198,8 +192,9 @@ const $TemplateDtoFields = z
     id: z.string().trim().min(1),
     createdAt: z.string(),
     updatedAt: z.string(),
+    templateStatus: z.enum(TEMPLATE_STATUS_LIST),
   })
-  .merge($UpdateTemplateFields);
+  .merge($BaseTemplateSchema);
 
 export const $TemplateDtoSchema = schemaFor<
   TemplateDto,

lambdas/backend-client/src/types/generated/types.gen.ts

@@ -86,14 +86,8 @@ export type BaseTemplate = {
 export type CreateTemplate = BaseTemplate &
   (NhsAppProperties | EmailProperties | SmsProperties | CreateLetterProperties);
 
-export type UpdateTemplate = BaseTemplate & {
-  templateStatus: TemplateStatus;
-} & (
-    | NhsAppProperties
-    | EmailProperties
-    | SmsProperties
-    | CreateLetterProperties
-  );
+export type UpdateTemplate = BaseTemplate &
+  (NhsAppProperties | EmailProperties | SmsProperties | CreateLetterProperties);
 
 export type UpdateStatus = {
   templateStatus: TemplateStatus;