From 0934c6ccd86b3be2355f3f5957af5310c1c46e0d Mon Sep 17 00:00:00 2001 From: Thomas Heartman Date: Tue, 13 Aug 2024 09:32:51 +0200 Subject: [PATCH] fix: search events by user ID, not by user name (#7846) Changes the event search handling, so that searching by user uses the user's ID, not the "createdBy" name in the event. This aligns better with what the OpenAPI schema describes it. --- src/lib/features/events/event-service.ts | 2 +- src/test/e2e/api/admin/event-search.e2e.test.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/features/events/event-service.ts b/src/lib/features/events/event-service.ts index 4923d662e0..eb09d65632 100644 --- a/src/lib/features/events/event-service.ts +++ b/src/lib/features/events/event-service.ts @@ -177,7 +177,7 @@ export default class EventService { if (params.createdBy) { const parsed = parseSearchOperatorValue( - 'created_by', + 'created_by_user_id', params.createdBy, ); if (parsed) queryParams.push(parsed); diff --git a/src/test/e2e/api/admin/event-search.e2e.test.ts b/src/test/e2e/api/admin/event-search.e2e.test.ts index 7856434c6d..31f71876cb 100644 --- a/src/test/e2e/api/admin/event-search.e2e.test.ts +++ b/src/test/e2e/api/admin/event-search.e2e.test.ts @@ -183,7 +183,7 @@ test('should filter events by created by', async () => { await eventService.storeEvent({ type: FEATURE_CREATED, createdBy: 'admin1@example.com', - createdByUserId: TEST_USER_ID, + createdByUserId: TEST_USER_ID + 1, ip: '127.0.0.1', }); @@ -194,7 +194,7 @@ test('should filter events by created by', async () => { ip: '127.0.0.1', }); - const { body } = await searchEvents({ createdBy: 'IS:admin2@example.com' }); + const { body } = await searchEvents({ createdBy: `IS:${TEST_USER_ID}` }); expect(body).toMatchObject({ events: [