Skip to content

Commit e45372a

Browse files
authored
Update letter request schema to replace specificationId with letterVariantId and remove urgency field; bump version to 1.1.0 (#26)
1 parent b626091 commit e45372a

File tree

8 files changed

+10
-20
lines changed

8 files changed

+10
-20
lines changed

package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/events/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,5 @@
4040
"test:unit": "jest",
4141
"prepare": "npm run build"
4242
},
43-
"version": "1.0.2"
43+
"version": "1.1.0"
4444
}

packages/events/schemas/examples/letter-request.prepared.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,15 @@
44
"clientId": "00f3b388-bbe9-41c9-9e76-052d37ee8988",
55
"createdAt": "2025-08-28T08:45:00.000Z",
66
"domainId": "0o5Fs0EELR0fUjHjbCnEtdUwQe4_0o5Fs0EELR0fUjHjbCnEtdUwQe5",
7+
"letterVariantId": "standard_economy",
78
"pageCount": 2,
89
"requestId": "0o5Fs0EELR0fUjHjbCnEtdUwQe3",
910
"requestItemId": "0o5Fs0EELR0fUjHjbCnEtdUwQe4",
1011
"requestItemPlanId": "0o5Fs0EELR0fUjHjbCnEtdUwQe5",
1112
"sha256Hash": "3a7bd3e2360a3d29eea436fcfb7e44c735d117c8f2f1d2d1e4f6e8f7e6e8f7e6",
12-
"specificationId": "standard_economy",
1313
"status": "PREPARED",
1414
"supplierId": "supplier_123",
1515
"templateId": "template_123",
16-
"urgency": "STANDARD",
1716
"url": "https://s3.eu-west-2.amazonaws.com/notify-letters-dev/letters/f47ac10b-58cc-4372-a567-0e02b2c3d479.pdf"
1817
},
1918
"datacontenttype": "application/json",

packages/events/src/domain/letter-request.ts

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ export const $LetterRequest = DomainBase("LetterRequest")
2121
"Identifier for the campaign which this letter is a part of",
2222
examples: ["campaign-456", "flu-campaign-2025"],
2323
}),
24-
specificationId: z.string().meta({
25-
title: "Specification ID",
24+
letterVariantId: z.string().meta({
25+
title: "Letter Variant ID",
2626
description:
27-
"Reference to the letter specification which should be used to produce a letter pack for this request",
27+
"Reference to the letter variant which should be used to select a letter pack and supplier for this request",
2828
examples: ["1y3q9v1zzzz"],
2929
}),
3030
requestId: z.string().meta({
@@ -92,11 +92,6 @@ The file will be a PDF file in A4 format suitable for printing.`,
9292
description: "Current status of the letter request",
9393
examples: ["PREPARED"],
9494
}),
95-
urgency: z.enum(["STANDARD", "URGENT"]).meta({
96-
title: "Urgency",
97-
description: "Indicates whether the letter is standard or urgent",
98-
examples: ["STANDARD", "URGENT"],
99-
}),
10095
})
10196
.meta({
10297
title: "Letter Request",

packages/events/src/events/__tests__/letter-request-prepared.test.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,9 @@ describe("LetterRequestPreparedEvent validations", () => {
2626
"https://notify.nhs.uk/cloudevents/schemas/letter-rendering/letter-request.prepared.1.0.0.schema.json",
2727
data: expect.objectContaining({
2828
domainId: "0o5Fs0EELR0fUjHjbCnEtdUwQe4_0o5Fs0EELR0fUjHjbCnEtdUwQe5",
29-
specificationId: "standard_economy",
29+
letterVariantId: "standard_economy",
3030
templateId: "template_123",
3131
requestId: "0o5Fs0EELR0fUjHjbCnEtdUwQe3",
32-
urgency: "STANDARD",
3332
}),
3433
}),
3534
);
@@ -39,7 +38,7 @@ describe("LetterRequestPreparedEvent validations", () => {
3938
const json = readJson("letter-request-prepared-with-missing-fields.json");
4039

4140
expect(() => $LetterRequestPreparedEvent.parse(json)).toThrow(
42-
"specificationId",
41+
"letterVariantId",
4342
);
4443
});
4544

packages/events/src/events/__tests__/testData/letter-request-prepared-valid.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,15 @@
44
"clientId": "00f3b388-bbe9-41c9-9e76-052d37ee8988",
55
"createdAt": "2025-08-28T08:45:00.000Z",
66
"domainId": "0o5Fs0EELR0fUjHjbCnEtdUwQe4_0o5Fs0EELR0fUjHjbCnEtdUwQe5",
7+
"letterVariantId": "standard_economy",
78
"pageCount": 2,
89
"requestId": "0o5Fs0EELR0fUjHjbCnEtdUwQe3",
910
"requestItemId": "0o5Fs0EELR0fUjHjbCnEtdUwQe4",
1011
"requestItemPlanId": "0o5Fs0EELR0fUjHjbCnEtdUwQe5",
1112
"sha256Hash": "3a7bd3e2360a3d29eea436fcfb7e44c735d117c8f2f1d2d1e4f6e8f7e6e8f7e6",
12-
"specificationId": "standard_economy",
1313
"status": "PREPARED",
1414
"supplierId": "supplier_123",
1515
"templateId": "template_123",
16-
"urgency": "STANDARD",
1716
"url": "https://s3.eu-west-2.amazonaws.com/notify-letters-dev/letters/f47ac10b-58cc-4372-a567-0e02b2c3d479.pdf"
1817
},
1918
"datacontenttype": "application/json",

packages/events/src/events/__tests__/testData/letter-request-prepared-with-invalid-major-version.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,15 @@
44
"clientId": "00f3b388-bbe9-41c9-9e76-052d37ee8988",
55
"createdAt": "2025-08-28T08:45:00.000Z",
66
"domainId": "0o5Fs0EELR0fUjHjbCnEtdUwQe4_0o5Fs0EELR0fUjHjbCnEtdUwQe5",
7+
"letterVariantId": "standard_economy",
78
"pageCount": 2,
89
"requestId": "0o5Fs0EELR0fUjHjbCnEtdUwQe3",
910
"requestItemId": "0o5Fs0EELR0fUjHjbCnEtdUwQe4",
1011
"requestItemPlanId": "0o5Fs0EELR0fUjHjbCnEtdUwQe5",
1112
"sha256Hash": "3a7bd3e2360a3d29eea436fcfb7e44c735d117c8f2f1d2d1e4f6e8f7e6e8f7e6",
12-
"specificationId": "standard_economy",
1313
"status": "PREPARED",
1414
"supplierId": "supplier_123",
1515
"templateId": "template_123",
16-
"urgency": "STANDARD",
1716
"url": "https://s3.eu-west-2.amazonaws.com/notify-letters-dev/letters/f47ac10b-58cc-4372-a567-0e02b2c3d479.pdf"
1817
},
1918
"datacontenttype": "application/json",

packages/events/src/events/__tests__/testData/letter-request-prepared-with-missing-fields.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
"status": "PREPARED",
1313
"supplierId": "supplier_123",
1414
"templateId": "template_123",
15-
"urgency": "STANDARD",
1615
"url": "https://s3.eu-west-2.amazonaws.com/notify-letters-dev/letters/f47ac10b-58cc-4372-a567-0e02b2c3d479.pdf"
1716
},
1817
"datacontenttype": "application/json",

0 commit comments

Comments
 (0)