Reducing duplicate code

Author: adrianoaru-nhs

pages/screening_subject_search/contact_with_patient_page.py

@@ -1,5 +1,7 @@
 from playwright.sync_api import Page
 from pages.base_page import BasePage
+from utils.calendar_picker import CalendarPicker
+from datetime import datetime
 
 
 class ContactWithPatientPage(BasePage):
@@ -84,3 +86,19 @@ def select_outcome_dropdown_option(self, outcome: str) -> None:
     def click_save_button(self) -> None:
         """Click the 'Save' button to save the contact with patient form."""
         self.click(self.save_button)
+
+    def record_post_investigation_appointment_not_required(self) -> None:
+        """
+        Record a post-investigation appointment not required contact.
+        """
+        self.select_direction_dropdown_option("To patient")
+        self.select_caller_id_dropdown_index_option(1)
+        self.click_calendar_button()
+        CalendarPicker(self.page).v1_calender_picker(datetime.today())
+        self.enter_start_time("11:00")
+        self.enter_end_time("12:00")
+        self.enter_discussion_record_text("Test Automation")
+        self.select_outcome_dropdown_option(
+            "Post-investigation Appointment Not Required"
+        )
+        self.click_save_button()

tests/regression/subject/episodes/datasets/investigation/endoscopy/polypcategories/test_advanced_colorectal_polyp.py

@@ -1,11 +1,8 @@
 import logging
 import pytest
-import pandas as pd
 from pytest import FixtureRequest
 from datetime import datetime
 from playwright.sync_api import Page
-from classes.subject import Subject
-from classes.user import User
 from pages.base_page import BasePage
 from pages.datasets.investigation_dataset_page import (
     InvestigationDatasetsPage,
@@ -49,19 +46,17 @@
 from pages.screening_subject_search.advance_fobt_screening_episode_page import (
     AdvanceFOBTScreeningEpisodePage,
 )
-from utils.batch_processing import batch_processing
 from utils.calendar_picker import CalendarPicker
 from utils.investigation_dataset import (
     InvestigationDatasetCompletion,
 )
-from utils.oracle.oracle import OracleDB
-from utils.oracle.subject_selection_query_builder import SubjectSelectionQueryBuilder
 from utils.screening_subject_page_searcher import (
     search_subject_episode_by_nhs_number,
 )
 from utils.datasets.investigation_datasets import (
     get_subject_with_investigation_dataset_ready,
     go_from_investigation_dataset_complete_to_a259_status,
+    get_subject_with_a99_status,
 )
 from utils.user_tools import UserTools
 
@@ -928,26 +923,7 @@ def test_identify_advanced_colorectal_polyp_from_histology_r(page: Page) -> None
     """
     This test identifies an advanced colorectal polyp from histology results (BCSS-5567 - R).
     """
-    criteria = {
-        "latest episode has colonoscopy assessment dataset": "yes_complete",
-        "latest episode has diagnostic test": "no",
-        "latest event status": "A99",
-        "latest episode type": "FOBT",
-        "latest episode started": "less than 4 years ago",
-    }
-    user = User()
-    subject = Subject()
-
-    builder = SubjectSelectionQueryBuilder()
-
-    query, bind_vars = builder.build_subject_selection_query(
-        criteria=criteria,
-        user=user,
-        subject=subject,
-        subjects_to_retrieve=1,
-    )
-
-    df = OracleDB().execute_query(query, bind_vars)
+    df = get_subject_with_a99_status()
 
     nhs_no = df.iloc[0]["subject_nhs_number"]
     logging.info(f"NHS Number: {nhs_no}")

tests/regression/subject/episodes/datasets/investigation/endoscopy/polypcategories/test_diminutive_rectal_hyperplastic_polyp.py

@@ -2,8 +2,6 @@
 import pytest
 from datetime import datetime
 from playwright.sync_api import Page
-from classes.subject import Subject
-from classes.user import User
 from pages.base_page import BasePage
 from pages.datasets.investigation_dataset_page import (
     InvestigationDatasetsPage,
@@ -30,33 +28,24 @@
 from pages.screening_subject_search.attend_diagnostic_test_page import (
     AttendDiagnosticTestPage,
 )
-from pages.screening_subject_search.contact_with_patient_page import (
-    ContactWithPatientPage,
-)
-from pages.screening_subject_search.diagnostic_test_outcome_page import (
-    DiagnosticTestOutcomePage,
-    OutcomeOfDiagnosticTest,
-)
 from pages.screening_subject_search.subject_screening_summary_page import (
     SubjectScreeningSummaryPage,
 )
 from pages.screening_subject_search.advance_fobt_screening_episode_page import (
     AdvanceFOBTScreeningEpisodePage,
 )
-from utils.batch_processing import batch_processing
 from utils.calendar_picker import CalendarPicker
 from utils.investigation_dataset import (
     InvestigationDatasetCompletion,
 )
-from utils.oracle.oracle import OracleDB
-from utils.oracle.subject_selection_query_builder import SubjectSelectionQueryBuilder
 from utils.screening_subject_page_searcher import (
     search_subject_episode_by_nhs_number,
 )
 from utils.user_tools import UserTools
 from utils.datasets.investigation_datasets import (
     get_subject_with_investigation_dataset_ready,
     go_from_investigation_dataset_complete_to_a259_status,
+    get_subject_with_a99_status,
 )
 
 general_information = {
@@ -281,26 +270,7 @@ def test_identify_diminutive_rectal_hyperplastic_polyp_from_histology_b(
     """
     This test identifies a diminutive rectal hyperplastic polyp from histology results. (BCSS-4659 - B)
     """
-    criteria = {
-        "latest episode has colonoscopy assessment dataset": "yes_complete",
-        "latest episode has diagnostic test": "no",
-        "latest event status": "A99",
-        "latest episode type": "FOBT",
-        "latest episode started": "less than 4 years ago",
-    }
-    user = User()
-    subject = Subject()
-
-    builder = SubjectSelectionQueryBuilder()
-
-    query, bind_vars = builder.build_subject_selection_query(
-        criteria=criteria,
-        user=user,
-        subject=subject,
-        subjects_to_retrieve=1,
-    )
-
-    df = OracleDB().execute_query(query, bind_vars)
+    df = get_subject_with_a99_status()
     nhs_no = df.iloc[0]["subject_nhs_number"]
     logging.info(f"NHS Number: {nhs_no}")
 

tests/smokescreen/test_compartment_5.py

@@ -190,17 +190,9 @@ def test_compartment_5(page: Page, smokescreen_properties: dict) -> None:
             page
         ).click_record_other_post_investigation_contact_button()
 
-        ContactWithPatientPage(page).select_direction_dropdown_option("To patient")
-        ContactWithPatientPage(page).select_caller_id_dropdown_index_option(1)
-        ContactWithPatientPage(page).click_calendar_button()
-        CalendarPicker(page).v1_calender_picker(datetime.today())
-        ContactWithPatientPage(page).enter_start_time("11:00")
-        ContactWithPatientPage(page).enter_end_time("12:00")
-        ContactWithPatientPage(page).enter_discussion_record_text("Test Automation")
-        ContactWithPatientPage(page).select_outcome_dropdown_option(
-            "Post-investigation Appointment Not Required"
-        )
-        ContactWithPatientPage(page).click_save_button()
+        ContactWithPatientPage(
+            page
+        ).record_post_investigation_appointment_not_required()
 
         verify_subject_event_status_by_nhs_no(
             page, nhs_no, "A323 - Post-investigation Appointment NOT Required"

utils/datasets/investigation_datasets.py

@@ -51,6 +51,33 @@ def get_subject_with_investigation_dataset_ready() -> pd.DataFrame:
     return df
 
 
+def get_subject_with_a99_status() -> pd.DataFrame:
+    """
+    This functions obtains 1 subject who has the latest episode status A99 - Suitable for Endoscopic Test
+    """
+    criteria = {
+        "latest episode has colonoscopy assessment dataset": "yes_complete",
+        "latest episode has diagnostic test": "no",
+        "latest event status": "A99",
+        "latest episode type": "FOBT",
+        "latest episode started": "less than 4 years ago",
+    }
+    user = User()
+    subject = Subject()
+
+    builder = SubjectSelectionQueryBuilder()
+
+    query, bind_vars = builder.build_subject_selection_query(
+        criteria=criteria,
+        user=user,
+        subject=subject,
+        subjects_to_retrieve=1,
+    )
+
+    df = OracleDB().execute_query(query, bind_vars)
+    return df
+
+
 def go_from_investigation_dataset_complete_to_a259_status(page: Page) -> None:
     """
     Takes a subject who has just had thier investigation dataset compelted to having the event status A259 - Attended Diagnostic Test.
@@ -77,17 +104,7 @@ def go_from_investigation_dataset_complete_to_a259_status(page: Page) -> None:
     AdvanceFOBTScreeningEpisodePage(
         page
     ).click_record_other_post_investigation_contact_button()
-    ContactWithPatientPage(page).select_direction_dropdown_option("To patient")
-    ContactWithPatientPage(page).select_caller_id_dropdown_index_option(1)
-    ContactWithPatientPage(page).click_calendar_button()
-    CalendarPicker(page).v1_calender_picker(datetime.today())
-    ContactWithPatientPage(page).enter_start_time("11:00")
-    ContactWithPatientPage(page).enter_end_time("12:00")
-    ContactWithPatientPage(page).enter_discussion_record_text("Test Automation")
-    ContactWithPatientPage(page).select_outcome_dropdown_option(
-        "Post-investigation Appointment Not Required"
-    )
-    ContactWithPatientPage(page).click_save_button()
+    ContactWithPatientPage(page).record_post_investigation_appointment_not_required()
     BasePage(page).click_back_button()
     SubjectScreeningSummaryPage(page).verify_latest_event_status_value(
         "A318 - Post-investigation Appointment NOT Required - Result Letter Created"