Fix/internal event datastore dep

internal/event-builders/README.md

@@ -0,0 +1,7 @@
+# @internal/event-builders
+
+Helper utilities to produce supplier api event types.
+
+This package contains functions for constructing CloudEvent-compliant event payloads and related helpers.
+
+Independent package to allow for type imports across the project without circular dependencies.

internal/event-builders/jest.config.ts

@@ -0,0 +1,14 @@
+export default {
+  preset: "ts-jest",
+  testEnvironment: "node",
+  testMatch: [
+    "**/src/__tests__/**/*.ts?(x)",
+    "**/src/?(*.)+(spec|test).ts?(x)",
+  ],
+  collectCoverageFrom: ["src/**/*.ts"],
+  coveragePathIgnorePatterns: ["/node_modules/", "__tests__"],
+  testPathIgnorePatterns: ["/node_modules/", "/dist/"],
+  transform: {
+    "^.+\\.tsx?$": ["ts-jest", {}],
+  },
+};

internal/event-builders/package.json

@@ -0,0 +1,19 @@
+{
+  "dependencies": {
+    "@internal/datastore": "*",
+    "@nhsdigital/nhs-notify-event-schemas-supplier-api": "*"
+  },
+  "devDependencies": {},
+  "main": "dist/index.js",
+  "name": "@internal/event-builders",
+  "private": true,
+  "scripts": {
+    "build": "tsc",
+    "lint": "eslint .",
+    "lint:fix": "eslint . --fix",
+    "test:unit": "jest",
+    "typecheck": "tsc --noEmit"
+  },
+  "types": "dist/index.d.ts",
+  "version": "1.0.0"
+}

internal/events/src/events/__tests__/letter-mapper.test.ts → internal/event-builders/src/__tests__/letter-mapper.test.ts

@@ -1,6 +1,6 @@
 import { $LetterEvent } from "@nhsdigital/nhs-notify-event-schemas-supplier-api/src";
 import { Letter } from "@internal/datastore";
-import { mapLetterToCloudEvent } from "@nhsdigital/nhs-notify-event-schemas-supplier-api/src/events/letter-mapper";
+import { mapLetterToCloudEvent } from "../letter-mapper";
 
 describe("letter-mapper", () => {
   it("maps a letter to a letter event", async () => {

internal/event-builders/src/index.ts

@@ -0,0 +1,2 @@
+// Export event builder utilities
+export * from "./letter-mapper";

internal/events/src/events/letter-mapper.ts → internal/event-builders/src/letter-mapper.ts

@@ -1,7 +1,7 @@
 import { randomBytes, randomUUID } from "node:crypto";
 import eventSchemaPackage from "@nhsdigital/nhs-notify-event-schemas-supplier-api/package.json";
 import { Letter } from "@internal/datastore";
-import { LetterEvent } from "./letter-events";
+import { LetterEvent } from "@nhsdigital/nhs-notify-event-schemas-supplier-api/src/events/letter-events";
 
 // eslint-disable-next-line import-x/prefer-default-export
 export function mapLetterToCloudEvent(

internal/event-builders/tsconfig.json

@@ -0,0 +1,14 @@
+{
+  "compilerOptions": {
+    "declaration": true
+  },
+  "exclude": [
+    "node_modules",
+    "dist"
+  ],
+  "extends": "../../tsconfig.base.json",
+  "include": [
+    "src/**/*",
+    "jest.config.ts"
+  ]
+}

internal/events/package.json

@@ -1,7 +1,6 @@
 {
   "dependencies": {
     "@asyncapi/bundler": "^0.6.4",
-    "@internal/datastore": "*",
     "zod": "^4.1.11"
   },
   "description": "Schemas for NHS Notify Supplier API events",
@@ -37,5 +36,5 @@
     "typecheck": "tsc --noEmit"
   },
   "types": "dist/index.d.ts",
-  "version": "1.0.16"
+  "version": "1.0.17"
 }

internal/events/src/index.ts

@@ -4,5 +4,4 @@ export { default as DomainBase } from "./domain/domain-base";
 export * from "./events/event-envelope";
 export * from "./events/letter-events";
 export * from "./events/mi-events";
-export * from "./events/letter-mapper";
 export * from "./version";

internal/helpers/package.json

@@ -1,5 +1,6 @@
 {
   "dependencies": {
+    "@nhsdigital/nhs-notify-event-schemas-supplier-api": "*",
     "aws-embedded-metrics": "^4.2.1",
     "pino": "^10.3.0",
     "zod": "^4.1.11"

lambdas/api-handler/package.json

@@ -7,6 +7,7 @@
     "@aws-sdk/lib-dynamodb": "^3.1008.0",
     "@aws-sdk/s3-request-presigner": "^3.925.0",
     "@internal/datastore": "*",
+    "@internal/event-builders": "*",
     "@internal/helpers": "*",
     "@nhsdigital/nhs-notify-event-schemas-supplier-api": "*",
     "aws-embedded-metrics": "^4.2.1",

lambdas/api-handler/src/handlers/__tests__/amendment-event-transformer.test.ts

@@ -2,7 +2,7 @@
 import { mockDeep } from "jest-mock-extended";
 import pino from "pino";
 import { SNSClient } from "@aws-sdk/client-sns";
-import { mapLetterToCloudEvent } from "@nhsdigital/nhs-notify-event-schemas-supplier-api/src/events/letter-mapper";
+import { mapLetterToCloudEvent } from "@internal/event-builders/src";
 import { Letter, LetterRepository } from "@internal/datastore/src";
 import { UpdateLetterCommand } from "../../contracts/letters";
 import { EnvVars } from "../../config/env";
@@ -120,7 +120,7 @@
             TopicArn: mockedDeps.env.SNS_TOPIC_ARN,
             Message: JSON.stringify(
               mapLetterToCloudEvent(
                 updateLetterCommands[i] as Letter,
                 mockedDeps.env.EVENT_SOURCE,
               ),
             ),

lambdas/api-handler/src/handlers/amendment-event-transformer.ts

@@ -1,10 +1,10 @@
 import { SQSBatchItemFailure, SQSEvent, SQSHandler } from "aws-lambda";
 import { PublishCommand } from "@aws-sdk/client-sns";
 import { LetterEvent } from "@nhsdigital/nhs-notify-event-schemas-supplier-api/src/events/letter-events";
-import { mapLetterToCloudEvent } from "@nhsdigital/nhs-notify-event-schemas-supplier-api/src/events/letter-mapper";
+import { MetricEntry, MetricStatus, buildEMFObject } from "@internal/helpers";
+import { mapLetterToCloudEvent } from "@internal/event-builders/src";
 import { Unit } from "aws-embedded-metrics";
 import pino from "pino";
-import { MetricEntry, MetricStatus, buildEMFObject } from "@internal/helpers";
 import {
   UpdateLetterCommand,
   UpdateLetterCommandSchema,

lambdas/letter-updates-transformer/package.json

@@ -3,6 +3,7 @@
     "@aws-sdk/client-sns": "^3.943.0",
     "@aws-sdk/util-dynamodb": "^3.943.0",
     "@internal/datastore": "^0.1.0",
+    "@internal/event-builders": "*",
     "@internal/helpers": "^0.1.0",
     "@nhsdigital/nhs-notify-event-schemas-supplier-api": "*",
     "aws-embedded-metrics": "^4.2.1",

lambdas/letter-updates-transformer/src/__tests__/letter-updates-transformer.test.ts

@@ -8,7 +8,7 @@ import {
 } from "aws-lambda";
 import { mockDeep } from "jest-mock-extended";
 import { Letter } from "@internal/datastore";
-import { mapLetterToCloudEvent } from "@nhsdigital/nhs-notify-event-schemas-supplier-api/src/events/letter-mapper";
+import { mapLetterToCloudEvent } from "@internal/event-builders/src";
 import createHandler from "../letter-updates-transformer";
 import { Deps } from "../deps";
 import { EnvVars } from "../env";

lambdas/letter-updates-transformer/src/letter-updates-transformer.ts

@@ -10,11 +10,11 @@ import {
   PublishBatchRequestEntry,
 } from "@aws-sdk/client-sns";
 import { LetterEvent } from "@nhsdigital/nhs-notify-event-schemas-supplier-api/src";
-import { mapLetterToCloudEvent } from "@nhsdigital/nhs-notify-event-schemas-supplier-api/src/events/letter-mapper";
+import { MetricEntry, buildEMFObject } from "@internal/helpers";
 import { Letter, LetterSchema } from "@internal/datastore";
+import { mapLetterToCloudEvent } from "@internal/event-builders/src";
 import { Unit } from "aws-embedded-metrics";
 import pino from "pino";
-import { MetricEntry, buildEMFObject } from "@internal/helpers";
 import { Deps } from "./deps";
 
 // SNS PublishBatchCommand supports up to 10 messages per batch