Support scheduled procedure time filters for find worklist items

Author: steventux

src/services/storage.py

@@ -366,6 +366,7 @@ def find_worklist_items(
         self,
         modality: Optional[str] = None,
         scheduled_date: Optional[str] = None,
+        scheduled_time: Optional[str] = None,
         patient_id: Optional[str] = None,
     ) -> List[WorklistItem]:
         """
@@ -374,6 +375,7 @@ def find_worklist_items(
         Args:
             modality: Filter by modality (e.g., "MG")
             scheduled_date: Filter by scheduled date (YYYYMMDD, or range like "20240101-20240131")
+            scheduled_time: Filter by scheduled time (HHMMSS, or range like "080000-170000")
             patient_id: Filter by patient ID
 
         Returns:
@@ -393,19 +395,14 @@ def find_worklist_items(
             params.append(modality)
 
         if scheduled_date:
-            if scheduled_date.endswith("-"):
-                where_clauses.append("scheduled_date >= ?")
-                params.append(scheduled_date[:-1].strip())
-            elif scheduled_date.startswith("-"):
-                where_clauses.append("scheduled_date <= ?")
-                params.append(scheduled_date[1:].strip())
-            elif "-" in scheduled_date:
-                start_date, end_date = [s.strip() for s in scheduled_date.split("-", 1)]
-                where_clauses.append("scheduled_date >= ? AND scheduled_date <= ?")
-                params.extend([start_date, end_date])
-            else:
-                where_clauses.append("scheduled_date = ?")
-                params.append(scheduled_date.strip())
+            where_clause, clause_params = self.scheduled_query_clause("scheduled_date", scheduled_date)
+            where_clauses.append(where_clause)
+            params.extend(clause_params)
+
+        if scheduled_time:
+            where_clause, clause_params = self.scheduled_query_clause("scheduled_time", scheduled_time)
+            where_clauses.append(where_clause)
+            params.extend(clause_params)
 
         if patient_id:
             where_clauses.append("patient_id = ?")
@@ -421,6 +418,27 @@ def find_worklist_items(
 
             return [WorklistItem(**row) for row in cursor.fetchall()]
 
+    def scheduled_query_clause(self, param_name: str, param_value: str) -> tuple[str, List[str]]:
+        """
+        Helper to build SQL clause for scheduled date/time parameters.
+
+        Args:
+            param_name: "scheduled_date" or "scheduled_time"
+            param_value: Value to filter by (e.g., "20240101", "20240101-20240131", "-20240131", "20240101-")
+
+        Returns:
+            Tuple of (SQL clause string, list of parameters)
+        """
+        if param_value.endswith("-"):
+            return f"{param_name} >= ?", [param_value[:-1].strip()]
+        elif param_value.startswith("-"):
+            return f"{param_name} <= ?", [param_value[1:].strip()]
+        elif "-" in param_value:
+            start, end = [s.strip() for s in param_value.split("-", 1)]
+            return f"{param_name} >= ? AND {param_name} <= ?", [start, end]
+        else:
+            return f"{param_name} = ?", [param_value.strip()]
+
     def get_worklist_item(self, accession_number: str) -> Optional[WorklistItem]:
         """
         Get a single WorklistItem instance by accession number.

tests/services/test_storage.py

@@ -344,6 +344,76 @@ def test_find_worklist_items_with_open_ended_date_range(self, mock_db, tmp_dir):
             ["20240101"],
         )
 
+    def test_find_worklist_items_with_time_range(self, mock_db, tmp_dir):
+        mock_cursor = MagicMock()
+        mock_cursor.fetchall.return_value = []
+        mock_connection = MagicMock()
+        mock_connection.execute.return_value = mock_cursor
+        mock_db.connect.return_value = mock_connection
+
+        subject = MWLStorage(tmp_dir)
+        mock_connection.reset_mock()
+
+        subject.find_worklist_items(scheduled_time="090000 - 170000")
+
+        mock_connection.execute.assert_called_once_with(
+            (
+                "SELECT accession_number, modality, patient_birth_date, patient_id, "
+                "patient_name, patient_sex, procedure_code, scheduled_date, scheduled_time, "
+                "source_message_id, study_description, study_instance_uid, status, mpps_instance_uid "
+                "FROM worklist_items WHERE scheduled_time >= ? AND scheduled_time <= ? "
+                "ORDER BY scheduled_date, scheduled_time"
+            ),
+            ["090000", "170000"],
+        )
+
+    def test_find_worklist_items_with_open_ended_time_range(self, mock_db, tmp_dir):
+        mock_cursor = MagicMock()
+        mock_cursor.fetchall.return_value = []
+        mock_connection = MagicMock()
+        mock_connection.execute.return_value = mock_cursor
+        mock_db.connect.return_value = mock_connection
+
+        subject = MWLStorage(tmp_dir)
+        mock_connection.reset_mock()
+
+        subject.find_worklist_items(scheduled_time="090000 -")
+
+        mock_connection.execute.assert_called_once_with(
+            (
+                "SELECT accession_number, modality, patient_birth_date, patient_id, "
+                "patient_name, patient_sex, procedure_code, scheduled_date, scheduled_time, "
+                "source_message_id, study_description, study_instance_uid, status, mpps_instance_uid "
+                "FROM worklist_items WHERE scheduled_time >= ? "
+                "ORDER BY scheduled_date, scheduled_time"
+            ),
+            ["090000"],
+        )
+
+    def test_find_worklist_items_with_date_and_time_range(self, mock_db, tmp_dir):
+        mock_cursor = MagicMock()
+        mock_cursor.fetchall.return_value = []
+        mock_connection = MagicMock()
+        mock_connection.execute.return_value = mock_cursor
+        mock_db.connect.return_value = mock_connection
+
+        subject = MWLStorage(tmp_dir)
+        mock_connection.reset_mock()
+
+        subject.find_worklist_items(scheduled_date="20240101 - 20240131", scheduled_time="090000 - 170000")
+
+        mock_connection.execute.assert_called_once_with(
+            (
+                "SELECT accession_number, modality, patient_birth_date, patient_id, "
+                "patient_name, patient_sex, procedure_code, scheduled_date, scheduled_time, "
+                "source_message_id, study_description, study_instance_uid, status, mpps_instance_uid "
+                "FROM worklist_items WHERE scheduled_date >= ? AND scheduled_date <= ? "
+                "AND scheduled_time >= ? AND scheduled_time <= ? "
+                "ORDER BY scheduled_date, scheduled_time"
+            ),
+            ["20240101", "20240131", "090000", "170000"],
+        )
+
     def test_get_worklist_item(self, mock_db, tmp_dir, result):
         mock_cursor = MagicMock()
         mock_cursor.fetchone.return_value = result