From 2b62f5afe4aaa417eb7e24fce40797c9d8dd45b0 Mon Sep 17 00:00:00 2001 From: Henry Cooksley Date: Thu, 28 Mar 2024 10:59:35 +0000 Subject: [PATCH 1/4] Enable denials csv upload --- caseworker/core/context_processors.py | 1 + caseworker/external_data/views.py | 4 ---- unit_tests/caseworker/external_data/test_views.py | 4 +++- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/caseworker/core/context_processors.py b/caseworker/core/context_processors.py index 486063f7cb..8eeeb87d3d 100644 --- a/caseworker/core/context_processors.py +++ b/caseworker/core/context_processors.py @@ -95,6 +95,7 @@ def lite_menu(request): or Permission.MANAGE_ALL_ROUTING_RULES.value in permissions, {"title": "Routing rules", "url": reverse_lazy("routing_rules:list"), "icon": "menu/routing-rules"}, ), + {"title": "Denial records", "url": reverse_lazy("external_data:denials-upload"), "icon": "menu/cases"}, ] else: pages = [] diff --git a/caseworker/external_data/views.py b/caseworker/external_data/views.py index 43831562e6..770b5902fa 100644 --- a/caseworker/external_data/views.py +++ b/caseworker/external_data/views.py @@ -5,7 +5,6 @@ from django.urls import reverse from django.views.generic import TemplateView from django.views.generic.edit import FormView, CreateView -from django.http import Http404 from core.auth.views import LoginRequiredMixin @@ -22,9 +21,6 @@ class DenialUploadView(LoginRequiredMixin, SuccessMessageMixin, CreateView): success_message = "Denials created successfully" extra_context = {"base_64_csv": base_64_csv} - def dispatch(self, request, *args, **kwargs): - raise Http404("CSV denials uploads have been disabled") - def form_valid(self, form): response = services.upload_denials(request=self.request, data=form.cleaned_data) if not response.ok: diff --git a/unit_tests/caseworker/external_data/test_views.py b/unit_tests/caseworker/external_data/test_views.py index 3c245ba545..90c8f11983 100644 --- a/unit_tests/caseworker/external_data/test_views.py +++ b/unit_tests/caseworker/external_data/test_views.py @@ -41,6 +41,7 @@ def mock_denial_patch(requests_mock): yield requests_mock.patch(url=url, json={}) +<<<<<<< HEAD def test_upload_denial_404(authorized_client, mock_denial_upload, settings): # given the case has activity from system user url = reverse( @@ -62,6 +63,8 @@ def test_upload_denial_404(authorized_client, mock_denial_upload, settings): @pytest.mark.skip(reason="CSV denials upload has been disabled") +======= +>>>>>>> 12ae42e4a (Enable denials csv upload) def test_upload_denial_valid_file(authorized_client, mock_denial_upload, settings): # given the case has activity from system user url = reverse( @@ -81,7 +84,6 @@ def test_upload_denial_valid_file(authorized_client, mock_denial_upload, setting assert mock_denial_upload.last_request.json() == {"csv_file": f.read()} -@pytest.mark.skip(reason="CSV denials upload has been disabled") def test_upload_denial_invalid_file(authorized_client, mock_denial_upload_validation_error, settings): # given the case has activity from system user url = reverse( From 326e5bab9492341fff0549f86841a1ff73e7746e Mon Sep 17 00:00:00 2001 From: Henry Cooksley Date: Thu, 11 Apr 2024 16:48:28 +0100 Subject: [PATCH 2/4] Remove lite menu option for denials upload --- caseworker/core/context_processors.py | 1 - 1 file changed, 1 deletion(-) diff --git a/caseworker/core/context_processors.py b/caseworker/core/context_processors.py index 8eeeb87d3d..486063f7cb 100644 --- a/caseworker/core/context_processors.py +++ b/caseworker/core/context_processors.py @@ -95,7 +95,6 @@ def lite_menu(request): or Permission.MANAGE_ALL_ROUTING_RULES.value in permissions, {"title": "Routing rules", "url": reverse_lazy("routing_rules:list"), "icon": "menu/routing-rules"}, ), - {"title": "Denial records", "url": reverse_lazy("external_data:denials-upload"), "icon": "menu/cases"}, ] else: pages = [] From 0777531febdac75777990dd98bae60a83e76a558 Mon Sep 17 00:00:00 2001 From: Henry Cooksley Date: Mon, 15 Apr 2024 16:42:50 +0100 Subject: [PATCH 3/4] Fix merge conflicts --- .../caseworker/external_data/test_views.py | 24 ------------------- 1 file changed, 24 deletions(-) diff --git a/unit_tests/caseworker/external_data/test_views.py b/unit_tests/caseworker/external_data/test_views.py index 90c8f11983..8a0c2dc448 100644 --- a/unit_tests/caseworker/external_data/test_views.py +++ b/unit_tests/caseworker/external_data/test_views.py @@ -41,30 +41,6 @@ def mock_denial_patch(requests_mock): yield requests_mock.patch(url=url, json={}) -<<<<<<< HEAD -def test_upload_denial_404(authorized_client, mock_denial_upload, settings): - # given the case has activity from system user - url = reverse( - "external_data:denials-add-by-csv" - ) # TODO: rename back to ""denials-upload" when we are ready to release this to users - - file_path = os.path.join(settings.BASE_DIR, "caseworker/external_data/example.csv") - data = {"csv_file": open(file_path, "rb")} - - # when the case is viewed - response = authorized_client.post(url, data, format="multipart") - - # then it does not error - assert response.status_code == 404 - # and the upstream endpoint was posted - - response = authorized_client.get(url) - assert response.status_code == 404 - - -@pytest.mark.skip(reason="CSV denials upload has been disabled") -======= ->>>>>>> 12ae42e4a (Enable denials csv upload) def test_upload_denial_valid_file(authorized_client, mock_denial_upload, settings): # given the case has activity from system user url = reverse( From 47fc5de51793427202abdd99f09efb9855de49fa Mon Sep 17 00:00:00 2001 From: Henry Cooksley Date: Tue, 16 Apr 2024 09:08:20 +0100 Subject: [PATCH 4/4] Change success message --- caseworker/external_data/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/caseworker/external_data/views.py b/caseworker/external_data/views.py index 770b5902fa..2d569f0809 100644 --- a/caseworker/external_data/views.py +++ b/caseworker/external_data/views.py @@ -18,7 +18,7 @@ class DenialUploadView(LoginRequiredMixin, SuccessMessageMixin, CreateView): template_name = "external_data/denial-upload.html" form_class = forms.DenialUploadForm - success_message = "Denials created successfully" + success_message = "Denials created or updated successfully" extra_context = {"base_64_csv": base_64_csv} def form_valid(self, form):