feat: Implement fuzzy username search using Elasticsearch by Appleple47 · Pull Request #10876 · growilabs/growi

Appleple47 · 2026-03-18T07:18:56Z

タスク

https://redmine.weseek.co.jp/issues/180046
https://redmine.weseek.co.jp/issues/180047
https://redmine.weseek.co.jp/issues/180048

miya · 2026-03-19T06:12:06Z

API route は activiry ディレクトリ側にあるはずだからそっちに定義した方が良さそうです

miya · 2026-03-19T06:18:38Z

+    loginRequiredStrictly,
+    adminRequired,
+    async (req: Request, res: ApiV3Response) => {
+      const { q = '', offset = 0, limit = 5 } = req.query;


express-validator による validation をしてください

他の API の実装も参考に req.query から取り出した値に型がつくようにしてください

miya · 2026-03-19T06:24:51Z

+        (result.aggregations?.unique_usernames as any)?.buckets ?? [];
+      const usernames = buckets.map((bucket) => bucket.key as string);


ここら辺 type safe にできませんか？ TS の恩恵がなくなるので as any はなるべく避けたいです。

miya · 2026-03-19T06:26:18Z

+
+    const body = activities.flatMap((activity) => {
+      const username = activity.snapshot?.username;
+      if (!username) return [];


username != null で判定しましょう

https://tips.weseek.co.jp/5fb74e7aa1ba4200489a4bd1#%E5%88%A4%E5%AE%9A%E5%BC%8F

miya · 2026-03-19T06:30:56Z

+    const indexName = 'auditlogs';
+    const tmpIndexName = 'auditlogs-tmp';
+    const aliasName = 'auditlogs-alias';


別のメソッドでも使い回す系のて定数はインスタンス変数とかに定義しておいた方が良さそう

miya · 2026-03-19T06:35:00Z

      <span className="input-group-text">
        <span className="material-symbols-outlined">person</span>
      </span>
-      <AsyncTypeahead


変更理由を書いておいて欲しいです

AsyncTypeahead のクライアント側フィルタリングがfuzzy検索の結果を除外していると勘違いして Typeahead に変更しましたが、filterBy={() => true} を追加すれば AsyncTypeahead のままでも動くことが発覚したので元に戻しました。

…ification and review fixes

miya · 2026-03-24T05:28:32Z

+      const q = req.query.q != null ? (req.query.q as string) : '';
+      const offset =
+        req.query.offset != null ? parseInt(req.query.offset as string, 10) : 0;
+      const limit =
+        req.query.limit != null ? parseInt(req.query.limit as string, 10) : 5;


Request を extends した型を使ってみてください。assertion もなるべく使いたくないです。

参考

growi/packages/remark-lsx/src/server/routes/list-pages/index.ts

Lines 64 to 67 in 1a565b3

interface IListPagesRequest

extends Request<undefined, undefined, undefined, LsxApiParams> {

user: IUser;

}

// biome-ignore lint/suspicious/noTsIgnore: Suppress auto fix by lefthook // @ts-ignore - Scope type causes "Type instantiation is excessively deep" with tsgo

get-recent-threads.ts では上のコメントをつけて運用しているみたい

miya · 2026-03-24T05:38:31Z

+      limit,
+    );
+
+    const User = mongoose.model('User');


こんな感じに書くと型がつけられるのでやってみてください

参考

growi/apps/app/src/features/page-bulk-export/server/service/page-bulk-export-job-cron/index.ts

Line 192 in 7034bfd

const User = mongoose.model<IUser>('User');

miya · 2026-03-24T05:46:07Z

+    query('offset').optional().isInt().withMessage('offset must be a number'),
+    query('limit')
+      .optional()
+      .isInt({ max: 100 })
+      .withMessage('limit must be a number less than or equal to 100'),
+  ],


.toInt() をつければ req.query.{hoge} で取り出した時に数値に変換された状態で受け取れる

parseInt が不要になる

miya · 2026-03-24T11:46:53Z

+      const q = req.query.q != null ? (req.query.q as string) : '';
+      const offset =
+        req.query.offset != null ? parseInt(req.query.offset as string, 10) : 0;
+      const limit =
+        req.query.limit != null ? parseInt(req.query.limit as string, 10) : 5;


// biome-ignore lint/suspicious/noTsIgnore: Suppress auto fix by lefthook // @ts-ignore - Scope type causes "Type instantiation is excessively deep" with tsgo

get-recent-threads.ts では上のコメントをつけて運用しているみたい

…search

mergify · 2026-03-24T11:49:31Z

Merge Queue Status

✅ Entered queue — 2026-03-24 11:48 UTC · Rule: default
✅ Checks started · on draft merge queue: embarking feat/179909-username-fuzzy-search (42ab20a) and #10876 together #10921
🚫 Left the queue — 2026-03-24 11:49 UTC · at 7034bfd71ed06bc825553fb18dbe578357712a3a

This pull request spent 1 minute 3 seconds in the queue, with no time running CI.

Required conditions to merge

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
-check-failure ~= ci-app-
-check-failure ~= ci-slackbot-
-check-failure ~= test-prod-node24 /

Reason

The pull request #10876 has been manually updated

Hint

If you want to requeue this pull request, you can post a @mergifyio queue comment.

mergify · 2026-03-24T11:55:31Z

Merge Queue Status

✅ Entered queue — 2026-03-24 11:54 UTC · Rule: default
✅ Checks started · on draft merge queue: embarking feat/179909-username-fuzzy-search (42ab20a) and #10876 together #10922
🚫 Left the queue — 2026-03-24 11:59 UTC · at 982e97cd254ee9a311520f8e6468fb25709f5990

This pull request spent 4 minutes 57 seconds in the queue, including 4 minutes 39 seconds running CI.

Required conditions to merge

-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
-check-failure ~= ci-app-
-check-failure ~= ci-slackbot-

Reason

The merge conditions cannot be satisfied due to failing checks

Failing checks:

❌ test-prod-node24 / build-prod

Hint

You may have to fix your CI before adding the pull request to the queue again.
If you update this pull request, to fix the CI, it will automatically be requeued once the queue conditions match again.
If you think this was a flaky issue instead, you can requeue the pull request, without updating it, by posting a @mergifyio queue comment.

mergify · 2026-03-24T12:58:38Z

Merge Queue Status

✅ Entered queue — 2026-03-24 12:57 UTC · Rule: default
✅ Checks started · on draft merge queue: embarking feat/179909-username-fuzzy-search (42ab20a) and #10876 together #10924
🚫 Left the queue — 2026-03-24 13:02 UTC · at a2a272b83cb4d8fe8267534d49d435f622b3dcbd

This pull request spent 4 minutes 46 seconds in the queue, including 4 minutes 36 seconds running CI.

Required conditions to merge

-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
-check-failure ~= ci-app-
-check-failure ~= ci-slackbot-

Reason

The merge conditions cannot be satisfied due to failing checks

Failing checks:

❌ test-prod-node24 / build-prod

Hint

You may have to fix your CI before adding the pull request to the queue again.
If you update this pull request, to fix the CI, it will automatically be requeued once the queue conditions match again.
If you think this was a flaky issue instead, you can requeue the pull request, without updating it, by posting a @mergifyio queue comment.

…tlog-search

yuki-takei · 2026-03-27T10:20:59Z

@Appleple47
Activity Log は mongodb に永続化されるデータだが、 ttl を利用して時間ベースでデータを削除する仕組みになっている
expireAfterSeconds でリポジトリ内を検索してほしい

そのため、今のままではMongoDB の TTL によって古いドキュメントが削除された場合に、対応する ES 側のドキュメントが削除されないという問題がある

ES 側にも ILM (Index Lifecycle Management) を設定する必要があるのではないか？

MongoDB v8.2 も一応選択肢ではあるが、現時点では ES による実装の方針は正しいと思う

yuki-takei · 2026-03-27T10:32:07Z

  );

+  router.get(
+    '/usernames',


Slack で相談を受けている UI 案を見ると、username だけのエンドポイントを作るのは全体設計に対してずれがあるんじゃないか？

あと REST API の設計として GET /api/v3/activity/usernames というエンドポイントから検索する挙動は想像できない
エンドポイントURLを工夫してほしい

…048-implement-fuzzy-auditlog-search

Appleple47 force-pushed the feat/179909-username-fuzzy-search branch from 57f3b51 to 42ab20a Compare March 18, 2026 09:47

Appleple47 force-pushed the feat/179909-180048-implement-fuzzy-auditlog-search branch from 01922a7 to e3de2a0 Compare March 18, 2026 09:47

Appleple47 added 8 commits March 19, 2026 04:35

refs #180045 add auditlog index mappings for elasticsearch

79713ad

refs #180046 sync existing auditlogs to elasticsearch on boot

c928e49

refs #180046: add count method to elasticsearch client delegators

9a7c154

refs #180047: sync auditlog to elasticsearch on save

0ed1f2e

180048: implement fuzzy search for auditlog username

02354ba

revert: disable audit log in develop env

15d40d1

fix normalizeAuditlogIndices to avoid duplicate sync and alias conflict

fa9d98b

fix username suggestions to show correct categories in auditlog search

78cc663

Appleple47 force-pushed the feat/179909-180048-implement-fuzzy-auditlog-search branch from e3de2a0 to 78cc663 Compare March 19, 2026 05:35

miya requested changes Mar 19, 2026

View reviewed changes

feat: implement fuzzy auditlog username search with user status class…

7034bfd

…ification and review fixes

miya requested changes Mar 24, 2026

View reviewed changes

miya approved these changes Mar 24, 2026

View reviewed changes

feat: enhance usernames validation and type definitions in audit log …

982e97c

…search

mergify Bot added the queued label Mar 24, 2026

mergify Bot added a commit that referenced this pull request Mar 24, 2026

Merge of #10876

05f33b6

mergify Bot mentioned this pull request Mar 24, 2026

merge queue: embarking feat/179909-username-fuzzy-search (42ab20a) and #10876 together #10921

Closed

15 tasks

mergify Bot added queued and removed queued labels Mar 24, 2026

mergify Bot added a commit that referenced this pull request Mar 24, 2026

Merge of #10876

d826ce3

mergify Bot mentioned this pull request Mar 24, 2026

merge queue: embarking feat/179909-username-fuzzy-search (42ab20a) and #10876 together #10922

Closed

15 tasks

mergify Bot added dequeued and removed queued labels Mar 24, 2026

Appleple47 added 2 commits March 24, 2026 12:24

fix: type usernames query params and mongoose User model

bf1bc5a

fix: type usernames query params and mongoose User model

a2a272b

mergify Bot removed the dequeued label Mar 24, 2026

mergify Bot added the queued label Mar 24, 2026

mergify Bot added a commit that referenced this pull request Mar 24, 2026

Merge of #10876

873f6cc

mergify Bot mentioned this pull request Mar 24, 2026

merge queue: embarking feat/179909-username-fuzzy-search (42ab20a) and #10876 together #10924

Closed

15 tasks

mergify Bot added dequeued and removed queued labels Mar 24, 2026

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

Merge branch 'dev/7.5.x' into feat/179909-180048-implement-fuzzy-audi…

a44b5be

…tlog-search

mergify Bot removed the dequeued label Mar 26, 2026

yuki-takei requested changes Mar 27, 2026

View reviewed changes

Appleple47 added 4 commits March 30, 2026 03:34

Merge branch 'feat/179909-username-fuzzy-search' into feat/179909-180…

f4d1736

…048-implement-fuzzy-auditlog-search

Merge branch 'feat/179909-username-fuzzy-search' into feat/179909-180…

432eb9e

…048-implement-fuzzy-auditlog-search

Merge branch 'feat/179909-username-fuzzy-search' into feat/179909-180…

87c75c9

…048-implement-fuzzy-auditlog-search

Merge branch 'feat/179909-username-fuzzy-search' into feat/179909-180…

d144fbc

…048-implement-fuzzy-auditlog-search

miya mentioned this pull request Apr 17, 2026

Feat: Sync existing datas to elasticsearch #10956

Merged

		(result.aggregations?.unique_usernames as any)?.buckets ?? [];
		const usernames = buckets.map((bucket) => bucket.key as string);

	interface IListPagesRequest
	extends Request<undefined, undefined, undefined, LsxApiParams> {
	user: IUser;
	}

Conversation

Appleple47 commented Mar 18, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

タスク

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!

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

Uh oh!

Merge Queue Status

Reason

Hint

Uh oh!

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

Uh oh!

Merge Queue Status

Reason

Hint

Uh oh!

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

Uh oh!

Merge Queue Status

Reason

Hint

Uh oh!

yuki-takei commented Mar 27, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Appleple47 commented Mar 18, 2026 •

edited

Loading

mergify Bot commented Mar 24, 2026 •

edited

Loading

mergify Bot commented Mar 24, 2026 •

edited

Loading

mergify Bot commented Mar 24, 2026 •

edited

Loading

yuki-takei commented Mar 27, 2026 •

edited

Loading