@@ -4,20 +4,18 @@ import {
44 CORE_NOTIFIER_LAMBDA_LOG_GROUP_NAME ,
55 EVENT_BUS_LOG_GROUP_NAME ,
66} from 'constants/backend-constants' ;
7+ import {
8+ SENDER_ID_SKIPS_NOTIFY ,
9+ SENDER_ID_THAT_TRIGGERS_ERROR_IN_NOTIFY_SANDBOX ,
10+ SENDER_ID_VALID_FOR_NOTIFY_SANDBOX ,
11+ } from 'config/component/senders.setup' ;
712import { PDMResourceAvailable } from 'digital-letters-events' ;
813import messagePDMResourceAvailableValidator from 'digital-letters-events/PDMResourceAvailable.js' ;
914import { getLogsFromCloudwatch } from 'helpers/cloudwatch-helpers' ;
1015import eventPublisher from 'helpers/event-bus-helpers' ;
1116import expectToPassEventually from 'helpers/expectations' ;
1217import { expectMessageContainingString , purgeQueue } from 'helpers/sqs-helpers' ;
13- import { SenderManagement } from 'sender-management' ;
1418import { v4 as uuidv4 } from 'uuid' ;
15- import { ParameterStoreCache } from 'utils' ;
16-
17- const senderIdInvokingNotify = 'componentTestSender_RoutingConfig' ;
18- const senderIdThatTriggersErrorInNotifySandbox =
19- 'componentTestSender_RoutingConfigInvalid' ;
20- const senderIdThatSkipsNotify = 'componentTestSender_NoRoutingConfig' ;
2119
2220const baseEvent : Omit < PDMResourceAvailable , 'id' | 'data' > = {
2321 specversion : '1.0' ,
@@ -37,54 +35,13 @@ const baseEvent: Omit<PDMResourceAvailable, 'id' | 'data'> = {
3735} ;
3836
3937test . describe ( 'Digital Letters - Core Notify' , ( ) => {
40- const parameterStore = new ParameterStoreCache ( ) ;
41- const senderManagement = SenderManagement ( {
42- parameterStore,
43- } ) ;
44-
45- async function deleteSendersIfExist ( ) {
46- senderManagement . deleteSender ( { senderId : senderIdInvokingNotify } ) ;
47- senderManagement . deleteSender ( {
48- senderId : senderIdThatTriggersErrorInNotifySandbox ,
49- } ) ;
50- senderManagement . deleteSender ( { senderId : senderIdThatSkipsNotify } ) ;
51- }
52-
5338 test . beforeAll ( async ( ) => {
5439 await purgeQueue ( CORE_NOTIFIER_DLQ_NAME ) ;
5540 test . setTimeout ( 250_000 ) ;
56-
57- await deleteSendersIfExist ( ) ;
58- senderManagement . putSender ( {
59- senderId : senderIdInvokingNotify ,
60- senderName : 'componentTestSender_RoutingConfig' ,
61- meshMailboxSenderId : 'meshMailboxSender1' ,
62- meshMailboxReportsId : 'meshMailboxReports1' ,
63- routingConfigId : 'b838b13c-f98c-4def-93f0-515d4e4f4ee1' ,
64- fallbackWaitTimeSeconds : 100 ,
65- } ) ;
66-
67- senderManagement . putSender ( {
68- senderId : senderIdThatTriggersErrorInNotifySandbox ,
69- senderName : 'componentTestSender_RoutingConfig' ,
70- meshMailboxSenderId : 'meshMailboxSender2' ,
71- meshMailboxReportsId : 'meshMailboxReports2' ,
72- routingConfigId : 'invalid' ,
73- fallbackWaitTimeSeconds : 100 ,
74- } ) ;
75-
76- senderManagement . putSender ( {
77- senderId : senderIdThatSkipsNotify ,
78- senderName : 'componentTestSender_WithoutRoutingConfig' ,
79- meshMailboxSenderId : 'meshMailboxSender3' ,
80- meshMailboxReportsId : 'meshMailboxReports3' ,
81- fallbackWaitTimeSeconds : 100 ,
82- } ) ;
8341 } ) ;
8442
8543 test . afterAll ( async ( ) => {
8644 await purgeQueue ( CORE_NOTIFIER_DLQ_NAME ) ;
87- await deleteSendersIfExist ( ) ;
8845 } ) ;
8946
9047 test ( 'given PDMResourceAvailable event, when client has routingConfigId then a message is sent to core Notify' , async ( ) => {
@@ -99,7 +56,7 @@ test.describe('Digital Letters - Core Notify', () => {
9956 id : eventId ,
10057 data : {
10158 messageReference,
102- senderId : senderIdInvokingNotify ,
59+ senderId : SENDER_ID_VALID_FOR_NOTIFY_SANDBOX ,
10360 resourceId,
10461 nhsNumber : '9990548609' ,
10562 odsCode : 'A12345' ,
@@ -132,7 +89,7 @@ test.describe('Digital Letters - Core Notify', () => {
13289 `$.details.event_detail = "*\\"notifyId\\":\\"*\\"*"` ,
13390 `$.details.event_detail = "*\\"messageUri\\":\\"https://www.nhsapp.service.nhs.uk/digital-letters?letterid=${ resourceId } \\"*"` ,
13491 `$.details.event_detail = "*\\"messageReference\\":\\"${ messageReference } \\"*"` ,
135- `$.details.event_detail = "*\\"senderId\\":\\"${ senderIdInvokingNotify } \\"*"` ,
92+ `$.details.event_detail = "*\\"senderId\\":\\"${ SENDER_ID_VALID_FOR_NOTIFY_SANDBOX } \\"*"` ,
13693 ] ,
13794 ) ;
13895
@@ -152,7 +109,7 @@ test.describe('Digital Letters - Core Notify', () => {
152109 id : eventId ,
153110 data : {
154111 messageReference,
155- senderId : senderIdThatTriggersErrorInNotifySandbox ,
112+ senderId : SENDER_ID_THAT_TRIGGERS_ERROR_IN_NOTIFY_SANDBOX ,
156113 resourceId,
157114 nhsNumber : '9434765919' ,
158115 odsCode : 'A12345' ,
@@ -185,7 +142,7 @@ test.describe('Digital Letters - Core Notify', () => {
185142 `$.details.event_detail = "*\\"failureCode\\":\\"CM_INVALID_VALUE\\"*"` ,
186143 `$.details.event_detail = "*\\"messageUri\\":\\"https://www.nhsapp.service.nhs.uk/digital-letters?letterid=${ resourceId } \\"*"` ,
187144 `$.details.event_detail = "*\\"messageReference\\":\\"${ messageReference } \\"*"` ,
188- `$.details.event_detail = "*\\"senderId\\":\\"${ senderIdThatTriggersErrorInNotifySandbox } \\"*"` ,
145+ `$.details.event_detail = "*\\"senderId\\":\\"${ SENDER_ID_THAT_TRIGGERS_ERROR_IN_NOTIFY_SANDBOX } \\"*"` ,
189146 ] ,
190147 ) ;
191148
@@ -204,7 +161,7 @@ test.describe('Digital Letters - Core Notify', () => {
204161 id : eventId ,
205162 data : {
206163 messageReference,
207- senderId : senderIdThatSkipsNotify ,
164+ senderId : SENDER_ID_SKIPS_NOTIFY ,
208165 resourceId : 'resource-7777' ,
209166 nhsNumber : '9990548609' ,
210167 odsCode : 'A12345' ,
@@ -222,7 +179,7 @@ test.describe('Digital Letters - Core Notify', () => {
222179 '$.message_type = "EVENT_RECEIPT"' ,
223180 '$.details.detail_type = "uk.nhs.notify.digital.letters.messages.request.skipped.v1"' ,
224181 `$.details.event_detail = "*\\"messageReference\\":\\"${ messageReference } \\"*"` ,
225- `$.details.event_detail = "*\\"senderId\\":\\"${ senderIdThatSkipsNotify } \\"*"` ,
182+ `$.details.event_detail = "*\\"senderId\\":\\"${ SENDER_ID_SKIPS_NOTIFY } \\"*"` ,
226183 ] ,
227184 ) ;
228185
0 commit comments