panyy
/
UnisKB
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: make datetime aware in get_start_time and get_end_time methods

v3.2
CaptainB 2025-08-28 18:08:29 +08:00 committed by 刘瑞斌
parent 24b36bf90f
commit 669764492c
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apps/application/serializers/application_stats.py
View File

@ -13,6 +13,7 @@ from typing import Dict, List
from django.db import models from django.db import models
from django.db.models import QuerySet from django.db.models import QuerySet
from django.utils.translation import gettext_lazy as _ from django.utils.translation import gettext_lazy as _
from django.utils import timezone
from rest_framework import serializers from rest_framework import serializers
from application.models import ApplicationChatUserStats, Application from application.models import ApplicationChatUserStats, Application
@ -48,12 +49,14 @@ class ApplicationStatisticsSerializer(serializers.Serializer):
raise AppApiException(500, _('Application id does not exist')) raise AppApiException(500, _('Application id does not exist'))
def get_end_time(self): def get_end_time(self):
return datetime.datetime.combine( d = datetime.datetime.strptime(self.data.get('end_time'), '%Y-%m-%d').date()
datetime.datetime.strptime(self.data.get('end_time'), '%Y-%m-%d'), naive = datetime.datetime.combine(d, datetime.time.max)
datetime.datetime.max.time()) return timezone.make_aware(naive, timezone.get_default_timezone())
def get_start_time(self): def get_start_time(self):
return self.data.get('start_time') d = datetime.datetime.strptime(self.data.get('start_time'), '%Y-%m-%d').date()
naive = datetime.datetime.combine(d, datetime.time.min)
return timezone.make_aware(naive, timezone.get_default_timezone())
def get_customer_count_trend(self, with_valid=True): def get_customer_count_trend(self, with_valid=True):
if with_valid: if with_valid: