Merge pull request #2190 from opensafely-core/evansd/t1oo

Temporarily revert to denylist for T1OO
opensafely-core · Oct 28, 2024 · b677ca5 · b677ca5
2 parents 66902e0 + 44585dc
commit b677ca5
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/ehrql/backends/tpp.py b/ehrql/backends/tpp.py
@@ -101,26 +101,28 @@ def modify_query_variables(self, variables):
             return variables
 
         # Otherwise we add an extra condition to the population definition which is that
-        # the patient appears in the table of "allowed" patients.
+        # the patient does not appear in the T1OO table.
         #
         # PLEASE NOTE: This logic is referenced in our public documentation, so if we
         # make any changes here we should ensure that the documentation is kept
         # up-to-date:
         # https://github.com/opensafely/documentation/blob/ea2e1645/docs/type-one-opt-outs.md
         #
-        # From ehrQL's point of view, the construction of the "allowed patients" table
-        # is opaque. For discussion of the approach currently used to populate this see:
+        # From ehrQL's point of view, the construction of the T1OO table is opaque. For
+        # discussion of the approach currently used to populate this see:
         # https://docs.google.com/document/d/1nBAwDucDCeoNeC5IF58lHk6LT-RJg6YZRp5RRkI7HI8/
         variables = dict(variables)
         variables["population"] = qm.Function.And(
             variables["population"],
-            qm.AggregateByPatient.Exists(
-                # We don't currently expose this table in the user-facing schema. If
-                # we did then we could avoid defining it inline like this.
-                qm.SelectPatientTable(
-                    "allowed_patients",
-                    # It doesn't need any columns: it's just a list of patient IDs
-                    schema=qm.TableSchema(),
+            qm.Function.Not(
+                qm.AggregateByPatient.Exists(
+                    # We don't currently expose this table in the user-facing schema. If
+                    # we did then we could avoid defining it inline like this.
+                    qm.SelectPatientTable(
+                        "t1oo",
+                        # It doesn't need any columns: it's just a list of patient IDs
+                        schema=qm.TableSchema(),
+                    )
                 )
             ),
         )
@@ -154,10 +156,8 @@ def get_exit_status_for_exception(self, exception):
         exception.add_note(f"\nDatabase error: {exception}")
         return 5
 
-    allowed_patients = MappedTable(
-        # This table has its name for historical reasons, and reads slightly oddly: it
-        # should be interpreted as "allowed patients with regard to type one dissents"
-        source="AllowedPatientsWithTypeOneDissent",
+    t1oo = MappedTable(
+        source="PatientsWithTypeOneDissent",
         # The allowed patients table doesn't need any columns: it's just a list of
         # patient IDs
         columns={},

diff --git a/tests/integration/backends/test_tpp.py b/tests/integration/backends/test_tpp.py
@@ -19,7 +19,6 @@
     OPA,
     OPA_ARCHIVED,
     UKRR,
-    AllowedPatientsWithTypeOneDissent,
     APCS_Cost,
     APCS_Cost_ARCHIVED,
     APCS_Cost_JRC20231009_LastFilesToContainAllHistoricalCostData,
@@ -52,6 +51,7 @@
     Organisation,
     Patient,
     PatientAddress,
+    PatientsWithTypeOneDissent,
     PotentialCareHomeAddress,
     RegistrationHistory,
     Relationship,
@@ -3112,8 +3112,8 @@ def test_t1oo_patients_excluded_as_specified(mssql_database, suffix, expected):
         Patient(Patient_ID=2, DateOfBirth=date(2002, 1, 1)),
         Patient(Patient_ID=3, DateOfBirth=date(2003, 1, 1)),
         Patient(Patient_ID=4, DateOfBirth=date(2004, 1, 1)),
-        AllowedPatientsWithTypeOneDissent(Patient_ID=1),
-        AllowedPatientsWithTypeOneDissent(Patient_ID=4),
+        PatientsWithTypeOneDissent(Patient_ID=2),
+        PatientsWithTypeOneDissent(Patient_ID=3),
     )
 
     dataset = create_dataset()