From a6525f3b287aa5efe5185768a0f77f5be27aa86c Mon Sep 17 00:00:00 2001
From: Dylan Leard <dylan@button.is>
Date: Fri, 8 May 2020 11:02:29 -0700
Subject: [PATCH 1/4] feat(certification): update submit certification request
 UI

---
 .../ApplicationWizardConfirmation.tsx         | 67 ++++++++++---------
 1 file changed, 37 insertions(+), 30 deletions(-)

diff --git a/app/containers/Applications/ApplicationWizardConfirmation.tsx b/app/containers/Applications/ApplicationWizardConfirmation.tsx
index c7670d4f4e..034c8bedf4 100644
--- a/app/containers/Applications/ApplicationWizardConfirmation.tsx
+++ b/app/containers/Applications/ApplicationWizardConfirmation.tsx
@@ -22,6 +22,9 @@ interface Target extends EventTarget {
   email: {
     value: string;
   };
+  sendEmailChecked: {
+    checked: boolean;
+  };
 }
 
 export const ApplicationWizardConfirmationComponent: React.FunctionComponent<Props> = (
@@ -45,6 +48,7 @@ export const ApplicationWizardConfirmationComponent: React.FunctionComponent<Pro
     e.preventDefault();
     e.persist();
     const email = (e.target as Target).email.value;
+    // Const sendEmail = (e.target as Target).sendEmailChecked.checked;
     const {environment} = props.relay;
     const variables = {
       input: {
@@ -97,27 +101,38 @@ export const ApplicationWizardConfirmationComponent: React.FunctionComponent<Pro
   const generateCertification = (
     <>
       <br />
-      <Form onSubmit={handleClickGenerateCertificationUrl}>
-        <Form.Row>
-          <Col md={6}>
-            <Form.Group controlId="certifierEmail">
-              <Form.Control
-                name="email"
-                type="email"
-                placeholder="Enter email"
+      <Card>
+        <Card.Header>Application Certification</Card.Header>
+        <Card.Body>
+          <Card.Text>
+            Once you have reviewed the application and ensured all the data is
+            correct, the application has to be certified.
+          </Card.Text>
+          <Form onSubmit={handleClickGenerateCertificationUrl}>
+            <Form.Row>
+              <Form.Group as={Col} md="4" controlId="certifierEmail">
+                <Form.Control
+                  name="email"
+                  type="email"
+                  placeholder="Certifier Email"
+                />
+              </Form.Group>
+            </Form.Row>
+            <Form.Group>
+              <Form.Check
+                className="text-muted"
+                name="sendEmailChecked"
+                type="checkbox"
+                label="Notify certifier via email that this application is ready for certification"
               />
-              <Form.Text className="text-muted">
-                Send URL to certifier
-              </Form.Text>
             </Form.Group>
-          </Col>
-          <Col md={2}>
-            <Button variant="primary" type="submit">
-              Send to Certifier
+            <Button variant="info" type="submit">
+              Submit for Certification
             </Button>
-          </Col>
-        </Form.Row>
-      </Form>
+          </Form>
+        </Card.Body>
+        <Card.Footer />
+      </Card>
     </>
   );
 
@@ -141,20 +156,12 @@ export const ApplicationWizardConfirmationComponent: React.FunctionComponent<Pro
   );
 
   if (!revision.certificationUrl) {
-    certificationMessage = (
+    certificationMessage = url ? (
       <>
-        <h5>
-          Thank you for reviewing the application information. You may now send
-          a generated Certification url to be signed prior to submission.
-        </h5>
-        {url ? (
-          <>
-            <span style={{color: 'green'}}>{copySuccess}</span> {copyUrl}
-          </>
-        ) : (
-          generateCertification
-        )}
+        <span style={{color: 'green'}}>{copySuccess}</span> {copyUrl}
       </>
+    ) : (
+      generateCertification
     );
   } else if (
     !revision.certificationUrl.certificationSignature &&

From 3fcac3d80aa82f4339f74be1e68a5fc6eb4c5d5c Mon Sep 17 00:00:00 2001
From: Dylan Leard <dylan@button.is>
Date: Fri, 8 May 2020 11:24:18 -0700
Subject: [PATCH 2/4] feat(certification)\!: add 'send_certification_email'
 boolean to certification_url table & update trigger to use it

---
 .../ApplicationWizardConfirmation.tsx         |   5 +-
 app/server/schema.graphql                     |  52 ++++--
 app/server/schema.json                        | 156 ++++++++++++------
 schema/deploy/tables/certification_url.sql    |  10 +-
 .../run_graphile_worker_job.sql               |  63 +++----
 schema/verify/tables/certification_url.sql    |   2 +-
 6 files changed, 186 insertions(+), 102 deletions(-)

diff --git a/app/containers/Applications/ApplicationWizardConfirmation.tsx b/app/containers/Applications/ApplicationWizardConfirmation.tsx
index 034c8bedf4..66590a52d3 100644
--- a/app/containers/Applications/ApplicationWizardConfirmation.tsx
+++ b/app/containers/Applications/ApplicationWizardConfirmation.tsx
@@ -48,7 +48,7 @@ export const ApplicationWizardConfirmationComponent: React.FunctionComponent<Pro
     e.preventDefault();
     e.persist();
     const email = (e.target as Target).email.value;
-    // Const sendEmail = (e.target as Target).sendEmailChecked.checked;
+    const sendEmail = (e.target as Target).sendEmailChecked.checked;
     const {environment} = props.relay;
     const variables = {
       input: {
@@ -84,7 +84,8 @@ export const ApplicationWizardConfirmationComponent: React.FunctionComponent<Pro
             }/certifier/certification-redirect?rowId=${encodeURIComponent(
               response.createCertificationUrl.certificationUrl.rowId
             )}&id=${encodeURIComponent(props.application.id)}`,
-            certificationRequestSentTo: email
+            certifierEmail: email,
+            sendCertificationEmail: sendEmail
           }
         }
       };
diff --git a/app/server/schema.graphql b/app/server/schema.graphql
index dfa6ff7ff5..c9b79834f4 100644
--- a/app/server/schema.graphql
+++ b/app/server/schema.graphql
@@ -1249,9 +1249,6 @@ type CertificationUrl implements Node {
   """The time at which the certification request was sent"""
   certificationRequestSentAt: Datetime
 
-  """The email that the certification request was sent to"""
-  certificationRequestSentTo: String
-
   """The base64 representation of the certifier's signature"""
   certificationSignature: String
 
@@ -1261,6 +1258,9 @@ type CertificationUrl implements Node {
   """The user id of the certifier references ggircs_portal.ciip_user"""
   certifiedBy: Int
 
+  """The email that the certification request was sent to"""
+  certifierEmail: String
+
   """The URL sent to the certifier"""
   certifierUrl: String
 
@@ -1313,6 +1313,11 @@ type CertificationUrl implements Node {
   """Unique ID for the certification_url"""
   rowId: String!
 
+  """
+  User defined boolean indicates whether to send an email to the certifier
+  """
+  sendCertificationRequest: Boolean!
+
   """Last update date of row"""
   updatedAt: Datetime!
 
@@ -1338,11 +1343,6 @@ input CertificationUrlCondition {
   """
   certificationRequestSentAt: Datetime
 
-  """
-  Checks for equality with the object’s `certificationRequestSentTo` field.
-  """
-  certificationRequestSentTo: String
-
   """Checks for equality with the object’s `certificationSignature` field."""
   certificationSignature: String
 
@@ -1352,6 +1352,9 @@ input CertificationUrlCondition {
   """Checks for equality with the object’s `certifiedBy` field."""
   certifiedBy: Int
 
+  """Checks for equality with the object’s `certifierEmail` field."""
+  certifierEmail: String
+
   """Checks for equality with the object’s `certifierUrl` field."""
   certifierUrl: String
 
@@ -1381,6 +1384,11 @@ input CertificationUrlCondition {
   """Checks for equality with the object’s `rowId` field."""
   rowId: String
 
+  """
+  Checks for equality with the object’s `sendCertificationRequest` field.
+  """
+  sendCertificationRequest: Boolean
+
   """Checks for equality with the object’s `updatedAt` field."""
   updatedAt: Datetime
 
@@ -1399,9 +1407,6 @@ input CertificationUrlInput {
   """The time at which the certification request was sent"""
   certificationRequestSentAt: Datetime
 
-  """The email that the certification request was sent to"""
-  certificationRequestSentTo: String
-
   """The base64 representation of the certifier's signature"""
   certificationSignature: String
 
@@ -1411,6 +1416,9 @@ input CertificationUrlInput {
   """The user id of the certifier references ggircs_portal.ciip_user"""
   certifiedBy: Int
 
+  """The email that the certification request was sent to"""
+  certifierEmail: String
+
   """The URL sent to the certifier"""
   certifierUrl: String
 
@@ -1440,6 +1448,11 @@ input CertificationUrlInput {
   """Unique ID for the certification_url"""
   rowId: String!
 
+  """
+  User defined boolean indicates whether to send an email to the certifier
+  """
+  sendCertificationRequest: Boolean
+
   """Last update date of row"""
   updatedAt: Datetime
 
@@ -1462,9 +1475,6 @@ input CertificationUrlPatch {
   """The time at which the certification request was sent"""
   certificationRequestSentAt: Datetime
 
-  """The email that the certification request was sent to"""
-  certificationRequestSentTo: String
-
   """The base64 representation of the certifier's signature"""
   certificationSignature: String
 
@@ -1474,6 +1484,9 @@ input CertificationUrlPatch {
   """The user id of the certifier references ggircs_portal.ciip_user"""
   certifiedBy: Int
 
+  """The email that the certification request was sent to"""
+  certifierEmail: String
+
   """The URL sent to the certifier"""
   certifierUrl: String
 
@@ -1503,6 +1516,11 @@ input CertificationUrlPatch {
   """Unique ID for the certification_url"""
   rowId: String
 
+  """
+  User defined boolean indicates whether to send an email to the certifier
+  """
+  sendCertificationRequest: Boolean
+
   """Last update date of row"""
   updatedAt: Datetime
 
@@ -1549,14 +1567,14 @@ enum CertificationUrlsOrderBy {
   APPLICATION_ID_DESC
   CERTIFICATION_REQUEST_SENT_AT_ASC
   CERTIFICATION_REQUEST_SENT_AT_DESC
-  CERTIFICATION_REQUEST_SENT_TO_ASC
-  CERTIFICATION_REQUEST_SENT_TO_DESC
   CERTIFICATION_SIGNATURE_ASC
   CERTIFICATION_SIGNATURE_DESC
   CERTIFIED_AT_ASC
   CERTIFIED_AT_DESC
   CERTIFIED_BY_ASC
   CERTIFIED_BY_DESC
+  CERTIFIER_EMAIL_ASC
+  CERTIFIER_EMAIL_DESC
   CERTIFIER_URL_ASC
   CERTIFIER_URL_DESC
   CREATED_AT_ASC
@@ -1578,6 +1596,8 @@ enum CertificationUrlsOrderBy {
   PRIMARY_KEY_DESC
   RECERTIFICATION_REQUEST_SENT_ASC
   RECERTIFICATION_REQUEST_SENT_DESC
+  SEND_CERTIFICATION_REQUEST_ASC
+  SEND_CERTIFICATION_REQUEST_DESC
   UPDATED_AT_ASC
   UPDATED_AT_DESC
   UPDATED_BY_ASC
diff --git a/app/server/schema.json b/app/server/schema.json
index 9a4c228aab..4ed658b1aa 100644
--- a/app/server/schema.json
+++ b/app/server/schema.json
@@ -13079,16 +13079,6 @@
               },
               "defaultValue": null
             },
-            {
-              "name": "certificationRequestSentTo",
-              "description": "Checks for equality with the object’s `certificationRequestSentTo` field.",
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
-              "defaultValue": null
-            },
             {
               "name": "certificationSignature",
               "description": "Checks for equality with the object’s `certificationSignature` field.",
@@ -13119,6 +13109,16 @@
               },
               "defaultValue": null
             },
+            {
+              "name": "certifierEmail",
+              "description": "Checks for equality with the object’s `certifierEmail` field.",
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
             {
               "name": "certifierUrl",
               "description": "Checks for equality with the object’s `certifierUrl` field.",
@@ -13209,6 +13209,16 @@
               },
               "defaultValue": null
             },
+            {
+              "name": "sendCertificationRequest",
+              "description": "Checks for equality with the object’s `sendCertificationRequest` field.",
+              "type": {
+                "kind": "SCALAR",
+                "name": "Boolean",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
             {
               "name": "updatedAt",
               "description": "Checks for equality with the object’s `updatedAt` field.",
@@ -13277,49 +13287,49 @@
               "deprecationReason": null
             },
             {
-              "name": "CERTIFICATION_REQUEST_SENT_TO_ASC",
+              "name": "CERTIFICATION_SIGNATURE_ASC",
               "description": null,
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "CERTIFICATION_REQUEST_SENT_TO_DESC",
+              "name": "CERTIFICATION_SIGNATURE_DESC",
               "description": null,
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "CERTIFICATION_SIGNATURE_ASC",
+              "name": "CERTIFIED_AT_ASC",
               "description": null,
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "CERTIFICATION_SIGNATURE_DESC",
+              "name": "CERTIFIED_AT_DESC",
               "description": null,
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "CERTIFIED_AT_ASC",
+              "name": "CERTIFIED_BY_ASC",
               "description": null,
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "CERTIFIED_AT_DESC",
+              "name": "CERTIFIED_BY_DESC",
               "description": null,
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "CERTIFIED_BY_ASC",
+              "name": "CERTIFIER_EMAIL_ASC",
               "description": null,
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "CERTIFIED_BY_DESC",
+              "name": "CERTIFIER_EMAIL_DESC",
               "description": null,
               "isDeprecated": false,
               "deprecationReason": null
@@ -13450,6 +13460,18 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
+            {
+              "name": "SEND_CERTIFICATION_REQUEST_ASC",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "SEND_CERTIFICATION_REQUEST_DESC",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "UPDATED_AT_ASC",
               "description": null,
@@ -13669,8 +13691,8 @@
               "deprecationReason": null
             },
             {
-              "name": "certificationRequestSentTo",
-              "description": "The email that the certification request was sent to",
+              "name": "certificationSignature",
+              "description": "The base64 representation of the certifier's signature",
               "args": [],
               "type": {
                 "kind": "SCALAR",
@@ -13681,36 +13703,36 @@
               "deprecationReason": null
             },
             {
-              "name": "certificationSignature",
-              "description": "The base64 representation of the certifier's signature",
+              "name": "certifiedAt",
+              "description": "The timestamp of when the signature was added",
               "args": [],
               "type": {
                 "kind": "SCALAR",
-                "name": "String",
+                "name": "Datetime",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "certifiedAt",
-              "description": "The timestamp of when the signature was added",
+              "name": "certifiedBy",
+              "description": "The user id of the certifier references ggircs_portal.ciip_user",
               "args": [],
               "type": {
                 "kind": "SCALAR",
-                "name": "Datetime",
+                "name": "Int",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "certifiedBy",
-              "description": "The user id of the certifier references ggircs_portal.ciip_user",
+              "name": "certifierEmail",
+              "description": "The email that the certification request was sent to",
               "args": [],
               "type": {
                 "kind": "SCALAR",
-                "name": "Int",
+                "name": "String",
                 "ofType": null
               },
               "isDeprecated": false,
@@ -13912,6 +13934,22 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
+            {
+              "name": "sendCertificationRequest",
+              "description": "User defined boolean indicates whether to send an email to the certifier",
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Boolean",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "updatedAt",
               "description": "Last update date of row",
@@ -31088,16 +31126,6 @@
               },
               "defaultValue": null
             },
-            {
-              "name": "certificationRequestSentTo",
-              "description": "The email that the certification request was sent to",
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
-              "defaultValue": null
-            },
             {
               "name": "certificationSignature",
               "description": "The base64 representation of the certifier's signature",
@@ -31128,6 +31156,16 @@
               },
               "defaultValue": null
             },
+            {
+              "name": "certifierEmail",
+              "description": "The email that the certification request was sent to",
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
             {
               "name": "certifierUrl",
               "description": "The URL sent to the certifier",
@@ -31222,6 +31260,16 @@
               },
               "defaultValue": null
             },
+            {
+              "name": "sendCertificationRequest",
+              "description": "User defined boolean indicates whether to send an email to the certifier",
+              "type": {
+                "kind": "SCALAR",
+                "name": "Boolean",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
             {
               "name": "updatedAt",
               "description": "Last update date of row",
@@ -41697,16 +41745,6 @@
               },
               "defaultValue": null
             },
-            {
-              "name": "certificationRequestSentTo",
-              "description": "The email that the certification request was sent to",
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
-              "defaultValue": null
-            },
             {
               "name": "certificationSignature",
               "description": "The base64 representation of the certifier's signature",
@@ -41737,6 +41775,16 @@
               },
               "defaultValue": null
             },
+            {
+              "name": "certifierEmail",
+              "description": "The email that the certification request was sent to",
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
             {
               "name": "certifierUrl",
               "description": "The URL sent to the certifier",
@@ -41827,6 +41875,16 @@
               },
               "defaultValue": null
             },
+            {
+              "name": "sendCertificationRequest",
+              "description": "User defined boolean indicates whether to send an email to the certifier",
+              "type": {
+                "kind": "SCALAR",
+                "name": "Boolean",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
             {
               "name": "updatedAt",
               "description": "Last update date of row",
diff --git a/schema/deploy/tables/certification_url.sql b/schema/deploy/tables/certification_url.sql
index 5c9b69255a..9d7ba76dca 100644
--- a/schema/deploy/tables/certification_url.sql
+++ b/schema/deploy/tables/certification_url.sql
@@ -18,7 +18,8 @@ create table ggircs_portal.certification_url (
   updated_by int references ggircs_portal.ciip_user,
   deleted_at timestamp with time zone,
   deleted_by int references ggircs_portal.ciip_user,
-  certification_request_sent_to varchar(1000),
+  send_certification_request boolean not null default false,
+  certifier_email varchar(1000),
   certification_request_sent_at timestamp with time zone,
   recertification_request_sent boolean default false,
   -- TODO(Dylan): revisit expiry / deprecation of generated URLs in the context of Authorization
@@ -59,7 +60,7 @@ create trigger _set_user_id
   execute procedure ggircs_portal.set_user_id('certification_url');
 
 create trigger _certification_request_email
-  before update of certification_request_sent_to on ggircs_portal.certification_url
+  before update of certifier_email on ggircs_portal.certification_url
   for each row
   execute procedure ggircs_portal_private.run_graphile_worker_job('certification_request');
 
@@ -87,7 +88,7 @@ perform ggircs_portal_private.grant_permissions('select', 'certification_url', '
 -- Grant ciip_industry_user permissions
 perform ggircs_portal_private.grant_permissions('select', 'certification_url', 'ciip_industry_user');
 perform ggircs_portal_private.grant_permissions('insert', 'certification_url', 'ciip_industry_user');
-perform ggircs_portal_private.grant_permissions('update', 'certification_url', 'ciip_industry_user', ARRAY['certification_signature', 'certifier_url', 'recertification_request_sent', 'certification_request_sent_to']);
+perform ggircs_portal_private.grant_permissions('update', 'certification_url', 'ciip_industry_user', ARRAY['certification_signature', 'certifier_url', 'recertification_request_sent', 'certifier_email', 'send_certification_request']);
 
 -- Grant ciip_guest permissions
 -- ?
@@ -148,7 +149,8 @@ comment on column ggircs_portal.certification_url.created_by is 'Creator of row'
 comment on column ggircs_portal.certification_url.updated_at is 'Last update date of row';
 comment on column ggircs_portal.certification_url.updated_by is 'The user who last updated the row';
 comment on column ggircs_portal.certification_url.deleted_at is 'Deletion date of row';
-comment on column ggircs_portal.certification_url.certification_request_sent_to is 'The email that the certification request was sent to';
+comment on column ggircs_portal.certification_url.send_certification_request is 'User defined boolean indicates whether to send an email to the certifier';
+comment on column ggircs_portal.certification_url.certifier_email is 'The email that the certification request was sent to';
 comment on column ggircs_portal.certification_url.certification_request_sent_at is 'The time at which the certification request was sent';
 comment on column ggircs_portal.certification_url.recertification_request_sent is 'Boolean for whether a recertification request has been sent to the reporter in the case of a data change';
 comment on column ggircs_portal.certification_url.deleted_by is 'The user who deleted the row';
diff --git a/schema/deploy/trigger_functions/run_graphile_worker_job.sql b/schema/deploy/trigger_functions/run_graphile_worker_job.sql
index f26e4c0669..61f8cd03d3 100644
--- a/schema/deploy/trigger_functions/run_graphile_worker_job.sql
+++ b/schema/deploy/trigger_functions/run_graphile_worker_job.sql
@@ -70,35 +70,38 @@ begin
     -- **ON REQUEST FOR CERTIFICATION**
     when tg_argv[0] = 'certification_request' then
 
-      with ad as (select o.operator_name, f.facility_name, u.first_name, u.last_name, u.email_address
-            from ggircs_portal.application_revision ar
-            join ggircs_portal.application a
-            on ar.application_id = a.id
-            and new.application_id = ar.application_id
-            and new.version_number = ar.version_number
-            join ggircs_portal.facility f
-            on a.facility_id = f.id
-            join ggircs_portal.organisation o
-            on f.organisation_id = o.id
-            join ggircs_portal.ciip_user u
-            on u.id = new.created_by
-            )
-      select operator_name, facility_name, first_name, last_name, email_address from ad into application_details;
-
-      perform ggircs_portal_private.graphile_worker_job_definer('sendMail',
-            json_build_object(
-              'type', 'certification_request',
-              'certifierUrl', new.certifier_url,
-              'reporterEmail', application_details.email_address,
-              'firstName', application_details.first_name,
-              'lastName', application_details.last_name,
-              'email', new.certification_request_sent_to,
-              'facilityName', application_details.facility_name,
-              'operatorName', application_details.operator_name));
-
-      -- timestamp when the email was sent
-      new.certification_request_sent_at = now();
-      return new;
+      if (new.send_certification_request = true) then
+
+        with ad as (select o.operator_name, f.facility_name, u.first_name, u.last_name, u.email_address
+              from ggircs_portal.application_revision ar
+              join ggircs_portal.application a
+              on ar.application_id = a.id
+              and new.application_id = ar.application_id
+              and new.version_number = ar.version_number
+              join ggircs_portal.facility f
+              on a.facility_id = f.id
+              join ggircs_portal.organisation o
+              on f.organisation_id = o.id
+              join ggircs_portal.ciip_user u
+              on u.id = new.created_by
+              )
+        select operator_name, facility_name, first_name, last_name, email_address from ad into application_details;
+
+        perform ggircs_portal_private.graphile_worker_job_definer('sendMail',
+              json_build_object(
+                'type', 'certification_request',
+                'certifierUrl', new.certifier_url,
+                'reporterEmail', application_details.email_address,
+                'firstName', application_details.first_name,
+                'lastName', application_details.last_name,
+                'email', new.certifier_email,
+                'facilityName', application_details.facility_name,
+                'operatorName', application_details.operator_name));
+
+        -- timestamp when the email was sent
+        new.certification_request_sent_at = now();
+    end if;
+    return new;
 
       -- **ON SIGNED BY CERTIFIER**
     when tg_argv[0] = 'signed_by_certifier' then
@@ -127,7 +130,7 @@ begin
               'email', application_details.email_address,
               'firstName', application_details.first_name,
               'lastName', application_details.last_name,
-              'certifierEmail', new.certification_request_sent_to,
+              'certifierEmail', new.certifier_email,
               'facilityName', application_details.facility_name,
               'operatorName', application_details.operator_name,
               'certifierFirstName', certifier_details.first_name,
diff --git a/schema/verify/tables/certification_url.sql b/schema/verify/tables/certification_url.sql
index a8c7feb2a9..a185830183 100644
--- a/schema/verify/tables/certification_url.sql
+++ b/schema/verify/tables/certification_url.sql
@@ -16,7 +16,7 @@ select ggircs_portal_private.verify_grant('select', 'certification_url', 'ciip_a
 select ggircs_portal_private.verify_grant('select', 'certification_url', 'ciip_industry_user');
 select ggircs_portal_private.verify_grant('insert', 'certification_url', 'ciip_industry_user');
 select ggircs_portal_private.verify_grant('update', 'certification_url', 'ciip_industry_user',
-  ARRAY['certification_signature', 'certifier_url', 'recertification_request_sent', 'certification_request_sent_to']);
+  ARRAY['certification_signature', 'certifier_url', 'recertification_request_sent', 'certifier_email', 'send_certification_request']);
 
 -- ciip_guest Grants
 

From 32bff5ef1b72a919ccc4fd4836f30056ccfb8a30 Mon Sep 17 00:00:00 2001
From: Dylan Leard <dylan@button.is>
Date: Fri, 8 May 2020 11:48:15 -0700
Subject: [PATCH 3/4] test(certification): add pgTap tests to check that the
 modified trigger behaves appropriately

---
 .../ApplicationWizardConfirmation.tsx         |  2 +-
 .../unit/tables/certification_url_test.sql    | 25 +++++++++++++++++--
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/app/containers/Applications/ApplicationWizardConfirmation.tsx b/app/containers/Applications/ApplicationWizardConfirmation.tsx
index 66590a52d3..5be716e527 100644
--- a/app/containers/Applications/ApplicationWizardConfirmation.tsx
+++ b/app/containers/Applications/ApplicationWizardConfirmation.tsx
@@ -85,7 +85,7 @@ export const ApplicationWizardConfirmationComponent: React.FunctionComponent<Pro
               response.createCertificationUrl.certificationUrl.rowId
             )}&id=${encodeURIComponent(props.application.id)}`,
             certifierEmail: email,
-            sendCertificationEmail: sendEmail
+            sendCertificationRequest: sendEmail
           }
         }
       };
diff --git a/schema/test/unit/tables/certification_url_test.sql b/schema/test/unit/tables/certification_url_test.sql
index 137366917d..60baafdde2 100644
--- a/schema/test/unit/tables/certification_url_test.sql
+++ b/schema/test/unit/tables/certification_url_test.sql
@@ -3,7 +3,7 @@ create extension if not exists pgtap;
 reset client_min_messages;
 
 begin;
-select plan(15);
+select plan(18);
 
 -- Table exists
 select has_table(
@@ -35,7 +35,28 @@ insert into ggircs_portal.application_revision(application_id, version_number) o
 insert into ggircs_portal.ciip_user_organisation(id, user_id, organisation_id) overriding system value values(999, 999, 999), (1000, 1000, 1000);
 insert into ggircs_portal.certification_url(id, application_id, version_number) overriding system value values('999', 999,1), ('1000', 1,1);
 
-select * from ggircs_portal.certification_url;
+select throws_like(
+  $$
+    update ggircs_portal.certification_url set certifier_email='changed', send_certification_request=true where id='999'
+  $$,
+  '%does not exist%',
+  '_certification_request_email trigger attempts to send an email if send_certification_request = true'
+);
+
+select lives_ok(
+  $$
+    update ggircs_portal.certification_url set certifier_email='changed', send_certification_request=false where id='999'
+  $$,
+  '_certification_request_email trigger does notattempt to send an email if send_certification_request = false'
+);
+
+select results_eq(
+  $$
+    select certification_request_sent_at from ggircs_portal.certification_url where id='999'
+  $$,
+  ARRAY[null::timestamptz],
+  '_certification_request_email trigger did not send an email if send_certification_request = false'
+);
 
 -- CIIP_ADMINISTRATOR
 set role ciip_administrator;

From 1d8a0f372f41ce62ad1cc41b93fa4ada3e6a97ff Mon Sep 17 00:00:00 2001
From: Dylan Leard <dylan@button.is>
Date: Fri, 8 May 2020 14:00:17 -0700
Subject: [PATCH 4/4] test(certification): Update jest/cypress tests &
 snapshots

---
 app/cypress/integration/email.spec.js         |   6 +-
 .../reporter-access-all-pages.spec.js         |   2 +-
 .../ApplicationWizardConfirmation.test.tsx    |  12 +-
 ...pplicationWizardConfirmation.test.tsx.snap | 213 +++++++++++++++---
 4 files changed, 197 insertions(+), 36 deletions(-)

diff --git a/app/cypress/integration/email.spec.js b/app/cypress/integration/email.spec.js
index a332d4926e..398d9b4687 100644
--- a/app/cypress/integration/email.spec.js
+++ b/app/cypress/integration/email.spec.js
@@ -49,7 +49,8 @@ if (Cypress.env('NO_MAIL')) {
       );
       cy.url().should('include', '/reporter/ciip-application');
       cy.get('#certifierEmail').clear().type('certifier@certi.fy');
-      cy.get('.btn').contains('Send to Certifier').click();
+      cy.get('.form-check-input').click();
+      cy.get('.btn').contains('Submit for Certification').click();
       cy.wait(1000);
       cy.request('localhost:8025/api/v1/messages').then((response) => {
         // eslint-disable-next-line jest/valid-expect
@@ -84,7 +85,8 @@ if (Cypress.env('NO_MAIL')) {
       );
       cy.url().should('include', '/reporter/ciip-application');
       cy.get('#certifierEmail').clear().type('certifier@certi.fy');
-      cy.get('.btn').contains('Send to Certifier').click();
+      cy.get('.form-check-input').click();
+      cy.get('.btn').contains('Submit for Certification').click();
       cy.wait(500);
       cy.request('DELETE', 'localhost:8025/api/v1/messages');
       cy.get('input')
diff --git a/app/cypress/integration/reporter-access-all-pages.spec.js b/app/cypress/integration/reporter-access-all-pages.spec.js
index c17664733e..3bf87446ae 100644
--- a/app/cypress/integration/reporter-access-all-pages.spec.js
+++ b/app/cypress/integration/reporter-access-all-pages.spec.js
@@ -29,7 +29,7 @@ describe('When logged in as a reporter', () => {
       `/reporter/ciip-application?applicationId=${applicationId}&confirmationPage=true&version=1`
     );
     cy.url().should('include', '/reporter/ciip-application');
-    cy.get('.btn').contains('Send to Certifier').click();
+    cy.get('.btn').contains('Submit for Certification').click();
     cy.wait(500); // Wait for half second (otherwise cypress gets the input before the value has been set)
     cy.get('input').invoke('val').should('contain', 'localhost');
     cy.get('input')
diff --git a/app/tests/unit/containers/Applications/ApplicationWizardConfirmation.test.tsx b/app/tests/unit/containers/Applications/ApplicationWizardConfirmation.test.tsx
index e9599639ec..71a06417da 100644
--- a/app/tests/unit/containers/Applications/ApplicationWizardConfirmation.test.tsx
+++ b/app/tests/unit/containers/Applications/ApplicationWizardConfirmation.test.tsx
@@ -58,10 +58,12 @@ describe('The Confirmation Component', () => {
         relay={null}
       />
     );
-    expect(wrapper.find('h5').at(1).text()).toBe(
-      'Thank you for reviewing the application information. You may now send a generated Certification url to be signed prior to submission.'
+    expect(wrapper.find('CardHeader').at(0).text()).toBe(
+      'Application Certification'
+    );
+    expect(wrapper.find('Button').at(0).text()).toBe(
+      'Submit for Certification'
     );
-    expect(wrapper.find('Button').at(0).text()).toBe('Send to Certifier');
   });
 
   it('should show the Submit application dialog when certificationSignatureIsvalid is true', () => {
@@ -127,7 +129,9 @@ describe('The Confirmation Component', () => {
         relay={null}
       />
     );
-    expect(wrapper.find('CardHeader').text()).toBe('Error');
+
+    expect(wrapper.find('CardHeader').at(0).text()).toBe('Error');
+    expect(wrapper).toMatchSnapshot();
   });
 
   it('should show a certifier has not yet signed message when hashMatches is true but certificationSignature is null', () => {
diff --git a/app/tests/unit/containers/Applications/__snapshots__/ApplicationWizardConfirmation.test.tsx.snap b/app/tests/unit/containers/Applications/__snapshots__/ApplicationWizardConfirmation.test.tsx.snap
index 13b88644fa..6b51988f0c 100644
--- a/app/tests/unit/containers/Applications/__snapshots__/ApplicationWizardConfirmation.test.tsx.snap
+++ b/app/tests/unit/containers/Applications/__snapshots__/ApplicationWizardConfirmation.test.tsx.snap
@@ -47,47 +47,202 @@ exports[`The Confirmation Component match the snapshot 1`] = `
   <br
     className="jsx-1753635690"
   />
-  <h5>
-    Thank you for reviewing the application information. You may now send a generated Certification url to be signed prior to submission.
-  </h5>
   <br />
-  <Form
-    inline={false}
-    onSubmit={[Function]}
+  <Card
+    body={false}
   >
-    <FormRow>
-      <Col
-        md={6}
+    <CardHeader>
+      Application Certification
+    </CardHeader>
+    <CardBody>
+      <CardText>
+        Once you have reviewed the application and ensured all the data is correct, the application has to be certified.
+      </CardText>
+      <Form
+        inline={false}
+        onSubmit={[Function]}
       >
-        <FormGroup
-          controlId="certifierEmail"
-        >
-          <FormControl
-            name="email"
-            placeholder="Enter email"
-            type="email"
-          />
-          <FormText
-            className="text-muted"
+        <FormRow>
+          <FormGroup
+            as={
+              Object {
+                "$$typeof": Symbol(react.forward_ref),
+                "displayName": "Col",
+                "render": [Function],
+              }
+            }
+            controlId="certifierEmail"
+            md="4"
           >
-            Send URL to certifier
-          </FormText>
+            <FormControl
+              name="email"
+              placeholder="Certifier Email"
+              type="email"
+            />
+          </FormGroup>
+        </FormRow>
+        <FormGroup>
+          <FormCheck
+            className="text-muted"
+            disabled={false}
+            inline={false}
+            isInvalid={false}
+            isValid={false}
+            label="Notify certifier via email that this application is ready for certification"
+            name="sendEmailChecked"
+            title=""
+            type="checkbox"
+          />
         </FormGroup>
-      </Col>
-      <Col
-        md={2}
+        <Button
+          active={false}
+          disabled={false}
+          type="submit"
+          variant="info"
+        >
+          Submit for Certification
+        </Button>
+      </Form>
+    </CardBody>
+    <CardFooter />
+  </Card>
+  <JSXStyle
+    id="1753635690"
+  >
+    .errors{margin-left:20px;padding:20px;background:#ce5c5c;color:white;font-size:20px;}
+  </JSXStyle>
+</Fragment>
+`;
+
+exports[`The Confirmation Component should show a "data has changed" dialogue when hashMatches is false but a signature exists 1`] = `
+<Fragment>
+  <h1
+    className="jsx-1753635690"
+  >
+    Summary of your application:
+  </h1>
+  <h5
+    className="jsx-1753635690"
+  >
+    Please review the information you have provided before continuing.
+  </h5>
+  <br
+    className="jsx-1753635690"
+  />
+  <Relay(ApplicationDetailsComponent)
+    application={
+      Object {
+        " $fragmentRefs": Object {
+          "ApplicationDetailsContainer_application": true,
+          "SubmitApplication_application": true,
+        },
+        " $refType": "ApplicationWizardConfirmation_application",
+        "id": "abc",
+        "latestDraftRevision": Object {
+          "certificationSignatureIsValid": false,
+          "certificationUrl": Object {
+            "certificationSignature": "signed",
+            "hashMatches": false,
+          },
+          "versionNumber": 1,
+        },
+        "rowId": 1,
+      }
+    }
+    liveValidate={true}
+    query={
+      Object {
+        " $fragmentRefs": Object {
+          "ApplicationDetailsContainer_query": true,
+        },
+        " $refType": "ApplicationWizardConfirmation_query",
+      }
+    }
+    review={false}
+    setHasErrors={[Function]}
+  />
+  <br
+    className="jsx-1753635690"
+  />
+  <Card
+    body={false}
+    className="text-center"
+  >
+    <CardHeader>
+      Error
+    </CardHeader>
+    <CardBody>
+      <CardTitle>
+        The data has changed
+      </CardTitle>
+      <CardText>
+        The application data has been changed since the certifier added their signature.
+      </CardText>
+      <CardText>
+        Please generate and send a new certification URL.
+      </CardText>
+    </CardBody>
+    <CardFooter />
+  </Card>
+  <br />
+  <Card
+    body={false}
+  >
+    <CardHeader>
+      Application Certification
+    </CardHeader>
+    <CardBody>
+      <CardText>
+        Once you have reviewed the application and ensured all the data is correct, the application has to be certified.
+      </CardText>
+      <Form
+        inline={false}
+        onSubmit={[Function]}
       >
+        <FormRow>
+          <FormGroup
+            as={
+              Object {
+                "$$typeof": Symbol(react.forward_ref),
+                "displayName": "Col",
+                "render": [Function],
+              }
+            }
+            controlId="certifierEmail"
+            md="4"
+          >
+            <FormControl
+              name="email"
+              placeholder="Certifier Email"
+              type="email"
+            />
+          </FormGroup>
+        </FormRow>
+        <FormGroup>
+          <FormCheck
+            className="text-muted"
+            disabled={false}
+            inline={false}
+            isInvalid={false}
+            isValid={false}
+            label="Notify certifier via email that this application is ready for certification"
+            name="sendEmailChecked"
+            title=""
+            type="checkbox"
+          />
+        </FormGroup>
         <Button
           active={false}
           disabled={false}
           type="submit"
-          variant="primary"
+          variant="info"
         >
-          Send to Certifier
+          Submit for Certification
         </Button>
-      </Col>
-    </FormRow>
-  </Form>
+      </Form>
+    </CardBody>
+    <CardFooter />
+  </Card>
   <JSXStyle
     id="1753635690"
   >