Merge branch 'main' of github.com:NHSDigital/bcss-playwright into feature/BCSS-20521-c6-investigation-dataset-navigation-util

# Conflicts:
#	tests/smokescreen/test_compartment_6.py

Author: adrianoaru-nhs

tests/smokescreen/bcss_smokescreen_tests.properties

@@ -42,7 +42,7 @@
 # ----------------------------------
 #   compartment 6
 # ----------------------------------
-#    c6_eng_org_id=23159
+    c6_eng_org_id=23159
 #    c6_eng_site_id=35317
 #    c6_eng_practitioner_id=243
 #    c6_eng_testing_clinician_id=805
@@ -90,8 +90,4 @@
 # ----------------------------------
 #   compartment 6
 # ----------------------------------
-#    c6_eng_number_of_normal_results_to_record=1
-#    c6_eng_number_of_lnpcp_results_to_record=1
-#    c6_eng_number_of_high_risk_findings_results_to_record=1
-#    c6_eng_number_of_lnpcp_results_over_74_to_record=1
-#    c6_eng_number_of_high_risk_findings_results_over_74_to_record=1
+    c6_eng_number_of_subjects_to_record=5

tests/smokescreen/test_compartment_6.py

@@ -4,6 +4,10 @@
 from utils.screening_subject_page_searcher import verify_subject_event_status_by_nhs_no
 from utils.batch_processing import batch_processing
 from pages.logout.log_out_page import LogoutPage
+from utils.oracle.oracle_specific_functions import (
+    get_subjects_for_investigation_dataset_updates,
+)
+from utils.subject_demographics import SubjectDemographicUtil
 from utils.investigation_dataset import (
     InvestigationDatasetCompletion,
     InvestigationDatasetResults,
@@ -15,13 +19,14 @@
 @pytest.mark.vpn_required
 @pytest.mark.smokescreen
 @pytest.mark.compartment6
-def test_compartment_6(page: Page) -> None:
+def test_compartment_6(page: Page, smokescreen_properties: dict) -> None:
     """
     This is the main compartment 6 method
     This test fills out the investigation datasets for different subjects to get different outcomes for a diagnostic test
     based on the test results and the subject's age, then prints the diagnostic test result letters.
     If the subject is old enough and they get a high-risk or LNPCP result, then they are handed over
     into symptomatic care, and the relevant letters are printed.
+    Here old refers to if a subject is over 75 at recall
     """
 
     # For the following tests 'old' refers to if a subject is over 75 at recall
@@ -30,51 +35,57 @@ def test_compartment_6(page: Page) -> None:
 
     UserTools.user_login(page, "Screening Centre Manager at BCS001")
 
-    # This needs to be repeated for two subjects, one old and one not - High Risk Result
-    # Older patient
+    # Older patient - High Risk Result
     logging.info("High-risk result for an older subject")
-    nhs_no = "9687319364"
+    subjects_df = get_subjects_for_investigation_dataset_updates(
+        smokescreen_properties["c6_eng_number_of_subjects_to_record"],
+        smokescreen_properties["c6_eng_org_id"],
+    )
+    nhs_no = subjects_df["subject_nhs_number"].iloc[0]
+    SubjectDemographicUtil(page).update_subject_dob(nhs_no, False)
     InvestigationDatasetCompletion(page).complete_with_result(
         nhs_no, InvestigationDatasetResults.HIGH_RISK
     )
     AfterInvestigationDatasetComplete(page).progress_episode_based_on_result(
         InvestigationDatasetResults.HIGH_RISK, False
     )
 
-    # Younger patient
+    # Younger patient - High Risk Result
     logging.info("High-risk result for a younger subject")
-    nhs_no = "9462733759"
+    nhs_no = subjects_df["subject_nhs_number"].iloc[1]
+    SubjectDemographicUtil(page).update_subject_dob(nhs_no, True)
     InvestigationDatasetCompletion(page).complete_with_result(
         nhs_no, InvestigationDatasetResults.HIGH_RISK
     )
     AfterInvestigationDatasetComplete(page).progress_episode_based_on_result(
         InvestigationDatasetResults.HIGH_RISK, True
     )
 
-    # This needs to be repeated for two subjects, one old and one not - LNPCP Result
-    # Older patient
+    # Older patient - LNPCP Result
     logging.info("LNPCP result for an older subject")
-    nhs_no = "9434999847"
+    nhs_no = subjects_df["subject_nhs_number"].iloc[2]
+    SubjectDemographicUtil(page).update_subject_dob(nhs_no, False)
     InvestigationDatasetCompletion(page).complete_with_result(
         nhs_no, InvestigationDatasetResults.LNPCP
     )
     AfterInvestigationDatasetComplete(page).progress_episode_based_on_result(
         InvestigationDatasetResults.LNPCP, False
     )
 
-    # Younger patient
+    # Younger patient - LNPCP Result
     logging.info("LNPCP result for a younger subject")
-    nhs_no = "9773554414"
+    nhs_no = subjects_df["subject_nhs_number"].iloc[3]
+    SubjectDemographicUtil(page).update_subject_dob(nhs_no, True)
     InvestigationDatasetCompletion(page).complete_with_result(
         nhs_no, InvestigationDatasetResults.LNPCP
     )
     AfterInvestigationDatasetComplete(page).progress_episode_based_on_result(
         InvestigationDatasetResults.LNPCP, True
     )
 
-    # This needs to be repeated for 1 subject, age does not matter - Normal Result
+    # Any patient -  Normal Result
     logging.info("Normal result for any age subject")
-    nhs_no_normal = "9039985766"
+    nhs_no_normal = subjects_df["subject_nhs_number"].iloc[4]
     InvestigationDatasetCompletion(page).complete_with_result(
         nhs_no_normal, InvestigationDatasetResults.NORMAL
     )

utils/oracle/oracle_specific_functions.py

@@ -12,6 +12,7 @@ class SqlQueryValues(IntEnum):
     OPEN_EPISODE_STATUS_ID = 11352
     A8_EVENT_STATUS = 11132
     POSITIVE_APPOINTMENT_BOOKED = 11119
+    POST_INVESTIGATION_APPOINTMENT_NOT_REQUIRED = 160182
 
 
 def get_kit_id_from_db(
@@ -364,3 +365,60 @@ def get_subjects_with_booked_appointments(subjects_to_retrieve: int) -> pd.DataF
     subjects_df = OracleDB().execute_query(query, params)
 
     return subjects_df
+
+
+def get_subjects_for_investigation_dataset_updates(
+    number_of_subjects: int, hub_id: str
+) -> pd.DataFrame:
+    """
+    This is used to get subjects for compartment 6
+    It finds subjects with latest envent status of A323 - Post-investigation Appointment
+
+    Args:
+        number_of_subjects (int): The number of subjects to retrieve
+        hub_id (str): hub id to use
+
+    Returns:
+        subjects_df (pd.DataFrame): A pandas DataFrame containing the result of the query
+    """
+
+    query = """SELECT distinct(ss.subject_nhs_number)
+    from
+    (
+    select count(*), eset.screening_subject_id
+    from ep_subject_episode_t eset
+    inner join screening_subject_t sst on (eset.screening_subject_id = sst.screening_subject_id)
+    inner join external_tests_t ext on (eset.subject_epis_id = ext.subject_epis_id)
+    inner join ds_colonoscopy_t dct on (ext.ext_test_id = dct.ext_test_id)
+    where dct.dataset_completed_date is null
+    and dct.deleted_flag ='N'
+    and ext.void = 'N'
+    group by eset.screening_subject_id
+    having
+    count(*)= 1 ) sst
+    inner join ep_subject_episode_t eset on ( sst.screening_subject_id = eset.screening_subject_id )
+    inner join screening_subject_t ss on (eset.screening_subject_id = ss.screening_subject_id)
+    inner join sd_contact_t c ON ss.subject_nhs_number = c.nhs_number
+    inner join EXTERNAL_TESTS_T ext on (eset.subject_epis_id = ext.subject_epis_id)
+    inner join DS_COLONOSCOPY_T dct on (ext.ext_test_id = dct.ext_test_id)
+    inner join sd_contact_t sd on (ss.subject_nhs_number = sd.nhs_number)
+    inner join sd_address_t sda on (sd.contact_id = sda.address_id)
+    inner join org on (sd.gp_practice_id = org.org_id)
+    where eset.latest_event_status_id = :latest_event_status_id -- A323 - Post-investigation Appointment NOT Required
+    and ext.void = 'N'
+    and dct.dataset_new_flag = 'Y'
+    and dct.deleted_flag = 'N'
+    and sd.GP_PRACTICE_ID is not null
+    and eset.start_hub_id = :start_hub_id
+    fetch first :subjects_to_retrieve rows only
+    """
+
+    params = {
+        "latest_event_status_id": SqlQueryValues.POST_INVESTIGATION_APPOINTMENT_NOT_REQUIRED,
+        "start_hub_id": hub_id,
+        "subjects_to_retrieve": number_of_subjects,
+    }
+
+    subjects_df = OracleDB().execute_query(query, params)
+
+    return subjects_df