Merge pull request Human-Connection#53 in HC/hc-api-feathers from develop to master

appinteractive · appinteractive · commit 76ea0a4e3e7e · 2018-02-01T10:51:58.000+01:00
* commit '371c91a5a9486897ab087bc628bcd2a591d49b58':
  fixed two issues
  add safety for find query in associated can dos
  add associated can dos
  add associated can dos
  add cando title
  fix missing srcset / renamed candoId
  started can dos
diff --git a/package-lock.json b/package-lock.json
diff --git a/server/helper/seed-helpers.js b/server/helper/seed-helpers.js
@@ -35,9 +35,17 @@ const ngoLogos = [
   null
 ];
 
+const difficulties = ['easy', 'medium', 'hard'];
+
 module.exports = {
-  randomItem: (items) => {
-    let randomIds = _.shuffle(_.keys(items));
+  randomItem: (items, filter) => {
+    let ids = filter
+      ? Object.keys(items)
+        .filter(id => {
+          return filter(items[id]);
+        })
+      : _.keys(items);
+    let randomIds = _.shuffle(ids);
     return items[randomIds.pop()];
   },
   randomItems: (items, key = '_id', min = 1, max = 1) => {
@@ -55,6 +63,9 @@ module.exports = {
     }
     return res;
   },
+  randomDifficulty: () => {
+    return _.shuffle(difficulties).pop();
+  },
   randomLogo: () => {
     return _.shuffle(ngoLogos).pop();
   },
diff --git a/server/hooks/is-single-item.js b/server/hooks/is-single-item.js
@@ -0,0 +1,8 @@
+// Check if the query is for a single item
+module.exports = () => hook => {
+  if (hook && hook.params && hook.params.query && hook.params.query.$limit === 1) {
+    return true;
+  } else {
+    return false;
+  }
+};
diff --git a/server/models/contributions.model.js b/server/models/contributions.model.js
@@ -4,13 +4,24 @@
 // for more of what you can do here.
 module.exports = function (app) {
   const mongooseClient = app.get('mongooseClient');
+
+  const candoSchema = mongooseClient.Schema({
+    difficulty: {
+      type: String,
+      enum: ['easy', 'medium', 'hard']
+    },
+    reasonTitle: { type: String },
+    reason: { type: String }
+  });
+
   const contributions = new mongooseClient.Schema({
     userId: { type: String, required: true },
     categoryIds: { type: Array },
     title: { type: String, required: true },
     // Generated from title
     slug: { type: String, required: true, unique: true },
     type: { type: String, required: true },
+    cando: candoSchema,
     content: { type: String, required: true },
     // Generated from content
     contentExcerpt: { type: String, required: true },
diff --git a/server/models/users-candos.model.js b/server/models/users-candos.model.js
@@ -0,0 +1,31 @@
+// users-candos-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 usersCandos = new mongooseClient.Schema({
+    userId: { type: String, required: true },
+    contributionId: { type: String, required: true },
+    done: { type: Boolean, default: false },
+    doneAt: { type: Date },
+    createdAt: { type: Date, default: Date.now },
+    updatedAt: { type: Date, default: Date.now },
+    wasSeeded: { type: Boolean }
+  });
+
+  usersCandos.index(
+    { userId: 1, contributionId: 1 },
+    { unique: true }
+  );
+
+  usersCandos.index(
+    { userId: 1 }
+  );
+
+  usersCandos.index(
+    { contributionId: 1 }
+  );
+
+  return mongooseClient.model('usersCandos', usersCandos);
+};
diff --git a/server/seeder/development/candos.js b/server/seeder/development/candos.js
@@ -0,0 +1,69 @@
+const seedHelpers = require('../../helper/seed-helpers');
+const { size } = require('lodash');
+
+module.exports = (seederstore) => {
+  return {
+    services: [{
+      count: 30,
+      path: 'contributions',
+      templates: [
+        {
+          userId: () => seedHelpers.randomItem(seederstore.users)._id,
+          title: '{{lorem.words}}',
+          type: 'cando',
+          categoryIds: () => seedHelpers.randomCategories(seederstore),
+          cando: {
+            difficulty: () => seedHelpers.randomDifficulty(),
+            reasonTitle: '{{lorem.words}}?',
+            reason: '{{lorem.text}} {{lorem.text}}'
+          },
+          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}}',
+          wasSeeded: true
+        },
+        {
+          userId: () => seedHelpers.randomItem(seederstore.users)._id,
+          title: '{{lorem.sentence}}',
+          type: 'cando',
+          categoryIds: () => seedHelpers.randomCategories(seederstore),
+          cando: {
+            difficulty: () => seedHelpers.randomDifficulty(),
+            reasonTitle: '{{lorem.words}}?',
+            reason: '{{lorem.text}} {{lorem.text}}'
+          },
+          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}}',
+          wasSeeded: true
+        },
+        {
+          userId: () => seedHelpers.randomItem(seederstore.users)._id,
+          title: '{{lorem.sentence}}',
+          type: 'cando',
+          categoryIds: () => seedHelpers.randomCategories(seederstore),
+          cando: {
+            difficulty: () => seedHelpers.randomDifficulty(),
+            reasonTitle: '{{lorem.words}}?',
+            reason: '{{lorem.text}} {{lorem.text}}'
+          },
+          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}}',
+          updatedAt: '{{date.recent}}',
+          wasSeeded: true
+        }
+      ]
+    }]
+  };
+};
diff --git a/server/seeder/development/contributions.js b/server/seeder/development/contributions.js
@@ -49,6 +49,6 @@ module.exports = (seederstore) => {
           wasSeeded: true
         }
       ]
-    }],
+    }]
   };
 };
diff --git a/server/seeder/development/index.js b/server/seeder/development/index.js
@@ -7,6 +7,8 @@ module.exports = function () {
     require('./users'),
     require('./moderators'),
     require('./contributions'),
+    require('./candos'),
+    require('./users-candos'),
     require('./organizations'),
     require('./projects'),
     require('./follows'),
diff --git a/server/seeder/development/users-candos.js b/server/seeder/development/users-candos.js
@@ -0,0 +1,30 @@
+const seedHelpers = require('../../helper/seed-helpers');
+
+module.exports = (seederstore) => {
+  let filter = ({type}) => type === 'cando';
+  return {
+    services: [{
+      count: 80,
+      path: 'users-candos',
+      templates: [
+        {
+          userId: () => seedHelpers.randomItem(seederstore.users)._id,
+          contributionId: () => seedHelpers.randomItem(seederstore.contributions, filter)._id,
+          done: true,
+          doneAt: '{{date.recent}}',
+          createdAt: '{{date.recent}}',
+          updatedAt: '{{date.recent}}',
+          wasSeeded: true
+        },
+        {
+          userId: () => seedHelpers.randomItem(seederstore.users)._id,
+          contributionId: () => seedHelpers.randomItem(seederstore.contributions, filter)._id,
+          done: false,
+          createdAt: '{{date.recent}}',
+          updatedAt: '{{date.recent}}',
+          wasSeeded: true
+        }
+      ]
+    }]
+  };
+};
diff --git a/server/services/contributions/contributions.hooks.js b/server/services/contributions/contributions.hooks.js
@@ -1,5 +1,5 @@
 const { authenticate } = require('feathers-authentication').hooks;
-const { unless, isProvider, populate } = require('feathers-hooks-common');
+const { when, unless, isProvider, populate } = require('feathers-hooks-common');
 const {
   //queryWithCurrentUser,
   associateCurrentUser,
@@ -13,6 +13,8 @@ const search = require('feathers-mongodb-fuzzy-search');
 const thumbnails = require('../../hooks/thumbnails');
 const isModerator = require('../../hooks/is-moderator-boolean');
 const excludeDisabled = require('../../hooks/exclude-disabled');
+const getAssociatedCanDos = require('./hooks/getAssociatedCanDos');
+const isSingleItem = require('../../hooks/is-single-item');
 
 const userSchema = {
   include: {
@@ -33,6 +35,16 @@ const categoriesSchema = {
   }
 };
 
+const candosSchema = {
+  include: {
+    service: 'users-candos',
+    nameAs: 'candoUsers',
+    parentField: '_id',
+    childField: 'contributionId',
+    asArray: true
+  }
+};
+
 const commentsSchema = {
   include: {
     service: 'comments',
@@ -53,7 +65,6 @@ const commentsSchema = {
   }
 };
 
-
 module.exports = {
   before: {
     all: [],
@@ -120,9 +131,13 @@ module.exports = {
     all: [
       populate({ schema: userSchema }),
       populate({ schema: categoriesSchema }),
+      populate({ schema: candosSchema }),
       populate({ schema: commentsSchema })
     ],
     find: [
+      when(isSingleItem(),
+        getAssociatedCanDos()
+      ),
       thumbnails({
         teaserImg: {
           cardS: '300x0',
@@ -136,11 +151,16 @@ module.exports = {
       })
     ],
     get: [
+      getAssociatedCanDos(),
       thumbnails({
         teaserImg: {
+          cardS: '300x0',
+          cardM: '400x0',
+          cardL: '740x0',
           zoom: '0x1024',
           cover: '800x300/smart',
-          placeholder: '800x300/filters:blur(10)'
+          placeholder: '800x300/filters:blur(10)',
+          coverPlaceholder: '243x100/smart/filters:blur(30)'
         }
       })
     ],
diff --git a/server/services/contributions/hooks/getAssociatedCanDos.js b/server/services/contributions/hooks/getAssociatedCanDos.js
@@ -0,0 +1,59 @@
+module.exports = function (options = {}) { // eslint-disable-line no-unused-vars
+  return function (hook) {
+    return new Promise(resolve => {
+      const contributionService = hook.app.service('contributions');
+      const limit = 5;
+
+      // Stop, if we have no result at all
+      if (!hook.result) {
+        return resolve(hook);
+      }
+
+      // Stop, if it was a find method and $limit was not set
+      if (hook.method === 'find' && (!hook.params.query || hook.params.query.$limit !== 1)) {
+        return resolve(hook);
+      }
+
+      // Stop, if we have an empty array or more then one item
+      let isArray = hook.result.data && Array.isArray(hook.result.data);
+      if (isArray && (!hook.result.data.length || hook.result.data.length > 1)) {
+        return resolve(hook);
+      }
+
+      let currentData = isArray ? hook.result.data[0] : hook.result;
+      if (!currentData.categoryIds || !currentData.categoryIds.length) {
+        return resolve(hook);
+      }
+
+      return contributionService.find({
+        query: {
+          type: 'cando'
+        }
+      })
+        .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);
+              });
+              if (check && item._id.toString() !== currentData._id.toString()) {
+                associatedCanDos.push(item);
+              }
+            }
+          }
+          if (isArray) {
+            hook.result.data[0].associatedCanDos = associatedCanDos;
+          } else {
+            hook.result.associatedCanDos = associatedCanDos;
+          }
+          return resolve(hook);
+        })
+        .catch(() => {
+          return resolve(hook);
+        });
+    });
+  };
+};
diff --git a/server/services/index.js b/server/services/index.js
@@ -14,6 +14,7 @@ const projects = require('./projects/projects.service.js');
 const follows = require('./follows/follows.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');
 
 module.exports = function () {
   const app = this; // eslint-disable-line no-unused-vars
@@ -32,5 +33,6 @@ module.exports = function () {
   app.configure(projects);
   app.configure(follows);
   app.configure(admin);
+  app.configure(usersCandos);
   app.configure(invites);
 };
diff --git a/server/services/users-candos/hooks/set-done-date.js b/server/services/users-candos/hooks/set-done-date.js
@@ -0,0 +1,9 @@
+// Set done date, when cando is done
+module.exports = () => hook => {
+  if (!hook.data.done) {
+    hook.data.doneAt = null;
+  } else if (!hook.data.doneAt) {
+    hook.data.doneAt = Date.now();
+  }
+  return hook;
+};
diff --git a/server/services/users-candos/users-candos.filters.js b/server/services/users-candos/users-candos.filters.js
@@ -0,0 +1,6 @@
+/* eslint no-console: 1 */
+console.warn('You are using the default filter for the users-candos 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/users-candos/users-candos.hooks.js b/server/services/users-candos/users-candos.hooks.js
diff --git a/server/services/users-candos/users-candos.service.js b/server/services/users-candos/users-candos.service.js
diff --git a/server/services/users/users.hooks.js b/server/services/users/users.hooks.js
diff --git a/test/services/users-candos.test.js b/test/services/users-candos.test.js

Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,6 @@ module.exports = (seederstore) => {`
`49`	`49`	`wasSeeded: true`
`50`	`50`	`}`
`51`	`51`	`]`
`52`		`- }],`
	`52`	`+ }]`
`53`	`53`	`};`
`54`	`54`	`};`