From bbe45dc5bc3f217a338c210cfa73e38d6b0352fe Mon Sep 17 00:00:00 2001
From: Tamara Hills <thills@mozilla.com>
Date: Mon, 25 Feb 2019 10:27:27 -0800
Subject: [PATCH 01/22] Add trending Pocket articles api

---
 command/CommandController.js | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/command/CommandController.js b/command/CommandController.js
index a6c847e..7f58b7c 100644
--- a/command/CommandController.js
+++ b/command/CommandController.js
@@ -60,6 +60,14 @@ const articleOptions = {
   }
 };
 
+const pocketRecOptions = {
+  uri:
+    'https://getpocket.cdn.mozilla.net/v3/firefox/global-recs?' +
+    'count=3&version=3&consumer_key=' +
+    process.env.POCKET_KEY,
+  method: 'GET'
+};
+
 const summaryLink =
   'https://api.smmry.com?SM_API_KEY=' + process.env.SM_API_KEY + '&SM_URL=';
 logger.info('SummaryLink Creation is: ' + summaryLink);
@@ -635,6 +643,26 @@ router.get('/search', VerifyToken, async function(req, res) {
   }
 });
 
+router.post('/trending', VerifyToken, async function(req, res) {
+  rp(pocketRecOptions).then(function(body) {
+    var jsonBody = JSON.parse(body);
+    if (jsonBody.status == '1') {
+      let promiseArray = [];
+      Object.keys(jsonBody.recommendations).forEach(key => {
+        let recItem = {
+          id: jsonBody.recommendations[key].url,
+          image_url: jsonBody.recommendations[key].image_src
+        };
+        promiseArray.push(recItem);
+      });
+      res.send(promiseArray);
+      resolve(promiseArray);
+    } else {
+      throw 'NoSearchMatch';
+    }
+  });
+});
+
 function logMetric(cmd, userid, agent) {
   if (process.env.GA_PROPERTY_ID) {
     logger.info('User-Agent is : ' + agent);

From 96f76bb6f245334d620e84f962f64fddf09d9da9 Mon Sep 17 00:00:00 2001
From: Tamara Hills <thills@mozilla.com>
Date: Mon, 25 Feb 2019 11:17:04 -0800
Subject: [PATCH 02/22] lint

---
 command/CommandController.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/command/CommandController.js b/command/CommandController.js
index 7f58b7c..afeed7a 100644
--- a/command/CommandController.js
+++ b/command/CommandController.js
@@ -656,7 +656,6 @@ router.post('/trending', VerifyToken, async function(req, res) {
         promiseArray.push(recItem);
       });
       res.send(promiseArray);
-      resolve(promiseArray);
     } else {
       throw 'NoSearchMatch';
     }

From 3ece40af319c84ae71f176d95866d08b5260e610 Mon Sep 17 00:00:00 2001
From: Tamara Hills <thills@mozilla.com>
Date: Mon, 25 Feb 2019 11:23:48 -0800
Subject: [PATCH 03/22] add count

---
 command/CommandController.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/command/CommandController.js b/command/CommandController.js
index afeed7a..c2840cc 100644
--- a/command/CommandController.js
+++ b/command/CommandController.js
@@ -63,7 +63,7 @@ const articleOptions = {
 const pocketRecOptions = {
   uri:
     'https://getpocket.cdn.mozilla.net/v3/firefox/global-recs?' +
-    'count=3&version=3&consumer_key=' +
+    'version=3&consumer_key=' +
     process.env.POCKET_KEY,
   method: 'GET'
 };
@@ -644,6 +644,8 @@ router.get('/search', VerifyToken, async function(req, res) {
 });
 
 router.post('/trending', VerifyToken, async function(req, res) {
+  pocketRecOptions.uri += '&count=' + req.body.count;
+
   rp(pocketRecOptions).then(function(body) {
     var jsonBody = JSON.parse(body);
     if (jsonBody.status == '1') {

From f2b7e6a6b014d29dbc81586119e6c73fcddfea3e Mon Sep 17 00:00:00 2001
From: Tamara Hills <thills@mozilla.com>
Date: Mon, 25 Feb 2019 12:51:26 -0800
Subject: [PATCH 04/22] add title

---
 command/CommandController.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/command/CommandController.js b/command/CommandController.js
index c2840cc..3d84591 100644
--- a/command/CommandController.js
+++ b/command/CommandController.js
@@ -653,13 +653,14 @@ router.post('/trending', VerifyToken, async function(req, res) {
       Object.keys(jsonBody.recommendations).forEach(key => {
         let recItem = {
           id: jsonBody.recommendations[key].url,
-          image_url: jsonBody.recommendations[key].image_src
+          image_url: jsonBody.recommendations[key].image_src,
+          title: jsonBody.recommendations[key].title
         };
         promiseArray.push(recItem);
       });
       res.send(promiseArray);
     } else {
-      throw 'NoSearchMatch';
+      res.sendStatus(500);
     }
   });
 });

From 46f4553788a2c213528ebca93470e1a1d2298507 Mon Sep 17 00:00:00 2001
From: Tamara Hills <thills@mozilla.com>
Date: Mon, 25 Feb 2019 14:13:12 -0800
Subject: [PATCH 05/22] add title

---
 command/CommandController.js | 40 ++++++++++++++++++++++++++----------
 1 file changed, 29 insertions(+), 11 deletions(-)

diff --git a/command/CommandController.js b/command/CommandController.js
index 3d84591..27ff7df 100644
--- a/command/CommandController.js
+++ b/command/CommandController.js
@@ -68,6 +68,12 @@ const pocketRecOptions = {
   method: 'GET'
 };
 
+const explorePocketOptions = {
+  uri: 'https://getpocket.com/v3/getExploreFeed/?&locale_lang=en-US&version=2' +
+  'consumer_key=' + process.env.POCKET_KEY,
+  method: 'GET'
+};
+
 const summaryLink =
   'https://api.smmry.com?SM_API_KEY=' + process.env.SM_API_KEY + '&SM_URL=';
 logger.info('SummaryLink Creation is: ' + summaryLink);
@@ -644,26 +650,38 @@ router.get('/search', VerifyToken, async function(req, res) {
 });
 
 router.post('/trending', VerifyToken, async function(req, res) {
-  pocketRecOptions.uri += '&count=' + req.body.count;
+  let topicArray = req.body.topic;
+  let resArray = [];
+
+  topicArray.forEach(topic => {
+    resArray.push(await getTopicRecommendations(topic, req.body.count));
+  });
 
-  rp(pocketRecOptions).then(function(body) {
+  res.send(promiseArray);
+});
+
+async function getTopicRecommendations(topic, count) {
+  explorePocketOptions.uri += `&query=${topic}&count=${count}`;
+  rp(explorePocketOptions).then(function(body) {
     var jsonBody = JSON.parse(body);
+    let promiseArray = [];
     if (jsonBody.status == '1') {
-      let promiseArray = [];
-      Object.keys(jsonBody.recommendations).forEach(key => {
+      Object.keys(jsonBody.feed).forEach(key => {
         let recItem = {
-          id: jsonBody.recommendations[key].url,
-          image_url: jsonBody.recommendations[key].image_src,
-          title: jsonBody.recommendations[key].title
+          id: jsonBody.feed[key].item.resolved_id,
+          image_url: jsonBody.feed[key].item.top_image_url,
+          title: jsonBody.feed[key].item.title,
+          url: jsonBody.feed[key].item.resolved_url,
+          logo: jsonBody.feed[key].item.domain_metadata.logo,
+          domain_name: jsonBody.feed[key].item.domain_metadata.name
         };
+        console.log(recItem);
         promiseArray.push(recItem);
       });
-      res.send(promiseArray);
-    } else {
-      res.sendStatus(500);
     }
+    return promiseArray; 
   });
-});
+}
 
 function logMetric(cmd, userid, agent) {
   if (process.env.GA_PROPERTY_ID) {

From 9004f4f49551efcfe9a2fee1bedc89f5e53f33cb Mon Sep 17 00:00:00 2001
From: Tamara Hills <thills@mozilla.com>
Date: Mon, 25 Feb 2019 14:23:47 -0800
Subject: [PATCH 06/22] add title

---
 command/CommandController.js | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/command/CommandController.js b/command/CommandController.js
index 27ff7df..6f24f5d 100644
--- a/command/CommandController.js
+++ b/command/CommandController.js
@@ -69,8 +69,10 @@ const pocketRecOptions = {
 };
 
 const explorePocketOptions = {
-  uri: 'https://getpocket.com/v3/getExploreFeed/?&locale_lang=en-US&version=2' +
-  'consumer_key=' + process.env.POCKET_KEY,
+  uri:
+    'https://getpocket.com/v3/getExploreFeed/?&locale_lang=en-US&version=2' +
+    'consumer_key=' +
+    process.env.POCKET_KEY,
   method: 'GET'
 };
 
@@ -653,9 +655,11 @@ router.post('/trending', VerifyToken, async function(req, res) {
   let topicArray = req.body.topic;
   let resArray = [];
 
-  topicArray.forEach(topic => {
-    resArray.push(await getTopicRecommendations(topic, req.body.count));
-  });
+  for (i = 0; i < req.body.topic.length; i++) {
+    resArray.push(
+      await getTopicRecommendations(req.body.topic[i], req.body.count)
+    );
+  }
 
   res.send(promiseArray);
 });
@@ -679,7 +683,7 @@ async function getTopicRecommendations(topic, count) {
         promiseArray.push(recItem);
       });
     }
-    return promiseArray; 
+    return promiseArray;
   });
 }
 

From 05cfbff62216a7748ffb1804e2f139949f88714c Mon Sep 17 00:00:00 2001
From: Tamara Hills <thills@mozilla.com>
Date: Mon, 25 Feb 2019 14:29:08 -0800
Subject: [PATCH 07/22] add title

---
 command/CommandController.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/CommandController.js b/command/CommandController.js
index 6f24f5d..a1902f4 100644
--- a/command/CommandController.js
+++ b/command/CommandController.js
@@ -654,7 +654,7 @@ router.get('/search', VerifyToken, async function(req, res) {
 router.post('/trending', VerifyToken, async function(req, res) {
   let topicArray = req.body.topic;
   let resArray = [];
-
+  console.log('topic array is: ' + topicArray);
   for (i = 0; i < req.body.topic.length; i++) {
     resArray.push(
       await getTopicRecommendations(req.body.topic[i], req.body.count)

From 27723baf50db5cc81e6ebc728373aee6bcd51d8c Mon Sep 17 00:00:00 2001
From: Tamara Hills <thills@mozilla.com>
Date: Mon, 25 Feb 2019 14:31:12 -0800
Subject: [PATCH 08/22] add title

---
 command/CommandController.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/CommandController.js b/command/CommandController.js
index a1902f4..d171dc9 100644
--- a/command/CommandController.js
+++ b/command/CommandController.js
@@ -661,7 +661,7 @@ router.post('/trending', VerifyToken, async function(req, res) {
     );
   }
 
-  res.send(promiseArray);
+  res.send(resArray);
 });
 
 async function getTopicRecommendations(topic, count) {

From f4ee906d494aea3ad4aef8fb5d94d48750342237 Mon Sep 17 00:00:00 2001
From: Tamara Hills <thills@mozilla.com>
Date: Mon, 25 Feb 2019 14:34:16 -0800
Subject: [PATCH 09/22] add title

---
 command/CommandController.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/command/CommandController.js b/command/CommandController.js
index d171dc9..20cd96d 100644
--- a/command/CommandController.js
+++ b/command/CommandController.js
@@ -666,6 +666,7 @@ router.post('/trending', VerifyToken, async function(req, res) {
 
 async function getTopicRecommendations(topic, count) {
   explorePocketOptions.uri += `&query=${topic}&count=${count}`;
+  console.log('uri is: ' + explorePocketOptions.uri);
   rp(explorePocketOptions).then(function(body) {
     var jsonBody = JSON.parse(body);
     let promiseArray = [];

From a951c5554a6f4a955d55994a287e42bc1c605c81 Mon Sep 17 00:00:00 2001
From: Tamara Hills <thills@mozilla.com>
Date: Mon, 25 Feb 2019 14:39:33 -0800
Subject: [PATCH 10/22] add title

---
 command/CommandController.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/command/CommandController.js b/command/CommandController.js
index 20cd96d..f23b556 100644
--- a/command/CommandController.js
+++ b/command/CommandController.js
@@ -656,9 +656,11 @@ router.post('/trending', VerifyToken, async function(req, res) {
   let resArray = [];
   console.log('topic array is: ' + topicArray);
   for (i = 0; i < req.body.topic.length; i++) {
-    resArray.push(
+    console.log(req.body.topic[i]);
+    console.log(req.body.count);
+    /*resArray.push(
       await getTopicRecommendations(req.body.topic[i], req.body.count)
-    );
+    );*/
   }
 
   res.send(resArray);

From 101f6818ce7a19e5284761819f7d0c048bde36b5 Mon Sep 17 00:00:00 2001
From: Tamara Hills <thills@mozilla.com>
Date: Mon, 25 Feb 2019 14:45:46 -0800
Subject: [PATCH 11/22] add title

---
 command/CommandController.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/command/CommandController.js b/command/CommandController.js
index f23b556..86c98d4 100644
--- a/command/CommandController.js
+++ b/command/CommandController.js
@@ -60,13 +60,13 @@ const articleOptions = {
   }
 };
 
-const pocketRecOptions = {
+/*const pocketRecOptions = {
   uri:
     'https://getpocket.cdn.mozilla.net/v3/firefox/global-recs?' +
     'version=3&consumer_key=' +
     process.env.POCKET_KEY,
   method: 'GET'
-};
+};*/
 
 const explorePocketOptions = {
   uri:
@@ -655,7 +655,7 @@ router.post('/trending', VerifyToken, async function(req, res) {
   let topicArray = req.body.topic;
   let resArray = [];
   console.log('topic array is: ' + topicArray);
-  for (i = 0; i < req.body.topic.length; i++) {
+  for (var i = 0; i < req.body.topic.length; i++) {
     console.log(req.body.topic[i]);
     console.log(req.body.count);
     /*resArray.push(

From ac6c47aa71a2fdb2b2b8b604d4e999bff93f0222 Mon Sep 17 00:00:00 2001
From: Tamara Hills <thills@mozilla.com>
Date: Mon, 25 Feb 2019 14:50:52 -0800
Subject: [PATCH 12/22] add title

---
 command/CommandController.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/command/CommandController.js b/command/CommandController.js
index 86c98d4..baa4e5c 100644
--- a/command/CommandController.js
+++ b/command/CommandController.js
@@ -665,7 +665,7 @@ router.post('/trending', VerifyToken, async function(req, res) {
 
   res.send(resArray);
 });
-
+/*
 async function getTopicRecommendations(topic, count) {
   explorePocketOptions.uri += `&query=${topic}&count=${count}`;
   console.log('uri is: ' + explorePocketOptions.uri);
@@ -688,7 +688,7 @@ async function getTopicRecommendations(topic, count) {
     }
     return promiseArray;
   });
-}
+}*/
 
 function logMetric(cmd, userid, agent) {
   if (process.env.GA_PROPERTY_ID) {

From 9f3c832b4c643f57f1ff148252e550c663487a86 Mon Sep 17 00:00:00 2001
From: Tamara Hills <thills@mozilla.com>
Date: Mon, 25 Feb 2019 15:10:42 -0800
Subject: [PATCH 13/22] add title

---
 command/CommandController.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/command/CommandController.js b/command/CommandController.js
index baa4e5c..839a069 100644
--- a/command/CommandController.js
+++ b/command/CommandController.js
@@ -658,14 +658,14 @@ router.post('/trending', VerifyToken, async function(req, res) {
   for (var i = 0; i < req.body.topic.length; i++) {
     console.log(req.body.topic[i]);
     console.log(req.body.count);
-    /*resArray.push(
+    resArray.push(
       await getTopicRecommendations(req.body.topic[i], req.body.count)
-    );*/
+    );
   }
 
   res.send(resArray);
 });
-/*
+
 async function getTopicRecommendations(topic, count) {
   explorePocketOptions.uri += `&query=${topic}&count=${count}`;
   console.log('uri is: ' + explorePocketOptions.uri);
@@ -688,7 +688,7 @@ async function getTopicRecommendations(topic, count) {
     }
     return promiseArray;
   });
-}*/
+}
 
 function logMetric(cmd, userid, agent) {
   if (process.env.GA_PROPERTY_ID) {

From 116d9e1d364d4c76cd2eae3588ff60285c6629fd Mon Sep 17 00:00:00 2001
From: Tamara Hills <thills@mozilla.com>
Date: Mon, 25 Feb 2019 15:19:42 -0800
Subject: [PATCH 14/22] add title

---
 command/CommandController.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/command/CommandController.js b/command/CommandController.js
index 839a069..28d63b9 100644
--- a/command/CommandController.js
+++ b/command/CommandController.js
@@ -68,11 +68,12 @@ const articleOptions = {
   method: 'GET'
 };*/
 
+const exploreUri =
+  'https://getpocket.com/v3/getExploreFeed/?&locale_lang=en-US&version=2' +
+  'consumer_key=' +
+  process.env.POCKET_KEY;
 const explorePocketOptions = {
-  uri:
-    'https://getpocket.com/v3/getExploreFeed/?&locale_lang=en-US&version=2' +
-    'consumer_key=' +
-    process.env.POCKET_KEY,
+  uri: '',
   method: 'GET'
 };
 
@@ -667,8 +668,8 @@ router.post('/trending', VerifyToken, async function(req, res) {
 });
 
 async function getTopicRecommendations(topic, count) {
-  explorePocketOptions.uri += `&query=${topic}&count=${count}`;
-  console.log('uri is: ' + explorePocketOptions.uri);
+  explorePocketOptions.uri = exploreUri + `&query=${topic}&count=${count}`;
+  console.log(explorePocketOptions.uri);
   rp(explorePocketOptions).then(function(body) {
     var jsonBody = JSON.parse(body);
     let promiseArray = [];

From e69e63812e1eb0fb7d43d9ddb7cb20e0e7848617 Mon Sep 17 00:00:00 2001
From: Tamara Hills <thills@mozilla.com>
Date: Mon, 25 Feb 2019 15:23:55 -0800
Subject: [PATCH 15/22] add title

---
 command/CommandController.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/CommandController.js b/command/CommandController.js
index 28d63b9..3c17ce9 100644
--- a/command/CommandController.js
+++ b/command/CommandController.js
@@ -69,7 +69,7 @@ const articleOptions = {
 };*/
 
 const exploreUri =
-  'https://getpocket.com/v3/getExploreFeed/?&locale_lang=en-US&version=2' +
+  'https://getpocket.com/v3/getExploreFeed?locale_lang=en-US&version=2' +
   'consumer_key=' +
   process.env.POCKET_KEY;
 const explorePocketOptions = {

From 348f0beabec5fa9b92badefbda3ee32e6b52b468 Mon Sep 17 00:00:00 2001
From: Tamara Hills <thills@mozilla.com>
Date: Mon, 25 Feb 2019 15:28:49 -0800
Subject: [PATCH 16/22] add title

---
 command/CommandController.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/CommandController.js b/command/CommandController.js
index 3c17ce9..8f8b02b 100644
--- a/command/CommandController.js
+++ b/command/CommandController.js
@@ -69,7 +69,7 @@ const articleOptions = {
 };*/
 
 const exploreUri =
-  'https://getpocket.com/v3/getExploreFeed?locale_lang=en-US&version=2' +
+  'https://getpocket.com/v3/getExploreFeed?locale_lang=en-US&version=2&' +
   'consumer_key=' +
   process.env.POCKET_KEY;
 const explorePocketOptions = {

From b84ee1c0c8bf01e1f8b1ba69a158cbfb7ebb74cc Mon Sep 17 00:00:00 2001
From: Tamara Hills <thills@mozilla.com>
Date: Mon, 25 Feb 2019 15:36:55 -0800
Subject: [PATCH 17/22] add title

---
 command/CommandController.js | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/command/CommandController.js b/command/CommandController.js
index 8f8b02b..e50dbd3 100644
--- a/command/CommandController.js
+++ b/command/CommandController.js
@@ -60,14 +60,6 @@ const articleOptions = {
   }
 };
 
-/*const pocketRecOptions = {
-  uri:
-    'https://getpocket.cdn.mozilla.net/v3/firefox/global-recs?' +
-    'version=3&consumer_key=' +
-    process.env.POCKET_KEY,
-  method: 'GET'
-};*/
-
 const exploreUri =
   'https://getpocket.com/v3/getExploreFeed?locale_lang=en-US&version=2&' +
   'consumer_key=' +
@@ -675,14 +667,22 @@ async function getTopicRecommendations(topic, count) {
     let promiseArray = [];
     if (jsonBody.status == '1') {
       Object.keys(jsonBody.feed).forEach(key => {
+        let item = jsonBody.feed[key].item;
         let recItem = {
-          id: jsonBody.feed[key].item.resolved_id,
-          image_url: jsonBody.feed[key].item.top_image_url,
-          title: jsonBody.feed[key].item.title,
-          url: jsonBody.feed[key].item.resolved_url,
-          logo: jsonBody.feed[key].item.domain_metadata.logo,
-          domain_name: jsonBody.feed[key].item.domain_metadata.name
+          id: item.resolved_id,
+          image_url: item.top_image_url,
+          title: item.title,
+          url: item.resolved_url
         };
+        if (item.domain_metadata) {
+          recItem['logo'] = item.domain_metadata.logo
+            ? item.domain_metadata.logo
+            : '';
+          recItem['domain_name'] = item.domain_metadata.name
+            ? item.domain_metadata.name
+            : '';
+        }
+
         console.log(recItem);
         promiseArray.push(recItem);
       });

From af06a123479428ea4b61cfd42c5999f97aa16ea1 Mon Sep 17 00:00:00 2001
From: Tamara Hills <thills@mozilla.com>
Date: Mon, 25 Feb 2019 15:41:40 -0800
Subject: [PATCH 18/22] add title

---
 command/CommandController.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/command/CommandController.js b/command/CommandController.js
index e50dbd3..de945e1 100644
--- a/command/CommandController.js
+++ b/command/CommandController.js
@@ -661,7 +661,7 @@ router.post('/trending', VerifyToken, async function(req, res) {
 
 async function getTopicRecommendations(topic, count) {
   explorePocketOptions.uri = exploreUri + `&query=${topic}&count=${count}`;
-  console.log(explorePocketOptions.uri);
+  // console.log(explorePocketOptions.uri);
   rp(explorePocketOptions).then(function(body) {
     var jsonBody = JSON.parse(body);
     let promiseArray = [];
@@ -683,10 +683,12 @@ async function getTopicRecommendations(topic, count) {
             : '';
         }
 
-        console.log(recItem);
+        // console.log(recItem);
         promiseArray.push(recItem);
       });
     }
+    console.log('promiseArray is:');
+    console.log(promiseArray);
     return promiseArray;
   });
 }

From 6c93516b868e197fbe6c7580af3549427855faba Mon Sep 17 00:00:00 2001
From: Tamara Hills <thills@mozilla.com>
Date: Mon, 25 Feb 2019 15:45:00 -0800
Subject: [PATCH 19/22] add title

---
 command/CommandController.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/CommandController.js b/command/CommandController.js
index de945e1..5455d9c 100644
--- a/command/CommandController.js
+++ b/command/CommandController.js
@@ -651,7 +651,7 @@ router.post('/trending', VerifyToken, async function(req, res) {
   for (var i = 0; i < req.body.topic.length; i++) {
     console.log(req.body.topic[i]);
     console.log(req.body.count);
-    resArray.push(
+    resArray.concat(
       await getTopicRecommendations(req.body.topic[i], req.body.count)
     );
   }

From 3cdfa11214b5bfa99c237c3ed6b058f81c2f74d6 Mon Sep 17 00:00:00 2001
From: Tamara Hills <thills@mozilla.com>
Date: Mon, 25 Feb 2019 15:48:13 -0800
Subject: [PATCH 20/22] add title

---
 command/CommandController.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/command/CommandController.js b/command/CommandController.js
index 5455d9c..4f70f2a 100644
--- a/command/CommandController.js
+++ b/command/CommandController.js
@@ -651,9 +651,12 @@ router.post('/trending', VerifyToken, async function(req, res) {
   for (var i = 0; i < req.body.topic.length; i++) {
     console.log(req.body.topic[i]);
     console.log(req.body.count);
-    resArray.concat(
-      await getTopicRecommendations(req.body.topic[i], req.body.count)
+    let resJson = await getTopicRecommendations(
+      req.body.topic[i],
+      req.body.count
     );
+    console.log(resJson);
+    resArray.concat(resJson);
   }
 
   res.send(resArray);
@@ -687,8 +690,6 @@ async function getTopicRecommendations(topic, count) {
         promiseArray.push(recItem);
       });
     }
-    console.log('promiseArray is:');
-    console.log(promiseArray);
     return promiseArray;
   });
 }

From 75da601f61f026f23b9e98e6c4b34b76cba6f4c5 Mon Sep 17 00:00:00 2001
From: Tamara Hills <thills@mozilla.com>
Date: Mon, 25 Feb 2019 15:51:50 -0800
Subject: [PATCH 21/22] add title

---
 command/CommandController.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/CommandController.js b/command/CommandController.js
index 4f70f2a..c8c60b3 100644
--- a/command/CommandController.js
+++ b/command/CommandController.js
@@ -689,8 +689,8 @@ async function getTopicRecommendations(topic, count) {
         // console.log(recItem);
         promiseArray.push(recItem);
       });
+      return promiseArray;
     }
-    return promiseArray;
   });
 }
 

From c2c16a10377d001a8614dd344a54dac8e082e9a4 Mon Sep 17 00:00:00 2001
From: Tamara Hills <thills@mozilla.com>
Date: Mon, 25 Feb 2019 16:07:34 -0800
Subject: [PATCH 22/22] add title

---
 command/CommandController.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/CommandController.js b/command/CommandController.js
index c8c60b3..86e4262 100644
--- a/command/CommandController.js
+++ b/command/CommandController.js
@@ -689,7 +689,7 @@ async function getTopicRecommendations(topic, count) {
         // console.log(recItem);
         promiseArray.push(recItem);
       });
-      return promiseArray;
+      return Promise.resolve(promiseArray);
     }
   });
 }