From 7fc8cbcca425700f31062e8a3b9d9b0e10075d81 Mon Sep 17 00:00:00 2001
From: Patrick Fic <snaptsoft@gmail.com>
Date: Thu, 22 Sep 2022 14:46:08 -0700
Subject: [PATCH] IO-2061 Handled Bounced Emails.

---
 bodyshop_translations.babel                   | 23 ++++++-
 .../email-audit-trail-list.component.jsx      |  9 ++-
 .../job-audit-trail.component.jsx             |  5 ++
 client/src/translations/en_us/common.json     |  1 +
 client/src/translations/es/common.json        |  1 +
 client/src/translations/fr/common.json        |  1 +
 hasura/MigrationResolution.md                 | 24 ++++++++
 hasura/metadata/tables.yaml                   | 19 +++---
 .../down.sql                                  |  4 ++
 .../up.sql                                    |  2 +
 .../down.sql                                  |  1 +
 .../up.sql                                    |  2 +
 .../down.sql                                  |  4 ++
 .../up.sql                                    |  2 +
 .../down.sql                                  |  4 ++
 .../up.sql                                    |  2 +
 server.js                                     |  6 +-
 server/email/sendemail.js                     | 60 +++++++++++++++++++
 server/graphql-client/queries.js              |  9 +++
 19 files changed, 165 insertions(+), 14 deletions(-)
 create mode 100644 hasura/MigrationResolution.md
 create mode 100644 hasura/migrations/1663878151393_alter_table_public_email_audit_trail_add_column_sesmessageid/down.sql
 create mode 100644 hasura/migrations/1663878151393_alter_table_public_email_audit_trail_add_column_sesmessageid/up.sql
 create mode 100644 hasura/migrations/1663878178548_create_index_email_audit_trail_sesmessageid/down.sql
 create mode 100644 hasura/migrations/1663878178548_create_index_email_audit_trail_sesmessageid/up.sql
 create mode 100644 hasura/migrations/1663878700494_alter_table_public_email_audit_trail_add_column_status/down.sql
 create mode 100644 hasura/migrations/1663878700494_alter_table_public_email_audit_trail_add_column_status/up.sql
 create mode 100644 hasura/migrations/1663878730170_alter_table_public_email_audit_trail_add_column_status_context/down.sql
 create mode 100644 hasura/migrations/1663878730170_alter_table_public_email_audit_trail_add_column_status_context/up.sql

diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index 25c76f851..a960152c9 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -1,4 +1,4 @@
-<babeledit_project be_version="2.7.1" version="1.2">
+<babeledit_project version="1.2" be_version="2.7.1">
     <!--
 
     BabelEdit project file
@@ -1233,6 +1233,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>status</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>subject</name>
                                         <definition_loaded>false</definition_loaded>
diff --git a/client/src/components/audit-trail-list/email-audit-trail-list.component.jsx b/client/src/components/audit-trail-list/email-audit-trail-list.component.jsx
index e40c6b7ed..db529df5f 100644
--- a/client/src/components/audit-trail-list/email-audit-trail-list.component.jsx
+++ b/client/src/components/audit-trail-list/email-audit-trail-list.component.jsx
@@ -1,9 +1,8 @@
-import React, { useState } from "react";
 import { Table } from "antd";
-import { alphaSort } from "../../utils/sorters";
-import { DateTimeFormatter } from "../../utils/DateFormatter";
+import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
-import AuditTrailValuesComponent from "../audit-trail-values/audit-trail-values.component";
+import { DateTimeFormatter } from "../../utils/DateFormatter";
+import { alphaSort } from "../../utils/sorters";
 
 export default function EmailAuditTrailListComponent({ loading, data }) {
   const [state, setState] = useState({
@@ -11,7 +10,7 @@ export default function EmailAuditTrailListComponent({ loading, data }) {
     filteredInfo: {},
   });
   const { t } = useTranslation();
-  const columns = [
+  const columns = [ 
     {
       title: t("audit.fields.created"),
       dataIndex: " created",
diff --git a/client/src/components/job-audit-trail/job-audit-trail.component.jsx b/client/src/components/job-audit-trail/job-audit-trail.component.jsx
index a5d32562c..a4349f9f5 100644
--- a/client/src/components/job-audit-trail/job-audit-trail.component.jsx
+++ b/client/src/components/job-audit-trail/job-audit-trail.component.jsx
@@ -85,6 +85,11 @@ export function JobAuditTrail({ currentUser, jobId }) {
       dataIndex: "subject",
       key: "subject",
     },
+    {
+      title: t("audit.fields.status"),
+      dataIndex: "status",
+      key: "status",
+    },
     ...(currentUser?.email.includes("@imex.")
       ? [
           {
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index 299c554fa..288d2b7a6 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -86,6 +86,7 @@
 				"contents": "Contents",
 				"created": "Time",
 				"operation": "Operation",
+				"status": "Status",
 				"subject": "Subject",
 				"to": "To",
 				"useremail": "User",
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index bd8f3bcb2..0b1bc7a5b 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -86,6 +86,7 @@
 				"contents": "",
 				"created": "",
 				"operation": "",
+				"status": "",
 				"subject": "",
 				"to": "",
 				"useremail": "",
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index a79c49a92..8093ec878 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -86,6 +86,7 @@
 				"contents": "",
 				"created": "",
 				"operation": "",
+				"status": "",
 				"subject": "",
 				"to": "",
 				"useremail": "",
diff --git a/hasura/MigrationResolution.md b/hasura/MigrationResolution.md
new file mode 100644
index 000000000..e76a8d91b
--- /dev/null
+++ b/hasura/MigrationResolution.md
@@ -0,0 +1,24 @@
+Issue when migrating events resolved by running SQL below. User needed updating when running in prod. 
+
+CREATE TABLE IF NOT EXISTS hdb_catalog.hdb_source_catalog_version
+(
+    version text COLLATE pg_catalog."default" NOT NULL,
+    upgraded_on timestamp with time zone NOT NULL
+)
+
+TABLESPACE pg_default;
+
+ALTER TABLE hdb_catalog.hdb_source_catalog_version
+    OWNER to postgres;
+-- Index: hdb_source_catalog_version_one_row
+
+-- DROP INDEX hdb_catalog.hdb_source_catalog_version_one_row;
+
+CREATE UNIQUE INDEX hdb_source_catalog_version_one_row
+    ON hdb_catalog.hdb_source_catalog_version USING btree
+    ((version IS NOT NULL) ASC NULLS LAST)
+    TABLESPACE pg_default;
+
+INSERT INTO hdb_catalog.hdb_source_catalog_version (version, upgraded_on) VALUES ('2', NOW());
+
+https://devscope.io/code/hasura/graphql-engine/issues/8694
\ No newline at end of file
diff --git a/hasura/metadata/tables.yaml b/hasura/metadata/tables.yaml
index 679599d31..2a338443a 100644
--- a/hasura/metadata/tables.yaml
+++ b/hasura/metadata/tables.yaml
@@ -1882,17 +1882,19 @@
     - role: user
       permission:
         columns:
-          - cc
-          - to
-          - contents
-          - subject
-          - useremail
-          - created_at
-          - updated_at
           - bodyshopid
+          - cc
+          - contents
+          - created_at
           - id
           - jobid
           - noteid
+          - status
+          - status_context
+          - subject
+          - to
+          - updated_at
+          - useremail
         filter:
           bodyshop:
             associations:
@@ -3139,6 +3141,7 @@
           - po_number
           - policy_no
           - production_vars
+          - qb_multiple_payers
           - queued_for_parts
           - rate_ats
           - rate_la1
@@ -3401,6 +3404,7 @@
           - po_number
           - policy_no
           - production_vars
+          - qb_multiple_payers
           - queued_for_parts
           - rate_ats
           - rate_la1
@@ -3673,6 +3677,7 @@
           - po_number
           - policy_no
           - production_vars
+          - qb_multiple_payers
           - queued_for_parts
           - rate_ats
           - rate_la1
diff --git a/hasura/migrations/1663878151393_alter_table_public_email_audit_trail_add_column_sesmessageid/down.sql b/hasura/migrations/1663878151393_alter_table_public_email_audit_trail_add_column_sesmessageid/down.sql
new file mode 100644
index 000000000..7114807d7
--- /dev/null
+++ b/hasura/migrations/1663878151393_alter_table_public_email_audit_trail_add_column_sesmessageid/down.sql
@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."email_audit_trail" add column "sesmessageid" text
+--  null;
diff --git a/hasura/migrations/1663878151393_alter_table_public_email_audit_trail_add_column_sesmessageid/up.sql b/hasura/migrations/1663878151393_alter_table_public_email_audit_trail_add_column_sesmessageid/up.sql
new file mode 100644
index 000000000..425c99dc4
--- /dev/null
+++ b/hasura/migrations/1663878151393_alter_table_public_email_audit_trail_add_column_sesmessageid/up.sql
@@ -0,0 +1,2 @@
+alter table "public"."email_audit_trail" add column "sesmessageid" text
+ null;
diff --git a/hasura/migrations/1663878178548_create_index_email_audit_trail_sesmessageid/down.sql b/hasura/migrations/1663878178548_create_index_email_audit_trail_sesmessageid/down.sql
new file mode 100644
index 000000000..f30f8bc2f
--- /dev/null
+++ b/hasura/migrations/1663878178548_create_index_email_audit_trail_sesmessageid/down.sql
@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."email_audit_trail_sesmessageid";
diff --git a/hasura/migrations/1663878178548_create_index_email_audit_trail_sesmessageid/up.sql b/hasura/migrations/1663878178548_create_index_email_audit_trail_sesmessageid/up.sql
new file mode 100644
index 000000000..f76d9d4f5
--- /dev/null
+++ b/hasura/migrations/1663878178548_create_index_email_audit_trail_sesmessageid/up.sql
@@ -0,0 +1,2 @@
+CREATE  INDEX "email_audit_trail_sesmessageid" on
+  "public"."email_audit_trail" using btree ("sesmessageid");
diff --git a/hasura/migrations/1663878700494_alter_table_public_email_audit_trail_add_column_status/down.sql b/hasura/migrations/1663878700494_alter_table_public_email_audit_trail_add_column_status/down.sql
new file mode 100644
index 000000000..d6da1de21
--- /dev/null
+++ b/hasura/migrations/1663878700494_alter_table_public_email_audit_trail_add_column_status/down.sql
@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."email_audit_trail" add column "status" text
+--  null;
diff --git a/hasura/migrations/1663878700494_alter_table_public_email_audit_trail_add_column_status/up.sql b/hasura/migrations/1663878700494_alter_table_public_email_audit_trail_add_column_status/up.sql
new file mode 100644
index 000000000..8aeb3483b
--- /dev/null
+++ b/hasura/migrations/1663878700494_alter_table_public_email_audit_trail_add_column_status/up.sql
@@ -0,0 +1,2 @@
+alter table "public"."email_audit_trail" add column "status" text
+ null;
diff --git a/hasura/migrations/1663878730170_alter_table_public_email_audit_trail_add_column_status_context/down.sql b/hasura/migrations/1663878730170_alter_table_public_email_audit_trail_add_column_status_context/down.sql
new file mode 100644
index 000000000..3fa5ac991
--- /dev/null
+++ b/hasura/migrations/1663878730170_alter_table_public_email_audit_trail_add_column_status_context/down.sql
@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."email_audit_trail" add column "status_context" jsonb
+--  null default jsonb_build_array();
diff --git a/hasura/migrations/1663878730170_alter_table_public_email_audit_trail_add_column_status_context/up.sql b/hasura/migrations/1663878730170_alter_table_public_email_audit_trail_add_column_status_context/up.sql
new file mode 100644
index 000000000..14ca5dd3a
--- /dev/null
+++ b/hasura/migrations/1663878730170_alter_table_public_email_audit_trail_add_column_status_context/up.sql
@@ -0,0 +1,2 @@
+alter table "public"."email_audit_trail" add column "status_context" jsonb
+ null default jsonb_build_array();
diff --git a/server.js b/server.js
index e6cbb7e5c..1780ab1d5 100644
--- a/server.js
+++ b/server.js
@@ -64,6 +64,11 @@ app.use(
 //Email Based Paths.
 var sendEmail = require("./server/email/sendemail.js");
 app.post("/sendemail", fb.validateFirebaseIdToken, sendEmail.sendEmail);
+app.post(
+  "/emailbounce",
+bodyParser.text(),
+  sendEmail.emailBounce
+);
 
 //Test route to ensure Express is responding.
 app.get("/test", async function (req, res) {
@@ -238,7 +243,6 @@ app.get("/", async function (req, res) {
   res.status(200).send("Access Forbidden.");
 });
 
-
 server.listen(port, (error) => {
   if (error) throw error;
   logger.log(
diff --git a/server/email/sendemail.js b/server/email/sendemail.js
index 40f5ecf79..c585b4815 100644
--- a/server/email/sendemail.js
+++ b/server/email/sendemail.js
@@ -148,6 +148,7 @@ exports.sendEmail = async (req, res) => {
           to: req.body.to,
           cc: req.body.cc,
           subject: req.body.subject,
+          messageId: info.messageId,
         });
         res.json({
           success: true, //response: info
@@ -190,6 +191,8 @@ async function logEmail(req, email) {
         useremail: req.user.email,
         contents: req.body.html,
         jobid: req.body.jobid,
+        sesmessageid: email.messageId,
+        status: "Sent",
       },
     });
   } catch (error) {
@@ -202,3 +205,60 @@ async function logEmail(req, email) {
     });
   }
 }
+
+exports.emailBounce = async function (req, res, next) {
+  try {
+    const body = JSON.parse(req.body);
+    if (body.type === "SubscriptionConfirmation") {
+      logger.log("SNS-confirmation", "DEBUG", "api", null, {
+        message: body.message,
+        url: body.SubscribeUrl,
+        body: body,
+      });
+    }
+    if (body.Type === "Notification") {
+      const message = JSON.parse(body.Message);
+      let replyTo, subject, messageId;
+      message.mail.headers.forEach((header) => {
+        if (header.name === "Reply-To") {
+          replyTo = header.value;
+        } else if (header.name === "Subject") {
+          subject = header.value;
+        } else if (header.name === "Message-ID") {
+          messageId = header.value;
+        }
+      });
+      //If it's bounced, log it as bounced in audit log. Send an email to the user.
+      const result = await client.request(queries.UPDATE_EMAIL_AUDIT, {
+        sesid: messageId,
+        status: "Bounced",
+        context: message.bounce?.bouncedRecipients,
+      });
+      transporter.sendMail(
+        {
+          from: `ImEX Online <noreply@imex.online>`,
+          to: "patrick@snapt.ca", // replyTo,
+          bcc: "patrick@snapt.ca",
+          subject: `ImEX Online Bounced Email - RE: ${subject}`,
+          text: `
+        ImEX Online has tried to deliver an email with the subject: ${subject} to the intended recipients but encountered an error.
+
+        ${message.bounce?.bouncedRecipients.map(
+          (r) =>
+            `Recipient: ${r.emailAddress} | Status: ${r.action} | Code: ${r.diagnosticCode}
+            `
+        )}
+        `,
+        },
+        (err, info) => {
+          console.log("***", err || info);
+        }
+      );
+    }
+  } catch (error) {
+    logger.log("sns-error", "ERROR", "api", null, {
+      error: JSON.stringify(error),
+    });
+  }
+  res.sendStatus(200);
+};
diff --git a/server/graphql-client/queries.js b/server/graphql-client/queries.js
index db92f3c0e..b7a49e3d1 100644
--- a/server/graphql-client/queries.js
+++ b/server/graphql-client/queries.js
@@ -1621,3 +1621,12 @@ mutation DELETE_DOCUMENTS($ids: [uuid!]!) {
   }
 }
 `;
+
+exports.UPDATE_EMAIL_AUDIT = `
+mutation ($sesid: String!, $status: String, $context: jsonb) {
+  update_email_audit_trail(where: {sesmessageid: {_eq: $sesid}}, _set: {status: $status, status_context: $context}) {
+    returning {
+      contents
+    }
+  }
+}`;