Merge pull request #1196 from rcpch/mbarton/fix-jersey-urn

Fix saving URN for jersey patients
rcpch · Jan 30, 2025 · 33b5fde · 33b5fde
2 parents 0aeac85 + e8f4edd
commit 33b5fde
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/epilepsy12/forms_folder/case_form.py b/epilepsy12/forms_folder/case_form.py
@@ -209,9 +209,12 @@ def clean_unique_reference_number(self):
         unique_reference_number = self.cleaned_data["unique_reference_number"]
 
         organisation = Organisation.objects.get(id=self.organisation_id)
+
         if organisation.ods_code == "RGT1W":
             if not unique_reference_number:
                 raise ValidationError("Missing unique reference number")
+
+            return unique_reference_number
         else:
             # Ensure we save NULL not the empty string otherwise it stops you adding
             # more patients (https://github.com/rcpch/rcpch-audit-engine/issues/1190)

diff --git a/epilepsy12/tests/view_tests/db_actions/test_create_actions.py b/epilepsy12/tests/view_tests/db_actions/test_create_actions.py
@@ -99,6 +99,9 @@ def test_mix_of_mainland_and_jersey_patients(client, seed_groups_fixture, seed_u
 
     case_count_before = Case.objects.count()
 
+    [nhsnumber] = nhs_number.generate()
+    unique_reference_number = "abcdef1234"
+
     client.post(
         reverse("create_case", kwargs={
             "organisation_id": KINGS.id
@@ -109,7 +112,7 @@ def test_mix_of_mainland_and_jersey_patients(client, seed_groups_fixture, seed_u
             "date_of_birth": "2008-03-20",
             "sex": 0,
             "postcode": "WC1X 8SH",
-            "nhs_number": nhs_number.generate(),
+            "nhs_number": nhsnumber,
             "ethnicity": "A"
         }
     )
@@ -124,13 +127,19 @@ def test_mix_of_mainland_and_jersey_patients(client, seed_groups_fixture, seed_u
             "date_of_birth": "2008-03-20",
             "sex": 0,
             "postcode": "JE2 3WR",
-            "unique_reference_number": "abcdef1234",
+            "unique_reference_number": unique_reference_number,
             "ethnicity": "A"
         }
     )
 
     assert Case.objects.count() == (case_count_before + 2)
 
+    mainland_case = Case.objects.get(nhs_number=nhsnumber)
+    assert(mainland_case.nhs_number == nhsnumber)
+
+    jersey_case = Case.objects.get(unique_reference_number=unique_reference_number)
+    assert(jersey_case.unique_reference_number == unique_reference_number)
+
 
 # https://github.com/rcpch/rcpch-audit-engine/issues/1190
 @pytest.mark.django_db