Skip to content

Commit 29ce725

Browse files
committed
feat: update time handling to use timezone-aware datetime objects
1 parent 7c23d6c commit 29ce725

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

apps/application/serializers/application_chat.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
from django.db import models
1919
from django.db.models import QuerySet, Q
2020
from django.http import StreamingHttpResponse
21+
from django.utils import timezone
2122
from django.utils.translation import gettext_lazy as _, gettext
2223
from openpyxl.cell.cell import ILLEGAL_CHARACTERS_RE
2324
from rest_framework import serializers
@@ -74,12 +75,14 @@ def is_valid(self, *, raise_exception=False):
7475
raise AppApiException(500, _('Application id does not exist'))
7576

7677
def get_end_time(self):
77-
return datetime.datetime.combine(
78-
datetime.datetime.strptime(self.data.get('end_time'), '%Y-%m-%d'),
79-
datetime.datetime.max.time())
78+
d = datetime.datetime.strptime(self.data.get('end_time'), '%Y-%m-%d').date()
79+
naive = datetime.datetime.combine(d, datetime.time.max)
80+
return timezone.make_aware(naive, timezone.get_default_timezone())
8081

8182
def get_start_time(self):
82-
return self.data.get('start_time')
83+
d = datetime.datetime.strptime(self.data.get('start_time'), '%Y-%m-%d').date()
84+
naive = datetime.datetime.combine(d, datetime.time.min)
85+
return timezone.make_aware(naive, timezone.get_default_timezone())
8386

8487
def get_query_set(self, select_ids=None):
8588
end_time = self.get_end_time()

0 commit comments

Comments
 (0)