From 2427ba0347df791e36089566046a96b2d307af73 Mon Sep 17 00:00:00 2001
From: VineetBala-AOT <90332175+VineetBala-AOT@users.noreply.github.com>
Date: Thu, 12 Sep 2024 09:15:21 -0700
Subject: [PATCH] fix submission page error for extended end date

---
 met-api/src/met_api/models/survey.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/met-api/src/met_api/models/survey.py b/met-api/src/met_api/models/survey.py
index be4e7826e..f5d7db8cb 100644
--- a/met-api/src/met_api/models/survey.py
+++ b/met-api/src/met_api/models/survey.py
@@ -46,13 +46,19 @@ def get_open(cls, survey_id) -> Survey:
         """Get an open survey."""
         now = local_datetime().date()  # Get the current PST date without the timestamp
 
+        end_date = (
+            db.session.query(Engagement.end_date)
+            .join(Survey, Engagement.id == Survey.engagement_id)
+            .filter(Survey.id == survey_id)
+            .first()
+        )
         # Calculate the threshold time (8 hours after the end_date)
-        extended_end_date = Engagement.end_date + timedelta(days=1, hours=8)
+        extended_end_date = end_date[0] + timedelta(days=1, hours=8)
 
         survey: Survey = db.session.query(Survey).filter_by(id=survey_id) \
             .join(Engagement) \
             .filter(or_(Engagement.status_id == Status.Published.value, Engagement.status_id == Status.Closed.value)) \
-            .filter(and_(func.date(Engagement.start_date) <= now, local_datetime() <= extended_end_date)) \
+            .filter(and_(func.date(Engagement.start_date) <= now, local_datetime().replace(tzinfo=None) <= extended_end_date)) \
             .join(EngagementStatus) \
             .first()
         return survey