Skip to content

Commit

Permalink
Merge pull request #1811 from uktrade/LTD-4719-assign-case-officer
Browse files Browse the repository at this point in the history
Remove assign_case_officer_form and CaseOfficer view
  • Loading branch information
Tllew authored Feb 27, 2024
2 parents 5b358e6 + b2edd55 commit 88f852d
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 150 deletions.
46 changes: 0 additions & 46 deletions caseworker/cases/forms/assign_users.py

This file was deleted.

1 change: 0 additions & 1 deletion caseworker/cases/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@
generate_document.SendExistingDocument.as_view(),
name="generate_document_send",
),
path("case-officer/", main.CaseOfficer.as_view(), name="case_officer"),
path("review-date/", main.NextReviewDate.as_view(), name="review_date"),
path(
"rerun-routing-rules/",
Expand Down
40 changes: 0 additions & 40 deletions caseworker/cases/views/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@
from lite_forms.views import SingleFormView

from caseworker.advice.services import get_advice_tab_context
from caseworker.cases.constants import CaseType
from caseworker.cases.forms.assign_users import assign_case_officer_form
from caseworker.cases.forms.attach_documents import attach_documents_form
from caseworker.cases.forms.change_status import ChangeStatusForm
from caseworker.cases.forms.change_sub_status import ChangeSubStatusForm
Expand All @@ -52,8 +50,6 @@
get_case,
post_case_notes,
put_case_queues,
put_case_officer,
delete_case_officer,
put_unassign_queues,
put_rerun_case_routing_rules,
put_application_status,
Expand Down Expand Up @@ -570,42 +566,6 @@ def get(self, request, **kwargs):
)


class CaseOfficer(SingleFormView):
def init(self, request, **kwargs):
self.object_pk = kwargs["pk"]
case = get_case(request, self.object_pk)
self.data = {}
if case.case_officer:
self.data = {"gov_user_pk": case.case_officer["id"]}
self.form = assign_case_officer_form(
request,
case.case_officer,
self.kwargs["queue_pk"],
self.object_pk,
is_compliance=case.case_type["type"]["key"] == CaseType.COMPLIANCE.value,
)
self.context = {"case": case}
self.success_url = reverse("cases:case", kwargs={"queue_pk": self.kwargs["queue_pk"], "pk": self.object_pk})
self.get_action()

def get_action(self):
action = self.get_validated_data().get("_action")
case_type = self.context["case"]["case_type"]["type"]["key"]

if action == "delete":
self.success_message = (
"Inspector removed" if case_type == CaseType.COMPLIANCE.value else "Case officer removed"
)
return delete_case_officer
else:
self.success_message = (
"Inspector set successfully"
if case_type == CaseType.COMPLIANCE.value
else "Case officer set successfully"
)
return put_case_officer


class RerunRoutingRules(SingleFormView):
def init(self, request, **kwargs):
self.action = put_rerun_case_routing_rules
Expand Down
63 changes: 0 additions & 63 deletions unit_tests/caseworker/cases/test_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -435,69 +435,6 @@ def test_good_on_application_good_on_application_without_document_type(
assert response.context["good_on_application_documents"] == {}


def test_case_worker_view_with_null_caseworker(
authorized_client,
requests_mock,
queue_pk,
standard_case_pk,
data_standard_case,
):
data_standard_case["case"]["case_officer"] = None

gov_users_url = client._build_absolute_uri("/gov-users/")
requests_mock.get(
url=gov_users_url,
json={
"results": [],
},
)

url = reverse(
"cases:case_officer",
kwargs={
"queue_pk": queue_pk,
"pk": standard_case_pk,
},
)
response = authorized_client.get(url)
assert response.status_code == 200
assert response.context["data"] == {}


def test_case_worker_view_with_caseworker(
authorized_client,
requests_mock,
queue_pk,
standard_case_pk,
data_standard_case,
):
case_officer_id = str(uuid.uuid4())
data_standard_case["case"]["case_officer"] = {
"id": case_officer_id,
}

gov_users_url = client._build_absolute_uri("/gov-users/")
requests_mock.get(
url=gov_users_url,
json={
"results": [],
},
)

url = reverse(
"cases:case_officer",
kwargs={
"queue_pk": queue_pk,
"pk": standard_case_pk,
},
)
response = authorized_client.get(url)
assert response.status_code == 200
assert response.context["data"] == {
"gov_user_pk": case_officer_id,
}


@pytest.fixture
def mock_get_queries(requests_mock, standard_case_pk, data_ecju_queries_gov_serializer):
requests_mock.get(
Expand Down

0 comments on commit 88f852d

Please sign in to comment.