Merge remote-tracking branch 'origin/develop' into cucumber-js

Author: roschaefer

README.md

@@ -7,6 +7,8 @@
   <a href="https://travis-ci.org/Human-Connection/API"><img src="https://img.shields.io/travis/Human-Connection/API/master.svg" alt="Build Status"></a>
   <a href="https://github.com/Human-Connection/WebApp/blob/develop/LICENSE.md"><img src="https://img.shields.io/badge/license-MIT-green.svg" "MIT" /></a>
   <a href="https://app.fossa.io/projects/git%2Bgithub.com%2FHuman-Connection%2FAPI?ref=badge_shield" alt="FOSSA Status"><img src="https://app.fossa.io/api/projects/git%2Bgithub.com%2FHuman-Connection%2FAPI.svg?type=shield"/></a>
+  <a href="https://discord.gg/NgVpvx9" alt="Discord Channel">
+<img src="https://img.shields.io/discord/443107904757694465.svg" alt="Discord" /></a>
 </p>
 
 # Human-Connection API

package.json

@@ -100,15 +100,15 @@
     "request-promise": "~4.2.2",
     "sanitize-html": "^1.18.2",
     "serve-favicon": "~2.5.0",
-    "shortid": "~2.2.11",
+    "shortid": "~2.2.12",
     "slug": "~0.9.1",
     "trunc-html": "^1.1.2",
     "uuid": "^3.3.2",
     "valid-url": "^1.0.9",
     "winston": "~3.0.0-rc5"
   },
   "devDependencies": {
-    "babel-eslint": "~8.2.3",
+    "babel-eslint": "~8.2.6",
     "chai": "^4.1.2",
     "cucumber": "^4.2.1",
     "concurrently": "~3.6.0",
@@ -117,7 +117,7 @@
     "istanbul": "1.1.0-alpha.1",
     "mocha": "~5.2.0",
     "node-fetch": "^2.1.2",
-    "nodemon": "~1.18.0",
+    "nodemon": "~1.18.1",
     "nyc": "^12.0.2",
     "wait-on": "~2.1.0"
   }

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;
       }
@@ -120,10 +120,10 @@ module.exports = {
       createNotifications()
     ],
     update: [
-      createMentionNotifications()
+      // createMentionNotifications()
     ],
     patch: [
-      createMentionNotifications()
+      // createMentionNotifications()
     ],
     remove: []
   },

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',
@@ -225,11 +228,11 @@ module.exports = {
       thumbnails(thumbs)
     ],
     update: [
-      createMentionNotifications(),
+      // createMentionNotifications(),
       thumbnails(thumbs)
     ],
     patch: [
-      createMentionNotifications(),
+      // createMentionNotifications(),
       thumbnails(thumbs)
     ],
     remove: [

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', () => {

yarn.lock

@@ -562,15 +562,15 @@ babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
     esutils "^2.0.2"
     js-tokens "^3.0.2"
 
-babel-eslint@~8.2.3:
-  version "8.2.5"
-  resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-8.2.5.tgz#dc2331c259d36782aa189da510c43dedd5adc7a3"
+babel-eslint@~8.2.6:
+  version "8.2.6"
+  resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-8.2.6.tgz#6270d0c73205628067c0f7ae1693a9e797acefd9"
   dependencies:
     "@babel/code-frame" "7.0.0-beta.44"
     "@babel/traverse" "7.0.0-beta.44"
     "@babel/types" "7.0.0-beta.44"
     babylon "7.0.0-beta.44"
-    eslint-scope "~3.7.1"
+    eslint-scope "3.7.1"
     eslint-visitor-keys "^1.0.0"
 
 babel-generator@^6.18.0:
@@ -1850,7 +1850,7 @@ [email protected], escape-string-regexp@^1.0.2, escape-string-regexp@^1
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
 
-eslint-scope@^3.7.1, eslint-scope@~3.7.1:
+[email protected], eslint-scope@^3.7.1:
   version "3.7.1"
   resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-3.7.1.tgz#3d63c3edfda02e06e01a452ad88caacc7cdcb6e8"
   dependencies:
@@ -4087,9 +4087,9 @@ nodemailer@^4.0.0:
   version "4.6.7"
   resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-4.6.7.tgz#b68de7f36d65618bdeeeb76234e3547d51266373"
 
-nodemon@~1.18.0:
-  version "1.18.0"
-  resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-1.18.0.tgz#44b75d5f19065c47a262d4ab21990da3b6f8feae"
+nodemon@~1.18.1:
+  version "1.18.1"
+  resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-1.18.1.tgz#873d2f7799662c549f7ea557db6934d5cbf665d6"
   dependencies:
     chokidar "^2.0.2"
     debug "^3.1.0"
@@ -5160,9 +5160,9 @@ shebang-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
 
-shortid@~2.2.11:
-  version "2.2.11"
-  resolved "https://registry.yarnpkg.com/shortid/-/shortid-2.2.11.tgz#a77896f086b0dae7fce1237e29232d2aeef5738e"
+shortid@~2.2.12:
+  version "2.2.12"
+  resolved "https://registry.yarnpkg.com/shortid/-/shortid-2.2.12.tgz#8e9a95ffbc671fff8f09e985dbc7874102b0cfd2"
   dependencies:
     nanoid "^1.0.7"