Merge branch 'master' into PAF-129-Bug-fix

Author: TemitopeAyokuHO

.drone.yml

@@ -275,6 +275,7 @@ steps:
       branch: master
       event: push
 
+
   # Tear down pull request UAT environment.
   - name: tear_down_branch
     pull: if-not-exists

apps/paf/behaviours/save-file.js

@@ -1,7 +1,9 @@
 'use strict';
 
 const _ = require('lodash');
+const config = require('../../../config');
 const Model = require('../models/file-upload');
+const fileSizeNum = size => size.match(/\d+/g)[0];
 
 module.exports = name => superclass => class extends superclass {
   process(req) {
@@ -20,7 +22,41 @@ module.exports = name => superclass => class extends superclass {
     if (!Object.keys(req.form.errors).length) {
       req.form.values['other-info-file-upload'] = null;
     }
-    return super.locals(req, res, next);
+    const maxNum = fileSizeNum(config.upload.maxFileSize);
+    const maxSize = config.upload.maxFileSize.match(/[a-zA-Z]+/g)[0].toUpperCase();
+    return Object.assign({}, super.locals(req, res, next), {
+      maxFileSize: `${maxNum} ${maxSize}`
+    });
+  }
+
+  validateField(key, req) {
+    if (req.form.values['other-info-file-upload']) {
+      const fileUpload = _.get(req.files, `${name}`);
+      if (fileUpload) {
+        const uploadSize = fileUpload.size;
+        const mimetype = fileUpload.mimetype;
+        const uploadSizeTooBig = uploadSize > (fileSizeNum(config.upload.maxFileSize) * 1000000);
+        const uploadSizeBeyondServerLimits = uploadSize === null;
+        const invalidMimetype = !config.upload.allowedMimeTypes.includes(mimetype);
+        const invalidSize = uploadSizeTooBig || uploadSizeBeyondServerLimits;
+
+        if (invalidSize || invalidMimetype) {
+          return new this.ValidationError(key, {
+            key,
+            type: invalidSize ? 'maxFileSize' : 'fileType',
+            redirect: undefined
+          });
+        }
+      } else {
+        return new this.ValidationError(key, {
+          key,
+          type: 'required',
+          redirect: undefined
+        });
+      }
+    }
+
+    return super.validateField(key, req);
   }
 
   saveValues(req, res, next) {

apps/paf/behaviours/set-transport-toggle.js

@@ -0,0 +1,84 @@
+module.exports = superclass => class extends superclass {
+  locals(req, res) {
+    const locals = super.locals(req, res);
+
+    // set crime-transport-vehicle toggles
+    if (req.form.values['crime-car-group'] === 'car') {
+      locals.carChecked = true;
+    } else if (req.form.values['crime-car-group'] === 'car-transporter') {
+      locals.carTransporterChecked = true;
+    } else if (req.form.values['crime-hgv-group'] === 'hgv-canvas-sided') {
+      locals.hgvCSChecked = true;
+    } else if (req.form.values['crime-hgv-group'] === 'hgv-flatbed') {
+      locals.hgvFChecked = true;
+    } else if (req.form.values['crime-hgv-group'] === 'hgv-hard-sided') {
+      locals.hgvHSChecked = true;
+    } else if (req.form.values['crime-hgv-group'] === 'hgv-refrigerated') {
+      locals.hgvRChecked = true;
+    } else if (req.form.values['crime-hgv-group'] === 'hgv-tanker') {
+      locals.hgvTChecked = true;
+    } else if (req.form.values['crime-lorry-group'] === 'lorry') {
+      locals.lorryChecked = true;
+    } else if (req.form.values['crime-lorry-group'] === 'lorry-and-drag') {
+      locals.lorryDragChecked = true;
+    } else if (req.form.values['crime-van-group'] === 'van') {
+      locals.vanChecked = true;
+    } else if (req.form.values['crime-van-group'] === 'van-and-trailer') {
+      locals.vanTrailerChecked = true;
+    } else if (req.form.values['crime-van-group'] === 'van-other') {
+      locals.vanOtherChecked = true;
+    } else if (req.form.values['crime-van-group'] === 'seven-point-five-tonne-van') {
+      locals.sevenVanChecked = true;
+    }
+
+    // set crime-transport-boat toggles
+    if (req.form.values['crime-carrier-group'] === 'bulk-carrier') {
+      locals.bulkChecked = true;
+    } else if (req.form.values['crime-carrier-group'] === 'vehicle-carrier') {
+      locals.vehicleChecked = true;
+    } else if (req.form.values['crime-carrier-group'] === 'vessel-carrier') {
+      locals.vesselChecked = true;
+    } else if (req.form.values['crime-general-cargo-group'] === 'general-cargo') {
+      locals.generalChecked = true;
+    } else if (req.form.values['crime-general-cargo-group'] === 'general-cargo-with-container-capacity') {
+      locals.generalContainerChecked = true;
+    } else if (req.form.values['crime-vessel-group'] === 'research-vessel') {
+      locals.researchChecked = true;
+    } else if (req.form.values['crime-vessel-group'] === 'supply-vessel') {
+      locals.supplyChecked = true;
+    } else if (req.form.values['crime-vessel-group'] === 'support-vessel') {
+      locals.supportChecked = true;
+    }
+
+    // set report-person-transport toggles
+    if (req.form.values['report-person-transport-car-group'] === 'car') {
+      locals.personCarChecked = true;
+    } else if (req.form.values['report-person-transport-car-group'] === 'car-transporter') {
+      locals.personCarTransporterChecked = true;
+    } else if (req.form.values['report-person-transport-hgv-group'] === 'hgv-canvas-sided') {
+      locals.personHgvCSChecked = true;
+    } else if (req.form.values['report-person-transport-hgv-group'] === 'hgv-flatbed') {
+      locals.personHgvFChecked = true;
+    } else if (req.form.values['report-person-transport-hgv-group'] === 'hgv-hard-sided') {
+      locals.personHgvHSChecked = true;
+    } else if (req.form.values['report-person-transport-hgv-group'] === 'hgv-refrigerated') {
+      locals.personHgvRChecked = true;
+    } else if (req.form.values['report-person-transport-hgv-group'] === 'hgv-tanker') {
+      locals.personHgvTChecked = true;
+    } else if (req.form.values['report-person-transport-lorry-group'] === 'lorry') {
+      locals.personLorryChecked = true;
+    } else if (req.form.values['report-person-transport-lorry-group'] === 'lorry-and-drag') {
+      locals.personLorryDragChecked = true;
+    } else if (req.form.values['report-person-transport-van-group'] === 'van') {
+      locals.personVanChecked = true;
+    } else if (req.form.values['report-person-transport-van-group'] === 'van-and-trailer') {
+      locals.personVanTrailerChecked = true;
+    } else if (req.form.values['report-person-transport-van-group'] === 'van-other') {
+      locals.personVanOtherChecked = true;
+    } else if (req.form.values['report-person-transport-van-group'] === 'seven-point-five-tonne-van') {
+      locals.personSevenVanChecked = true;
+    }
+
+    return locals;
+  }
+};

apps/paf/behaviours/time-formatter.js

@@ -0,0 +1,56 @@
+/* eslint-disable  max-len */
+const _ = require('lodash');
+
+module.exports = superclass => class extends superclass {
+  configure(req, res, next) {
+    // preprend '0' if number is only a single digit
+    const pad = num => num !== '' && num.length < 2 ? `0${num}` : num;
+
+    if (req.sessionModel.get('time-crime-will-happen-hour')) {
+      req.sessionModel.set('time-crime-will-happen-hour', pad(req.sessionModel.get('time-crime-will-happen-hour')));
+    }
+    if (req.sessionModel.get('time-crime-will-happen-minute')) {
+      req.sessionModel.set('time-crime-will-happen-minute', pad(req.sessionModel.get('time-crime-will-happen-minute')));
+    }
+    // sets minutes to 00 if the hour field has been completed but the minute field left blank
+    if (req.sessionModel.get('time-crime-will-happen-hour') && req.sessionModel.get('time-crime-will-happen-minute') === '') {
+      req.sessionModel.set('time-crime-will-happen-minute', '00');
+    }
+
+    if (req.sessionModel.get('time-crime-will-happen-hour') && req.sessionModel.get('time-crime-will-happen-minute')) {
+      const time = req.sessionModel.get('time-crime-will-happen-hour').concat(' : ', req.sessionModel.get('time-crime-will-happen-minute'));
+      if (req.sessionModel.get('time-crime-will-happen-hour') < 12) {
+        req.sessionModel.set('time-crime-will-happen', time + ' am');
+      } else {
+        req.sessionModel.set('time-crime-will-happen', time + ' pm');
+      }
+    } else {
+      req.sessionModel.unset('time-crime-will-happen');
+    }
+
+    return super.configure(req, res, next);
+  }
+
+  locals(req, res) {
+    const locals = super.locals(req, res);
+    // set change link for for time-crime-will-happen field
+    if (locals.route === 'confirm') {
+      _.forEach(locals.rows, fields => {
+        locals.rows = locals.rows.map(row => {
+          if (row.section === 'The Crime - Duration') {
+            _.forEach(fields, sectionFields => {
+              _.forEach(sectionFields, field => {
+                if (field.field === 'time-crime-will-happen') {
+                  field.changeLink = '/paf/date-time-crime-will-happen/edit#time-crime-will-happen-hour';
+                }
+              });
+            });
+            return row;
+          }
+          return row;
+        });
+      });
+    }
+    return locals;
+  }
+};

apps/paf/fields/index.js

@@ -16,6 +16,7 @@ function lettersAndSpacesOnly(value) {
   return /^[A-Za-z\s]*$/.test(value);
 }
 const moment = require('moment');
+const after1900Validator = { type: 'after', arguments: ['1900'] };
 const PRETTY_DATE_FORMAT = 'Do MMMM YYYY';
 
 module.exports = {
@@ -125,12 +126,24 @@ module.exports = {
     options: [
       'next-twenty-four-hours',
       'more-than-twenty-four-hours',
-      'unknown'
+      'when-will-crime-happen-unknown'
     ]
   },
   'date-crime-will-happen': dateComponent('date-crime-will-happen', {
     mixin: 'input-date'
   }),
+  'time-crime-will-happen-hour': {
+    mixin: 'input-text',
+    className: ['govuk-input', 'govuk-date-input__input', 'govuk-input--width-2'],
+    attributes: [{ attribute: 'maxlength', value: '2' }],
+    validate: ['numeric', { type: 'min', arguments: 0}, { type: 'max', arguments: 23 }]
+  },
+  'time-crime-will-happen-minute': {
+    mixin: 'input-text',
+    className: ['govuk-input', 'govuk-date-input__input', 'govuk-input--width-2'],
+    attributes: [{ attribute: 'maxlength', value: '2' }],
+    validate: ['numeric', { type: 'min', arguments: 0}, { type: 'max', arguments: 59 }]
+  },
   'time-crime-will-happen': {
     mixin: 'input-text'
   },
@@ -242,7 +255,7 @@ module.exports = {
       'hgv-canvas-sided',
       'hgv-flatbed',
       'hgv-hard-sided',
-      'hgv-refridgerated',
+      'hgv-refrigerated',
       'hgv-tanker'
     ],
     dependent: {
@@ -678,7 +691,8 @@ module.exports = {
   },
   'report-person-dob': dateComponent('report-person-dob', {
     isPageHeading: true,
-    mixin: 'input-date'
+    mixin: 'input-date',
+    validate: ['before', after1900Validator]
   }),
   'report-person-age-range': {
     mixin: 'radio-group',
@@ -1039,7 +1053,7 @@ module.exports = {
       'hgv-canvas-sided',
       'hgv-flatbed',
       'hgv-hard-sided',
-      'hgv-refridgerated',
+      'hgv-refrigerated',
       'hgv-tanker'
     ],
     dependent: {
@@ -1130,6 +1144,7 @@ module.exports = {
   personAddDob: dateComponent('personAddDob', {
     isPageHeading: true,
     mixin: 'input-date',
+    validate: ['before', after1900Validator],
     parse: d => d && moment(d).format(PRETTY_DATE_FORMAT)
   }),
   personAddAgeRange: {
@@ -1342,7 +1357,8 @@ module.exports = {
   },
   'about-you-dob': dateComponent('about-you-dob', {
     isPageHeading: true,
-    mixin: 'input-date'
+    mixin: 'input-date',
+    validate: ['before', after1900Validator]
   }),
   'about-you-nationality': {
     isPageHeading: true,

apps/paf/index.js

@@ -7,13 +7,15 @@ const limitDocs = require('./behaviours/limit-documents');
 const disableUpload = require('./behaviours/disable-file-upload');
 const SummaryPageBehaviour = require('hof').components.summary;
 const transportBehaviour = require('./behaviours/transport-behaviour');
+const transportToggle = require('./behaviours/set-transport-toggle');
 const Aggregate = require('./behaviours/aggregator');
 const limitPerson = require('./behaviours/limit-person');
 const personNumber = require('./behaviours/person-number');
 const addressFormatter = require('./behaviours/address-formatter');
 const additionalPersonFormatter = require('./behaviours/additional-person-formatter');
 const vehicleToggleFormatter = require('./behaviours/vehicle-toggle-formatter');
 const SendToSQS = require('./behaviours/send-to-sqs');
+const timeFormatter = require('./behaviours/time-formatter');
 
 module.exports = {
   name: 'paf',
@@ -59,7 +61,7 @@ module.exports = {
       }]
     },
     '/date-time-crime-will-happen': {
-      fields: ['date-crime-will-happen', 'time-crime-will-happen'],
+      fields: ['date-crime-will-happen', 'time-crime-will-happen-hour', 'time-crime-will-happen-minute'],
       next: '/when-will-crime-happen-more-info'
     },
     '/when-will-crime-happen-more-info': {
@@ -115,6 +117,7 @@ module.exports = {
       continueOnEdit: true
     },
     '/crime-transport-vehicle-type': {
+      behaviours: [transportToggle],
       fields: ['vehicle-type',
         'crime-car-group',
         'crime-hgv-group',
@@ -164,6 +167,7 @@ module.exports = {
       continueOnEdit: true
     },
     '/crime-transport-boat-type': {
+      behaviours: [transportToggle],
       fields: ['boat-type',
         'crime-carrier-group',
         'crime-general-cargo-group',
@@ -545,6 +549,7 @@ module.exports = {
       ]
     },
     '/report-person-transport-type': {
+      behaviours: [transportToggle],
       fields: ['report-person-transport-type',
         'report-person-transport-car-group',
         'report-person-transport-hgv-group',
@@ -770,7 +775,7 @@ module.exports = {
       fields: ['are-you-eighteen', 'contact-number', 'when-to-contact']
     },
     '/confirm': {
-      behaviours: [SummaryPageBehaviour, personNumber],
+      behaviours: [SummaryPageBehaviour, personNumber, timeFormatter],
       sections: require('./sections/summary-data-sections'),
       next: '/declaration'
     },

apps/paf/models/file-upload.js

@@ -14,10 +14,11 @@ module.exports = class UploadModel extends Model {
 
   async save() {
     const result = await new Promise((resolve, reject) => {
+      console.log("url: " + config.upload.hostname);
       const attributes = {
         url: config.upload.hostname
       };
-      const reqConf = new url.URL(this.url(attributes));
+      const reqConf = url.parse(this.url(attributes));
       reqConf.formData = {
         document: {
           value: this.get('data'),
@@ -59,7 +60,7 @@ module.exports = class UploadModel extends Model {
     };
 
     return new Promise((resolve, reject) => {
-      this._request(tokenReq, (err, response) => {
+      return this._request(tokenReq, (err, response) => {
         const body = JSON.parse(response.body);
 
         if (err || body.error) {

apps/paf/translations/src/en/fields.json

@@ -128,8 +128,11 @@
   "date-crime-will-happen": {
     "label": "Date"
   },
-  "time-crime-will-happen": {
-    "label": "Time"
+  "time-crime-will-happen-hour": {
+    "label": "Hour"
+  },
+  "time-crime-will-happen-minute": {
+    "label": "Minute"
   },
   "crime-transport": {
     "legend": "Does the crime involve any vehicles, transport or travel?",
@@ -233,8 +236,8 @@
       "hgv-hard-sided": {
         "label": "HGV hard sided"
       },
-      "hgv-refridgerated": {
-        "label": "HGV refridgerated"
+      "hgv-refrigerated": {
+        "label": "HGV refrigerated"
       },
       "hgv-tanker": {
         "label": "HGV tanker"
@@ -1022,8 +1025,8 @@
       "hgv-hard-sided": {
         "label": "HGV hard sided"
       },
-      "hgv-refridgerated": {
-        "label": "HGV refridgerated"
+      "hgv-refrigerated": {
+        "label": "HGV refrigerated"
       },
       "hgv-tanker": {
         "label": "HGV tanker"