Skip to content

CCM-14238: Status Update For Records With Id "Test" #450

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
francisco-videira-nhs wants to merge 5 commits into
base: main
Choose a base branch
from
Open

CCM-14238: Status Update For Records With Id "Test" #450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
70d5f02
Init
francisco-videira-nhs Mar 10, 2026
360e83a
Event envelope allows wider subject resource id
francisco-videira-nhs Mar 10, 2026
d7ef248
Bump bersion and clean up
francisco-videira-nhs Mar 10, 2026
0719b5d
Ignore regex false positives
francisco-videira-nhs Mar 11, 2026
130259d
Merge remote-tracking branch 'origin/main' into feature/CCM-14238
francisco-videira-nhs Mar 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion internal/events/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,5 @@
"typecheck": "tsc --noEmit"
},
"types": "dist/index.d.ts",
"version": "1.0.13"
"version": "1.0.14"
}
22 changes: 22 additions & 0 deletions internal/events/src/events/__tests__/event-envelope.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,5 +364,27 @@ describe("EventEnvelope schema validation", () => {
const result = $EnvelopeNoPrefix.safeParse(envelope);
expect(result.success).toBe(false);
});

it("should accept subject with non uuid resource id", () => {
const envelope = {
...baseLetterEnvelope,
subject: "letter-origin/letter-rendering/letter/Some_Letter_12345",
};

const result = $EnvelopeWithPrefix.safeParse(envelope);
expect(result.error).toBeUndefined();
expect(result.success).toBe(true);
});

it("should accept subject with multi sub path resource id", () => {
const envelope = {
...baseLetterEnvelope,
subject: "letter-origin/letter-rendering/letter/a/B/c/123",
};

const result = $EnvelopeWithPrefix.safeParse(envelope);
expect(result.error).toBeUndefined();
expect(result.success).toBe(true);
});
});
});
7 changes: 5 additions & 2 deletions internal/events/src/events/event-envelope.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ export function EventEnvelope<TData extends z.ZodTypeAny>(

source: z
.string()
// eslint-disable-next-line security/detect-unsafe-regex
.regex(/^\/data-plane\/supplier-api(?:\/.*)?$/)
.meta({
title: "Event Source",
Expand All @@ -90,8 +91,10 @@ export function EventEnvelope<TData extends z.ZodTypeAny>(

subject: z
.string()

.regex(new RegExp(`^${subjectPrefixRegex}${resourceName}/[a-z0-9-]+$`))
.regex(
// eslint-disable-next-line security/detect-non-literal-regexp
new RegExp(`^${subjectPrefixRegex}${resourceName}/[^/]+(?:/.*)?$`),
)
.meta({
title: "Event Subject",
description:
Expand Down
Loading