fix: email permission validations

Author: s-barrah

src/Model/SQS/MarketingPreference.model.js

@@ -466,14 +466,13 @@ export default class MarketingPreference extends Model {
         && this.getPermissionEmail() !== ''
         && this.getPermissionEmail() !== '0')
       || this.getEmail() !== '') {
-        if (this.getEmail() !== '') {
+        if (this.getEmail() !== '' && this.getEmail() !== null) {
           requestConstraintsClone.email = { email: true };
         } else {
-          requestConstraintsClone.email = { presence: { allowEmpty: false } };
+          requestConstraintsClone.email = { presence: { allowEmpty: false }, email: true };
         }
       }
       // Update constraints if fields are not empty
-
       requestConstraintsClone.firstname = this.getFirstName() !== null && this.getFirstName() !== '' ? { format: { pattern: "[a-zA-Z.'-_ ]+", flags: 'i', message: 'can only contain alphabetical characters' } } : '';
       requestConstraintsClone.lastname = this.getLastName() !== null && this.getLastName() !== '' ? { format: { pattern: "[a-zA-Z.'-_ ]+", flags: 'i', message: 'can only contain alphabetical characters' } } : '';
       requestConstraintsClone.phone = this.getPhone() !== null && this.getPhone() !== '' ? { format: { pattern: '[0-9 ]+', flags: 'i', message: 'can only contain numerical characters' } } : '';

tests/unit/Model/SQS/MarketingPreferences.model.js

@@ -168,8 +168,7 @@ describe('Model/MarketingPreferencesModel', () => {
       transSource: 'giftaid-sportrelief',
       transSourceUrl: 'https://giftaid.sportrelief.com/',
       transType: 'prefs',
-      email: '',
-      permissionEmail: 1,
+      permissionEmail: 0,
       permissionPost: 0,
       permissionPhone: 0,
       permissionSMS: 0,
@@ -185,6 +184,8 @@ describe('Model/MarketingPreferencesModel', () => {
           done();
         })
         .catch((error) => {
+          console.log('Error: ', error);
+
           expect(error instanceof ResponseModel).to.eql(true);
           expect(error.getCode()).to.eql(400);
           expect(error.body.validation_errors.email[0]).to.eql('Email can\'t be blank');