Move update activity logic to its own function

apps/app/src/server/routes/apiv3/page/update-page.ts

@@ -32,6 +32,7 @@ import {
   serializePageSecurely,
   serializeRevisionSecurely,
 } from '~/server/models/serializers';
+import { shouldGenerateUpdate } from '~/server/service/activity/update-activity-logic';
 import { configManager } from '~/server/service/config-manager/config-manager';
 import { preNotifyService } from '~/server/service/pre-notify';
 import { normalizeLatestRevisionIfBroken } from '~/server/service/revision/normalize-latest-revision-if-broken';
@@ -124,44 +125,14 @@ export const updatePageHandlersFactory = (crowi: Crowi): RequestHandler[] => {
     // Decide if update activity should generate
     try {
       const targetPageId = updatedPage._id.toString();
-      const Activity = mongoose.model('Activity');
-
-      // Get most recent update or create activity on the page
-      const lastContentActivity = await Activity.findOne({
-        target: targetPageId,
-        action: {
-          $in: [
-            SupportedAction.ACTION_PAGE_CREATE,
-            SupportedAction.ACTION_PAGE_UPDATE,
-          ],
-        },
-        _id: { $ne: res.locals.activity?._id },
-      }).sort({ createdAt: -1 });
-
+      const latestSupportedActivityId = res.locals.activity?._id.toString();
       const currentUserId = req.user?._id?.toString();
 
-      const isLastActivityByMe =
-        !!currentUserId &&
-        lastContentActivity?.user?._id?.toString() === currentUserId;
-
-      const lastActivityTime = lastContentActivity?.createdAt?.getTime?.() ?? 0;
-      const timeSinceLastActivityMs = Date.now() - lastActivityTime;
-
-      // Decide if update activity should generate
-      let shouldGenerateUpdateActivity: boolean;
-      if (!isLastActivityByMe) {
-        shouldGenerateUpdateActivity = true;
-      } else if (timeSinceLastActivityMs < SUPPRESION_UPDATE_WINDOW_MS) {
-        shouldGenerateUpdateActivity = false;
-      } else {
-        const Revision = mongoose.model<IRevisionHasId>('Revision');
-        const revisionCount = await Revision.countDocuments({
-          pageId: updatedPage._id,
-        });
-
-        shouldGenerateUpdateActivity =
-          revisionCount > MINIMUM_REVISION_FOR_ACTIVITY;
-      }
+      const shouldGenerateUpdateActivity = await shouldGenerateUpdate({
+        currentUserId,
+        targetPageId,
+        latestSupportedActivityId,
+      });
 
       if (shouldGenerateUpdateActivity) {
         // persist activity

apps/app/src/server/service/activity/index.ts

@@ -0,0 +1 @@
+export * from './update-activity-logic';

apps/app/src/server/service/activity/update-activity-logic.ts

@@ -0,0 +1,55 @@
+import type { IRevisionHasId } from '@growi/core';
+import mongoose from 'mongoose';
+
+import { SupportedAction } from '~/interfaces/activity';
+
+type GenerateUpdatePayload = {
+  currentUserId: string;
+  targetPageId: string;
+  latestSupportedActivityId: string;
+};
+
+const MINIMUM_REVISION_FOR_ACTIVITY = 2;
+const SUPPRESION_UPDATE_WINDOW_MS = 1 * 10 * 1000; // 5 min
+
+export const shouldGenerateUpdate = async (payload: GenerateUpdatePayload) => {
+  const { targetPageId, latestSupportedActivityId, currentUserId } = payload;
+  const Activity = mongoose.model('Activity');
+
+  // Get most recent update or create activity on the page
+  const lastContentActivity = await Activity.findOne({
+    target: targetPageId,
+    action: {
+      $in: [
+        SupportedAction.ACTION_PAGE_CREATE,
+        SupportedAction.ACTION_PAGE_UPDATE,
+      ],
+    },
+    _id: { $ne: latestSupportedActivityId },
+  }).sort({ createdAt: -1 });
+
+  const isLastActivityByMe =
+    !!currentUserId &&
+    lastContentActivity?.user?._id?.toString() === currentUserId;
+
+  const lastActivityTime = lastContentActivity?.createdAt?.getTime?.() ?? 0;
+  const timeSinceLastActivityMs = Date.now() - lastActivityTime;
+
+  // Decide if update activity should generate
+  let shouldGenerateUpdateActivity: boolean;
+  if (!isLastActivityByMe) {
+    shouldGenerateUpdateActivity = true;
+  } else if (timeSinceLastActivityMs < SUPPRESION_UPDATE_WINDOW_MS) {
+    shouldGenerateUpdateActivity = false;
+  } else {
+    const Revision = mongoose.model<IRevisionHasId>('Revision');
+    const revisionCount = await Revision.countDocuments({
+      pageId: targetPageId,
+    });
+
+    shouldGenerateUpdateActivity =
+      revisionCount > MINIMUM_REVISION_FOR_ACTIVITY;
+  }
+
+  return shouldGenerateUpdateActivity;
+};