moved types to separate file

Author: nhsd-david-wass

lambdas/supplier-allocator/src/handler/allocate-handler.ts

@@ -1,13 +1,11 @@
 import { SQSBatchItemFailure, SQSEvent, SQSHandler } from "aws-lambda";
 import { SendMessageCommand } from "@aws-sdk/client-sqs";
-import { LetterRequestPreparedEvent } from "@nhsdigital/nhs-notify-event-schemas-letter-rendering-v1";
 import {
   LetterVariant,
   PackSpecification,
   Supplier,
   VolumeGroup,
 } from "@nhsdigital/nhs-notify-event-schemas-supplier-config";
-import { LetterRequestPreparedEventV2 } from "@nhsdigital/nhs-notify-event-schemas-letter-rendering";
 import z from "zod";
 import { Unit } from "aws-embedded-metrics";
 import { MetricEntry, MetricStatus, buildEMFObject } from "@internal/helpers";
@@ -25,20 +23,7 @@ import {
 } from "./allocation-config";
 
 import { Deps } from "../config/deps";
-
-type SupplierSpec = {
-  supplierId: string;
-  specId: string;
-  priority: number;
-  billingId: string;
-};
-
-type SupplierDetails = {
-  supplierSpec: SupplierSpec;
-  volumeGroupId: string;
-};
-
-type PreparedEvents = LetterRequestPreparedEventV2 | LetterRequestPreparedEvent;
+import { PreparedEvents, SupplierDetails, SupplierSpec } from "./types";
 
 // small envelope that must exist in all inputs
 const TypeEnvelope = z.object({ type: z.string().min(1) });

lambdas/supplier-allocator/src/handler/allocation-config.ts

@@ -1,5 +1,3 @@
-import { LetterRequestPreparedEvent } from "@nhsdigital/nhs-notify-event-schemas-letter-rendering-v1";
-import { LetterRequestPreparedEventV2 } from "@nhsdigital/nhs-notify-event-schemas-letter-rendering";
 import {
   PackSpecification,
   Supplier,
@@ -17,8 +15,7 @@ import {
 } from "../services/supplier-config";
 import { calculateSupplierAllocatedFactor } from "../services/supplier-quotas";
 import { Deps } from "../config/deps";
-
-type PreparedEvents = LetterRequestPreparedEventV2 | LetterRequestPreparedEvent;
+import { PreparedEvents } from "./types";
 
 export async function eligibleSuppliers(
   volumeGroup: VolumeGroup,

lambdas/supplier-allocator/src/handler/types.ts

@@ -0,0 +1,18 @@
+import { LetterRequestPreparedEvent } from "@nhsdigital/nhs-notify-event-schemas-letter-rendering-v1";
+import { LetterRequestPreparedEventV2 } from "@nhsdigital/nhs-notify-event-schemas-letter-rendering";
+
+export type SupplierSpec = {
+  supplierId: string;
+  specId: string;
+  priority: number;
+  billingId: string;
+};
+
+export type SupplierDetails = {
+  supplierSpec: SupplierSpec;
+  volumeGroupId: string;
+};
+
+export type PreparedEvents =
+  | LetterRequestPreparedEventV2
+  | LetterRequestPreparedEvent;

lambdas/supplier-allocator/src/services/supplier-config.ts

@@ -6,12 +6,9 @@ import {
   SupplierPack,
   VolumeGroup,
 } from "@nhsdigital/nhs-notify-event-schemas-supplier-config";
-import { LetterRequestPreparedEventV2 } from "@nhsdigital/nhs-notify-event-schemas-letter-rendering";
-import { LetterRequestPreparedEvent } from "@nhsdigital/nhs-notify-event-schemas-letter-rendering-v1";
 
 import { Deps } from "../config/deps";
-
-type PreparedEvents = LetterRequestPreparedEventV2 | LetterRequestPreparedEvent;
+import { PreparedEvents } from "../handler/types";
 
 export async function getVariantDetails(
   variantId: string,