From 4830425360573d0fefe442234ee18d159bbe4e62 Mon Sep 17 00:00:00 2001 From: Namitha-Prabhu Date: Mon, 20 Apr 2026 09:30:07 +0000 Subject: [PATCH 1/3] fix --- .../urgent-letter-priority.spec.ts | 24 ++----------------- .../helpers/urgent-letter-priority-helper.ts | 6 +++++ 2 files changed, 8 insertions(+), 22 deletions(-) diff --git a/tests/component-tests/integration-tests/urgent-letter-priority.spec.ts b/tests/component-tests/integration-tests/urgent-letter-priority.spec.ts index eb0f3e240..ea2a8f729 100644 --- a/tests/component-tests/integration-tests/urgent-letter-priority.spec.ts +++ b/tests/component-tests/integration-tests/urgent-letter-priority.spec.ts @@ -1,4 +1,4 @@ -import { expect, test } from "@playwright/test"; +import { test } from "@playwright/test"; import getRestApiGatewayBaseUrl from "tests/helpers/aws-gateway-helper"; import { pollForLetterStatus } from "tests/helpers/poll-for-letters-helper"; import { getLettersFromQueueViaIndex } from "tests/helpers/generate-fetch-test-data"; @@ -9,12 +9,6 @@ import { verifyAllocationLogsContainPriority, verifyIndexPositionOfLetterVariants, } from "tests/helpers/urgent-letter-priority-helper"; -import { createValidRequestHeaders } from "tests/constants/request-headers"; -import { SUPPLIER_LETTERS } from "tests/constants/api-constants"; -import { - GetLettersResponse, - GetLettersResponseSchema, -} from "../../../lambdas/api-handler/src/contracts/letters"; let baseUrl: string; @@ -43,25 +37,11 @@ test.describe("Urgent Letter Priority Tests", () => { await verifyAllocationLogsContainPriority(urgencyTenLetterIds, 10); const lettersFromQueue = await getLettersFromQueueViaIndex(supplier); + const letterIdsFromQueue = lettersFromQueue.map( (letter) => letter.letterId, ); - const header = createValidRequestHeaders(supplier); - const response = await request.get(`${baseUrl}/${SUPPLIER_LETTERS}`, { - headers: header, - }); - - expect(response.status()).toBe(200); - const responseBody = await response.json(); - expect(responseBody.data.length).toBeGreaterThanOrEqual(1); - - const getLettersResponse: GetLettersResponse = - GetLettersResponseSchema.parse(responseBody); - - const letterIds = getLettersResponse.data.map((letter) => letter.id); - expect(letterIds).toEqual(letterIdsFromQueue); - verifyIndexPositionOfLetterVariants( letterIdsFromQueue, urgencyTenLetterIds, diff --git a/tests/helpers/urgent-letter-priority-helper.ts b/tests/helpers/urgent-letter-priority-helper.ts index 8effbd51b..9382b35c0 100644 --- a/tests/helpers/urgent-letter-priority-helper.ts +++ b/tests/helpers/urgent-letter-priority-helper.ts @@ -95,6 +95,9 @@ export function verifyIndexPositionOfLetterVariants( // All higher-urgency letters must appear before any lower-urgency letter expect(highestUrgencyMaxIndex).toBeLessThan(lowerUrgencyMinIndex); + logger.info( + `Verified all higher urgency letters appear before lower urgency letters in index. Highest index for urgency ${variantUrgencyMap[letterIdsHigherUrgency[0]]} was ${highestUrgencyMaxIndex}, lowest index for urgency ${variantUrgencyMap[letterIdsLowerUrgency[0]]} was ${lowerUrgencyMinIndex}`, + ); } export async function verifyAllocationLogsContainPriority( @@ -111,5 +114,8 @@ export async function verifyAllocationLogsContainPriority( expect(supplierSpec).toBeDefined(); expect(supplierSpec.priority).toBeDefined(); expect(supplierSpec.priority).toBe(priority); + logger.info( + `Verified log for domainId ${domainId} contains priority ${priority}`, + ); } } From 30672a20d6415ca6bd019e17dd9d2efedf24e2aa Mon Sep 17 00:00:00 2001 From: vlasis-perdikidis Date: Thu, 16 Apr 2026 16:13:42 +0000 Subject: [PATCH 2/3] add commit to gitleaksignore --- .gitleaksignore | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitleaksignore b/.gitleaksignore index 743843dbe..6758264a1 100644 --- a/.gitleaksignore +++ b/.gitleaksignore @@ -25,3 +25,9 @@ debc75a97cfe551a69fd1e8694be483213322a9d:pact-contracts/pacts/letter-rendering/s 4fa1923947bbff2387218d698d766cbb7c121a0f:pact-contracts/pacts/letter-rendering/supplier-api-letter-request-prepared.json:generic-api-key:10 d005112adcfd286c3bef076214836dbb2fe8d0b5:.npmrc:npm-access-token:9 d005112adcfd286c3bef076214836dbb2fe8d0b5:.npmrc:github-pat:7 +ff889d4c3f29da4468ecf1f05f467fe84d35b2a1:lambdas/supplier-mock/.aws-sam/build/SupplierMockFunction/index.js.map:ipv4:4 +ff889d4c3f29da4468ecf1f05f467fe84d35b2a1:lambdas/supplier-mock/.aws-sam/build/SupplierMockFunction/index.js:ipv4:63 +ff889d4c3f29da4468ecf1f05f467fe84d35b2a1:lambdas/supplier-mock/.aws-sam/build/SupplierMockFunction/index.js:ipv4:62 +ff889d4c3f29da4468ecf1f05f467fe84d35b2a1:lambdas/supplier-mock/.aws-sam/build/SupplierMockFunction/index.js:ipv4:60 +ff889d4c3f29da4468ecf1f05f467fe84d35b2a1:lambdas/supplier-mock/.aws-sam/build/SupplierMockFunction/index.js:ipv4:59 +ff889d4c3f29da4468ecf1f05f467fe84d35b2a1:lambdas/supplier-mock/.aws-sam/build/SupplierMockFunction/index.js:ipv4:24 From b8be2e978dbca4a6b4a4b65b809675655b7bc2bd Mon Sep 17 00:00:00 2001 From: Namitha-Prabhu Date: Mon, 20 Apr 2026 13:51:25 +0000 Subject: [PATCH 3/3] add dependencies --- .../urgent-letter-priority.spec.ts | 23 ++++++++++++++++++- tests/config/main.config.ts | 2 ++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/tests/component-tests/integration-tests/urgent-letter-priority.spec.ts b/tests/component-tests/integration-tests/urgent-letter-priority.spec.ts index ea2a8f729..c91d288cd 100644 --- a/tests/component-tests/integration-tests/urgent-letter-priority.spec.ts +++ b/tests/component-tests/integration-tests/urgent-letter-priority.spec.ts @@ -1,4 +1,4 @@ -import { test } from "@playwright/test"; +import { expect, test } from "@playwright/test"; import getRestApiGatewayBaseUrl from "tests/helpers/aws-gateway-helper"; import { pollForLetterStatus } from "tests/helpers/poll-for-letters-helper"; import { getLettersFromQueueViaIndex } from "tests/helpers/generate-fetch-test-data"; @@ -9,6 +9,12 @@ import { verifyAllocationLogsContainPriority, verifyIndexPositionOfLetterVariants, } from "tests/helpers/urgent-letter-priority-helper"; +import { createValidRequestHeaders } from "tests/constants/request-headers"; +import { SUPPLIER_LETTERS } from "tests/constants/api-constants"; +import { + GetLettersResponse, + GetLettersResponseSchema, +} from "../../../lambdas/api-handler/src/contracts/letters"; let baseUrl: string; @@ -42,6 +48,21 @@ test.describe("Urgent Letter Priority Tests", () => { (letter) => letter.letterId, ); + const header = createValidRequestHeaders(supplier); + const response = await request.get(`${baseUrl}/${SUPPLIER_LETTERS}`, { + headers: header, + }); + + expect(response.status()).toBe(200); + const responseBody = await response.json(); + expect(responseBody.data.length).toBeGreaterThanOrEqual(1); + + const getLettersResponse: GetLettersResponse = + GetLettersResponseSchema.parse(responseBody); + + const letterIds = getLettersResponse.data.map((letter) => letter.id); + expect(letterIds).toEqual(letterIdsFromQueue); + verifyIndexPositionOfLetterVariants( letterIdsFromQueue, urgencyTenLetterIds, diff --git a/tests/config/main.config.ts b/tests/config/main.config.ts index 3a371f324..ec77660b7 100644 --- a/tests/config/main.config.ts +++ b/tests/config/main.config.ts @@ -13,6 +13,7 @@ const localConfig: PlaywrightTestConfig = { name: "apiGateway-tests", testDir: path.resolve(__dirname, "../component-tests/apiGateway-tests"), testMatch: "**/*.spec.ts", + dependencies: ["integration-tests"], }, { name: "events-tests", @@ -24,6 +25,7 @@ const localConfig: PlaywrightTestConfig = { name: "letterQueue-tests", testDir: path.resolve(__dirname, "../component-tests/letterQueue-tests"), testMatch: "**/*.spec.ts", + dependencies: ["apiGateway-tests"], }, { name: "integration-tests",