fix test and lint

ohcnetwork · Jan 30, 2025 · 56fbf56 · 56fbf56
1 parent 525ca75
commit 56fbf56
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/care/emr/api/viewsets/scheduling/schedule.py b/care/emr/api/viewsets/scheduling/schedule.py
@@ -15,11 +15,11 @@
 from care.emr.models.scheduling.booking import TokenSlot
 from care.emr.models.scheduling.schedule import Availability, Schedule
 from care.emr.resources.scheduling.schedule.spec import (
+    AvailabilityCreateSpec,
     AvailabilityForScheduleSpec,
     ScheduleCreateSpec,
     ScheduleReadSpec,
     ScheduleUpdateSpec,
-    AvailabilityCreateSpec,
 )
 from care.facility.models import Facility
 from care.security.authorization import AuthorizationController

diff --git a/care/emr/resources/scheduling/schedule/spec.py b/care/emr/resources/scheduling/schedule/spec.py
@@ -1,4 +1,5 @@
 import datetime
+from datetime import UTC
 from enum import Enum
 
 from django.db.models import Sum
@@ -70,10 +71,10 @@ def validate_for_slot_type(self):
 
             for availability in self.availability:
                 start_time = datetime.datetime.combine(
-                    datetime.date.today(), availability.start_time, tzinfo=None
+                    datetime.datetime.now(tz=UTC).date(), availability.start_time
                 )
                 end_time = datetime.datetime.combine(
-                    datetime.date.today(), availability.end_time, tzinfo=None
+                    datetime.datetime.now(tz=UTC).date(), availability.end_time
                 )
                 slot_size_in_seconds = self.slot_size_in_minutes * 60
                 if (end_time - start_time).total_seconds() % slot_size_in_seconds != 0:

diff --git a/care/emr/tests/test_schedule_api.py b/care/emr/tests/test_schedule_api.py
@@ -884,11 +884,8 @@ def test_create_availability_validate_availability(self):
             ]
         )
         response = self.client.post(self.base_url, data, format="json")
-        self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
         self.assertContains(
-            response,
-            "Availability time ranges are overlapping",
-            status_code=400,
+            response, "Availability time ranges are overlapping", status_code=400
         )
 
         # Verify that non-overlapping ranges on same day are allowed
@@ -914,12 +911,12 @@ def test_create_availability_validate_availability(self):
         data = self.generate_availability_data(
             availability=[
                 {
-                    "day_of_week": 1,  # Monday
+                    "day_of_week": 2,  # Tuesday
                     "start_time": "09:00:00",
                     "end_time": "17:00:00",
                 },
                 {
-                    "day_of_week": 2,  # Tuesday
+                    "day_of_week": 3,  # Wednesday
                     "start_time": "09:00:00",  # Same time range but different day
                     "end_time": "17:00:00",
                 },