feature/change-contact-consent-to-read-only

src/apps/contacts/constants.js

@@ -35,9 +35,6 @@ const QUERY_FIELDS = [
   'company_uk_region',
 ]
 
-const EMAIL_CONSENT_YES = 'Can be marketed to'
-const EMAIL_CONSENT_NO = 'Cannot be marketed to'
-
 const LEFT_COMPANY_OPTION = 'Left the company'
 const NO_CONTACT_OPTION = 'Does not want to be contacted'
 const ROLE_CHANGE_OPTION = 'Changed role/responsibility'
@@ -47,8 +44,6 @@ module.exports = {
   LOCAL_NAV,
   APP_PERMISSIONS,
   QUERY_FIELDS,
-  EMAIL_CONSENT_YES,
-  EMAIL_CONSENT_NO,
   LEFT_COMPANY_OPTION,
   NO_CONTACT_OPTION,
   ROLE_CHANGE_OPTION,

src/apps/contacts/services/__test__/form.test.js

@@ -32,7 +32,6 @@ describe('contact form service', () => {
       primary: true,
       full_telephone_number: '+1 652423467167',
       email: '[email protected]',
-      accepts_dit_email_marketing: true,
       address_same_as_company: false,
       notes: 'Some notes',
       archived_by: null,
@@ -60,7 +59,6 @@ describe('contact form service', () => {
         primary: 'yes',
         full_telephone_number: '+1 652423467167',
         email: '[email protected]',
-        accepts_dit_email_marketing: true,
         address_same_as_company: 'no',
         address_1: '99 N Shore Road',
         address_2: 'Suite 20',
@@ -107,7 +105,6 @@ describe('contact form service', () => {
         address_postcode: null,
         address_country: null,
         notes: 'Some notes',
-        accepts_dit_email_marketing: true,
       }
 
       const actual = contactFormService.getContactAsFormData(contact)
@@ -118,15 +115,5 @@ describe('contact form service', () => {
     it('should handle a null contact', () => {
       expect(contactFormService.getContactAsFormData(null)).to.be.null
     })
-
-    context('when the contact accepts DBT email marketing', () => {
-      it('should set the marketing preferences to accepts_dit_email_marketing', () => {
-        const contact = assign({}, contactData, {
-          accepts_dit_email_marketing: true,
-        })
-        const actual = contactFormService.getContactAsFormData(contact)
-        expect(actual.accepts_dit_email_marketing).to.be.true
-      })
-    })
   })
 })

src/apps/contacts/services/form.js

@@ -14,11 +14,6 @@ function getContactAsFormData(contact) {
     return null
   }
 
-  // default is that people are always marketable, unless opted out
-  if (!contact.hasOwnProperty('accepts_dit_email_marketing')) {
-    contact.accepts_dit_email_marketing = true
-  }
-
   let result = {
     id: contact.id,
     company: contact.company.id,
@@ -29,7 +24,6 @@ function getContactAsFormData(contact) {
     primary: contact.primary ? 'yes' : 'no',
     full_telephone_number: contact.full_telephone_number,
     email: contact.email,
-    accepts_dit_email_marketing: contact.accepts_dit_email_marketing,
     address_same_as_company: contact.address_same_as_company ? 'yes' : 'no',
     address_1: contact.address_1,
     address_2: contact.address_2,

src/client/components/ContactForm/index.jsx

@@ -17,7 +17,6 @@ import {
   FieldInput,
   FieldRadios,
   FieldTextarea,
-  FieldCheckboxes,
   FieldAddress,
   Main,
   FormLayout,
@@ -80,7 +79,6 @@ const _ContactForm = ({
   // We need to convert these to YES / NO strings
   primary,
   addressSameAsCompany,
-  acceptsDitEmailMarketing,
   // These need to be renamed, so that they are compatible with the fields of
   // the address sub-form
   addressPostcode: postcode,
@@ -175,7 +173,6 @@ const _ContactForm = ({
                         city,
                         county,
                         postcode,
-                        acceptsDitEmailMarketing,
                         addressSameAsCompany,
                         primary,
                         email,
@@ -189,8 +186,6 @@ const _ContactForm = ({
                           email,
                           valid_email: true,
                           notes: moreDetails,
-                          accepts_dit_email_marketing:
-                            acceptsDitEmailMarketing.includes(YES),
                           primary,
                           company,
                           address_same_as_company:
@@ -251,12 +246,9 @@ const _ContactForm = ({
                         country: addressCountry?.id,
                         primary: boolToYesNo(primary),
                         addressSameAsCompany: boolToYesNo(addressSameAsCompany),
-                        acceptsDitEmailMarketing: [
-                          boolToYesNo(acceptsDitEmailMarketing),
-                        ].filter(Boolean),
                       }}
                     >
-                      {({ values }) => (
+                      {() => (
                         <>
                           <FieldInput
                             label="First name"
@@ -329,21 +321,6 @@ const _ContactForm = ({
                               { value: NO, label: NO },
                             ]}
                           />
-                          <FieldCheckboxes
-                            name="acceptsDitEmailMarketing"
-                            options={[
-                              {
-                                value: YES,
-                                label:
-                                  'The company contact does accept email marketing',
-                                hint:
-                                  values?.acceptsDitEmailMarketing?.includes(
-                                    YES
-                                  ) &&
-                                  'By checking this box, you confirm that the contact has opted in to email marketing.',
-                              },
-                            ]}
-                          />
                           <FieldTextarea
                             label="More details (optional)"
                             name="moreDetails"
@@ -394,7 +371,6 @@ ContactForm.propTypes = {
   primary: PropTypes.bool,
   fullTelephoneNumber: PropTypes.string,
   email: PropTypes.string,
-  acceptsDitEmailMarketing: PropTypes.bool,
   addressSameAsCompany: PropTypes.bool,
   address1: PropTypes.string,
   address2: PropTypes.string,

src/client/components/Resource/__stories__/tasks.js

@@ -13,7 +13,6 @@ const CONTACT = {
   telephoneCountrycode: '123',
   telephoneNumber: '456789',
   email: '[email protected]',
-  acceptsDitEmailMarketing: true,
   addressSameAsCompany: true,
   address1: 'Foo',
   address2: 'Bar',
@@ -112,7 +111,6 @@ export default {
                 addressCountry: null,
                 addressPostcode: null,
                 notes: null,
-                acceptsDitEmailMarketing: false,
                 archived: false,
                 archivedDocumentsUrlPath: '',
                 archivedOn: null,

src/client/modules/Contacts/ContactDetails/ConsentDetails.jsx

@@ -0,0 +1,25 @@
+import React from 'react'
+import { isNil } from 'lodash'
+
+import { SectionHeader } from '../../../components'
+import { transformContactConsents } from './transformers'
+
+const ConsentDetails = ({ contact }) => {
+  const consentGiven = transformContactConsents(contact)
+  return (
+    <div>
+      <SectionHeader type="contact-consent">Contact consent</SectionHeader>
+      {isNil(contact.consentData) ? (
+        <p data-test="no-contact-consents">
+          There is no consent data available for this contact
+        </p>
+      ) : (
+        <p>
+          {`This contact has ${consentGiven ? 'given' : 'not given'} consent to be contacted.`}
+        </p>
+      )}
+    </div>
+  )
+}
+
+export default ConsentDetails

src/client/modules/Contacts/ContactDetails/ContactDetails.jsx

@@ -7,15 +7,14 @@ import { ContactResource } from '../../../components/Resource'
 import { SummaryTable, ErrorSummary } from '../../../components'
 import urls from '../../../../lib/urls'
 import {
-  EMAIL_CONSENT_NO,
-  EMAIL_CONSENT_YES,
   LEFT_COMPANY_OPTION,
   NO_CONTACT_OPTION,
   ROLE_CHANGE_OPTION,
 } from '../../../../apps/contacts/constants'
 import { ID, TASK_ARCHIVE_CONTACT } from './state'
 import ArchiveForm from '../../../components/ArchiveForm'
 import ContactLayout from '../../../components/Layout/ContactLayout'
+import ConsentDetails from './ConsentDetails'
 
 const getAddress = (contact, companyAddress) => {
   const address = contact.addressSameAsCompany
@@ -82,14 +81,6 @@ const ContactDetails = ({ contactId, companyAddress, permissions }) => (
                 children={contact.notes}
               />
             ) : null}
-            <SummaryTable.Row
-              heading="Email marketing"
-              children={
-                contact.acceptsDitEmailMarketing
-                  ? EMAIL_CONSENT_YES
-                  : EMAIL_CONSENT_NO
-              }
-            />
           </SummaryTable>
           {!contact.archived ? (
             <Button
@@ -103,6 +94,8 @@ const ContactDetails = ({ contactId, companyAddress, permissions }) => (
             </Button>
           ) : null}
 
+          <ConsentDetails contact={contact} />
+
           <ArchiveForm
             id={ID}
             submissionTaskName={TASK_ARCHIVE_CONTACT}

src/client/modules/Contacts/ContactDetails/__test__/transformers.test.js

@@ -0,0 +1,93 @@
+import 'core-js/proposals/array-grouping-v2'
+import { transformContactConsents } from '../transformers'
+
+describe('transformContactConsents', () => {
+  context('When a falsey contact is passed', () => {
+    it('Should return false', () => {
+      expect(transformContactConsents(undefined)).to.equal(false)
+    })
+  })
+
+  context('When a contact has no consent data', () => {
+    it('Should return false', () => {
+      expect(transformContactConsents({})).to.equal(false)
+    })
+  })
+
+  context(
+    'When a contact has a single domain and has not given consent',
+    () => {
+      it('Should return false', () => {
+        expect(
+          transformContactConsents({
+            consentData: [
+              {
+                consentDomain: 'International',
+                emailContactConsent: false,
+              },
+            ],
+          })
+        ).to.equal(false)
+      })
+    }
+  )
+
+  context('When a contact has a single domain and has given consent', () => {
+    it('Should return true', () => {
+      expect(
+        transformContactConsents({
+          consentData: [
+            {
+              consentDomain: 'International',
+              emailContactConsent: true,
+            },
+          ],
+        })
+      ).to.equal(true)
+    })
+  })
+
+  context(
+    'When a contact has a multiple domains and has given consent to one',
+    () => {
+      it('Should return true', () => {
+        expect(
+          transformContactConsents({
+            consentData: [
+              {
+                consentDomain: 'International',
+                emailContactConsent: true,
+              },
+              {
+                consentDomain: 'International',
+                emailContactConsent: false,
+              },
+            ],
+          })
+        ).to.equal(true)
+      })
+    }
+  )
+
+  context(
+    'When a contact has a multiple domains and has given consent to all',
+    () => {
+      it('Should return true', () => {
+        expect(
+          transformContactConsents({
+            consentData: [
+              {
+                consentDomain: 'International',
+                emailContactConsent: true,
+              },
+              {
+                consentDomain: 'International',
+                emailContactConsent: true,
+              },
+            ],
+          })
+        ).to.equal(true)
+      })
+    }
+  )
+})

src/client/modules/Contacts/ContactDetails/transformers.js

@@ -0,0 +1,7 @@
+export const transformContactConsents = (contact) => {
+  if (!contact || !contact.consentData) {
+    return false
+  }
+
+  return contact.consentData.some((consent) => consent.emailContactConsent)
+}