fix template client

Author: alexnuttall

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

@@ -21,8 +21,6 @@ const versionId = '28F-D4-72-A93-A6';
 const defaultLetterSupplier = 'SUPPLIER';
 
 const setup = () => {
-  const enableLetters = true;
-
   const templateRepository = mock<TemplateRepository>();
 
   const letterUploadRepository = mock<LetterUploadRepository>();
@@ -32,7 +30,6 @@ const setup = () => {
   const { logger, logMessages } = createMockLogger();
 
   const templateClient = new TemplateClient(
-    enableLetters,
     templateRepository,
     letterUploadRepository,
     queueMock,
@@ -847,42 +844,6 @@ describe('templateClient', () => {
         },
       });
     });
-
-    test('should return a failure result when letters feature flag is not enabled', async () => {
-      const { mocks } = setup();
-
-      const client = new TemplateClient(
-        false,
-        mocks.templateRepository,
-        mocks.letterUploadRepository,
-        mocks.queueMock,
-        defaultLetterSupplier,
-        mocks.logger
-      );
-
-      const data: CreateUpdateTemplate = {
-        templateType: 'LETTER',
-        name: 'name',
-        language: 'en',
-        letterType: 'x0',
-      };
-
-      const pdf = new File(['pdf'], 'template.pdf', {
-        type: 'application/pdf',
-      });
-
-      const result = await client.createLetterTemplate(data, owner, pdf);
-
-      expect(result).toEqual({
-        error: expect.objectContaining({
-          code: 400,
-          message: 'Request failed validation',
-        }),
-      });
-
-      expect(mocks.templateRepository.create).not.toHaveBeenCalled();
-      expect(mocks.letterUploadRepository.upload).not.toHaveBeenCalled();
-    });
   });
 
   describe('updateTemplate', () => {
@@ -1128,48 +1089,6 @@ describe('templateClient', () => {
       });
     });
 
-    test('should return a failure result, when fetching a letter, if letter flag is not enabled', async () => {
-      const { mocks } = setup();
-
-      const noLettersClient = new TemplateClient(
-        false,
-        mocks.templateRepository,
-        mocks.letterUploadRepository,
-        mocks.queueMock,
-        defaultLetterSupplier,
-        mocks.logger
-      );
-
-      mocks.templateRepository.get.mockResolvedValueOnce({
-        data: {
-          id: templateId,
-          templateType: 'LETTER',
-          name: 'name',
-          createdAt: new Date().toISOString(),
-          updatedAt: new Date().toISOString(),
-          templateStatus: 'NOT_YET_SUBMITTED',
-          letterType: 'q4',
-          language: 'fr',
-          owner,
-          version: 1,
-        },
-      });
-
-      const result = await noLettersClient.getTemplate(templateId, owner);
-
-      expect(mocks.templateRepository.get).toHaveBeenCalledWith(
-        templateId,
-        owner
-      );
-
-      expect(result).toEqual({
-        error: {
-          code: 404,
-          message: 'Template not found',
-        },
-      });
-    });
-
     test('should return template', async () => {
       const { templateClient, mocks } = setup();
 
@@ -1224,54 +1143,6 @@ describe('templateClient', () => {
       });
     });
 
-    test('filters out letters if the feature flag is not enabled', async () => {
-      const { mocks } = setup();
-
-      const noLettersClient = new TemplateClient(
-        false,
-        mocks.templateRepository,
-        mocks.letterUploadRepository,
-        mocks.queueMock,
-        defaultLetterSupplier,
-        mocks.logger
-      );
-
-      const template: TemplateDto = {
-        id: templateId,
-        templateType: 'LETTER',
-        name: 'name',
-        createdAt: new Date().toISOString(),
-        updatedAt: new Date().toISOString(),
-        templateStatus: 'NOT_YET_SUBMITTED',
-        letterType: 'q4',
-        language: 'fr',
-        files: {
-          pdfTemplate: {
-            fileName: 'file.pdf',
-            currentVersion: 'uuid',
-            virusScanStatus: 'PENDING',
-          },
-          testDataCsv: {
-            fileName: 'file.csv',
-            currentVersion: 'uuid',
-            virusScanStatus: 'PENDING',
-          },
-        },
-      };
-
-      mocks.templateRepository.list.mockResolvedValueOnce({
-        data: [{ ...template, owner, version: 1 }],
-      });
-
-      const result = await noLettersClient.listTemplates(owner);
-
-      expect(mocks.templateRepository.list).toHaveBeenCalledWith(owner);
-
-      expect(result).toEqual({
-        data: [],
-      });
-    });
-
     test('should filter out invalid templates', async () => {
       const { templateClient, mocks } = setup();
 

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

@@ -23,7 +23,6 @@ import { ProofingQueue } from '../infra/proofing-queue';
 
 export class TemplateClient implements ITemplateClient {
   constructor(
-    private readonly enableLetters: boolean,
     private readonly templateRepository: TemplateRepository,
     private readonly letterUploadRepository: LetterUploadRepository,
     private readonly proofingQueue: ProofingQueue,
@@ -80,10 +79,6 @@ export class TemplateClient implements ITemplateClient {
       owner,
     });
 
-    if (!this.enableLetters) {
-      return failure(ErrorCase.VALIDATION_FAILED, 'Request failed validation');
-    }
-
     const templateValidationResult = await validate(
       $CreateLetterTemplate,
       template
@@ -291,10 +286,6 @@ export class TemplateClient implements ITemplateClient {
       return getResult;
     }
 
-    if (getResult.data.templateType === 'LETTER' && !this.enableLetters) {
-      return failure(ErrorCase.TEMPLATE_NOT_FOUND, 'Template not found');
-    }
-
     const templateDTO = this.mapDatabaseObjectToDTO(getResult.data);
     if (!templateDTO) {
       return failure(ErrorCase.INTERNAL, 'Error retrieving template');
@@ -314,8 +305,7 @@ export class TemplateClient implements ITemplateClient {
 
     const templateDTOs = listResult.data
       .map((template) => this.mapDatabaseObjectToDTO(template))
-      .flatMap((t) => t ?? [])
-      .filter((t) => this.enableLetters || t.templateType !== 'LETTER');
+      .flatMap((t) => t ?? []);
 
     return success(templateDTOs);
   }

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

@@ -39,7 +39,6 @@ export function createContainer() {
   );
 
   const templateClient = new TemplateClient(
-    config.enableLetters,
     templateRepository,
     letterUploadRepository,
     proofingQueue,