corrected some stuff and added some hooks

Author: appinteractive

server/helper/seed-helpers.js

@@ -48,16 +48,6 @@ module.exports = {
     let randomIds = _.shuffle(ids);
     return items[randomIds.pop()];
   },
-  randomAdmin: (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) => {
     let randomIds = _.shuffle(_.keys(items));
     let res = [];

server/hooks/create-excerpt.js

@@ -3,16 +3,23 @@
 // https://github.com/yangsibai/node-html-excerpt
 const excerpt = require('html-excerpt');
 
-module.exports = function (options = {}) { // eslint-disable-line no-unused-vars
+module.exports = function (options = {
+  field: 'content',
+  length: 120
+}) { // eslint-disable-line no-unused-vars
   return function (hook) {
-    if(!hook.data || !hook.data.content) {
+    console.log('TRY TO CREATE EXCERPT');
+    console.log('field', options.field);
+    if(!options.field || !hook.data[options.field]) return hook;
+
+    if(!hook.data || !hook.data[options.field]) {
       return hook;
     }
     /* eslint no-use-before-define: 0 */  // --> OFF
-    const content = hook.data.content
-      .replace(/\<br\>|\<\/br\>|\<\/ br\>|\<\/(strong|b|h[1-6])>/ig, "\n")
+    const text = hook.data[options.field]
+      .replace(/\<br\>|\<\/br\>|\<\/ br\>|<br \/\>|\<\/(strong|b|h[1-6])>/ig, "\n")
       .replace(/(<([^>]+)>)/ig, '');
-    hook.data.contentExcerpt = excerpt.text(content, 120, '...');
+    hook.data[`${options.field}Excerpt`] = excerpt.text(text, options.length, '...');
     return Promise.resolve(hook);
   };
 };

server/models/organizations.model.js

@@ -7,17 +7,23 @@ module.exports = function (app) {
   const { Schema } = mongooseClient;
   const organizations = new Schema({
     name: { type: String, required: true },
-    slug: { type: String },
+    slug: { type: String, required: true, unique: true },
     followerIds: [],
     categoryIds: { type: Array },
     logo: { type: String },
     coverImg: { type: String },
     userId: { type: String, required: true },
     description: { type: String, required: true },
+    // will be generated automatically
+    descriptionExcerpt: { type: String },
     addresses: { type: Array, default: [] },
     content: { type: String, required: true },
     createdAt: { type: Date, default: Date.now },
     updatedAt: { type: Date, default: Date.now },
+    isEnabled: {
+      type: Boolean,
+      default: true
+    },
     wasSeeded: { type: Boolean }
   });
 

server/seeder/development/index.js

@@ -7,9 +7,9 @@ module.exports = function () {
     require('./users'),
     require('./moderators'),
     require('./contributions'),
+    require('./organizations'),
     require('./candos'),
     require('./users-candos'),
-    require('./organizations'),
     require('./projects'),
     require('./follows'),
     require('./comments'),

server/seeder/development/organizations.js

@@ -7,21 +7,19 @@ module.exports = (seederstore) => {
       path: 'organizations',
       count: 30,
       template: {
-        slug: '{{lorem.slug}}',
-        name: '{{lorem.text}}',
+        name: '{{company.companyName}}',
         followerIds: [],
         logo: () => seedHelpers.randomLogo(),
         coverImg: () => seedHelpers.randomUnsplashUrl(),
         categoryIds: () => seedHelpers.randomCategories(seederstore),
-        userId: () => seedHelpers.randomAdmin(seederstore.users, filter)._id,
+        userId: () => seedHelpers.randomItem(seederstore.users, filter)._id,
         addresses: () => seedHelpers.randomAddresses(),
         description: '{{lorem.text}}',
         content: '{{lorem.text}} {{lorem.text}} {{lorem.text}} {{lorem.text}}',
-        isVerified : true,
-        role : 'user',
-        doiToken: null,
-        confirmedAt: null,
+        isVerified: () => seedHelpers.randomItem([true, false]),
         deletedAt: null,
+        createdAt: '{{date.recent}}',
+        updatedAt: '{{date.recent}}',
         wasSeeded: true
       }
     }]

server/services/organizations/organizations.hooks.js

@@ -1,7 +1,12 @@
+const { unless, isProvider } = require('feathers-hooks-common');
+const { isVerified } = require('feathers-authentication-management').hooks;
 const { authenticate } = require('feathers-authentication').hooks;
+const { associateCurrentUser, restrictToOwner } = require('feathers-authentication-hooks');
 const createSlug = require('../../hooks/create-slug');
 const saveRemoteImages = require('../../hooks/save-remote-images');
-const saveAvatar = require('./hooks/save-avatar');
+const createExcerpt = require('../../hooks/create-excerpt');
+const isModerator = require('../../hooks/is-moderator-boolean');
+const excludeDisabled = require('../../hooks/exclude-disabled');
 const thumbnails = require('../../hooks/thumbnails');
 
 const thumbnailOptions = {
@@ -20,27 +25,61 @@ const thumbnailOptions = {
 module.exports = {
   before: {
     all: [],
-    find: [],
-    get: [],
+    find: [
+      unless(isModerator(),
+        excludeDisabled()
+      )
+    ],
+    get: [
+      unless(isModerator(),
+        excludeDisabled()
+      )
+    ],
     create: [
       authenticate('jwt'),
+      // Allow seeder to seed contributions
+      unless(isProvider('server'),
+        isVerified()
+      ),
+      associateCurrentUser(),
       createSlug({ field: 'name' }),
-      saveRemoteImages(['logo', 'coverImg']),
-      saveAvatar()
+      createExcerpt({ field: 'description '}),
+      saveRemoteImages(['logo', 'coverImg'])
     ],
     update: [
       authenticate('jwt'),
+      unless(isProvider('server'),
+        isVerified()
+      ),
+      unless(isModerator(),
+        excludeDisabled(),
+        restrictToOwner()
+      ),
       createSlug({ field: 'name' }),
-      saveRemoteImages(['logo', 'coverImg']),
-      saveAvatar()
+      createExcerpt({ field: 'description '}),
+      saveRemoteImages(['logo', 'coverImg'])
     ],
     patch: [
       authenticate('jwt'),
+      unless(isProvider('server'),
+        isVerified()
+      ),
+      unless(isModerator(),
+        excludeDisabled(),
+        restrictToOwner()
+      ),
       createSlug({ field: 'name' }),
-      saveRemoteImages(['logo', 'coverImg']),
-      saveAvatar()
+      createExcerpt({ field: 'description' }),
+      saveRemoteImages(['logo', 'coverImg'])
     ],
-    remove: [ authenticate('jwt') ]
+    remove: [
+      authenticate('jwt'),
+      isVerified(),
+      unless(isModerator(),
+        excludeDisabled(),
+        restrictToOwner()
+      )
+    ]
   },
 
   after: {