Editting compartment 2 utils to be easier to understand and obtain nhs_numbers in a nicer way.

Added an if statement to compartment 1 as the confirm button is not always present

Author: adrianoaru-nhs

tests/Smokescreen/test_compartment_1.py

@@ -6,6 +6,7 @@
 
 @pytest.mark.smoke
 @pytest.mark.smokescreen
+@pytest.mark.compartment1
 def test_compartment_1(page: Page) -> None:
 
     page.goto("/")
@@ -19,7 +20,8 @@ def test_compartment_1(page: Page) -> None:
     CreateAPlan(page).click_set_all_button()
     CreateAPlan(page).fill_daily_invitation_rate_field("10")
     CreateAPlan(page).click_update_button()
-    CreateAPlan(page).click_confirm_button()
+    if CreateAPlan(page).confirm_button.is_visible():
+        CreateAPlan(page).click_confirm_button()
     CreateAPlan(page).click_save_button()
     CreateAPlan(page).fill_note_field("test data")
     CreateAPlan(page).click_saveNote_button()

tests/Smokescreen/test_compartment_2.py

@@ -23,7 +23,7 @@ def test_compartment_2(page: Page) -> None:
         LogDevices(page).fill_sample_date_field(sample_date)
         LogDevices(page).verify_successfully_logged_device_text()
 
-    nhs_no = subjectdf["subject_nhs_number"].iloc[0]
+    nhs_no = subjectdf["nhs_number"].iloc[0]
     verify_subject_event_status_by_nhs_no(page, nhs_no, "S43 - Kit Returned and Logged (Initial Test)")
 
     NavigationBar(page).click_main_menu_link()

utils/fit_kit_generation.py

@@ -7,16 +7,10 @@ def create_fit_id_df():
     df["fit_device_id"] = df["kitid"].apply(calculate_check_digit)
     df["fit_device_id"] = df["fit_device_id"].apply(convert_kit_id_to_fit_device_id)
 
-    temp_string = df["screening_subject_id"].apply(str).iloc[0]
-    for subject in range(df.shape[0]):
-        subject_id = df["screening_subject_id"].apply(str).iloc[subject]
-        temp_string += f" or SCREENING_SUBJECT_ID = {subject_id}"
-
-    df = get_nhs_number_from_subject_id(temp_string, df)
     return df
 
 def get_kit_id_from_db():
-    kit_id_df = OracleDB().execute_query("""select tk.kitid, tk.screening_subject_id
+    kit_id_df = OracleDB().execute_query("""select tk.kitid, tk.screening_subject_id, sdc.nhs_number
     from tk_items_t tk
     inner join ep_subject_episode_t se on se.screening_subject_id = tk.screening_subject_id
     inner join screening_subject_t sst on (sst.screening_subject_id = tk.screening_subject_id)
@@ -43,8 +37,3 @@ def convert_kit_id_to_fit_device_id(kit_id: str):
     today = datetime.now()
     year = today.strftime("%y") # Get the year from todays date in YY format
     return f"{kit_id}12{int(year)+1}12345/KD00001"
-
-def get_nhs_number_from_subject_id(subject_ids, df):
-    temp_df = OracleDB().execute_query(f"SELECT SCREENING_SUBJECT_ID, SUBJECT_NHS_NUMBER FROM SCREENING_SUBJECT_T WHERE SCREENING_SUBJECT_ID = {subject_ids}")
-    df = df.merge(temp_df[["screening_subject_id","subject_nhs_number"]], on="screening_subject_id", how="left")
-    return df