Merge branch 'master' into production

DoSomethingArchive · Oct 25, 2018 · dde94a0 · dde94a0
2 parents 25529ab + 16f118f
commit dde94a0
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 25 deletions.
diff --git a/documentation/endpoints/topics.md b/documentation/endpoints/topics.md
@@ -80,7 +80,6 @@ curl http://localhost:5000/v1/topics?skip=5
           "topic": {}
         }
       },
-      "triggers": []
     },
     {
       "id": "2X4r3fZrTGA2mGemowgiEI",
@@ -118,7 +117,6 @@ curl http://localhost:5000/v1/topics?skip=5
           "topic": {}
         }
       },
-      "triggers": [],
     },
     {
       "id": "3peS2Oye08o6OwUMAEcS2c",
@@ -144,9 +142,6 @@ curl http://localhost:5000/v1/topics?skip=5
         },
         ...
       },
-      "triggers": [
-        "mascot",
-      ]
     },
     ...
   ],

diff --git a/lib/middleware/topics/index/topics-get.js b/lib/middleware/topics/index/topics-get.js
@@ -7,14 +7,6 @@ module.exports = function getTopics() {
     .then((fetchTopicResult) => {
       req.data = fetchTopicResult.data;
       req.meta = fetchTopicResult.meta;
-      const promises = req.data.map(topic => helpers.defaultTopicTrigger.getByTopicId(topic.id));
-      return Promise.all(promises);
-    })
-    .then((defaultTopicTriggersByTopic) => {
-      defaultTopicTriggersByTopic.forEach((result, index) => {
-        req.data[index].triggers = helpers.defaultTopicTrigger
-          .getTriggersFromDefaultTopicTriggers(result);
-      });
       return helpers.response.sendIndexData(res, req.data, req.meta);
     })
     .catch(err => helpers.sendErrorResponse(res, err));

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gambit-campaigns",
-  "version": "5.14.2",
+  "version": "5.14.3",
   "description": "The DoSomething.org chatbot service for campaigns and their activity.",
   "license": "MIT",
   "repository": {

diff --git a/test/lib/middleware/topics/index/topics-get.test.js b/test/lib/middleware/topics/index/topics-get.test.js
@@ -38,26 +38,16 @@ test.afterEach((t) => {
 test('getTopics should send helpers.topic.fetch result', async (t) => {
   const next = sinon.stub();
   const middleware = getTopics();
-  const triggers = [stubs.getRandomWord()];
-  const firstTopic = topicFactory.getValidTopic();
-  const secondTopic = topicFactory.getValidTopic();
-  const topics = [firstTopic, secondTopic];
+  const topics = [topicFactory.getValidTopic(), topicFactory.getValidTopic()];
   const fetchResult = stubs.contentful.getFetchByContentTypesResultWithArray(topics);
   sandbox.stub(helpers.topic, 'fetch')
     .returns(Promise.resolve(fetchResult));
-  sandbox.stub(helpers.defaultTopicTrigger, 'getByTopicId')
-    .returns(Promise.resolve(fetchResult));
-  sandbox.stub(helpers.defaultTopicTrigger, 'getTriggersFromDefaultTopicTriggers')
-    .returns(triggers);
   const queryParams = { skip: 20 };
   t.context.req.query = queryParams;
 
   // test
   await middleware(t.context.req, t.context.res, next);
   helpers.topic.fetch.should.have.been.calledWith(queryParams);
-  helpers.defaultTopicTrigger.getByTopicId.should.have.been.calledWith(firstTopic.id);
-  helpers.defaultTopicTrigger.getByTopicId.should.have.been.calledWith(secondTopic.id);
-
   helpers.response.sendIndexData
     .should.have.been.calledWith(t.context.res, fetchResult.data, fetchResult.meta);
   helpers.sendErrorResponse.should.not.have.been.called;