Skip to content

Commit c78c8ae

Browse files
committed
CCM-12616: Fix event subject + fix component tests
1 parent 99ceb79 commit c78c8ae

2 files changed

Lines changed: 2 additions & 7 deletions

File tree

lambdas/mesh-poll/mesh_poll/processor.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,14 +135,15 @@ def _publish_mesh_inbox_message_received_event(self, event_detail):
135135
'id': str(uuid4()),
136136
'specversion': '1.0',
137137
'source': self.__cloud_event_source,
138-
'subject': 'customer/00000000-0000-0000-0000-000000000000/recipient/00000000-0000-0000-0000-000000000000',
138+
'subject': f'customer/{event_detail["data"]["senderId"]}/recipient/{event_detail["data"]["messageReference"]}',
139139
'type': 'uk.nhs.notify.digital.letters.mesh.inbox.message.received.v1',
140140
'time': now,
141141
'recordedtime': now,
142142
'severitynumber': 2,
143143
'severitytext': 'INFO',
144144
'traceparent': '00-0af7651916cd43dd8448eb211c80319c-b7ad6b7169203331-01',
145145
'dataschema': 'https://notify.nhs.uk/cloudevents/schemas/digital-letters/2025-10-draft/data/digital-letters-mesh-inbox-message-received-data.schema.json',
146+
'datacontenttype': 'application/json',
146147
'data': event_detail.get('data', {}),
147148
}
148149

tests/playwright/digital-letters-component-tests/pdm-uploader.component.spec.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ test.describe('Digital Letters - Upload to PDM', () => {
6363
const messageUri = `s3://${LETTERS_S3_BUCKET_NAME}/${resourceKey}`;
6464
const messageReference = uuidv4();
6565
const senderId = 'test-sender-1';
66-
const meshMessageId = '12345';
6766

6867
uploadToS3(JSON.stringify(pdmRequest), LETTERS_S3_BUCKET_NAME, resourceKey);
6968

@@ -73,7 +72,6 @@ test.describe('Digital Letters - Upload to PDM', () => {
7372
...baseEvent,
7473
id: eventId,
7574
data: {
76-
meshMessageId,
7775
messageUri,
7876
messageReference,
7977
senderId,
@@ -117,7 +115,6 @@ test.describe('Digital Letters - Upload to PDM', () => {
117115
const messageUri = `s3://${LETTERS_S3_BUCKET_NAME}/${resourceKey}`;
118116
const messageReference = uuidv4();
119117
const senderId = 'test-sender-1';
120-
const meshMessageId = '12345';
121118
const invalidPdmRequest = {
122119
...pdmRequest,
123120
unexpectedField: 'I should not be here',
@@ -135,7 +132,6 @@ test.describe('Digital Letters - Upload to PDM', () => {
135132
...baseEvent,
136133
id: eventId,
137134
data: {
138-
meshMessageId,
139135
messageUri,
140136
messageReference,
141137
senderId,
@@ -179,15 +175,13 @@ test.describe('Digital Letters - Upload to PDM', () => {
179175
const messageUri = `not-a-valid-s3-uri`;
180176
const messageReference = uuidv4();
181177
const senderId = 'test-sender-1';
182-
const meshMessageId = '12345';
183178

184179
await eventPublisher.sendEvents(
185180
[
186181
{
187182
...baseEvent,
188183
id: eventId,
189184
data: {
190-
meshMessageId,
191185
messageUri,
192186
messageReference,
193187
senderId,

0 commit comments

Comments
 (0)