NEXT-173 - Shout Component

appinteractive · appinteractive · commit 69a245d5a7bd · 2018-02-16T14:30:58.000+01:00
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
@@ -6,7 +6,6 @@ const { addVerification, removeVerification } = require('feathers-authentication
 const sendVerificationEmail = require('./hooks/send-verification-email');
 const restrictUserRole = require('./hooks/restrict-user-role');
 const createAdmin = require('./hooks/create-admin');
-const saveAvatar = require('./hooks/save-avatar');
 const createSlug = require('../../hooks/create-slug');
 const thumbnails = require('../../hooks/thumbnails');
 const inviteCode = require('./hooks/invite-code')();
diff --git a/test/services/shouts.test.js b/test/services/shouts.test.js
@@ -0,0 +1,97 @@
+const mongoose = require('mongoose');
+const assert = require('assert');
+const app = require('../../server/app');
+
+const shoutService = app.service('shouts');
+
+let user1;
+let user2;
+
+let contribution1;
+
+let shoutUser1Contribution1;
+let shoutUser2Contribution1;
+
+describe('\'shouts\' shoutService', () => {
+  it('registered the shoutService', () => {
+    assert.ok(shoutService, 'Registered the service');
+  });
+
+  it('create two users and a contribution with zero shouts', async () => {
+    mongoose.connection.dropDatabase();
+
+    // create users
+    user1 = await app.service('users').create({
+      email: 'messagetest@example.com',
+      password: 'supersecret'
+    });
+    user2 = await app.service('users').create({
+      email: 'max@mustermann.com',
+      password: 'supersecret'
+    });
+    // create contribution
+    contribution1 = await app.service('contributions').create({
+      userId: user1._id,
+      title: 'My Super Contribution!',
+      content: 'This is some awesome content',
+      language: 'en',
+      type: 'post'
+    });
+
+    // should have zero shouts
+    assert.equal(contribution1.shoutCount, 0);
+  });
+
+  it('shout a contribution', async () => {
+
+    // create shout
+    shoutUser2Contribution1 = await shoutService.create({
+      userId: user2._id,
+      foreignId: contribution1._id,
+      foreignService: 'contributions'
+    });
+
+    assert.equal(shoutUser2Contribution1.foreignId, contribution1._id);
+    assert.equal(shoutUser2Contribution1.foreignService, 'contributions');
+
+    // should have one shout
+    contribution1 = await app.service('contributions').get(contribution1._id);
+    assert.equal(contribution1.shoutCount, 1);
+
+    // create shout
+    shoutUser1Contribution1 = await shoutService.create({
+      userId: user1._id,
+      foreignId: contribution1._id,
+      foreignService: 'contributions'
+    });
+
+    // should have two shout
+    contribution1 = await app.service('contributions').get(contribution1._id);
+    assert.equal(contribution1.shoutCount, 2);
+
+    let error;
+    try {
+      shoutUser2Contribution1 = await shoutService.create({
+        userId: user2._id,
+        foreignId: contribution1._id,
+        foreignService: 'contributions'
+      });
+    } catch (err) {
+      error = err;
+    }
+    assert.ok(/already exists/.test(error));
+
+    contribution1 = await app.service('contributions').get(contribution1._id);
+
+    // should still have two shout
+    assert.equal(contribution1.shoutCount, 2);
+  });
+
+  it('remove a shut', async () => {
+    await shoutService.remove(shoutUser2Contribution1._id);
+
+    // should have one shout
+    contribution1 = await app.service('contributions').get(contribution1._id);
+    assert.equal(contribution1.shoutCount, 1);
+  });
+});
