Fixing SonarQube issue

Author: adrianoaru-nhs

pages/screening_practitioner_appointments/book_appointment_page.py

@@ -3,6 +3,7 @@
 from utils.table_util import TableUtils
 from datetime import datetime
 from utils.calendar_picker import CalendarPicker
+from typing import Optional
 
 
 class BookAppointmentPage(BasePage):
@@ -49,7 +50,7 @@ def click_save_button(self) -> None:
         """Clicks the save button."""
         self.safe_accept_dialog(self.save_button)
 
-    def click_save_button_and_return_message(self) -> str | None:
+    def click_save_button_and_return_message(self) -> Optional[str]:
         """
         Clicks the save button and returns the dialog message if a dialog appears.
         Returns None if no dialog appears.

utils/appointments.py

@@ -168,7 +168,7 @@ def book_post_investigation_appointment(
         current_time = f"{hour:02d}:{minute:02d}"
         book_appointments_page.enter_appointment_start_time(current_time)
         dialog_message = book_appointments_page.click_save_button_and_return_message()
-        if dialog_message is None or overlap_message not in dialog_message:
+        if dialog_message is None or overlap_message not in (dialog_message or ""):
             # Success or no overlap dialog
             break
         # Increase time by 15 minutes