Skip to content

Commit 517b4c2

Browse files
authored
Merge pull request #802 from NHSDigital/DTOSS-11767
Removed send_message_batch functionality
2 parents 0aa198e + b1dd034 commit 517b4c2

File tree

8 files changed

+4
-650
lines changed

8 files changed

+4
-650
lines changed

docs/diagrams/workspace.dsl

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,6 @@ workspace {
4242
technology "Event driven container app job"
4343
tags job
4444
}
45-
send_message_batch = component "Send message batch / Retry failed message batch" "2 separate jobs" {
46-
technology "Event driven container app job"
47-
tags job
48-
}
4945
create_appointments = component "Create appointments" {
5046
technology "Event driven container app job"
5147
tags job
@@ -126,10 +122,6 @@ workspace {
126122
store_mesh_messages -> mesh "Fetches appointments from" {
127123
tags store_mesh
128124
}
129-
send_message_batch -> notify "Sends message requests"
130-
send_message_batch -> retry_queue "Sends failed batches" {
131-
tags send_retry
132-
}
133125
create_appointments -> mesh_blob_container "Gets MESH messages"
134126
store_mesh_messages -> mesh_blob_container "Stores MESH messages"
135127
create_report -> reports_blob_container "Stores message status reports"

infrastructure/modules/container-apps/jobs.tf

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,6 @@ locals {
1616
job_short_name = "cap"
1717
job_container_args = "create_appointments"
1818
}
19-
send_message_batch = {
20-
21-
# cron_expression = "0,30 9 * * 1-5"
22-
cron_expression = null
23-
environment_variables = {
24-
API_OAUTH_TOKEN_URL = var.api_oauth_token_url
25-
NHS_NOTIFY_API_MESSAGE_BATCH_URL = var.nhs_notify_api_message_batch_url
26-
RETRY_QUEUE_NAME = "notifications-message-batch-retries"
27-
}
28-
job_short_name = "smb"
29-
job_container_args = "send_message_batch"
30-
}
3119
save_message_status = {
3220
# cron_expression = "0,30 * * * *"
3321
cron_expression = null

manage_breast_screening/notifications/README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,8 @@ The test performs the following steps:
7373
1. Uploads test data to a non-production MESH inbox
7474
2. Calls the `store_mesh_messages` Django admin command via the deployed container app job.
7575
3. Calls the `create_appointments` command which processes the test data and creates 1 clinic and 1 appointment.
76-
4. Calls `send_message_batch` which sends an appointment invite via integration NHS Notify API
77-
5. Calls `create_reports --smoke-test` which generates a smoke test specific report for the test data.
78-
6. Downloads the report from blob storage and verifies the contents.
76+
4. Calls `create_reports --smoke-test` which generates a smoke test specific report for the test data.
77+
5. Downloads the report from blob storage and verifies the contents.
7978

8079
To run the smoke test on a deployed environment:
8180

manage_breast_screening/notifications/management/commands/send_message_batch.py

Lines changed: 0 additions & 97 deletions
This file was deleted.

0 commit comments

Comments
 (0)