Merge branch 'master' into fix/callback

opengovsg · Jul 6, 2023 · f19331a · f19331a
2 parents 2e11f63 + 59cfda3
commit f19331a
Showing 1 changed file with 21 additions and 6 deletions.
diff --git a/worker/src/core/loaders/message-worker/util/govsg.class.ts b/worker/src/core/loaders/message-worker/util/govsg.class.ts
@@ -165,12 +165,27 @@ class Govsg {
           }
         )
       }
-      return validatedWhatsAppIds
-        .filter((message) => message.status === 'valid')
-        .map((message) => ({
-          ...message,
-          body: '', // just putting this in to satisfy the interface grrr
-        }))
+
+      const validMessages = validatedWhatsAppIds.filter(
+        (message) => message.status === 'valid'
+      )
+
+      if (validMessages.length === 0) {
+        // Has to run one more time get_messages db function to set the job
+        // queue item to `SENT` if needed
+        await this.postmanConnection.query(
+          'SELECT get_messages_to_send_govsg(:jobId, :rate);',
+          {
+            replacements: { jobId, rate },
+            type: QueryTypes.SELECT,
+          }
+        )
+      }
+
+      return validMessages.map((message) => ({
+        ...message,
+        body: '', // just putting this in to satisfy the interface grrr
+      }))
     } catch (error) {
       logger.error({
         message: '[govsg.class.getMessages] Error processing messages',