Skip to content

Commit 8d2d506

Browse files
committed
Fixes for backwards compatibility
1 parent b9c566f commit 8d2d506

File tree

2 files changed

+12
-5
lines changed

2 files changed

+12
-5
lines changed

gefapi/routes/api/v1/gef_api_router.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,7 @@ def get_executions():
266266
end_date_lte = request.args.get("end_date_lte", None)
267267
if end_date_lte:
268268
end_date_lte = dateutil.parser.parse(end_date_lte)
269+
269270
sort = request.args.get("sort", None)
270271
include = request.args.get("include")
271272
include = include.split(",") if include else []
@@ -351,7 +352,7 @@ def update_execution(execution):
351352
@endpoints.route("/execution/<execution>/log", strict_slashes=False, methods=["GET"])
352353
def get_execution_logs(execution):
353354
"""Get the exectuion logs"""
354-
logger.info("[ROUTER]: Getting exectuion logs of execution %s " % (execution))
355+
logger.info("[ROUTER]: Getting execution logs of execution %s " % (execution))
355356
try:
356357
start = request.args.get("start", None)
357358
if start:

gefapi/services/execution_service.py

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,12 @@ def get_executions(
5959
):
6060
logger.info("[SERVICE]: Getting executions")
6161
logger.info("[DB]: QUERY")
62-
if not updated_at:
63-
updated_at = datetime.datetime(2000, 12, 1)
6462
query = None
63+
if page < 1:
64+
raise Exception("Page must be greater than 0")
65+
if per_page < 1:
66+
raise Exception("Per page must be greater than 0")
67+
6568
# Admin
6669
if user.role == "ADMIN":
6770
# Target User
@@ -81,8 +84,6 @@ def get_executions(
8184
else:
8285
query = db.session.query(Execution).filter(Execution.user_id == user.id)
8386

84-
query = query.filter(Execution.end_date > updated_at)
85-
8687
if status:
8788
query = query.filter(Execution.status == status)
8889
if start_date_gte:
@@ -93,6 +94,10 @@ def get_executions(
9394
query = query.filter(Execution.end_date >= end_date_gte)
9495
if end_date_lte:
9596
query = query.filter(Execution.end_date <= end_date_lte)
97+
elif updated_at:
98+
# For backwards compatibility, if no end_date_lte is provided,
99+
# filter by updated_at
100+
query = query.filter(Execution.end_date >= updated_at)
96101

97102
if sort:
98103
sort_field = sort[1:] if sort.startswith("-") else sort
@@ -102,6 +107,7 @@ def get_executions(
102107
getattr(getattr(Execution, sort_field), sort_direction)()
103108
)
104109
else:
110+
# Default to sorting by end_date for backwards compatibility
105111
query = query.order_by(Execution.end_date.desc())
106112

107113
total = query.count()

0 commit comments

Comments
 (0)