From 6068b6c7460735c345ccf6028711f2a735052d13 Mon Sep 17 00:00:00 2001 From: Faruk AYDIN Date: Thu, 27 Mar 2025 23:22:22 +0100 Subject: [PATCH] feat: Implement time based filters for executions API endpoint --- .../api/v1/executions/get-executions.js | 2 ++ packages/backend/src/models/user.js | 16 +++++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/packages/backend/src/controllers/api/v1/executions/get-executions.js b/packages/backend/src/controllers/api/v1/executions/get-executions.js index 62db44d8..eb89ed40 100644 --- a/packages/backend/src/controllers/api/v1/executions/get-executions.js +++ b/packages/backend/src/controllers/api/v1/executions/get-executions.js @@ -15,5 +15,7 @@ const executionParams = (request) => { return { name: request.query.name, status: request.query.status, + startDateTime: request.query.startDateTime, + endDateTime: request.query.endDateTime, }; }; diff --git a/packages/backend/src/models/user.js b/packages/backend/src/models/user.js index 7e92ac78..4499381d 100644 --- a/packages/backend/src/models/user.js +++ b/packages/backend/src/models/user.js @@ -566,7 +566,7 @@ class User extends Base { .orderBy('updated_at', 'desc'); } - getExecutions({ name, status }) { + getExecutions({ name, status, startDateTime, endDateTime }) { return this.authorizedExecutions .clone() .withSoftDeleted() @@ -590,6 +590,20 @@ class User extends Base { } else if (status === 'failure') { builder.where('executions.status', 'failure'); } + + if (startDateTime && endDateTime) { + const startDate = DateTime.fromMillis(Number(startDateTime)); + + if (startDate.isValid) { + builder.where('executions.created_at', '>=', startDate.toISO()); + } + + const endDate = DateTime.fromMillis(Number(endDateTime)); + + if (endDate.isValid) { + builder.where('executions.created_at', '<=', endDate.toISO()); + } + } }) .orderBy('created_at', 'desc'); }