Code review

Author: teddmason

lib/functions/getMessage.js

@@ -3,7 +3,7 @@
 const Joi = require('joi')
 const database = require('../helpers/database')
 const queries = require('../helpers/queries')
-const eventSchema = require('../helpers/schemas.js').getMessageEventSchema
+const eventSchema = require('../helpers/schemas').getMessageEventSchema
 
 module.exports.getMessage = (event, context, callback) => {
   const response = {
@@ -21,14 +21,13 @@ module.exports.getMessage = (event, context, callback) => {
     if (err) {
       return callback(err)
     }
-    let id = event.pathParameters.id
 
-    database.queryVars(queries.getMessage, [id], (err, ret) => {
+    database.queryVars(queries.getMessage, [event.pathParameters.id], (err, ret) => {
       if (err) {
         return callback(err)
       }
 
-      if (ret.rows.length === 0) {
+      if (!ret || !ret.rows || ret.rows.length === 0) {
         console.log('No message found for ' + event.pathParameters.id)
         return callback(new Error('No message found'))
       }

lib/functions/getMessagesAtom.js

@@ -23,7 +23,7 @@ module.exports.getMessagesAtom = (event, context, callback) => {
     if (err) {
       return callback(err)
     }
-    let feed = new Feed({
+    const feed = new Feed({
       title: 'Flood warnings for England',
       generator: 'Environment Agency CAP XML flood warnings',
       description: 'Flood warnings for England',
@@ -36,18 +36,21 @@ module.exports.getMessagesAtom = (event, context, callback) => {
       }
     })
 
-    ret.rows.forEach((item) => {
-      feed.addItem({
-        title: item.fwis_code,
-        id: config.url + '/message/' + item.identifier,
-        link: config.url + '/message/' + item.identifier,
-        author: {
-          name: 'Environment Agency',
-          link: 'https://www.gov.uk/government/organisations/environment-agency'
-        },
-        date: item.sent
+    if (!!ret && Array.isArray(ret.rows)) {
+      ret.rows.forEach((item) => {
+        feed.addItem({
+          title: item.fwis_code,
+          id: config.url + '/message/' + item.identifier,
+          link: config.url + '/message/' + item.identifier,
+          author: {
+            name: 'Environment Agency',
+            link: 'https://www.gov.uk/government/organisations/environment-agency'
+          },
+          date: item.sent
+        })
       })
-    })
+    }
+
     response.body = feed.atom1()
     return callback(null, response)
   })

lib/functions/processMessage.js

@@ -23,7 +23,7 @@ module.exports.processMessage = (event, context, callback) => {
       return callback(err)
     }
     // Add in the references field
-    let message = event.bodyXml.replace('</scope>', '</scope>\n<references></references>')
+    const message = event.bodyXml.replace('</scope>', '</scope>\n<references></references>')
 
     xml2js.parseString(message, (err, xmlResult) => {
       if (err) {
@@ -34,7 +34,7 @@ module.exports.processMessage = (event, context, callback) => {
         if (err) {
           return callback(err)
         }
-        let lastMessage = dbResult.rows[0]
+        const lastMessage = (!!dbResult && dbResult.rows.length > 0) ? dbResult.rows[0] : undefined
 
         // If not production set status to test
         if (AWSConfig.stage !== 'ea') {
@@ -49,7 +49,7 @@ module.exports.processMessage = (event, context, callback) => {
           delete xmlResult.alert.references
         }
 
-        let message = new Message(xmlResult)
+        const message = new Message(xmlResult)
 
         console.log('Processing CAP message: ' + message.data.identifier + ' for ' + message.data.fwis_code)