contribution / comment tests and optimization

Author: visualjerk

server/helper/alter-items.js

@@ -14,7 +14,7 @@ module.exports = func => hook => {
   }
   let items = getItems(hook);
   if (Array.isArray(items)) {
-    items.map(item => func(item, hook));
+    items = items.map(item => func(item, hook));
   } else if (items) {
     items = func(items, hook);
   }

server/services/comments/hooks/create-notifications.js

@@ -14,7 +14,7 @@ module.exports = function (options = {}) { // eslint-disable-line no-unused-vars
       const contributionId = hook.result.contributionId;
       const creatorId = hook.result.userId;
 
-      contributionService.get(contributionId)
+      contributionService.get(contributionId, { _populate: 'skip' })
         .then(result => {
           const userId = result.userId;
 

server/services/contributions/hooks/get-associated-can-dos.js

@@ -10,7 +10,7 @@ module.exports = function (options = {}) { // eslint-disable-line no-unused-vars
       }
 
       // Stop, if it was a find method and $limit was not set
-      if (hook.method === 'find' && (!hook.params.query || hook.params.query.$limit !== 1)) {
+      if (hook.method === 'find' && (!hook.params.query || (hook.params.query.$limit !== 1 && !hook.params.query.slug))) {
         return resolve(hook);
       }
 
@@ -21,7 +21,8 @@ module.exports = function (options = {}) { // eslint-disable-line no-unused-vars
       }
 
       let currentData = isArray ? hook.result.data[0] : hook.result;
-      if (!currentData.categoryIds || !currentData.categoryIds.length) {
+      let categoryIds = currentData.categoryIds;
+      if (!categoryIds || !categoryIds.length) {
         return resolve(hook);
       }
 
@@ -32,16 +33,15 @@ module.exports = function (options = {}) { // eslint-disable-line no-unused-vars
       })
         .then(({data}) => {
           let associatedCanDos = [];
-          let categoryIds = currentData.categoryIds;
-          if (categoryIds && categoryIds.length) {
-            while (associatedCanDos.length < limit && data.length) {
-              let item = data.shift();
-              let check = categoryIds.some(category => {
-                return item.categoryIds.includes(category);
+          while (associatedCanDos.length < limit && data.length) {
+            let item = data.shift();
+            let check = categoryIds.some(id => {
+              return item.categoryIds.some(innerId => {
+                return innerId.toString() == id.toString();
               });
-              if (check && item._id.toString() !== currentData._id.toString()) {
-                associatedCanDos.push(item);
-              }
+            });
+            if (check && item._id.toString() !== currentData._id.toString()) {
+              associatedCanDos.push(item);
             }
           }
           if (isArray) {

test/assets/categories.js

@@ -0,0 +1,8 @@
+const categoryData = {
+  title: 'a',
+  icon: 'a'
+};
+
+module.exports = {
+  categoryData
+};

test/assets/comments.js

@@ -0,0 +1,7 @@
+const commentData = {
+  content: 'My comment content',
+};
+
+module.exports = {
+  commentData
+};

test/assets/contributions.js

@@ -0,0 +1,32 @@
+const contributionData = {
+  title: 'a',
+  type: 'post',
+  content: 'My contribution content',
+  language: 'en'
+};
+
+const contributionData2 = {
+  title: 'b',
+  type: 'post',
+  content: 'My contribution content',
+  language: 'en'
+};
+
+const contributionCandoData = {
+  title: 'c',
+  type: 'cando',
+  content: 'My contribution content',
+  language: 'en',
+  cando: {
+    difficulty: 'easy',
+    reasonTitle: 'a',
+    reason: 'My cando reason'
+  }
+};
+
+module.exports = {
+  contributionData,
+  contributionData2,
+  contributionCandoData
+};
+

test/services/comments.test.js

@@ -1,10 +1,84 @@
 const assert = require('assert');
 const app = require('../../server/app');
+const service = app.service('comments');
+const contributionService = app.service('contributions');
+const userService = app.service('users');
+
+const { userData } = require('../assets/users');
+const { contributionData } = require('../assets/contributions');
+const { commentData } = require('../assets/comments');
 
 describe('\'comments\' service', () => {
-  it('registered the service', () => {
-    const service = app.service('comments');
+  let user;
+  let params;
+  let contribution;
+
+  before(function(done) {
+    this.server = app.listen(3031);
+    this.server.once('listening', () => done());
+  });
+
+  after(function(done) {
+    this.server.close(done);
+  });
+
+  beforeEach(async () => {
+    await app.get('mongooseClient').connection.dropDatabase();
+    user = await userService.create(userData);
+    params = {
+      user
+    };
+    contribution = await contributionService.create(contributionData, params);
+    commentData.userId = user._id;
+    commentData.contributionId = contribution._id;
+  });
+
+  afterEach(async () => {
+    await app.get('mongooseClient').connection.dropDatabase();
+    user = null;
+    params = null;
+    contribution = null;
+    delete commentData.userId;
+    delete commentData.contributionId;
+  });
 
+  it('registered the service', () => {
     assert.ok(service, 'Registered the service');
   });
-});
+
+  describe('comments create', () => {
+    it('runs create', async () => {
+      const comment = await service.create(commentData, params);
+      assert.ok(comment, 'created comment');
+    });
+  });
+
+  describe('comments patch', () => {
+    let comment;
+
+    beforeEach(async () => {
+      comment = await service.create(commentData, params);
+    });
+
+    it('runs patch', async () => {
+      const result = await service.patch(
+        comment._id,
+        { content: 'Test' },
+        params
+      );
+      assert.ok(result, 'returns result');
+      assert.equal(result.content, 'Test', 'patched content');
+    });
+  });
+
+  describe('comments find', () => {
+    beforeEach(async () => {
+      await service.create(commentData, params);
+    });
+
+    it('runs find', async () => {
+      const result = await service.find();
+      assert.ok(result.data[0], 'returns data');
+    });
+  });
+});