CCM-11537: Remove stray filter types

Author: ClareJonesBJSS

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

@@ -10,16 +10,14 @@ import type {
 import { TemplateRepository } from '../../infra';
 import { TemplateClient } from '../../app/template-client';
 import { LetterUploadRepository } from '../../infra/letter-upload-repository';
-import {
-  DatabaseTemplate,
-  TemplateFilter,
-} from 'nhs-notify-web-template-management-utils';
+import { DatabaseTemplate } from 'nhs-notify-web-template-management-utils';
 import { ProofingQueue } from '../../infra/proofing-queue';
 import { createMockLogger } from 'nhs-notify-web-template-management-test-helper-utils/mock-logger';
 import { isoDateRegExp } from 'nhs-notify-web-template-management-test-helper-utils';
 import { ClientConfigRepository } from '../../infra/client-config-repository';
 import { isRightToLeft } from 'nhs-notify-web-template-management-utils/enum';
 import { TemplateQuery } from '../../infra/template-repository/query';
+import { TemplateFilter } from 'nhs-notify-backend-client/src/types/filters';
 
 jest.mock('node:crypto');
 jest.mock('nhs-notify-web-template-management-utils/enum');

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

@@ -12,8 +12,7 @@ import {
   ClientConfiguration,
   $LockNumber,
   $TemplateDto,
-  $ListTemplateFilters,
-  ListTemplateFilters,
+  $TemplateFilter,
 } from 'nhs-notify-backend-client';
 import { LETTER_MULTIPART } from 'nhs-notify-backend-client/src/schemas/constants';
 import {
@@ -29,6 +28,7 @@ import { LetterUploadRepository } from '../infra/letter-upload-repository';
 import { ProofingQueue } from '../infra/proofing-queue';
 import { ClientConfigRepository } from '../infra/client-config-repository';
 import { TemplateRepository } from '../infra';
+import { TemplateFilter } from 'nhs-notify-backend-client/src/types/filters';
 
 export class TemplateClient {
   private $LetterForProofing = z.intersection(
@@ -421,10 +421,10 @@ export class TemplateClient {
     user: User,
     filters?: unknown
   ): Promise<Result<TemplateDto[]>> {
-    let parsedFilters: ListTemplateFilters = {};
+    let parsedFilters: TemplateFilter = {};
 
     if (filters) {
-      const validation = await validate($ListTemplateFilters, filters);
+      const validation = await validate($TemplateFilter, filters);
 
       if (validation.error) {
         return validation;

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

@@ -31,6 +31,7 @@ import {
   TEMPLATE_TYPE_LIST,
   VIRUS_SCAN_STATUS_LIST,
 } from './union-lists';
+import { TemplateFilter } from '../types/filters';
 
 export const $LetterType = schemaFor<LetterType>()(z.enum(LETTER_TYPE_LIST));
 
@@ -177,18 +178,13 @@ export const $TemplateDto = schemaFor<
   ])
 );
 
-export type ListTemplateFilters = {
-  templateStatus?: TemplateStatus;
-  templateType?: TemplateType;
-  language?: Language;
-  letterType?: LetterType;
-};
-
-export const $ListTemplateFilters = schemaFor<ListTemplateFilters>()(
-  z.object({
-    templateStatus: $TemplateStatusActive.optional(),
-    templateType: $TemplateType.optional(),
-    language: $Language.optional(),
-    letterType: $LetterType.optional(),
-  })
+export const $TemplateFilter = schemaFor<TemplateFilter>()(
+  z
+    .object({
+      templateStatus: $TemplateStatusActive,
+      templateType: $TemplateType,
+      language: $Language,
+      letterType: $LetterType,
+    })
+    .partial()
 );

utils/utils/src/types.ts

@@ -125,13 +125,6 @@ export type DatabaseTemplate = {
   supplierReferences?: Record<string, string>;
 } & DbOnlyTemplateProperties;
 
-export type TemplateFilter = Partial<
-  Pick<
-    DatabaseTemplate,
-    'templateStatus' | 'templateType' | 'language' | 'letterType'
-  >
->;
-
 type DbOnlyTemplateProperties = {
   owner: string;
   version: number;