Merge pull request #121 from Human-Connection/105_get_unique_slug_considers_deleted_contributions

[WIP] Fix #105

Author: visualjerk

server/helper/get-unique-slug.js

@@ -14,6 +14,7 @@ const getUniqueSlug = (service, slug, count, id) => {
     }
     service.find({
       query,
+      _includeAll: true,
       _populate: 'skip'
     }).then((result) => {
       if (result.data.length > 0) {

server/hooks/include-all.js

@@ -0,0 +1,12 @@
+module.exports = () => hook => {
+  if (!hook.params._includeAll) {
+    return hook;
+  }
+  if (hook.params.query.deleted) {
+    delete hook.params.query.deleted;
+  }
+  if (hook.params.query.isEnabled) {
+    delete hook.params.query.isEnabled;
+  }
+  return hook;
+};

server/services/comments/comments.hooks.js

@@ -41,7 +41,7 @@ module.exports = {
     ],
     find: [
       // We want to deleted comments to show up
-      (hook) => {
+      hook => {
         delete hook.params.query.deleted;
         return hook;
       }

server/services/contributions/contributions.hooks.js

@@ -10,6 +10,7 @@ const createSlug = require('../../hooks/create-slug');
 const saveRemoteImages = require('../../hooks/save-remote-images');
 const createExcerpt = require('../../hooks/create-excerpt');
 const patchDeletedData = require('../../hooks/patch-deleted-data');
+const includeAll = require('../../hooks/include-all');
 const cleanupRelatedItems = require('../../hooks/cleanup-related-items');
 const keepDeletedDataFields = require('../../hooks/keep-deleted-data-fields');
 const search = require('feathers-mongodb-fuzzy-search');
@@ -108,6 +109,9 @@ module.exports = {
       unless(isModerator(),
         excludeDisabled()
       ),
+      when(isProvider('server'),
+        includeAll()
+      ),
       search(),
       search({
         fields: ['title', 'content']
@@ -163,7 +167,6 @@ module.exports = {
       patchDeletedData({
         data: {
           $set: {
-            title: 'DELETED',
             type: 'DELETED',
             content: 'DELETED',
             contentExcerpt: 'DELETED',

test/services/contributions.test.js

@@ -81,6 +81,52 @@ describe('\'contributions\' service', () => {
       assert.ok(notification.relatedContributionId, 'has relatedContributionId');
       assert.equal(notification.relatedContributionId, contribution._id, 'has correct relatedContributionId');
     });
+
+    context('given soft-deleted contribution', () => {
+      const contributionAttributes = {
+        title: 'title',
+        type: 'post',
+        content: 'blah',
+        language: 'en',
+      };
+
+      beforeEach(async () => {
+        const deletedContributionAttributes = Object.assign({}, contributionAttributes, {
+          deleted: true,
+          slug: 'title'
+        });
+        await service.create(deletedContributionAttributes, params);
+      });
+
+      it('increments title slug', async () => {
+        let contribution = await service.create(contributionAttributes, params);
+        assert.ok(contribution, 'created contribution');
+        assert.equal(contribution.slug, 'title1');
+      });
+    });
+
+    context('given disabled contribution', () => {
+      const contributionAttributes = {
+        title: 'title',
+        type: 'post',
+        content: 'blah',
+        language: 'en',
+      };
+
+      beforeEach(async () => {
+        const disabledContributionAttributes = Object.assign({}, contributionAttributes, {
+          isEnabled: false,
+          slug: 'title'
+        });
+        await service.create(disabledContributionAttributes, params);
+      });
+
+      it('increments title slug', async () => {
+        let contribution = await service.create(contributionAttributes, params);
+        assert.ok(contribution, 'created contribution');
+        assert.equal(contribution.slug, 'title1');
+      });
+    });
   });
 
   describe('contributions patch', () => {