Altering the execute_query method based on Dave's feedback

Author: adrianoaru-nhs

utils/oracle/oracle.py

@@ -134,30 +134,15 @@ def execute_query(
         """
         conn = self.connect_to_db()
         engine = create_engine("oracle+oracledb://", creator=lambda: conn)
-        if parameters == None:
-            try:
-                logging.info("Attempting to execute query")
-                df = pd.read_sql(query, engine)
-                logging.info("Query execution successful!")
-            except Exception as executionError:
-                logging.error(
-                    f"Failed to execute query with execution error {executionError}"
-                )
-            finally:
-                if conn is not None:
-                    self.disconnect_from_db(conn)
-        else:
-            try:
-                logging.info("Attempting to execute query")
-                df = pd.read_sql(query, engine, params = parameters)
-                logging.info("Query execution successful!")
-            except Exception as executionError:
-                logging.error(
-                    f"Failed to execute query with execution error {executionError}"
-                )
-            finally:
-                if conn is not None:
-                    self.disconnect_from_db(conn)
+        try:
+            df = pd.read_sql(query, engine) if parameters == None else pd.read_sql(query, engine, params = parameters)
+        except Exception as executionError:
+            logging.error(
+                f"Failed to execute query with execution error {executionError}"
+            )
+        finally:
+            if conn is not None:
+                self.disconnect_from_db(conn)
         return df
 
     def execute_stored_procedure(