Adressing comment on PR#6: oracle.py lines 23-25

Author: adrianoaru-nhs

pages/batch_list_page.py

@@ -58,4 +58,4 @@ def __init__(self, page):
 
 class ArchivedBatchList(BatchList):
     def __init__(self, page):
-        super().__init__(page)
+        super().__init__(page)

utils/oracle/oracle.py

@@ -27,13 +27,7 @@ def exec_bcss_timed_events(self, nhs_number_df):  # Executes bcss_timed_events w
         conn = self.connect_to_db()
         try:
             for index, row in nhs_number_df.iterrows():
-                logging.info(f"Attempting to get subject_id from nhs number: {row["subject_nhs_number"]}")
-                cursor = conn.cursor()
-                cursor.execute(
-                    f"SELECT SCREENING_SUBJECT_ID FROM SCREENING_SUBJECT_T WHERE SUBJECT_NHS_NUMBER = {int(row["subject_nhs_number"])}")
-                result = cursor.fetchall()
-                subject_id = result[0][0]
-                logging.info(f"Able to extract subject ID: {subject_id}")
+                subject_id = self.get_subject_id_from_nhs_number(row["subject_nhs_number"])
                 try:
                     logging.info(
                         f"Attempting to execute stored procedure: {f"'bcss_timed_events', [{subject_id},'Y']"}")
@@ -49,6 +43,17 @@ def exec_bcss_timed_events(self, nhs_number_df):  # Executes bcss_timed_events w
                 conn.close()
                 logging.info("Connection closed")
 
+    def get_subject_id_from_nhs_number(self, nhs_number) -> str:
+        conn = self.connect_to_db()
+        logging.info(f"Attempting to get subject_id from nhs number: {nhs_number}")
+        cursor = conn.cursor()
+        cursor.execute(
+            f"SELECT SCREENING_SUBJECT_ID FROM SCREENING_SUBJECT_T WHERE SUBJECT_NHS_NUMBER = {int(nhs_number)}")
+        result = cursor.fetchall()
+        subject_id = result[0][0]
+        logging.info(f"Able to extract subject ID: {subject_id}")
+        return subject_id
+
     def populate_ui_approved_users_table(self, user: str):  # To add users to the UI_APPROVED_USERS table
         conn = self.connect_to_db()
         try:
@@ -93,7 +98,7 @@ def execute_query(self, query: str) -> pd.DataFrame:  # To use when "select xxxx
             if conn is not None:
                 conn.close()
                 logging.info("Connection Closed - Returning results")
-                return df
+        return df
 
     def execute_stored_procedure(self, procedure: str):  # To use when "exec xxxx" (stored procedures)
         conn = self.connect_to_db()

utils/oracle/oracle_specific_functions.py

@@ -29,4 +29,4 @@ def get_nhs_no_from_batch_id(batch_id) -> pd.DataFrame:
     AND ss.screening_status_id != 4008
     ORDER BY ss.subject_nhs_number
     """)
-    return nhs_number_df
+    return nhs_number_df