Minor changes.

Author: wildjames

SAMtemplates/messaging/main.yaml

@@ -113,7 +113,7 @@ Resources:
       MessageRetentionPeriod: 86400    # 1 day in seconds
       RedrivePolicy:
         deadLetterTargetArn: !GetAtt PostDatedNotificationsDeadLetterQueue.Arn
-        maxReceiveCount: 13 # processed every 6 hours for 3 days, plus one for the first time it's placed on queue.
+        maxReceiveCount: 166 # 999 hours / 6 hours
       VisibilityTimeout: 300
 
   PostDatedNotificationsDeadLetterQueue:

packages/common/commonTypes/src/index.ts

@@ -34,6 +34,21 @@ export interface PostDatedNotifyDataItem extends NotifyDataItem {
   LineItemID: string
 }
 
+/**
+ * The structure of a single SQS message in a batch send.
+ * I couldn't find this type exported from the SDK, and the Message type that IS exported is for receiving data,
+ * not sending it.
+ *
+ * So, I've just done it myself. These are the core attrtibutes we use.
+ */
+export interface SQSBatchMessage {
+  Id: string
+  MessageBody: string
+  MessageDeduplicationId: string
+  MessageGroupId: string
+  MessageAttributes: {[key: string]: {DataType: string; StringValue: string}}
+}
+
 /**
  * The fields stored in the Notifications table potentially updated by the Notify callback.
  */

packages/updatePrescriptionStatus/src/utils/sqsClient.ts

@@ -8,19 +8,12 @@ import {
   NotifyDataItem,
   PostDatedNotifyDataItem,
   PSUDataItem,
-  PSUDataItemWithPrevious
+  PSUDataItemWithPrevious,
+  SQSBatchMessage
 } from "@psu-common/commonTypes"
 
 import {checkSiteOrSystemIsNotifyEnabled} from "../validation/notificationSiteAndSystemFilters"
 
-type SQSBatchMessage = {
-  Id: string
-  MessageBody: string
-  MessageDeduplicationId: string
-  MessageGroupId: string
-  MessageAttributes: {[key: string]: {DataType: string; StringValue: string}}
-}
-
 const sqsUrl: string | undefined = process.env.NHS_NOTIFY_PRESCRIPTIONS_SQS_QUEUE_URL
 const postDatedSqsUrl: string | undefined = process.env.POST_DATED_PRESCRIPTIONS_SQS_QUEUE_URL