merge main

Author: Vlasis-Perdikidis

.github/actions/build-proxies/action.yml

@@ -72,19 +72,6 @@ runs:
           echo "TARGET_DOMAIN=suppliers.dev.nhsnotify.national.nhs.uk" >> $GITHUB_ENV
         fi
 
-        if [ -z $PR_NUMBER ]
-        then
-          echo "INSTANCE=$PROXYGEN_API_NAME" >> $GITHUB_ENV
-          echo "TARGET=https://main.$TARGET_DOMAIN" >> $GITHUB_ENV
-          echo "SANDBOX_TAG=latest" >> $GITHUB_ENV
-          echo "MTLS_NAME=notify-supplier-mtls" >> $GITHUB_ENV
-        else
-          echo "TARGET=https://pr$PR_NUMBER.$TARGET_DOMAIN" >> $GITHUB_ENV
-          echo "INSTANCE=$PROXYGEN_API_NAME-PR-$PR_NUMBER" >> $GITHUB_ENV
-          echo "SANDBOX_TAG=pr$PR_NUMBER" >> $GITHUB_ENV
-          echo "MTLS_NAME=notify-supplier-mtls-pr$PR_NUMBER" >> $GITHUB_ENV
-        fi
-
     - name: Set APIM_ENV
       shell: bash
       run: |

.github/actions/test-types.json

@@ -1,5 +1,4 @@
 [
   "component",
-  "e2e",
-  "sandbox"
+  "e2e"
 ]

VERSION

@@ -1 +1 @@
-1.1.6-${yyyy}${mm}${dd}.${HH}${MM}${SS}+${hash}
+1.2.0-${yyyy}${mm}${dd}.${HH}${MM}${SS}+${hash}

package-lock.json

@@ -3,4 +3,4 @@ healthcheck: /_status
 url: https://main.suppliers.nonprod.nhsnotify.national.nhs.uk
 security:
   type: mtls
-  secret: notify-supplier-mtls-int
+  secret: nhs-notify-supplier-mtls-int

specification/api/components/environments/int/target.yml

@@ -3,4 +3,4 @@ healthcheck: /_status
 url: https://suppliers.dev.nhsnotify.national.nhs.uk
 security:
   type: mtls
-  secret: nhs-notify-supplier-mtls
+  secret: nhs-notify-supplier-mtls-internal-dev-prNNN # Will be dynamically set via the proxy-deploy workflow in the internal repo

specification/api/components/environments/internal-dev-pr/target.yml

@@ -3,4 +3,4 @@ healthcheck: /_status
 url: https://suppliers.dev.nhsnotify.national.nhs.uk
 security:
   type: mtls
-  secret: nhs-notify-supplier-mtls
+  secret: nhs-notify-supplier-mtls-internal-dev-main

specification/api/components/environments/internal-dev/target.yml

@@ -3,4 +3,4 @@ healthcheck: /_status
 url: https://main.suppliers.nonprod.nhsnotify.national.nhs.uk
 security:
   type: mtls
-  secret: notify-supplier-mtls-ref
+  secret: nhs-notify-supplier-mtls-ref

specification/api/components/environments/ref/target.yml

@@ -1,6 +1,9 @@
 import { expect, test } from "@playwright/test";
 import getRestApiGatewayBaseUrl from "../../helpers/aws-gateway-helper";
-import { getLettersBySupplier } from "../../helpers/generate-fetch-test-data";
+import {
+  createTestData,
+  waitForLetterStatus,
+} from "../../helpers/generate-fetch-test-data";
 import {
   DATA,
   SUPPLIERID,
@@ -19,16 +22,17 @@ test.describe("API Gateway Tests to Verify Get Letter PDF Endpoint", () => {
   test(`Get /letters/{id}/data returns 200 and valid response for a given id`, async ({
     request,
   }) => {
-    const letters = await getLettersBySupplier(SUPPLIERID, "PENDING", 1);
+    const letterIds: string[] = await createTestData(SUPPLIERID);
+    const createdLetter = await waitForLetterStatus(
+      SUPPLIERID,
+      letterIds[0],
+      "PENDING",
+    );
 
-    if (!letters?.length) {
-      test.fail(true, `No PENDING letters found for supplier ${SUPPLIERID}`);
-      return;
-    }
-    const letter = letters[0];
     const headers = createValidRequestHeaders();
+
     const response = await request.get(
-      `${baseUrl}/${SUPPLIER_LETTERS}/${letter.id}/${DATA}`,
+      `${baseUrl}/${SUPPLIER_LETTERS}/${createdLetter.id}/${DATA}`,
       {
         headers,
       },
@@ -63,32 +67,13 @@ test.describe("API Gateway Tests to Verify Get Letter PDF Endpoint", () => {
     expect(after.status).toBe(403);
   });
 
-  test(`Get /letters/{id}/data returns 404 if no resource is found for id`, async ({
-    request,
-  }) => {
-    const id = "11";
-    const headers = createValidRequestHeaders();
-    const response = await request.get(
-      `${baseUrl}/${SUPPLIER_LETTERS}/${id}/${DATA}`,
-      {
-        headers,
-      },
-    );
-
-    const responseBody = await response.json();
-    expect(response.status()).toBe(404);
-    expect(responseBody).toMatchObject(error404ResponseBody());
-  });
-
-  // CCM-14318: Remove this test
   test(`Get /letters/{id}/data returns 404 if letter is not found for supplierId ${SUPPLIERID}`, async ({
     request,
   }) => {
     const id = "non-existing-id-12345";
     const headers = createValidRequestHeaders();
     const response = await request.get(
-      `
-      ${baseUrl}/${SUPPLIER_LETTERS}/${id}/${DATA}`,
+      `${baseUrl}/${SUPPLIER_LETTERS}/${id}/${DATA}`,
       {
         headers,
       },

tests/component-tests/apiGateway-tests/get-letter-pdf.spec.ts

@@ -1,6 +1,9 @@
 import { expect, test } from "@playwright/test";
 import getRestApiGatewayBaseUrl from "../../helpers/aws-gateway-helper";
-import { getLettersBySupplier } from "../../helpers/generate-fetch-test-data";
+import {
+  createTestData,
+  waitForLetterStatus,
+} from "../../helpers/generate-fetch-test-data";
 import { SUPPLIERID, SUPPLIER_LETTERS } from "../../constants/api-constants";
 import { createValidRequestHeaders } from "../../constants/request-headers";
 import { error404ResponseBody } from "../../helpers/common-types";
@@ -15,16 +18,16 @@ test.describe("API Gateway Tests to Verify Get Letter Status Endpoint", () => {
   test(`Get /letters/{id} returns 200 and valid response for a given id`, async ({
     request,
   }) => {
-    const letters = await getLettersBySupplier(SUPPLIERID, "PENDING", 1);
+    const letterIds: string[] = await createTestData(SUPPLIERID);
+    const createdLetter = await waitForLetterStatus(
+      SUPPLIERID,
+      letterIds[0],
+      "PENDING",
+    );
 
-    if (!letters?.length) {
-      test.fail(true, `No PENDING letters found for supplier ${SUPPLIERID}`);
-      return;
-    }
-    const letter = letters[0];
     const headers = createValidRequestHeaders();
     const response = await request.get(
-      `${baseUrl}/${SUPPLIER_LETTERS}/${letter.id}`,
+      `${baseUrl}/${SUPPLIER_LETTERS}/${createdLetter.id}`,
       {
         headers,
       },
@@ -37,10 +40,10 @@ test.describe("API Gateway Tests to Verify Get Letter Status Endpoint", () => {
       data: {
         attributes: {
           status: "PENDING",
-          specificationId: letter.specificationId,
-          groupId: letter.groupId,
+          specificationId: createdLetter.specificationId,
+          groupId: createdLetter.groupId,
         },
-        id: letter.id,
+        id: createdLetter.id,
         type: "Letter",
       },
     });