Merge pull request #2325 from HHS/kw-fix-on-demand-email-notifications

[TTAHUB-3311] Resolve issues with on-demand AR email notifications
HHS · Aug 22, 2024 · fc40478 · fc40478
2 parents 2bd50ba + f2588cb
commit fc40478
Show file tree

Hide file tree

Showing 6 changed files with 71 additions and 559 deletions.
diff --git a/frontend/package.json b/frontend/package.json
@@ -58,7 +58,8 @@
     "sass": "^1.51.0",
     "url-join": "^4.0.1",
     "use-deep-compare-effect": "^1.6.1",
-    "uuid": "^8.3.2"
+    "uuid": "^8.3.2",
+    "micromatch": "^4.0.7"
   },
   "engines": {
     "node": "18.20.3"

diff --git a/frontend/yarn-audit-known-issues b/frontend/yarn-audit-known-issues
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
@@ -8320,6 +8320,14 @@ micromatch@^4.0.2, micromatch@^4.0.4, micromatch@^4.0.5:
     braces "^3.0.2"
     picomatch "^2.3.1"
 
+micromatch@^4.0.7:
+  version "4.0.7"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.7.tgz#33e8190d9fe474a9895525f5618eee136d46c2e5"
+  integrity sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==
+  dependencies:
+    braces "^3.0.3"
+    picomatch "^2.3.1"
+
 [email protected], "mime-db@>= 1.43.0 < 2":
   version "1.52.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"

diff --git a/package.json b/package.json
@@ -129,7 +129,8 @@
     "http-cache-semantics": "^4.1.1",
     "xml2js": "^0.5.0",
     "semver": "^7.5.3",
-    "tough-cookie": "^4.1.3"
+    "tough-cookie": "^4.1.3",
+    "micromatch": "^4.0.7"
   },
   "eslintConfig": {
     "extends": [

diff --git a/src/lib/mailer/index.js b/src/lib/mailer/index.js
@@ -1014,7 +1014,7 @@ export const processNotificationQueue = () => {
   notificationQueue.process(
     EMAIL_ACTIONS.NEEDS_ACTION,
     transactionQueueWrapper(
-      notifyApproverAssigned,
+      notifyChangesRequested,
       EMAIL_ACTIONS.NEEDS_ACTION,
     ),
   );
@@ -1030,23 +1030,23 @@ export const processNotificationQueue = () => {
   notificationQueue.process(
     EMAIL_ACTIONS.APPROVED,
     transactionQueueWrapper(
-      notifyApproverAssigned,
+      notifyReportApproved,
       EMAIL_ACTIONS.APPROVED,
     ),
   );
 
   notificationQueue.process(
     EMAIL_ACTIONS.COLLABORATOR_ADDED,
     transactionQueueWrapper(
-      notifyApproverAssigned,
+      notifyCollaboratorAssigned,
       EMAIL_ACTIONS.COLLABORATOR_ADDED,
     ),
   );
 
   notificationQueue.process(
     EMAIL_ACTIONS.RECIPIENT_REPORT_APPROVED,
     transactionQueueWrapper(
-      notifyApproverAssigned,
+      notifyRecipientReportApproved,
       EMAIL_ACTIONS.RECIPIENT_REPORT_APPROVED,
     ),
   );