get actionUsers without using virtual

packages/app/src/server/models/activity.ts

@@ -96,10 +96,6 @@ activitySchema.methods.getNotificationTargetUsers = async function() {
   return activeNotificationUsers;
 };
 
-activitySchema.statics.getActionUsersFromActivities = function(activities) {
-  return activities.map(({ user }) => user).filter((user, i, self) => self.indexOf(user) === i);
-};
-
 activitySchema.post('save', async(savedActivity: ActivityDocument) => {
   let targetUsers: Types.ObjectId[] = [];
   try {

packages/app/src/server/models/in-app-notification.ts

@@ -81,13 +81,6 @@ const inAppNotificationSchema = new Schema<InAppNotificationDocument, InAppNotif
 });
 inAppNotificationSchema.plugin(mongoosePaginate);
 
-inAppNotificationSchema.virtual('actionUsers').get(function(this: InAppNotificationDocument) {
-
-  const actionUsers = Activity.getActionUsersFromActivities((this.activities as any) as ActivityDocument[]);
-
-  return actionUsers;
-});
-
 const transform = (doc, ret) => {
   delete ret.activities;
 };

packages/app/src/server/routes/apiv3/in-app-notification.ts

@@ -1,4 +1,5 @@
 import { InAppNotification } from '../../models/in-app-notification';
+import { InAppNotification as IInAppNotification } from '../../../interfaces/in-app-notification';
 
 const express = require('express');
 const { serializeUserSecurely } = require('../../models/serializers/user-serializer');
@@ -30,34 +31,33 @@ module.exports = (crowi) => {
 
     const paginationResult = await inAppNotificationService.getLatestNotificationsByUser(user._id, requestLimit, offset);
 
-    interface IDoc {
-      status: string,
-      _id: string
-      action: string,
-      target: [],
-      user: typeof User,
-      createdAt: Date,
-      targetModel: string,
-      actionUsers: Array<typeof User>,
-      id: string,
-    }
 
-    interface IPaginationResult {
-      docs: Array<IDoc | null>,
-      totalDocs: number,
-      offset: number,
-      limit: number,
-      totalPages: number,
-      page: number,
-      pagingCounter: number,
-      hasPrevPage: boolean,
-      hasNextPage: boolean,
-      prevPage: number | null,
-      nextPage: number | null,
-    }
+    const getActionUsersFromActivities = function(activities) {
+      return activities.map(({ user }) => user).filter((user, i, self) => self.indexOf(user) === i);
+    };
+
+    let docObj: IInAppNotification;
+    const serializedDocs: Array<IInAppNotification> = [];
+
+    paginationResult.docs.forEach((doc, i) => {
+      if (doc.user != null && doc.user instanceof User) {
+        doc.user = serializeUserSecurely(doc.user);
+      }
 
-    const seriarizedPaginationResult: IPaginationResult = {
-      docs: [],
+      docObj = doc.toObject();
+      const actionUsersNew = getActionUsersFromActivities(doc.activities);
+
+      const serializedActionUsers = actionUsersNew.map((actionUser) => {
+        return serializeUserSecurely(actionUser);
+      });
+
+      docObj.actionUsers = serializedActionUsers;
+
+      serializedDocs.push(docObj);
+    });
+
+    const serializedPaginationResult = {
+      docs: serializedDocs,
       totalDocs: paginationResult.totalDocs,
       offset: paginationResult.offset,
       limit: paginationResult.limit,
@@ -70,32 +70,7 @@ module.exports = (crowi) => {
       nextPage: paginationResult.nextPage,
     };
 
-
-    paginationResult.docs.forEach((doc) => {
-      let seriarizedUser;
-      if (doc.user != null && doc.user instanceof User) {
-        seriarizedUser = serializeUserSecurely(doc.user);
-      }
-
-      const serializedActionUsers = doc.actionUsers.map((actionUser) => {
-        return serializeUserSecurely(actionUser);
-      });
-
-      seriarizedPaginationResult.docs.push({
-        status: doc.status,
-        _id: doc._id,
-        action: doc.action,
-        target: doc.target,
-        user: seriarizedUser,
-        createdAt: doc.createdAt,
-        targetModel: doc.targetModel,
-        actionUsers: serializedActionUsers,
-        id: doc.status,
-      });
-    });
-
-    return res.apiv3(seriarizedPaginationResult);
-
+    return res.apiv3(serializedPaginationResult);
   });
 
   router.get('/status', accessTokenParser, loginRequiredStrictly, async(req, res) => {