diff --git a/frontend/src/openapi/models/searchEventsParams.ts b/frontend/src/openapi/models/searchEventsParams.ts index c5016dfe88..7f4a179141 100644 --- a/frontend/src/openapi/models/searchEventsParams.ts +++ b/frontend/src/openapi/models/searchEventsParams.ts @@ -28,11 +28,11 @@ export type SearchEventsParams = { /** * The starting date of the creation date range in IS:yyyy-MM-dd format */ - createdAtFrom?: string; + from?: string; /** * The ending date of the creation date range in IS:yyyy-MM-dd format */ - createdAtTo?: string; + to?: string; /** * The number of features to skip when returning a page. By default it is set to 0. */ diff --git a/src/lib/features/events/event-service.ts b/src/lib/features/events/event-service.ts index 2a05565a83..a64328b67f 100644 --- a/src/lib/features/events/event-service.ts +++ b/src/lib/features/events/event-service.ts @@ -146,11 +146,8 @@ export default class EventService { convertToDbParams = (params: IEventSearchParams): IQueryParam[] => { const queryParams: IQueryParam[] = []; - if (params.createdAtFrom) { - const parsed = parseSearchOperatorValue( - 'created_at', - params.createdAtFrom, - ); + if (params.from) { + const parsed = parseSearchOperatorValue('created_at', params.from); if (parsed) { queryParams.push({ field: parsed.field, @@ -160,11 +157,8 @@ export default class EventService { } } - if (params.createdAtTo) { - const parsed = parseSearchOperatorValue( - 'created_at', - params.createdAtTo, - ); + if (params.to) { + const parsed = parseSearchOperatorValue('created_at', params.to); if (parsed) { queryParams.push({ field: parsed.field, diff --git a/src/lib/openapi/spec/event-search-query-parameters.ts b/src/lib/openapi/spec/event-search-query-parameters.ts index 1c921353a7..4da5b92203 100644 --- a/src/lib/openapi/spec/event-search-query-parameters.ts +++ b/src/lib/openapi/spec/event-search-query-parameters.ts @@ -57,7 +57,7 @@ export const eventSearchQueryParameters = [ in: 'query', }, { - name: 'createdAtFrom', + name: 'from', schema: { type: 'string', example: 'IS:2024-01-01', @@ -68,7 +68,7 @@ export const eventSearchQueryParameters = [ in: 'query', }, { - name: 'createdAtTo', + name: 'to', schema: { type: 'string', example: 'IS:2024-01-31', diff --git a/src/lib/types/stores/event-store.ts b/src/lib/types/stores/event-store.ts index afbd53076b..2e905f13c7 100644 --- a/src/lib/types/stores/event-store.ts +++ b/src/lib/types/stores/event-store.ts @@ -9,8 +9,8 @@ export interface IEventSearchParams { project?: string; query?: string; feature?: string; - createdAtFrom?: string; - createdAtTo?: string; + from?: string; + to?: string; createdBy?: string; type?: string; offset: number; 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 5378a18f01..d16e5a69f6 100644 --- a/src/test/e2e/api/admin/event-search.e2e.test.ts +++ b/src/test/e2e/api/admin/event-search.e2e.test.ts @@ -228,7 +228,7 @@ test('should filter events by created date range', async () => { const today = new Date(); const { body } = await searchEvents({ - createdAtFrom: `IS:${today.toISOString().split('T')[0]}`, + from: `IS:${today.toISOString().split('T')[0]}`, }); expect(body).toMatchObject({