Integrate get and patch branches

Author: francisco-videira-nhs

.vscode/launch.json

@@ -7,17 +7,10 @@
       ],
       "console": "integratedTerminal",
       "cwd": "${workspaceFolder}/${input:workspace}",
-      "disableOptimisticBPs": true,
       "internalConsoleOptions": "neverOpen",
       "name": "Debug current test file (pick workspace)",
       "program": "${workspaceFolder}/node_modules/.bin/jest",
       "request": "launch",
-      "runtimeArgs": [
-        "run",
-        "test:unit",
-        "--"
-      ],
-      "runtimeExecutable": "npm",
       "type": "node"
     },
     {
@@ -29,17 +22,10 @@
       ],
       "console": "integratedTerminal",
       "cwd": "${workspaceFolder}/${input:workspace}",
-      "disableOptimisticBPs": true,
       "internalConsoleOptions": "neverOpen",
       "name": "Debug single test by name (pick workspace)",
       "program": "${workspaceFolder}/node_modules/.bin/jest",
       "request": "launch",
-      "runtimeArgs": [
-        "run",
-        "test:unit",
-        "--"
-      ],
-      "runtimeExecutable": "npm",
       "type": "node"
     }
   ],

lambdas/api-handler/src/contracts/errors.ts

@@ -34,8 +34,9 @@ export enum ApiErrorDetail {
   InvalidRequestMissingLetterIdPathParameter = 'The request is missing the letter id path parameter',
   InvalidRequestLetterIdsMismatch = 'The letter ID in the request body does not match the letter ID path parameter',
   InvalidRequestBody = 'The request body is invalid',
-  InvalidRequestLimitNotANumber = "The limit parameter is not a number",
-  InvalidRequestLimitNotPositive = "The limit parameter is not positive"
+  InvalidRequestLimitNotANumber = 'The limit parameter is not a number',
+  InvalidRequestLimitNotInRange = 'The limit parameter must be a positive number not greater than %s',
+  InvalidRequestLimitOnly = "Only 'limit' query parameter is supported"
 }
 
 export function buildApiError(params: {

lambdas/api-handler/src/mappers/__tests__/error-mapper.test.ts

@@ -35,7 +35,7 @@ describe("mapErrorToResponse", () => {
       "errors": [
         {
           "code": "NOTIFY_LETTER_NOT_FOUND",
-          "detail": "The provided letter ID does not exist",
+          "detail": "The provided letter ID does not exist for the supplier",
           "id": expect.any(String),
           "links": {
             "about": "https://digital.nhs.uk/developer/api-catalogue/nhs-notify-supplier"

lambdas/api-handler/src/services/__tests__/letter-operations.test.ts

@@ -84,7 +84,7 @@ describe('patchLetterStatus function', () => {
 
   it('should throw notFoundError when letter does not exist', async () => {
     const mockRepo = {
-      updateLetterStatus: jest.fn().mockRejectedValue(new Error('not found'))
+      updateLetterStatus: jest.fn().mockRejectedValue(new Error('Letter with id l1 not found for supplier s1'))
     };
 
     await expect(patchLetterStatus(letterResource, 'letter1', 'supplier1', mockRepo as any)).rejects.toThrow("The provided letter ID does not exist");

lambdas/api-handler/src/utils/__tests__/validation.test.ts

@@ -0,0 +1,57 @@
+import { assertNotEmpty } from "../validation";
+import { ValidationError } from "../../errors";
+import { ApiErrorDetail } from "../../contracts/errors";
+
+describe("assertNotEmpty", () => {
+  const detail = ApiErrorDetail.NotFoundLetterId;
+
+  it("throws for null", () => {
+    expect(() => assertNotEmpty(null, detail)).toThrow(ValidationError);
+  });
+
+  it("throws for undefined", () => {
+    expect(() => assertNotEmpty(undefined, detail)).toThrow(ValidationError);
+  });
+
+  it("throws for empty string", () => {
+    expect(() => assertNotEmpty("", detail)).toThrow(ValidationError);
+  });
+
+  it("throws for whitespace string", () => {
+    expect(() => assertNotEmpty("   ", detail)).toThrow(ValidationError);
+  });
+
+  it("returns non-empty string", () => {
+    const result = assertNotEmpty("hello", detail);
+    expect(result).toBe("hello");
+  });
+
+  it("returns number", () => {
+    const result = assertNotEmpty(42, detail);
+    expect(result).toBe(42);
+  });
+
+  it("returns object", () => {
+    const obj = { a: 1 };
+    const result = assertNotEmpty(obj, detail);
+    expect(result).toBe(obj);
+  });
+
+  it("returns array", () => {
+    const arr = [1, 2, 3];
+    const result = assertNotEmpty(arr, detail);
+    expect(result).toBe(arr);
+  });
+
+  it("does not throw for empty array (current behavior)", () => {
+    const arr: any[] = [];
+    const result = assertNotEmpty(arr, detail);
+    expect(result).toBe(arr);
+  });
+
+  it("does not throw for empty object (current behavior)", () => {
+    const obj = {};
+    const result = assertNotEmpty(obj, detail);
+    expect(result).toBe(obj);
+  });
+});

lambdas/api-handler/src/utils/validation.ts

@@ -1,9 +1,17 @@
 import * as errors from '../contracts/errors';
 import { ValidationError } from '../errors';
 
-export function assertNotEmpty(value: string | null | undefined, detail: errors.ApiErrorDetail): string {
-  if (!value || value.trim() === '') {
+export function assertNotEmpty<T>(
+  value: T | null | undefined,
+  detail: errors.ApiErrorDetail
+): T {
+  if (value == null) {
     throw new ValidationError(detail);
   }
+
+  if (typeof value === "string" && value.trim() === "") {
+    throw new ValidationError(detail);
+  }
+
   return value;
 }