feat: Define actions that result in Create vs Edit activities by arvid-e · Pull Request #10818 · growilabs/growi

arvid-e · 2026-02-26T07:40:44Z

https://redmine.weseek.co.jp/issues/177734
https://redmine.weseek.co.jp/issues/177877

Rules for Update Activity

https://dev.growi.org/6992e8c71f452b96f288b4cd

Copilot

Pull request overview

This PR refines how page updates are recorded as activities by suppressing certain “edit/update” activity emissions based on recent activity history and revision count, aligning activity generation with the intended Create vs Edit behavior.

Changes:

Add logic in the APIV3 page update route to look up the most recent CREATE/UPDATE activity for the page.
Suppress emitting an UPDATE activity for rapid successive edits by the same user (within a 5-minute window), with additional gating based on revision count.
Keep existing notification flows (global notification, Slack, AI vector store rebuild) while conditionally emitting the activity update event.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

miya · 2026-03-18T08:06:07Z

+    if (shouldGenerateUpdateActivity) {
+      // persist activity
+      const creator =
+        updatedPage.creator != null
+          ? getIdForRef(updatedPage.creator)


ACTION_UNSETTLED のアクティビティがそのまま残るのであれば問題なさそう？

miya · 2026-03-18T08:01:18Z

+    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 });
+
+    // Check if last updated user is me
+    const isLastActivityByMe =
+      lastContentActivity &&
+      lastContentActivity.user._id.toString() === req.user._id.toString();
+
+    // Get time since activity
+    const lastActivityTime = lastContentActivity
+      ? 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 < suppressUpdateWindow) {
+      shouldGenerateUpdateActivity = false;
+    } else {
+      const Revision = mongoose.model<IRevisionHasId>('Revision');
+      const revisionCount = await Revision.countDocuments({
+        pageId: updatedPage._id,
+      });
+
+      shouldGenerateUpdateActivity = revisionCount > minimumRevisionForActivity;
+    }
+
+    if (shouldGenerateUpdateActivity) {
+      // persist activity
+      const creator =
+        updatedPage.creator != null
+          ? getIdForRef(updatedPage.creator)
+          : undefined;
+      const parameters = {
+        targetModel: SupportedTargetModel.MODEL_PAGE,
+        target: updatedPage,
+        action: SupportedAction.ACTION_PAGE_UPDATE,
+      };
+      const activityEvent = crowi.events.activity;
+      activityEvent.emit(
+        'update',
+        res.locals.activity._id,
+        parameters,
+        { path: updatedPage.path, creator },
+        preNotifyService.generatePreNotify,
+      );
+    }


対応した方がいいと思います

miya · 2026-03-18T08:04:10Z

+      lastContentActivity &&
+      lastContentActivity.user._id.toString() === req.user._id.toString();


user が存在しないケースは存在するのか？

前編集したユーザーが削除された場合はlastContentActivity.user がnullになるかもしれないので対応しました

miya · 2026-03-18T07:55:52Z

+    const minimumRevisionForActivity = 2;
+    const suppressUpdateWindow = 5 * 60 * 1000; // 5 min


これは定数として route の外に出しおきたいです

miya · 2026-03-18T08:01:18Z

+    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 });
+
+    // Check if last updated user is me
+    const isLastActivityByMe =
+      lastContentActivity &&
+      lastContentActivity.user._id.toString() === req.user._id.toString();
+
+    // Get time since activity
+    const lastActivityTime = lastContentActivity
+      ? 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 < suppressUpdateWindow) {
+      shouldGenerateUpdateActivity = false;
+    } else {
+      const Revision = mongoose.model<IRevisionHasId>('Revision');
+      const revisionCount = await Revision.countDocuments({
+        pageId: updatedPage._id,
+      });
+
+      shouldGenerateUpdateActivity = revisionCount > minimumRevisionForActivity;
+    }
+
+    if (shouldGenerateUpdateActivity) {
+      // persist activity
+      const creator =
+        updatedPage.creator != null
+          ? getIdForRef(updatedPage.creator)
+          : undefined;
+      const parameters = {
+        targetModel: SupportedTargetModel.MODEL_PAGE,
+        target: updatedPage,
+        action: SupportedAction.ACTION_PAGE_UPDATE,
+      };
+      const activityEvent = crowi.events.activity;
+      activityEvent.emit(
+        'update',
+        res.locals.activity._id,
+        parameters,
+        { path: updatedPage.path, creator },
+        preNotifyService.generatePreNotify,
+      );
+    }


対応した方がいいと思います

miya · 2026-03-18T08:02:13Z

+
+    // Check if last updated user is me
+    const isLastActivityByMe =
+      lastContentActivity &&


null チェックをしましょう

miya · 2026-03-18T08:04:10Z

+      lastContentActivity &&
+      lastContentActivity.user._id.toString() === req.user._id.toString();


user が存在しないケースは存在するのか？

miya · 2026-03-18T08:06:07Z

+    if (shouldGenerateUpdateActivity) {
+      // persist activity
+      const creator =
+        updatedPage.creator != null
+          ? getIdForRef(updatedPage.creator)


ACTION_UNSETTLED のアクティビティがそのまま残るのであれば問題なさそう？

miya · 2026-03-18T08:06:29Z

-      { path: updatedPage.path, creator },
-      preNotifyService.generatePreNotify,
-    );
+    const minimumRevisionForActivity = 2;


これは 2 でいいんでしたっけ？

2が正しいでした:

Revision 1: ページ作成

Revision 2: 初めての編集 (activityが発生しない)

Revision 3: ２つ目の編集 (activityが発生する)

実装と仕様書 (dev wiki) を一致させてください

miya · 2026-03-24T07:10:17Z

+const minimumRevisionForActivity = 2;
+const suppressUpdateWindowMs = 5 * 60 * 1000; // 5 min


定数は大文字且つ snake case にしたいです

miya · 2026-03-24T07:22:15Z

+        lastContentActivity?.user?._id?.toString() ===
+          req.user?._id?.toString();
+
+      const lastActivityTime = lastContentActivity


null チェックをしてください

miya · 2026-03-24T07:31:59Z

-      { path: updatedPage.path, creator },
-      preNotifyService.generatePreNotify,
-    );
+    const minimumRevisionForActivity = 2;


実装と仕様書 (dev wiki) を一致させてください

…creator

…ho is not creator

yuki-takei · 2026-04-08T11:34:41Z

+    try {
+      const targetPageId = updatedPage._id.toString();
+      const currentActivityId = res.locals.activity?._id.toString();
+      const currentUserId = req.user?._id?.toString();


currentUserId が undefined の場合、isLastActivityByMe は常に false となり、常にアクティビティが生成されてしまう。認証済みルートなので実際には起きにくいが、型定義を string | undefined に明示し、undefined時の振る舞いを意図的にすべき。

yuki-takei · 2026-04-08T11:35:46Z

+
+  const isLastActivityByMe =
+    !!currentUserId &&
+    lastContentActivity?.user?._id?.toString() === currentUserId;


import { getIdForRef, getIdStringForRef } from '@growi/core';

を利用してください

mergify · 2026-04-15T10:14:46Z

Merge Queue Status

✅ Entered queue — 2026-04-15 10:14 UTC · Rule: default
✅ Checks passed · on draft merge queue: embarking master (def736e) and #10818 together #11008
✅ Merged — 2026-04-15 10:26 UTC · at e48c662c283bd6c550cf425d4a6b077b257d240b

This pull request spent 11 minutes 27 seconds in the queue, including 10 minutes 57 seconds running CI.

Required conditions to merge

-check-failure ~= ci-app-
-check-failure ~= ci-slackbot-
-check-failure ~= test-prod-node24 /
check-success = test-prod-node24 / build-prod
check-success ~= ci-app-launch-dev
check-success ~= ci-app-lint
check-success ~= ci-app-test
check-success ~= test-prod-node24 / launch-prod
check-success ~= test-prod-node24 / run-playwright

Add reminder

227d915

github-actions Bot added the type/feature label Feb 26, 2026

arvid-e added 5 commits March 3, 2026 08:21

Implement page update activity generation rules

f548d62

Merge branch 'master' into feat/177877-activity-create-update-logic

cc77c14

Implement activity creation rules for update activities

f3e2e0b

Add comments

3f4d936

Implement rules on when update activities generate

bd9019d

arvid-e requested a review from miya March 16, 2026 07:07

miya requested a review from Copilot March 18, 2026 05:47

Copilot started reviewing on behalf of miya March 18, 2026 05:47 View session

Copilot AI reviewed Mar 18, 2026

View reviewed changes

miya reviewed Mar 18, 2026

View reviewed changes

arvid-e added 2 commits March 24, 2026 05:16

Merge branch 'master' into feat/177877-activity-create-update-logic

75dad1f

Catch error and handle user is null

8053c50

arvid-e requested a review from miya March 24, 2026 06:14

miya approved these changes Mar 24, 2026

View reviewed changes

miya requested a review from yuki-takei March 24, 2026 07:32

arvid-e added 2 commits March 25, 2026 04:49

Merge branch 'master' into feat/177877-activity-create-update-logic

b8cbb44

Check if createdAt exist on last activity object

9d69b0a

yuki-takei requested changes Mar 27, 2026

View reviewed changes

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

arvid-e added 10 commits March 30, 2026 06:20

Merge branch 'master' into feat/177877-activity-create-update-logic

7c093b7

Move update activity logic to its own function

834095c

Test that update activity generates if last updated user is different

c4ba07b

Test that activity is not generated if it is the first update by the …

6eb394d

…creator

Test that update activity is generated on first update made by user w…

7ea540e

…ho is not creator

Refactor by reusing constants

8d9f7fc

Test that suppression window is working

d1d3dd4

Add test case and refactor

bbb2efe

Merge branch 'master' into feat/177877-activity-create-update-logic

94caa2a

Correct constant name

7054a2f

arvid-e added 2 commits March 31, 2026 07:09

Remove unused imports

632d8a2

Make amount of activities and revisions be consistent

4ecec98

arvid-e requested a review from yuki-takei March 31, 2026 07:34

yuki-takei requested changes Mar 31, 2026

View reviewed changes

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

arvid-e added 3 commits April 7, 2026 08:20

Remove duplicate test case

451aba9

Add missing test cases

6836970

Merge branch 'master' into feat/177877-activity-create-update-logic

2132f4e

arvid-e requested a review from yuki-takei April 8, 2026 08:16

yuki-takei requested changes Apr 8, 2026

View reviewed changes

arvid-e added 3 commits April 10, 2026 05:54

Do not generate update activity if user id is undefined

a8382b5

Make use of utility to get id of objects

c0d6e18

Merge branch 'master' into feat/177877-activity-create-update-logic

e40da0b

arvid-e requested a review from yuki-takei April 10, 2026 06:30

yuki-takei requested changes Apr 14, 2026

View reviewed changes

Comment thread apps/app/src/server/service/activity/update-activity.spec.ts

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

arvid-e added 3 commits April 14, 2026 06:52

Add createdAt field to activity interface

3a2b46e

Import activity model to get types in activity logic

5c70173

Split try catch block up for more accurate errors

e48c662

arvid-e requested a review from yuki-takei April 14, 2026 07:51

yuki-takei approved these changes Apr 15, 2026

View reviewed changes

mergify Bot added the queued label Apr 15, 2026

mergify Bot added a commit that referenced this pull request Apr 15, 2026

Merge of #10818

0803d8e

mergify Bot mentioned this pull request Apr 15, 2026

merge queue: embarking master (def736e) and #10818 together #11008

Closed

15 tasks

mergify Bot merged commit ced383b into master Apr 15, 2026
24 checks passed

mergify Bot deleted the feat/177877-activity-create-update-logic branch April 15, 2026 10:26

mergify Bot removed the queued label Apr 15, 2026

This was referenced Apr 15, 2026

Release v7.5.1 #10973

Merged

Release v7.5.2 #11020

Closed

github-actions Bot mentioned this pull request Apr 27, 2026

Release v7.5.3 #11062

Open

		lastContentActivity &&
		lastContentActivity.user._id.toString() === req.user._id.toString();

		const minimumRevisionForActivity = 2;
		const suppressUpdateWindow = 5 * 60 * 1000; // 5 min

		const minimumRevisionForActivity = 2;
		const suppressUpdateWindowMs = 5 * 60 * 1000; // 5 min

Conversation

arvid-e commented Feb 26, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Rules for Update Activity

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

mergify Bot commented Apr 15, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Merge Queue Status

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

arvid-e commented Feb 26, 2026 •

edited

Loading

mergify Bot commented Apr 15, 2026 •

edited

Loading