Merge branch 'main' into bugfix/DBC22-5976

Author: ray-oxd

src/backend/apps/event/tests/test_event_notification.py

@@ -321,35 +321,17 @@ def test_generate_footer_message(self):
         msg = generate_settings_message(route)
         assert 'on January 01.' in msg
 
-        # Date range - PST
+        # Date range - always PDT (BC no longer observes daylight saving)
         route = SavedRoutes(
             notification_types=[EVENT_DISPLAY_CATEGORY.MAJOR_DELAYS],
             notification_start_time=datetime.time(8, 0),
             notification_end_time=datetime.time(17, 0),
             notification_start_date=datetime.date(2023, 1, 1),
             notification_end_date=datetime.date(2023, 1, 7)
         )
-        msg = generate_settings_message(
-            route,
-            test_time=datetime.datetime(2023, 1, 3, 0, 0, tzinfo=ZoneInfo('America/Vancouver'))
-        )
-        assert 'between 08:00am and 05:00pm Pacific Standard Time (PST) ' in msg
-        assert 'from January 01 and January 07.' in msg
-
-        # Date range - PDT
-        route = SavedRoutes(
-            notification_types=[EVENT_DISPLAY_CATEGORY.MAJOR_DELAYS],
-            notification_start_time=datetime.time(8, 0),
-            notification_end_time=datetime.time(17, 0),
-            notification_start_date=datetime.date(2023, 4, 1),
-            notification_end_date=datetime.date(2023, 4, 7)
-        )
-        msg = generate_settings_message(
-            route,
-            test_time=datetime.datetime(2023, 4, 3, 0, 0, tzinfo=ZoneInfo('America/Vancouver'))
-        )
+        msg = generate_settings_message(route)
         assert 'between 08:00am and 05:00pm Pacific Daylight Time (PDT) ' in msg
-        assert 'from April 01 and April 07.' in msg
+        assert 'from January 01 and January 07.' in msg
 
         # Days of the week
         route = SavedRoutes(

src/backend/apps/wildfire/tests/test_wildfire_populate.py

@@ -124,22 +124,23 @@ def test_populate_wildfire_function(self):
         out_of_control_feature = self.feature_by_id(self.parsed_features, 'K70659')
         area_data = self.areas_dict['G70422']
 
-        # Under Control, not populated
-        under_control_data = {
-            **self.combine_with_area(holding_feature),
-            'status': WILDFIRE_STATUS.UNDR_CNTRL,
-        }
-        assert populate_wildfire_from_data(under_control_data) is None
-        assert not Wildfire.objects.filter(id='G90400').exists()
-
         # Out, not populated
         out_data = {
             **self.combine_with_area(holding_feature),
             'status': WILDFIRE_STATUS.OUT,
         }
-        populate_wildfire_from_data(out_data)
+        assert populate_wildfire_from_data(out_data) is None
         assert not Wildfire.objects.filter(id='G90400').exists()
 
+        # Under Control
+        under_control_data = {
+            **self.combine_with_area(holding_feature),
+            'status': WILDFIRE_STATUS.UNDR_CNTRL,
+        }
+        assert populate_wildfire_from_data(under_control_data) == 'G90400'
+        wildfire = Wildfire.objects.get(id='G90400')
+        assert wildfire.status == WILDFIRE_STATUS.UNDR_CNTRL
+
         # Being Held
         populate_wildfire_from_data(self.combine_with_area(holding_feature))
         wildfire = Wildfire.objects.get(id='G90400')