Fixes and unit tests

Author: mabe13

application/common/dos.py

@@ -270,18 +270,21 @@ def db_big_rows_to_spec_open_times(db_rows: Iterable[dict]) -> list[SpecifiedOpe
     note: The rows must to be for the same service.
     """
     specified_opening_times = []
-    date_sorted_rows = sorted(db_rows, key=lambda row: (row["date"], row["starttime"]))
-    for date, db_rows in groupby(date_sorted_rows, lambda row: row["date"]):
+    specified_op_times_ids = []
+    db_rows_refined = []
+    for row in list(db_rows):
+        if row["ssot_id"] is not None and row["ssot_id"] not in specified_op_times_ids:
+            specified_op_times_ids.append(row["ssot_id"])
+            db_rows_refined.append(row)
+    date_sorted_rows = sorted(db_rows_refined, key=lambda row: (row["date"], row["date_starttime"]))
+    for date, db_rows_refined in groupby(date_sorted_rows, lambda row: row["date"]):
         is_open = True
         open_periods = []
-        specified_op_times_ids = []
-        for row in list(db_rows):
-            if row["ssot_id"] is not None and row["ssot_id"] not in specified_op_times_ids:
-                specified_op_times_ids.append = row["ssot_id"]
-                if row["isclosed"] is True:
-                    is_open = False
-                else:
-                    open_periods.append(OpenPeriod(row["starttime"], row["endtime"]))
+        for row in list(db_rows_refined):
+            if row["isclosed"] is True:
+                is_open = False
+            else:
+                open_periods.append(OpenPeriod(row["date_starttime"], row["date_endtime"]))
         specified_opening_times.append(SpecifiedOpeningTime(open_periods, date, is_open))
 
     return specified_opening_times
@@ -311,7 +314,7 @@ def db_big_rows_to_std_open_times(db_rows: Iterable[dict]) -> StandardOpeningTim
     std_op_times_ids = []
     for row in db_rows:
         if row["sdot_id"] is not None and row["sdot_id"] not in std_op_times_ids:
-            std_op_times_ids.append = row["sdot_id"]
+            std_op_times_ids.append(row["sdot_id"])
             weekday = row["name"].lower()
             start = row["day_starttime"]
             end = row["day_endtime"]

application/common/tests/test_dos.py

@@ -4,6 +4,8 @@
 
 from application.common.dos import (
     DoSService,
+    db_big_rows_to_spec_open_times,
+    db_big_rows_to_std_open_times,
     db_rows_to_spec_open_times,
     db_rows_to_std_open_times,
     get_dos_locations,
@@ -584,6 +586,91 @@ def test_db_rows_to_spec_open_times() -> None:
     assert spec_open_times == expected_spec_open_times
 
 
+def test_db_big_rows_to_spec_open_times() -> None:
+    db_rows = [
+        {
+            "serviceid": 1,
+            "date": date(2019, 5, 6),
+            "date_starttime": time(8, 0, 0),
+            "date_endtime": time(20, 0, 0),
+            "isclosed": False,
+            "ssot_id": 123,
+        },
+        {
+            "serviceid": 1,
+            "date": date(2019, 5, 6),
+            "date_starttime": time(21, 0, 0),
+            "date_endtime": time(22, 0, 0),
+            "isclosed": False,
+            "ssot_id": 324,
+        },
+        {
+            "serviceid": 1,
+            "date": date(2019, 5, 27),
+            "date_starttime": time(8, 0, 0),
+            "date_endtime": time(20, 0, 0),
+            "isclosed": False,
+            "ssot_id": 768,
+        },
+        {
+            "serviceid": 1,
+            "date": date(2019, 8, 26),
+            "date_starttime": time(8, 0, 0),
+            "date_endtime": time(20, 0, 0),
+            "isclosed": False,
+            "ssot_id": 987,
+        },
+        {
+            "serviceid": 1,
+            "date": date(2019, 9, 20),
+            "date_starttime": None,
+            "date_endtime": None,
+            "isclosed": True,
+            "ssot_id": 567,
+        },
+        {
+            "serviceid": 1,
+            "date": date(2020, 5, 6),
+            "date_starttime": time(6, 0, 0),
+            "date_endtime": time(7, 0, 0),
+            "isclosed": False,
+            "ssot_id": 876,
+        },
+        {
+            "serviceid": 1,
+            "date": date(2020, 5, 6),
+            "date_starttime": time(6, 0, 0),
+            "date_endtime": time(7, 0, 0),
+            "isclosed": False,
+            "ssot_id": 876,
+        },
+        {
+            "serviceid": 1,
+            "date": None,
+            "date_starttime": None,
+            "date_endtime": None,
+            "isclosed": None,
+            "ssot_id": None,
+        },
+    ]
+
+    spec_open_times = db_big_rows_to_spec_open_times(db_rows)
+
+    expected_spec_open_times = [
+        SpecifiedOpeningTime(
+            [OpenPeriod.from_string_times("08:00", "20:00"), OpenPeriod.from_string_times("21:00", "22:00")],
+            date(2019, 5, 6),
+            True,
+        ),
+        SpecifiedOpeningTime([OpenPeriod.from_string_times("08:00", "20:00")], date(2019, 5, 27), True),
+        SpecifiedOpeningTime([OpenPeriod.from_string_times("08:00", "20:00")], date(2019, 8, 26), True),
+        SpecifiedOpeningTime([], date(2019, 9, 20), False),
+        SpecifiedOpeningTime([OpenPeriod.from_string_times("06:00", "07:00")], date(2020, 5, 6), True),
+    ]
+
+    assert spec_open_times == expected_spec_open_times
+
+
 def test_db_rows_to_std_open_time() -> None:
     db_rows = [
         {"serviceid": 1, "dayid": 0, "name": "Monday", "starttime": time(8, 0, 0), "endtime": time(17, 0, 0)},
@@ -611,6 +698,90 @@ def test_db_rows_to_std_open_time() -> None:
     assert actual_std_open_times == expected_std_open_times
 
 
+def test_db_big_rows_to_std_open_time() -> None:
+    db_rows = [
+        {
+            "serviceid": 1,
+            "dayid": 0,
+            "name": "Monday",
+            "day_starttime": time(8, 0, 0),
+            "day_endtime": time(17, 0, 0),
+            "sdot_id": 230,
+        },
+        {
+            "serviceid": 1,
+            "dayid": 6,
+            "name": "Sunday",
+            "day_starttime": time(13, 0, 0),
+            "day_endtime": time(15, 30, 0),
+            "sdot_id": 231,
+        },
+        {
+            "serviceid": 1,
+            "dayid": 1,
+            "name": "Tuesday",
+            "day_starttime": time(13, 0, 0),
+            "day_endtime": time(18, 0, 0),
+            "sdot_id": 233,
+        },
+        {
+            "serviceid": 1,
+            "dayid": 4,
+            "name": "Friday",
+            "day_starttime": time(13, 0, 0),
+            "day_endtime": time(15, 30, 0),
+            "sdot_id": 232,
+        },
+        {
+            "serviceid": 1,
+            "dayid": 6,
+            "name": "Wednesday",
+            "day_starttime": time(7, 0, 0),
+            "day_endtime": time(15, 30, 0),
+            "sdot_id": 234,
+        },
+        {
+            "serviceid": 1,
+            "dayid": 1,
+            "name": "Tuesday",
+            "day_starttime": time(8, 0, 0),
+            "day_endtime": time(12, 0, 0),
+            "sdot_id": 287,
+        },
+        {
+            "serviceid": 1,
+            "dayid": 4,
+            "name": "Thursday",
+            "day_starttime": time(11, 0, 0),
+            "day_endtime": time(13, 30, 0),
+            "sdot_id": 238,
+        },
+        {
+            "serviceid": 1,
+            "dayid": 4,
+            "name": "Thursday",
+            "day_starttime": time(11, 0, 0),
+            "day_endtime": time(13, 30, 0),
+            "sdot_id": 238,
+        },
+    ]
+
+    expected_std_open_times = StandardOpeningTimes()
+    expected_std_open_times.monday = [OpenPeriod.from_string_times("08:00", "17:00")]
+    expected_std_open_times.tuesday = [
+        OpenPeriod.from_string_times("08:00", "12:00"),
+        OpenPeriod.from_string_times("13:00", "18:00"),
+    ]
+    expected_std_open_times.wednesday = [OpenPeriod.from_string_times("07:00", "15:30")]
+    expected_std_open_times.thursday = [OpenPeriod.from_string_times("11:00", "13:30")]
+    expected_std_open_times.friday = [OpenPeriod.from_string_times("13:00", "15:30")]
+    expected_std_open_times.sunday = [OpenPeriod.from_string_times("13:00", "15:30")]
+
+    actual_std_open_times = db_big_rows_to_std_open_times(db_rows)
+
+    assert actual_std_open_times == expected_std_open_times
+
+
 def get_db_item(odscode: str = "FA9321", name: str = "fake name", id: int = 9999, typeid: int = 13) -> dict:  # noqa: A002
     return {
         "id": id,

application/service_sync/data_processing/get_data.py

@@ -86,7 +86,7 @@ def get_dos_service_and_history_one_query(service_id: int) -> tuple[DoSService,
         "publicphone, publicname, st.name service_type_name, easting, northing, latitude, longitude, "
         'sdo.id as "sdo_id", sdo.dayid, otd.name, sdot.id as "sdot_id", sdot.starttime as "day_starttime", '
         'sdot.endtime as "day_endtime", ssod.id as "ssod_id", ssod.date, ssot.id as "ssot_id", '
-        "ssot.starttime, ssot.endtime, ssot.isclosed "
+        'ssot.starttime as "date_starttime", ssot.endtime as "date_endtime", ssot.isclosed '
         "FROM services s "
         "INNER JOIN servicetypes st ON s.typeid = st.id INNER JOIN servicestatuses ss on s.statusid = ss.id "
         "LEFT JOIN servicedayopenings sdo ON s.id = sdo.serviceid "