From 6914dc9f429c1a9f81ba9c96ce47f3b50d8a9f72 Mon Sep 17 00:00:00 2001 From: guru_sainath Date: Tue, 7 Jan 2025 15:20:35 +0530 Subject: [PATCH] fix: start date and end date comparassion fix in cycle create and update (#6333) --- apiserver/plane/api/serializers/cycle.py | 4 +++- apiserver/plane/app/serializers/cycle.py | 4 +++- apiserver/plane/app/views/cycle/base.py | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/apiserver/plane/api/serializers/cycle.py b/apiserver/plane/api/serializers/cycle.py index f7aef4384..ea3c4eb3d 100644 --- a/apiserver/plane/api/serializers/cycle.py +++ b/apiserver/plane/api/serializers/cycle.py @@ -32,7 +32,9 @@ class CycleSerializer(BaseSerializer): ): project_id = self.initial_data.get("project_id") or self.instance.project_id is_start_date_end_date_equal = ( - True if data.get("start_date") == data.get("end_date") else False + True + if str(data.get("start_date")) == str(data.get("end_date")) + else False ) data["start_date"] = convert_to_utc( date=str(data.get("start_date").date()), diff --git a/apiserver/plane/app/serializers/cycle.py b/apiserver/plane/app/serializers/cycle.py index 6e0d31553..dce2b98b0 100644 --- a/apiserver/plane/app/serializers/cycle.py +++ b/apiserver/plane/app/serializers/cycle.py @@ -22,7 +22,9 @@ class CycleWriteSerializer(BaseSerializer): ): project_id = self.initial_data.get("project_id") or self.instance.project_id is_start_date_end_date_equal = ( - True if data.get("start_date") == data.get("end_date") else False + True + if str(data.get("start_date")) == str(data.get("end_date")) + else False ) data["start_date"] = convert_to_utc( date=str(data.get("start_date").date()), diff --git a/apiserver/plane/app/views/cycle/base.py b/apiserver/plane/app/views/cycle/base.py index b063a8a26..5c80809d2 100644 --- a/apiserver/plane/app/views/cycle/base.py +++ b/apiserver/plane/app/views/cycle/base.py @@ -535,7 +535,7 @@ class CycleDateCheckEndpoint(BaseAPIView): ) is_start_date_end_date_equal = ( - True if str("start_date") == str("end_date") else False + True if str(start_date) == str(end_date) else False ) start_date = convert_to_utc( date=str(start_date), project_id=project_id, is_start_date=True