From f60e1fbd2a1d40b2af8586a3f72385930f46e89c Mon Sep 17 00:00:00 2001 From: lizerk Date: Fri, 6 Mar 2026 20:49:36 +0300 Subject: [PATCH] =?UTF-8?q?fix(birthdays):=20=D0=B8=D1=81=D0=BF=D1=80?= =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=20=D0=BF=D0=BE=D1=80=D1=8F=D0=B4?= =?UTF-8?q?=D0=BE=D0=BA=20=D0=BE=D0=BF=D0=B5=D1=80=D0=B0=D1=86=D0=B8=D0=B9?= =?UTF-8?q?=20=D1=81=20timezone=20=D0=B4=D0=BB=D1=8F=20=D0=BA=D0=BE=D1=80?= =?UTF-8?q?=D1=80=D0=B5=D0=BA=D1=82=D0=BD=D0=BE=D0=B9=20=D0=B4=D0=BB=D0=B8?= =?UTF-8?q?=D1=82=D0=B5=D0=BB=D1=8C=D0=BD=D0=BE=D1=81=D1=82=D0=B8=20=D1=81?= =?UTF-8?q?=D0=BE=D0=B1=D1=8B=D1=82=D0=B8=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/employees/services/birthday_events.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/backend/employees/services/birthday_events.py b/backend/employees/services/birthday_events.py index dfb2fe47..d71a5f51 100644 --- a/backend/employees/services/birthday_events.py +++ b/backend/employees/services/birthday_events.py @@ -82,14 +82,16 @@ class UpsertBirthdayEventService(Service): month=employee.birth_date.month, day=employee.birth_date.day, hour=0, - minute=0 + minute=0, + second=0 ) - end_date = start_date + timedelta(minutes=1439) - # Делаем aware если USE_TZ=True + # Делаем aware ПЕРЕД вычислением end_date if timezone.is_naive(start_date): start_date = timezone.make_aware(start_date) - end_date = timezone.make_aware(end_date) + + # Теперь добавляем timedelta к уже aware datetime + end_date = start_date + timedelta(hours=23, minutes=59, seconds=59) if existing_event: # Обновляем существующее событие