Merge branches 'develop' and 'feature/NEXT-250' of https://team.human-connection.org/bitbucket/scm/hc/hc-api-feathers into feature/NEXT-250

vz01d · vz01d · commit de9caf533bf6 · 2018-02-17T13:35:54.000+01:00
diff --git a/package.json b/package.json
@@ -33,7 +33,7 @@
     "yarn": ">= 0.18.0"
   },
   "scripts": {
-    "clear": "rm -Rf tmp",
+    "clear": "shx rm -Rf tmp",
     "test": "npm run eslint && npm run mocha",
     "eslint": "eslint server/. test/. --config .eslintrc.json",
     "start": "concurrently 'mongod' 'wait-on tcp:27017 && NODE_ENV=production node server/'",
@@ -96,6 +96,7 @@
     "eslint": "~4.16.0",
     "mocha": "~4.0.1",
     "nodemon": "~1.14.11",
+    "shx": "^0.2.2",
     "wait-on": "~2.1.0"
   }
 }
diff --git a/server/hooks/save-remote-images.js b/server/hooks/save-remote-images.js
@@ -28,7 +28,7 @@ module.exports = function (options = []) { // eslint-disable-line no-unused-vars
 
         // save all given fields and update the hook data
         options.forEach((field) => {
-          if (!hook.data[field] || hook.data[field].search(uploadsUrl) >= 0) {
+          if (!hook.data[field] || (typeof hook.data[field] === 'string' && hook.data[field].search(uploadsUrl) >= 0)) {
             // skip invalid and local data
             return;
           }
@@ -39,32 +39,16 @@ module.exports = function (options = []) { // eslint-disable-line no-unused-vars
           const imgName = `${field}_${uuid}`;
           let imgPath = path.resolve('public', 'uploads/' + imgName);
 
-          request({
-            url: hook.data[field],
-            encoding: null
-          }, (err, res, body) => {
-            if (err) {
-              hook.app.error(err);
-              reject(err);
-            }
+          if (typeof hook.data[field] === 'object') {
             try {
-              const mimeType = res.headers['content-type'];
-              if (mimeType.indexOf('image') !== 0) {
-                hook.app.error('its not an image');
-                reject('its not an image');
-              }
-
-              const ext = mime.getExtension(mimeType);
+              hook.app.debug('SAVE REMOTE IMAGES HOOK');
+              hook.app.debug(typeof hook.data[field]);
 
-              imgPath += `.${ext}`;
-
-              fs.writeFileSync(imgPath, body, {
+              fs.writeFileSync(`${imgPath}.png`, hook.data[field], {
                 encoding: 'binary'
               });
-
               loading--;
-
-              hook.data[field] = uploadsUrl + imgName + `.${ext}`;
+              hook.data[field] = uploadsUrl + imgName + '.png';
 
               if (imgCount > 0 && loading <= 0) {
                 hook.app.debug('Download(s) finished', urls);
@@ -73,7 +57,43 @@ module.exports = function (options = []) { // eslint-disable-line no-unused-vars
             } catch (err) {
               hook.app.error(err);
             }
-          });
+          } else {
+            request({
+              url: hook.data[field],
+              encoding: null
+            }, (err, res, body) => {
+              if (err) {
+                hook.app.error(err);
+                reject(err);
+              }
+              try {
+                const mimeType = res.headers['content-type'];
+                if (mimeType.indexOf('image') !== 0) {
+                  hook.app.error('its not an image');
+                  reject('its not an image');
+                }
+
+                const ext = mime.getExtension(mimeType);
+
+                imgPath += `.${ext}`;
+
+                fs.writeFileSync(imgPath, body, {
+                  encoding: 'binary'
+                });
+
+                loading--;
+
+                hook.data[field] = uploadsUrl + imgName + `.${ext}`;
+
+                if (imgCount > 0 && loading <= 0) {
+                  hook.app.debug('Download(s) finished', urls);
+                  resolve(hook);
+                }
+              } catch (err) {
+                hook.app.error(err);
+              }
+            });
+          }
 
           hook.app.debug('Downloading', hook.data[field]);
         });
diff --git a/server/logger.js b/server/logger.js
@@ -1,14 +1,14 @@
 const { createLogger, format, transports } = require('winston');
+const env = process.env.NODE_ENV;
 
 const logger = createLogger({
-  level: 'info',
+  level: 'warn',
   format: format.json(),
   transports: [
     new transports.File({ filename: './data/error.log', level: 'error' }),
     new transports.File({ filename: './data/combined.log' })
   ]
 });
-// if (process.env.NODE_ENV !== 'production') {
 logger.add(new transports.Console({
   format: format.combine(
     format.printf((info) => {
@@ -22,8 +22,6 @@ logger.add(new transports.Console({
       return `${levelColors[info.level]}${date.toLocaleTimeString()} | ${info.level}: ${JSON.stringify(info.message)}\u001b[39m`;
     })
   ),
-  level: 'debug'
+  level: env === 'development' ? 'debug' : 'warn'
 }));
-// }
-
 module.exports = logger;
diff --git a/server/models/contributions.model.js b/server/models/contributions.model.js
@@ -27,7 +27,7 @@ module.exports = function (app) {
     contentExcerpt: { type: String, required: true },
     teaserImg: { type: String },
     language: { type: String, required: true },
-    shouts: { type: Array },
+    shoutCount: { type: Number, default: 0 },
     visibility: {
       type: String,
       enum: ['public', 'friends', 'private'],
diff --git a/server/models/shouts.model.js b/server/models/shouts.model.js
@@ -0,0 +1,21 @@
+// users-shouts-model.js - A mongoose model
+// 
+// See http://mongoosejs.com/docs/models.html
+// for more of what you can do here.
+module.exports = function (app) {
+  const mongooseClient = app.get('mongooseClient');
+  const shouts = new mongooseClient.Schema({
+    userId: { type: String, required: true, index: true },
+    foreignId: { type: String, required: true, index: true },
+    foreignService: { type: String, required: true, index: true },
+    createdAt: { type: Date, default: Date.now },
+    wasSeeded: { type: Boolean }
+  });
+
+  shouts.index(
+    { userId: 1, foreignId: 1 },
+    { unique: true }
+  );
+
+  return mongooseClient.model('shouts', shouts);
+};
diff --git a/server/seeder/development/contributions.js b/server/seeder/development/contributions.js
@@ -1,5 +1,4 @@
 const seedHelpers = require('../../helper/seed-helpers');
-const { size } = require('lodash');
 
 module.exports = (seederstore) => {
   return {
@@ -15,7 +14,6 @@ module.exports = (seederstore) => {
           content: '{{lorem.text}} {{lorem.text}}',
           teaserImg: seedHelpers.randomUnsplashUrl,
           language: () => seedHelpers.randomItem(['de', 'en']),
-          shouts: () => seedHelpers.randomItems(seederstore.users, '_id', 0, Math.floor(size(seederstore.users) / 2)),
           visibility: 'public',
           createdAt: '{{date.recent}}',
           updatedAt: '{{date.recent}}',
@@ -28,7 +26,6 @@ module.exports = (seederstore) => {
           categoryIds: () => seedHelpers.randomCategories(seederstore),
           content: '{{lorem.text}} {{lorem.text}}',
           language: () => seedHelpers.randomItem(['de', 'en']),
-          shouts: () => seedHelpers.randomItems(seederstore.users, '_id', 0, Math.floor(size(seederstore.users) / 2)),
           visibility: 'public',
           createdAt: '{{date.recent}}',
           updatedAt: '{{date.recent}}',
@@ -41,7 +38,6 @@ module.exports = (seederstore) => {
           categoryIds: () => seedHelpers.randomCategories(seederstore),
           content: '{{lorem.text}} {{lorem.text}}',
           language: () => seedHelpers.randomItem(['de', 'en']),
-          shouts: () => seedHelpers.randomItems(seederstore.users, '_id', 0, Math.floor(size(seederstore.users) / 2)),
           visibility: 'public',
           isEnabled: false,
           createdAt: '{{date.recent}}',
diff --git a/server/seeder/development/index.js b/server/seeder/development/index.js
@@ -14,6 +14,7 @@ module.exports = function () {
     require('./follows'),
     require('./comments'),
     require('./emotions'),
-    require('./invites')
+    require('./invites'),
+    require('./shouts')
   ];
 };
diff --git a/server/seeder/development/shouts.js b/server/seeder/development/shouts.js
@@ -0,0 +1,18 @@
+const seedHelpers = require('../../helper/seed-helpers');
+
+module.exports = (seederstore) => {
+  return {
+    services: [{
+      count: 240,
+      path: 'shouts',
+      templates: [
+        {
+          userId: () => seedHelpers.randomItem(seederstore.users)._id,
+          foreignId: () => seedHelpers.randomItem(seederstore.contributions)._id,
+          foreignService: 'contributions',
+          wasSeeded: true
+        }
+      ]
+    }]
+  };
+};
diff --git a/server/services/index.js b/server/services/index.js
@@ -13,6 +13,7 @@ const emotions = require('./emotions/emotions.service.js');
 const organizations = require('./organizations/organizations.service.js');
 const projects = require('./projects/projects.service.js');
 const follows = require('./follows/follows.service.js');
+const shouts = require('./shouts/shouts.service.js');
 const admin = require('./admin/admin.service.js');
 const invites = require('./invites/invites.service.js');
 const usersCandos = require('./users-candos/users-candos.service.js');
@@ -34,6 +35,7 @@ module.exports = function () {
   app.configure(organizations);
   app.configure(projects);
   app.configure(follows);
+  app.configure(shouts);
   app.configure(admin);
   app.configure(usersCandos);
   app.configure(invites);
diff --git a/server/services/shouts/hooks/set-shout-count.js b/server/services/shouts/hooks/set-shout-count.js
@@ -0,0 +1,22 @@
+// Set done date, when cando is done
+module.exports = () => async hook => {
+
+  // get count of all shouts on this thing
+  const shoutCount = await hook.app.service('shouts').find({
+    query: {
+      foreignService: hook.result.foreignService,
+      foreignId: hook.result.foreignId,
+      $limit: 0
+    }
+  });
+
+  // update the shoud count on the foreign service
+  await hook.app.service(hook.result.foreignService)
+    .patch(hook.result.foreignId, {
+      $set: {
+        shoutCount: shoutCount.total
+      }
+    });
+
+  return hook;
+};
diff --git a/server/services/shouts/shouts.filters.js b/server/services/shouts/shouts.filters.js
@@ -0,0 +1,6 @@
+/* eslint no-console: 1 */
+console.warn('You are using the default filter for the shouts service. For more information about event filters see https://docs.feathersjs.com/api/events.html#event-filtering'); // eslint-disable-line no-console
+
+module.exports = function (data, connection, hook) { // eslint-disable-line no-unused-vars
+  return data;
+};
diff --git a/server/services/shouts/shouts.hooks.js b/server/services/shouts/shouts.hooks.js
@@ -0,0 +1,70 @@
+const { authenticate } = require('feathers-authentication').hooks;
+const { unless, isProvider } = require('feathers-hooks-common');
+const isModerator = require('../../hooks/is-moderator-boolean');
+const setShoutCount = require('./hooks/set-shout-count');
+const {
+  associateCurrentUser,
+  restrictToOwner
+} = require('feathers-authentication-hooks');
+const { isVerified } = require('feathers-authentication-management').hooks;
+
+module.exports = {
+  before: {
+    all: [],
+    find: [],
+    get: [],
+    create: [
+      unless(isProvider('server'),
+        authenticate('jwt'),
+        isVerified(),
+        associateCurrentUser()
+      )
+    ],
+    update: [
+      authenticate('jwt'),
+      unless(isModerator(),
+        restrictToOwner()
+      )
+    ],
+    patch: [
+      authenticate('jwt'),
+      unless(isModerator(),
+        restrictToOwner()
+      )
+    ],
+    remove: [
+      authenticate('jwt'),
+      unless(isModerator(),
+        restrictToOwner()
+      )
+    ]
+  },
+
+  after: {
+    all: [],
+    find: [],
+    get: [],
+    create: [
+      setShoutCount()
+    ],
+    update: [
+      setShoutCount()
+    ],
+    patch: [
+      setShoutCount()
+    ],
+    remove: [
+      setShoutCount()
+    ]
+  },
+
+  error: {
+    all: [],
+    find: [],
+    get: [],
+    create: [],
+    update: [],
+    patch: [],
+    remove: []
+  }
+};
diff --git a/server/services/shouts/shouts.service.js b/server/services/shouts/shouts.service.js
@@ -0,0 +1,29 @@
+// Initializes the `shouts` service on path `/shouts`
+const createService = require('feathers-mongoose');
+const createModel = require('../../models/shouts.model');
+const hooks = require('./shouts.hooks');
+const filters = require('./shouts.filters');
+
+module.exports = function () {
+  const app = this;
+  const Model = createModel(app);
+  const paginate = app.get('paginate');
+
+  const options = {
+    name: 'shouts',
+    Model,
+    paginate
+  };
+
+  // Initialize our service with any options it requires
+  app.use('/shouts', createService(options));
+
+  // Get our initialized service so that we can register hooks and filters
+  const service = app.service('shouts');
+
+  service.hooks(hooks);
+
+  if (service.filter) {
+    service.filter(filters);
+  }
+};
diff --git a/server/services/users/users.hooks.js b/server/services/users/users.hooks.js
diff --git a/test/services/shouts.test.js b/test/services/shouts.test.js
diff --git a/yarn.lock b/yarn.lock
