Fixed _add_criteria_has_temporary_address() method and added to tests

Author: adrianoaru-nhs

utils/oracle/query_builder_test_harness/test_subject_selection_query_builder_util.py

@@ -3,8 +3,10 @@
 from classes.user import User
 from classes.subject import Subject
 import logging
+import pytest
 
 
+@pytest.mark.wip3
 def test_subject_selection_query_builder():
     """
     This function demonstrates how to use the builder to create a query
@@ -46,3 +48,17 @@ def test_subject_selection_query_builder():
     assert (
         df.iloc[0]["subject_nhs_number"] == "9163626810"
     ), "NHS number should match the input"
+
+    criteria = {
+        "subject has temporary address": "no",
+    }
+    user = User()
+    subject = Subject()
+    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)
+    logging.info(f"DataFrame: {df}")
+    assert df is not None, "DataFrame should not be None"
+    assert df.shape[0] == 1, "DataFrame should contain exactly one row"

utils/oracle/subject_selection_query_builder.py

@@ -2340,17 +2340,23 @@ def _add_criteria_has_temporary_address(self) -> None:
         try:
             answer = YesNoType.from_description(self.criteria_value)
 
-            # INNER JOIN on sd_address_t with address type 13043 (temporary)
-            self.sql_from.append(
-                "INNER JOIN sd_address_t adds ON adds.contact_id = c.contact_id "
-                "AND adds.ADDRESS_TYPE = 13043"
-            )
-
-            # Apply logic for EFFECTIVE_FROM based on yes/no
             if answer == YesNoType.YES:
-                self.sql_from.append("AND adds.EFFECTIVE_FROM IS NOT NULL")
+                self.sql_from.append(
+                    " INNER JOIN sd_address_t adds ON adds.contact_id = c.contact_id "
+                    " AND adds.ADDRESS_TYPE = 13043 "
+                    " AND adds.EFFECTIVE_FROM IS NOT NULL "
+                )
             elif answer == YesNoType.NO:
-                self.sql_where.append("AND adds.EFFECTIVE_FROM IS NULL")
+                self.sql_from.append(
+                    " LEFT JOIN sd_address_t  adds ON adds.contact_id = c.contact_id "
+                )
+                self.sql_where.append(
+                    " AND NOT EXISTS ("
+                    " SELECT 1 "
+                    " FROM sd_address_t x "
+                    " WHERE x.contact_id  = c.contact_id "
+                    " AND x.address_type = 13043) "
+                )
             else:
                 raise ValueError()
         except Exception: