Skip to content

Commit ecf08bf

Browse files
committed
CCM-13966 Pin rendering event schema version and use it in tests
1 parent eb8f0f2 commit ecf08bf

File tree

6 files changed

+24
-13
lines changed

6 files changed

+24
-13
lines changed

lambdas/supplier-allocator/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"@aws-sdk/lib-dynamodb": "^3.1008.0",
66
"@internal/datastore": "*",
77
"@internal/helpers": "^0.1.0",
8-
"@nhsdigital/nhs-notify-event-schemas-letter-rendering": "^2.0.1",
8+
"@nhsdigital/nhs-notify-event-schemas-letter-rendering": "2.0.1",
99
"@nhsdigital/nhs-notify-event-schemas-letter-rendering-v1": "npm:@nhsdigital/nhs-notify-event-schemas-letter-rendering@^1.1.5",
1010
"@nhsdigital/nhs-notify-event-schemas-supplier-api": "^1.0.8",
1111
"@nhsdigital/nhs-notify-event-schemas-supplier-config": "^1.0.1",

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,12 @@ import * as supplierConfig from "../../services/supplier-config";
1313

1414
import { Deps } from "../../config/deps";
1515
import { EnvVars } from "../../config/env";
16+
import packageJson from "../../../package.json";
17+
18+
const renderingSchemaVersion: string =
19+
packageJson.dependencies[
20+
"@nhsdigital/nhs-notify-event-schemas-letter-rendering"
21+
];
1622

1723
jest.mock("../../services/supplier-config");
1824

@@ -86,9 +92,8 @@ function createPreparedV2Event(
8692
return {
8793
...createPreparedV1Event(overrides),
8894
type: "uk.nhs.notify.letter-rendering.letter-request.prepared.v2",
89-
dataschema:
90-
"https://notify.nhs.uk/cloudevents/schemas/letter-rendering/letter-request.prepared.2.0.1.schema.json",
91-
dataschemaversion: "2.0.1",
95+
dataschema: `https://notify.nhs.uk/cloudevents/schemas/letter-rendering/letter-request.prepared.${renderingSchemaVersion}.schema.json`,
96+
dataschemaversion: renderingSchemaVersion,
9297
};
9398
}
9499

lambdas/upsert-letter/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"@aws-sdk/lib-dynamodb": "^3.1008.0",
55
"@internal/datastore": "*",
66
"@internal/helpers": "*",
7-
"@nhsdigital/nhs-notify-event-schemas-letter-rendering": "^2.0.1",
7+
"@nhsdigital/nhs-notify-event-schemas-letter-rendering": "2.0.1",
88
"@nhsdigital/nhs-notify-event-schemas-letter-rendering-v1": "npm:@nhsdigital/nhs-notify-event-schemas-letter-rendering@^1.1.5",
99
"@nhsdigital/nhs-notify-event-schemas-supplier-api": "^1.0.8",
1010
"@types/aws-lambda": "^8.10.148",

lambdas/upsert-letter/src/handler/__tests__/upsert-handler.test.ts

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,12 @@ import {
1313
import createUpsertLetterHandler from "../upsert-handler";
1414
import { Deps } from "../../config/deps";
1515
import { EnvVars } from "../../config/env";
16+
import packageJson from "../../../package.json";
17+
18+
const renderingSchemaVersion: string =
19+
packageJson.dependencies[
20+
"@nhsdigital/nhs-notify-event-schemas-letter-rendering"
21+
];
1622

1723
function createSQSEvent(records: SQSRecord[]): SQSEvent {
1824
return {
@@ -127,9 +133,8 @@ function createPreparedV2Event(
127133
return {
128134
...createPreparedV1Event(overrides),
129135
type: "uk.nhs.notify.letter-rendering.letter-request.prepared.v2",
130-
dataschema:
131-
"https://notify.nhs.uk/cloudevents/schemas/letter-rendering/letter-request.prepared.2.0.1.schema.json",
132-
dataschemaversion: "2.0.1",
136+
dataschema: `https://notify.nhs.uk/cloudevents/schemas/letter-rendering/letter-request.prepared.${renderingSchemaVersion}.schema.json`,
137+
dataschemaversion: renderingSchemaVersion,
133138
};
134139
}
135140

package-lock.json

Lines changed: 5 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"@aws-sdk/client-lambda": "^3.986.0",
88
"@aws-sdk/client-sns": "^3.984.0",
99
"@aws-sdk/lib-dynamodb": "^3.1008.0",
10-
"@nhsdigital/nhs-notify-event-schemas-letter-rendering": "^2.0.1",
10+
"@nhsdigital/nhs-notify-event-schemas-letter-rendering": "2.0.1",
1111
"@pact-foundation/pact": "^16.0.4",
1212
"@pact-foundation/pact-core": "^17.0.2",
1313
"@playwright/test": "^1.57.0",

0 commit comments

Comments
 (0)