From 0f2dfd40346563f8fc05e58c15b8a8bea9f94311 Mon Sep 17 00:00:00 2001 From: Niraj Adhikari Date: Thu, 14 Dec 2023 10:59:18 +0545 Subject: [PATCH 1/2] hotfix: calculate max last_submission only if valid_datetimes present --- src/backend/app/submission/submission_crud.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/backend/app/submission/submission_crud.py b/src/backend/app/submission/submission_crud.py index 94be8e9c15..dfa5dd0822 100644 --- a/src/backend/app/submission/submission_crud.py +++ b/src/backend/app/submission/submission_crud.py @@ -470,7 +470,7 @@ def update_submission_in_s3( ] last_submission = max( valid_datetimes, key=lambda x: datetime.strptime(x, "%Y-%m-%dT%H:%M:%S.%fZ") - ) + ) if valid_datetimes else None # Check if the file already exists in s3 s3_project_path = f"/{project.organisation_id}/{project_id}" From f07aec26a96f83202b9f2e10a70e51bcad48cef8 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 14 Dec 2023 05:15:48 +0000 Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- src/backend/app/submission/submission_crud.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/backend/app/submission/submission_crud.py b/src/backend/app/submission/submission_crud.py index dfa5dd0822..ba615de7e9 100644 --- a/src/backend/app/submission/submission_crud.py +++ b/src/backend/app/submission/submission_crud.py @@ -468,9 +468,14 @@ def update_submission_in_s3( for form in odk_forms if form["lastSubmission"] is not None ] - last_submission = max( - valid_datetimes, key=lambda x: datetime.strptime(x, "%Y-%m-%dT%H:%M:%S.%fZ") - ) if valid_datetimes else None + last_submission = ( + max( + valid_datetimes, + key=lambda x: datetime.strptime(x, "%Y-%m-%dT%H:%M:%S.%fZ"), + ) + if valid_datetimes + else None + ) # Check if the file already exists in s3 s3_project_path = f"/{project.organisation_id}/{project_id}"