extended notifications to also trigger on new contributions from followed organizations

Author: appinteractive

server/models/notifications.model.js

@@ -17,8 +17,9 @@ module.exports = function (app) {
         'following-contribution'
       ]
     },
-    relatedUserId: { type: String },
-    relatedContributionId: { type: String },
+    relatedUserId: { type: String, index: true },
+    relatedContributionId: { type: String, index: true },
+    relatedOrganizationId: { type: String, index: true },
     relatedCommentId: { type: String },
     unseen: { type: Boolean, default: true, index: true },
     createdAt: { type: Date, default: Date.now },

server/services/contributions/hooks/notify-followers.js

@@ -15,13 +15,14 @@ module.exports = function () {
       }
 
       const contribution = hook.result;
-      const creatorId = hook.result.userId;
+      const creatorType = hook.result.organizationId ? 'organizations' : 'users';
+      const creatorId = hook.result.organizationId || hook.result.userId;
 
       // get all followers
       const followers = await hook.app.service('follows').find({
         query: {
-          $limit: 1000,
-          foreignService: 'users',
+          $limit: 5000,
+          foreignService: creatorType,
           foreignId: creatorId
         }
       });
@@ -34,6 +35,7 @@ module.exports = function () {
           userId: follower.userId,
           type: 'following-contribution',
           relatedUserId: creatorId,
+          relatedOrganizationId: hook.result.organizationId || null,
           relatedContributionId: contribution._id
         });
       });

server/services/notifications/notifications.hooks.js

@@ -54,6 +54,19 @@ const userSchema = {
   }
 };
 
+const organizationSchema = {
+  include: {
+    service: 'organizations',
+    nameAs: 'organization',
+    parentField: 'relatedOrganizationId',
+    childField: '_id',
+    query: {
+      $limit: 1,
+      $select: ['_id', 'userId', 'name', 'slug', 'logo', 'thumbnails']
+    }
+  }
+};
+
 module.exports = {
   before: {
     all: [
@@ -73,6 +86,7 @@ module.exports = {
 
   after: {
     all: [
+      populate({ schema: organizationSchema }),
       populate({ schema: contributionSchema }),
       populate({ schema: commentSchema }),
       populate({ schema: userSchema })