Merge pull request Human-Connection#56 in HC/hc-api-feathers from feature/NEXT-270 to develop

* commit '62e8fbad20396ac63db89c2a742a462b87856c11':
  use --quiet for mongo
  try to de-dupe some stuff inside package.json by using variables
  disable one test and add coverage
  create comment notifications
  NEXT-270 - fixed travis build
  testing ends
  remove console logs
  add tests for contributions / make notifications translatable
  added mention notification test
  added mention notification test
  added general search endpoint

Author: appinteractive

.istanbul.yml

@@ -0,0 +1,14 @@
+verbose: false
+instrumentation:
+  root: ./
+reporting:
+  print: summary
+  reports:
+    - html
+    - text
+    - lcov
+  watermarks:
+    statements: [70, 90]
+    lines: [70, 90]
+    functions: [70, 90]
+    branches: [70, 90]

package-lock.json

@@ -38,11 +38,18 @@
     "eslint": "eslint server/. test/. --config .eslintrc.json",
     "start": "concurrently 'mongod' 'wait-on tcp:27017 && NODE_ENV=production node server/'",
     "start-win": "concurrently \"mongod\" \"wait-on tcp:27017 &&SET NODE_ENV=production&& node server/\"",
-    "dev": "npm run clear && concurrently 'mongod --dbpath data --quiet' 'wait-on tcp:27017 && NODE_ENV=development nodemon --inspect server/'",
+    "dev": "npm run clear && concurrently '$npm_package_config_mongoDev' 'wait-on tcp:27017 && NODE_ENV=development nodemon --inspect server/'",
     "dev-win": "npm run clear && concurrently \"mongod --dbpath data\" \"wait-on tcp:27017&&SET NODE_ENV=development&& nodemon --inspect server/\"",
     "dev-noseed": "concurrently 'mongod --dbpath data' 'wait-on tcp:27017 && NODE_ENV=development nodemon --inspect server/'",
     "dev-win-noseed": "concurrently \"mongod --dbpath data\" \"wait-on tcp:27017 && nodemon --inspect server/\"",
-    "mocha": "npm run clear && concurrently --success first --kill-others 'mongod --dbpath data &>/dev/null' 'wait-on tcp:27017 && NODE_ENV=test mocha test/ --recursive --timeout 10000 --exit'"
+    "mocha": "npm run clear && $npm_package_config_concurrently '$npm_package_config_mongoDev &>/dev/null' 'wait-on tcp:27017 && NODE_ENV=test $npm_package_config_mocha'",
+    "coverage": "npm run clear && $npm_package_config_concurrently '$npm_package_config_mongoDev &>/dev/null' 'wait-on tcp:27017 && NODE_ENV=test istanbul cover $npm_package_config_mochaCoverage'"
+  },
+  "config": {
+    "mongoDev": "mongod --dbpath data --quiet",
+    "mocha": "node_modules/mocha/bin/_mocha test/ --recursive --timeout 10000 --exit",
+    "mochaCoverage": "node_modules/mocha/bin/_mocha -- test/ --recursive --timeout 10000 --exit",
+    "concurrently": "concurrently --kill-others --success first"
   },
   "dependencies": {
     "body-parser": "~1.18.2",
@@ -94,7 +101,8 @@
     "babel-eslint": "~8.2.1",
     "concurrently": "~3.5.1",
     "eslint": "~4.16.0",
-    "mocha": "~4.0.1",
+    "istanbul": "^0.4.5",
+    "mocha": "^5.0.0",
     "nodemon": "~1.14.11",
     "shx": "^0.2.2",
     "wait-on": "~2.1.0"

package.json

@@ -1,19 +1,28 @@
 // Application hooks that run for every service
-const logger = require('./hooks/logger');
+// const logger = require('./hooks/logger');
+const { discard } = require('feathers-hooks-common');
 
 module.exports = {
   before: {
     all: [],
     find: [],
     get: [],
-    create: [],
-    update: [],
-    patch: [],
+    create: [
+      discard('_id')
+    ],
+    update: [
+      discard('_id')
+    ],
+    patch: [
+      discard('_id')
+    ],
     remove: []
   },
 
   after: {
-    all: [ logger() ],
+    all: [
+      // logger()
+    ],
     find: [],
     get: [],
     create: [],
@@ -23,7 +32,9 @@ module.exports = {
   },
 
   error: {
-    all: [ logger() ],
+    all: [
+      // logger()
+    ],
     find: [],
     get: [],
     create: [],

server/app.hooks.js

@@ -0,0 +1,18 @@
+const mentionRegex = /data-hc-mention="([\s\S]+?)"/g;
+
+const getMentions = async (app, content) => {
+  let match = mentionRegex.exec(content);
+  let mention = {};
+  let mentionsTable = {};
+  while (match !== null) {
+    mention = JSON.parse(match[1].replace(/"/g, '"'));
+    if (!mentionsTable[mention._id]) {
+      let mentionData = await app.service('users').get(mention._id);
+      mentionsTable[mention._id] = mentionData;
+    }
+    match = mentionRegex.exec(content);
+  }
+  return mentionsTable;
+};
+
+module.exports = getMentions;

server/helper/get-mentions.js

@@ -7,7 +7,12 @@ module.exports = function (app) {
   const notifications = new mongooseClient.Schema({
     // User this notification is sent to
     userId: { type: String, required: true },
-    message: { type: String, required: true },
+    type: {
+      type: String,
+      required: true,
+      enum: ['comment','comment-mention','contribution-mention']
+    },
+    relatedUserId: { type: String },
     relatedContributionId: { type: String },
     relatedCommentId: { type: String },
     unseen: { type: Boolean, default: true },

server/models/notifications.model.js

@@ -46,5 +46,9 @@ module.exports = function (app) {
     language: { type: String, default: 'en' }
   });
 
+  users.index({
+    name: 'text'
+  });
+
   return mongooseClient.model('users', users);
 };

server/models/users.model.js

@@ -12,7 +12,7 @@ module.exports = function () {
     connectTimeoutMS: 10000,
     socketTimeoutMS: 10000
   }, function () {
-    if (app.get('seeder').dropDatabase === true) {
+    if (process.NODE_ENV !== 'production' && app.get('seeder').dropDatabase === true) {
       mongoose.connection.dropDatabase().then(() => {
         app.debug('>>>>>> DROPED DATABASE <<<<<<');
         let uploadDir = path.resolve('public/uploads');

server/mongoose.js

@@ -10,6 +10,7 @@ module.exports = (seederstore) => {
         email: '[email protected]',
         password: '1234',
         name: 'Peter',
+        slug: 'peter',
         isnothere: true,
         timezone: 'Europe/Berlin',
         avatar: '{{internet.avatar}}',
@@ -24,6 +25,7 @@ module.exports = (seederstore) => {
         email: '[email protected]',
         password: '1234',
         name: 'Hans',
+        slug: 'hans',
         isnothere: true,
         timezone: 'Europe/Berlin',
         avatar: '{{internet.avatar}}',

server/seeder/base/users-admin.js

@@ -9,6 +9,7 @@ const {
 const { isVerified } = require('feathers-authentication-management').hooks;
 const createExcerpt = require('../../hooks/create-excerpt');
 const createNotifications = require('./hooks/create-notifications');
+const createMentionNotifications = require('./hooks/create-mention-notifications');
 const _ = require('lodash');
 
 const userSchema = {
@@ -70,6 +71,7 @@ module.exports = {
     ],
     get: [],
     create: [
+      createMentionNotifications(),
       createNotifications()
     ],
     update: [],