From 0b330898a7531ed8f1f8f0a84a3260109e46e74e Mon Sep 17 00:00:00 2001
From: "mark.j0hnst0n" <mark.johnston@digital.trade.gov.uk>
Date: Thu, 27 Feb 2025 16:13:52 +0000
Subject: [PATCH] tidy test and refine hepler fuction

---
 caseworker/cases/helpers/case.py            |  2 --
 caseworker/cases/helpers/tests/test_case.py | 34 ++++++---------------
 caseworker/cases/views/case_assignments.py  |  3 +-
 3 files changed, 12 insertions(+), 27 deletions(-)

diff --git a/caseworker/cases/helpers/case.py b/caseworker/cases/helpers/case.py
index 6d427ecf6..9efaa16df 100644
--- a/caseworker/cases/helpers/case.py
+++ b/caseworker/cases/helpers/case.py
@@ -267,8 +267,6 @@ def get_case_detail_url(case_id, case_type, queue_id):
         "standard": {"url": "cases:case", "kwargs": {"queue_pk": queue_id, "pk": case_id, "tab": "details"}},
     }
 
-    case_type = case_type["sub_type"]["key"]
     url_name = destinations[case_type]["url"]
     kwargs = destinations[case_type]["kwargs"]
-
     return reverse(url_name, kwargs=kwargs)
diff --git a/caseworker/cases/helpers/tests/test_case.py b/caseworker/cases/helpers/tests/test_case.py
index 1b9015991..585d97f39 100644
--- a/caseworker/cases/helpers/tests/test_case.py
+++ b/caseworker/cases/helpers/tests/test_case.py
@@ -1,39 +1,25 @@
 import pytest
+from uuid import uuid4
 
 from ..case import get_case_detail_url
 
 
 @pytest.mark.parametrize(
-    "case, expected",
+    "case_type, expected",
     (
         (
-            {
-                "id": "67271217-7e55-4345-9db4-31de1bfe4067",
-                "case_type": {
-                    "id": "00000000-0000-0000-0000-000000000007",
-                    "reference": {"key": "f680", "value": "MOD F680 Clearance"},
-                    "sub_type": {"key": "f680_clearance", "value": "MOD F680 Clearance"},
-                    "type": {"key": "application", "value": "Application"},
-                },
-            },
-            "/queues/00000000-0000-0000-0000-000000000001/cases/67271217-7e55-4345-9db4-31de1bfe4067/f680/",
+            "f680_clearance",
+            "f680",
         ),
         (
-            {
-                "id": "67271217-7e55-4345-9db4-31de1bfe4067",
-                "case_type": {
-                    "id": "00000000-0000-0000-0000-000000000004",
-                    "reference": {"key": "siel", "value": "Standard Individual Export Licence"},
-                    "type": {"key": "application", "value": "Application"},
-                    "sub_type": {"key": "standard", "value": "Standard Licence"},
-                },
-            },
-            "/queues/00000000-0000-0000-0000-000000000001/cases/67271217-7e55-4345-9db4-31de1bfe4067/details/",
+            "standard",
+            "details",
         ),
     ),
 )
-def test_get_case_detail_url(case, expected):
+def test_get_case_detail_url(case_type, expected):
+    case_id = uuid4()
     queue_id = "00000000-0000-0000-0000-000000000001"
-    result = get_case_detail_url(case["id"], case["case_type"], queue_id)
+    result = get_case_detail_url(case_id, case_type, queue_id)
 
-    assert result == expected
+    assert result == f"/queues/{queue_id}/cases/{case_id}/{expected}/"
diff --git a/caseworker/cases/views/case_assignments.py b/caseworker/cases/views/case_assignments.py
index 6b10bc59e..bb42a558d 100644
--- a/caseworker/cases/views/case_assignments.py
+++ b/caseworker/cases/views/case_assignments.py
@@ -69,7 +69,8 @@ def form_valid(self, form):
 
     def get_success_url(self):
         case = self.get_case()
-        return get_case_detail_url(case.id, case.case_type, self.kwargs["queue_pk"])
+        case_type = case.case_type["sub_type"]["key"]
+        return get_case_detail_url(case.id, case_type, self.kwargs["queue_pk"])
 
 
 class CaseOfficerRemove(LoginRequiredMixin, FormView):