move marked to google.js, break function into two functions

Author: Spazcool

app.js

@@ -1,10 +1,13 @@
 const express = require('express');
 
-const marked = require('marked');
-
 const qr = require('qr-image');
 
-const { loadDatabase, searchDatabase } = require('./googleSpreadsheet');
+const {
+  loadDatabase,
+  searchDatabase,
+  addMarkdown,
+  addSimilarItems,
+} = require('./googleSpreadsheet');
 
 const app = express();
 
@@ -24,16 +27,6 @@ function logScanned(uuid, fixture) {
   allScans.unshift({ time: now, fixture, uuid });
 }
 
-function modifyContent(obj, allObj) {
-  obj.HOWTO = marked(obj.HOWTO);
-  obj.details = marked(obj.details);
-  obj.Troubleshooting = marked(obj.Troubleshooting);
-  obj.similarItems = searchDatabase({ fixture: obj.fixture }, allObj)
-    .filter(item => item.uuid !== obj.uuid)
-    .splice(0, 3);
-  return obj;
-}
-
 app.set('view engine', 'ejs');
 
 app.use(express.static(`${__dirname}/public`));
@@ -68,6 +61,7 @@ app.get('/recent', (req, res) => {
 
 app.get('/:uuid', (req, res) => {
   loadDatabase((allItems) => {
+    addMarkdown(allItems);
     const matches = searchDatabase(req.params, allItems);
     if (matches.length === 0) {
       logScanned(req.params.uuid);
@@ -77,8 +71,10 @@ app.get('/:uuid', (req, res) => {
       });
       return;
     }
+    addSimilarItems(matches[0], allItems);
     logScanned(req.params.uuid, matches[0].fixture);
-    res.render('item', modifyContent(matches[0], allItems));
+    // modifyContent(matches[0], allItems
+    res.render('item', matches[0]);
   });
 });
 

googleSpreadsheet.js

@@ -1,5 +1,6 @@
 const google = require('googleapis');
 const keys = require('./config/keys');
+const marked = require('marked');
 
 function rowToObject(val, lab) {
   const o = {};
@@ -33,7 +34,28 @@ function searchDatabase(query, rows) {
   return matches;
 }
 
+function addSimilarItems(object, objects) {
+  const obj = object;
+  const allObj = objects;
+  obj.similarItems = searchDatabase({ fixture: obj.fixture }, allObj)
+    .filter(item => item.uuid !== obj.uuid)
+    .splice(0, 3);
+  return obj;
+}
+
+function addMarkdown(objects) {
+  const objs = objects;
+  for (let i = 0; i < objs.length; i += 1) {
+    objs[i].HOWTO = marked(objs[i].HOWTO);
+    objs[i].details = marked(objs[i].details);
+    objs[i].Troubleshooting = marked(objs[i].Troubleshooting);
+  }
+  return objs;
+}
+
 module.exports = {
   loadDatabase,
   searchDatabase,
+  addMarkdown,
+  addSimilarItems,
 };