From 8192922d382b76fd913e81acf69e034fd9d5fde7 Mon Sep 17 00:00:00 2001 From: "mark.j0hnst0n" Date: Thu, 11 Apr 2024 15:51:12 +0100 Subject: [PATCH 01/14] aws region varible addition and added a few other missing variables --- example.caseworker.env | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/example.caseworker.env b/example.caseworker.env index b55a7cffc1..9ff69d39ce 100644 --- a/example.caseworker.env +++ b/example.caseworker.env @@ -6,7 +6,6 @@ ALLOWED_HOSTS=* ALLOWED_HOSTS=* OAUTHLIB_INSECURE_TRANSPORT=True GTM_ID='' -LITE_API_HAWK_KEY= LITE_API_URL=http://host.docker.internal:8100 # comment above LITE_API_URL and uncomment below if running outside docker @@ -27,22 +26,26 @@ TEST_TYPE_HEADLESS=False TEST_SSO_EMAIL=<> TEST_SSO_PASSWORD=<> TEST_SSO_NAME=<> +TEST_EXPORTER_SSO_NAME=<> EXPORTER_TEST_SSO_EMAIL=<> EXPORTER_TEST_SSO_PASSWORD=<> # AWS AWS_S3_ENDPOINT_URL=http://s3:9000 AWS_ACCESS_KEY_ID=minio_username +AWS_REGION=eu-west-2 AWS_SECRET_ACCESS_KEY=minio_password AWS_STORAGE_BUCKET_NAME=uploads +LITE_API_HAWK_KEY=<> +LITE_E2E_HAWK_KEY=<> +LITE_EXPORTER_HAWK_KEY=LITE_EXPORTER_HAWK_KEY LITE_INTERNAL_HAWK_KEY=LITE_INTERNAL_HAWK_KEY DJANGO_SECRET_KEY=DJANGO_SECRET_KEY ENVIRONMENT=local -LITE_E2E_HAWK_KEY=LITE_E2E_HAWK_KEY PERMISSIONS_FINDER_URL= STATICFILES_STORAGE=django.contrib.staticfiles.storage.StaticFilesStorage From 1d75be5342c0f5ef8f71f7692cd2e5937c9243ba Mon Sep 17 00:00:00 2001 From: "mark.j0hnst0n" Date: Thu, 11 Apr 2024 15:51:28 +0100 Subject: [PATCH 02/14] minor readme amendments --- README.md | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 34cc36d1f0..7dd330ab61 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,7 @@ - [Python 3.9](https://www.python.org/downloads/release/python-39/) - [Pipenv](https://pipenv.pypa.io/en/latest/) +- [Homebrew](https://brew.sh/) ### Installing @@ -62,15 +63,21 @@ make run_exporter - Set up your local config file: - `make secrets` - populate the newly created `caseworker.env` and `exporter.env` with values from Vault. + - As it states in the env file add the following to your to your /etc/hosts file: + ``` + 127.0.0.1 caseworker + 127.0.0.1 exporter + ``` + - Further information at https://kinsta.com/knowledgebase/edit-mac-hosts-file/ * Ensure docker is running * Build and start docker images: - If you haven't already done this for lite-api, set up a shared docker network: - - `docker network create lite` - shared network to allow API and frontend to communicate + - `docker network create lite` - shared network to allow API and frontend to communicate - `docker-compose build` - build the container image * Installation requirements - - install libmagic + - install libmagic with the `brew install libmagic` command. #### Starting the service From ce43397431509f27feb3f5453b9488e3549be9c8 Mon Sep 17 00:00:00 2001 From: "mark.j0hnst0n" Date: Fri, 12 Apr 2024 08:53:28 +0100 Subject: [PATCH 03/14] removed unecessary information --- example.caseworker.env | 3 --- 1 file changed, 3 deletions(-) diff --git a/example.caseworker.env b/example.caseworker.env index 9ff69d39ce..7fc696d30c 100644 --- a/example.caseworker.env +++ b/example.caseworker.env @@ -37,9 +37,6 @@ AWS_REGION=eu-west-2 AWS_SECRET_ACCESS_KEY=minio_password AWS_STORAGE_BUCKET_NAME=uploads -LITE_API_HAWK_KEY=<> -LITE_E2E_HAWK_KEY=<> -LITE_EXPORTER_HAWK_KEY=LITE_EXPORTER_HAWK_KEY LITE_INTERNAL_HAWK_KEY=LITE_INTERNAL_HAWK_KEY DJANGO_SECRET_KEY=DJANGO_SECRET_KEY From 1b2f4a4df29d39f026a1a3a82758e5ee963854ad Mon Sep 17 00:00:00 2001 From: "mark.j0hnst0n" Date: Fri, 12 Apr 2024 16:40:03 +0100 Subject: [PATCH 04/14] changed typo on both file to reflect 'bill of lading' --- exporter/applications/forms/export_details.py | 2 +- exporter/applications/forms/route_of_goods.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/exporter/applications/forms/export_details.py b/exporter/applications/forms/export_details.py index bac6af56bf..78a623d31a 100644 --- a/exporter/applications/forms/export_details.py +++ b/exporter/applications/forms/export_details.py @@ -176,7 +176,7 @@ def route_of_goods_form(): "
" + "
" + "" - + "Help with airway bill and bill of landing" + + "Help with airway bill and bill of lading" + "" + "
" + "

" diff --git a/exporter/applications/forms/route_of_goods.py b/exporter/applications/forms/route_of_goods.py index 0ee23ffdb5..28f060f131 100644 --- a/exporter/applications/forms/route_of_goods.py +++ b/exporter/applications/forms/route_of_goods.py @@ -32,7 +32,7 @@ def route_of_goods_form(back_link): "
" + "

" + "" - + "Help with airway bill and bill of landing" + + "Help with airway bill and bill of lading" + "" + "
" + "

" From a2d3d733395a28fd7fbb7c280565aca11ffa042a Mon Sep 17 00:00:00 2001 From: "mark.j0hnst0n" Date: Fri, 12 Apr 2024 16:47:04 +0100 Subject: [PATCH 05/14] re-submitting changes --- exporter/templates/core/hub.html | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/exporter/templates/core/hub.html b/exporter/templates/core/hub.html index 2e7bc00d83..a71ae14656 100644 --- a/exporter/templates/core/hub.html +++ b/exporter/templates/core/hub.html @@ -260,4 +260,9 @@

{% endif %} +
+
+ {% comment %}/PS-IGNORE{% endcomment %}If you or any of your colleagues have accessibility needs, tell us how we can improve your user experience. Contact LITE.support@businessandtrade.gov.uk. +
+
{% endblock %} From afb0ea4d0afe4acdb5df15ab92cfc202443f6b26 Mon Sep 17 00:00:00 2001 From: "mark.j0hnst0n" Date: Mon, 15 Apr 2024 09:10:05 +0100 Subject: [PATCH 06/14] form link added --- exporter/templates/applications/goods/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/exporter/templates/applications/goods/index.html b/exporter/templates/applications/goods/index.html index 0e9d9f9dbe..eb5e720275 100644 --- a/exporter/templates/applications/goods/index.html +++ b/exporter/templates/applications/goods/index.html @@ -16,7 +16,7 @@

- Where possible, please add items in the same order as they are shown on the end user undertaking document. This will help case officers process applications quickly. + Where possible, please add items in the same order as they are shown on the end-user undertaking form (opens in new tab). This will help case officers process applications quickly.

{% if application.status.key in 'applicant_editing,draft' %} From eba7386e418f1297f51f75e8230194884d4a3389 Mon Sep 17 00:00:00 2001 From: "mark.j0hnst0n" Date: Mon, 15 Apr 2024 11:54:08 +0100 Subject: [PATCH 07/14] amended urls.py and tests --- caseworker/external_data/urls.py | 2 +- unit_tests/caseworker/external_data/test_views.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/caseworker/external_data/urls.py b/caseworker/external_data/urls.py index 4f5ce4b32e..f20ca9f64a 100644 --- a/caseworker/external_data/urls.py +++ b/caseworker/external_data/urls.py @@ -5,7 +5,7 @@ app_name = "external_data" urlpatterns = [ - path("denials/upload/", views.DenialUploadView.as_view(), name="denials-upload"), + path("denials/upload/", views.DenialUploadView.as_view(), name="denials-add-by-csv"), path("denials//", views.DenialDetailView.as_view(), name="denial-detail"), path("denials//revoke/", views.DenialRevokeView.as_view(), name="denial-revoke"), ] diff --git a/unit_tests/caseworker/external_data/test_views.py b/unit_tests/caseworker/external_data/test_views.py index ea4b65e128..efeff91fbe 100644 --- a/unit_tests/caseworker/external_data/test_views.py +++ b/unit_tests/caseworker/external_data/test_views.py @@ -43,7 +43,7 @@ def mock_denial_patch(requests_mock): def test_upload_denial_404(authorized_client, mock_denial_upload, settings): # given the case has activity from system user - url = reverse("external_data:denials-upload") + url = reverse("external_data:denials-add-by-csv") file_path = os.path.join(settings.BASE_DIR, "caseworker/external_data/example.csv") data = {"csv_file": open(file_path, "rb")} @@ -62,7 +62,7 @@ def test_upload_denial_404(authorized_client, mock_denial_upload, settings): @pytest.mark.skip(reason="CSV denials upload has been disabled") def test_upload_denial_valid_file(authorized_client, mock_denial_upload, settings): # given the case has activity from system user - url = reverse("external_data:denials-upload") + url = reverse("external_data:denials-add-by-csv") file_path = os.path.join(settings.BASE_DIR, "caseworker/external_data/example.csv") data = {"csv_file": open(file_path, "rb")} @@ -80,7 +80,7 @@ def test_upload_denial_valid_file(authorized_client, mock_denial_upload, setting @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("external_data:denials-upload") + url = reverse("external_data:denials-add-by-csv") file_path = os.path.join(settings.BASE_DIR, "caseworker/external_data/example.csv") data = {"csv_file": open(file_path, "rb")} From 1fc4303521b2d2444e99d06b4681e01d9d070b4b Mon Sep 17 00:00:00 2001 From: "mark.j0hnst0n" Date: Mon, 15 Apr 2024 12:03:09 +0100 Subject: [PATCH 08/14] govuk-link class added --- exporter/templates/applications/goods/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/exporter/templates/applications/goods/index.html b/exporter/templates/applications/goods/index.html index eb5e720275..63f2fb5fbe 100644 --- a/exporter/templates/applications/goods/index.html +++ b/exporter/templates/applications/goods/index.html @@ -16,7 +16,7 @@

- Where possible, please add items in the same order as they are shown on the end-user undertaking form (opens in new tab). This will help case officers process applications quickly. + Where possible, please add items in the same order as they are shown on the end-user undertaking form (opens in new tab). This will help case officers process applications quickly.

{% if application.status.key in 'applicant_editing,draft' %} From 809ff2259cb9337a082ba6791640daa5a23d9ef8 Mon Sep 17 00:00:00 2001 From: "mark.j0hnst0n" Date: Mon, 15 Apr 2024 12:22:50 +0100 Subject: [PATCH 09/14] url pattern changed --- caseworker/external_data/urls.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/caseworker/external_data/urls.py b/caseworker/external_data/urls.py index f20ca9f64a..ec1349853c 100644 --- a/caseworker/external_data/urls.py +++ b/caseworker/external_data/urls.py @@ -5,7 +5,7 @@ app_name = "external_data" urlpatterns = [ - path("denials/upload/", views.DenialUploadView.as_view(), name="denials-add-by-csv"), + path("denials/add-by-csv", views.DenialUploadView.as_view(), name="denials-add-by-csv"), path("denials//", views.DenialDetailView.as_view(), name="denial-detail"), path("denials//revoke/", views.DenialRevokeView.as_view(), name="denial-revoke"), ] From e0dd5abce54cb967306411b5213d93064c93a663 Mon Sep 17 00:00:00 2001 From: "mark.j0hnst0n" Date: Mon, 15 Apr 2024 12:24:23 +0100 Subject: [PATCH 10/14] Update urls.py --- caseworker/external_data/urls.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/caseworker/external_data/urls.py b/caseworker/external_data/urls.py index ec1349853c..ef84d4d8a4 100644 --- a/caseworker/external_data/urls.py +++ b/caseworker/external_data/urls.py @@ -5,7 +5,7 @@ app_name = "external_data" urlpatterns = [ - path("denials/add-by-csv", views.DenialUploadView.as_view(), name="denials-add-by-csv"), + path("denials/add-by-csv/", views.DenialUploadView.as_view(), name="denials-add-by-csv"), path("denials//", views.DenialDetailView.as_view(), name="denial-detail"), path("denials//revoke/", views.DenialRevokeView.as_view(), name="denial-revoke"), ] From 565521b90104a20677ef9f0f67b12925efb59f8c Mon Sep 17 00:00:00 2001 From: Henry Cooksley Date: Mon, 15 Apr 2024 12:40:20 +0100 Subject: [PATCH 11/14] Update build_caseworker script to build desnz js file --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index df83890318..af404d3eb3 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "private": true, "scripts": { "build_exporter": "parcel build ./exporter/assets/javascripts/main.js ./exporter/assets/javascripts/cookie-policy-form.js --dist-dir exporter/assets/built --public-url /assets/", - "build_caseworker": "parcel build ./caseworker/assets/javascripts/{main,head,bookmarks,cookie-policy-form,beis,tau,tau-edit,tau-multiple-assessment-edit,case-filters,refusal-review-consolidate,search-products}.js --dist-dir caseworker/assets/built --public-url /assets/", + "build_caseworker": "parcel build ./caseworker/assets/javascripts/{main,head,bookmarks,cookie-policy-form,desnz,tau,tau-edit,tau-multiple-assessment-edit,case-filters,refusal-review-consolidate,search-products}.js --dist-dir caseworker/assets/built --public-url /assets/", "watch_exporter": "PARCEL_WORKERS=0 parcel watch --port 8400 ./exporter/assets/javascripts/{main,head}.js ./exporter/assets/javascripts/cookie-policy-form.js --dist-dir exporter/assets/built --public-url /assets/", "watch_caseworker": "PARCEL_WORKERS=0 parcel watch --port 8401 ./caseworker/assets/javascripts/{main,head,bookmarks,cookie-policy-form,search-cases,beis,tau,tau-edit,tau-multiple-assessment-edit,case-filters,refusal-review-consolidate,search-products}.js --dist-dir caseworker/assets/built --public-url /assets/", "watch": "rm -rf .parcel-cache && npm run build_exporter && npm run build_caseworker && concurrently 'npm run watch_exporter' 'npm run watch_caseworker'", From 19edbf56abe58165850353bdafd00c00be99db5a Mon Sep 17 00:00:00 2001 From: Henry Cooksley Date: Mon, 15 Apr 2024 12:45:58 +0100 Subject: [PATCH 12/14] Update watch_caseworker script to watch desnz file --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index af404d3eb3..e4367a76a2 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "build_exporter": "parcel build ./exporter/assets/javascripts/main.js ./exporter/assets/javascripts/cookie-policy-form.js --dist-dir exporter/assets/built --public-url /assets/", "build_caseworker": "parcel build ./caseworker/assets/javascripts/{main,head,bookmarks,cookie-policy-form,desnz,tau,tau-edit,tau-multiple-assessment-edit,case-filters,refusal-review-consolidate,search-products}.js --dist-dir caseworker/assets/built --public-url /assets/", "watch_exporter": "PARCEL_WORKERS=0 parcel watch --port 8400 ./exporter/assets/javascripts/{main,head}.js ./exporter/assets/javascripts/cookie-policy-form.js --dist-dir exporter/assets/built --public-url /assets/", - "watch_caseworker": "PARCEL_WORKERS=0 parcel watch --port 8401 ./caseworker/assets/javascripts/{main,head,bookmarks,cookie-policy-form,search-cases,beis,tau,tau-edit,tau-multiple-assessment-edit,case-filters,refusal-review-consolidate,search-products}.js --dist-dir caseworker/assets/built --public-url /assets/", + "watch_caseworker": "PARCEL_WORKERS=0 parcel watch --port 8401 ./caseworker/assets/javascripts/{main,head,bookmarks,cookie-policy-form,search-cases,desnz,tau,tau-edit,tau-multiple-assessment-edit,case-filters,refusal-review-consolidate,search-products}.js --dist-dir caseworker/assets/built --public-url /assets/", "watch": "rm -rf .parcel-cache && npm run build_exporter && npm run build_caseworker && concurrently 'npm run watch_exporter' 'npm run watch_caseworker'", "build": "npm install --no-save && npm run build_all", "build_all": "export NODE_ENV=production && concurrently 'npm run build_exporter' 'npm run build_caseworker'", From d1a1c0f54e894009f13b2397f8b50ec5383e9c47 Mon Sep 17 00:00:00 2001 From: "mark.j0hnst0n" Date: Mon, 15 Apr 2024 14:36:46 +0100 Subject: [PATCH 13/14] todo comments added --- caseworker/external_data/urls.py | 4 +++- unit_tests/caseworker/external_data/test_views.py | 12 +++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/caseworker/external_data/urls.py b/caseworker/external_data/urls.py index ef84d4d8a4..12fa181221 100644 --- a/caseworker/external_data/urls.py +++ b/caseworker/external_data/urls.py @@ -5,7 +5,9 @@ app_name = "external_data" urlpatterns = [ - path("denials/add-by-csv/", views.DenialUploadView.as_view(), name="denials-add-by-csv"), + path( + "denials/add-by-csv/", views.DenialUploadView.as_view(), name="denials-add-by-csv" + ), # TODO: rename back to "denials/upload/" and "denials-upload" when we are ready to release this to users path("denials//", views.DenialDetailView.as_view(), name="denial-detail"), path("denials//revoke/", views.DenialRevokeView.as_view(), name="denial-revoke"), ] diff --git a/unit_tests/caseworker/external_data/test_views.py b/unit_tests/caseworker/external_data/test_views.py index efeff91fbe..3c245ba545 100644 --- a/unit_tests/caseworker/external_data/test_views.py +++ b/unit_tests/caseworker/external_data/test_views.py @@ -43,7 +43,9 @@ def mock_denial_patch(requests_mock): 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") + 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")} @@ -62,7 +64,9 @@ def test_upload_denial_404(authorized_client, mock_denial_upload, settings): @pytest.mark.skip(reason="CSV denials upload has been disabled") def test_upload_denial_valid_file(authorized_client, mock_denial_upload, settings): # given the case has activity from system user - url = reverse("external_data:denials-add-by-csv") + 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")} @@ -80,7 +84,9 @@ def test_upload_denial_valid_file(authorized_client, mock_denial_upload, setting @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("external_data:denials-add-by-csv") + 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")} From e3a335894b69c4ba0d414c27bffb967c1d535801 Mon Sep 17 00:00:00 2001 From: Arun Siluvery Date: Mon, 15 Apr 2024 12:17:45 +0100 Subject: [PATCH 14/14] Expose Closed case status to users --- caseworker/core/services.py | 1 - .../cases/views/test_change_status.py | 36 +++++++++++++++++++ unit_tests/caseworker/conftest.py | 17 ++++++++- 3 files changed, 52 insertions(+), 2 deletions(-) diff --git a/caseworker/core/services.py b/caseworker/core/services.py index 45d7d4cdf6..d18f769a19 100644 --- a/caseworker/core/services.py +++ b/caseworker/core/services.py @@ -80,7 +80,6 @@ def get_permissible_statuses(request, case): if status["key"] not in [ CaseStatusEnum.APPLICANT_EDITING, - CaseStatusEnum.CLOSED, CaseStatusEnum.FINALISED, CaseStatusEnum.REGISTERED, CaseStatusEnum.CLC, diff --git a/unit_tests/caseworker/cases/views/test_change_status.py b/unit_tests/caseworker/cases/views/test_change_status.py index 023cf0472e..eb7a63144c 100644 --- a/unit_tests/caseworker/cases/views/test_change_status.py +++ b/unit_tests/caseworker/cases/views/test_change_status.py @@ -125,6 +125,42 @@ def test_change_status_GET_provides_finalise_status( assert (CaseStatusEnum.FINALISED in statuses) == expected +@pytest.mark.parametrize( + "gov_user_type,expected", + [ + ("mock_gov_tau_user", False), + ("mock_gov_fcdo_user", False), + ("mock_gov_desnz_nuclear_user", False), + ("mock_gov_lu_user", False), + ("mock_gov_lu_super_user", True), + ], +) +def test_closed_status_visible_to_specific_roles( + authorized_client, + change_status_url, + case_id, + gov_user_type, + expected, + request, +): + _ = request.getfixturevalue(gov_user_type) + + response = authorized_client.get(change_status_url) + assert response.status_code == 200 + + assertTemplateUsed(response, "layouts/case.html") + context = response.context + assert context["case"].id == case_id + + html = BeautifulSoup(response.content, "html.parser") + all_h1s = [elem.get_text().strip() for elem in html.find_all("h1")] + assert "Change case status" in all_h1s + + # Only LU users get an option set the status as 'Finalised' + statuses = [item["value"] for item in html.find_all("option")] + assert (CaseStatusEnum.CLOSED in statuses) == expected + + def test_change_status_success( authorized_client, case_url, diff --git a/unit_tests/caseworker/conftest.py b/unit_tests/caseworker/conftest.py index 5ebcedec2d..affed79ce6 100644 --- a/unit_tests/caseworker/conftest.py +++ b/unit_tests/caseworker/conftest.py @@ -649,6 +649,22 @@ def mock_gov_lu_user(requests_mock, mock_notifications, mock_case_statuses, mock requests_mock.get(url=re.compile(f"{url}{gov_uk_user_id}/"), json=mock_gov_user) +@pytest.fixture +def mock_gov_lu_super_user(requests_mock, mock_notifications, mock_case_statuses, mock_gov_user, gov_uk_user_id): + mock_gov_user["user"]["team"] = { + "id": "521154de-f39e-45bf-9922-baaaaaa", + "name": "Licencing Unit", + "alias": "LICENSING_UNIT", + } + mock_gov_user["user"]["role"]["statuses"].extend( + [{"id": "00000000-0000-0000-0000-000000000009", "key": "closed", "value": "Closed", "priority": 16}] + ) + + url = client._build_absolute_uri("/gov-users/") + requests_mock.get(url=f"{url}me/", json=mock_gov_user) + requests_mock.get(url=re.compile(f"{url}{gov_uk_user_id}/"), json=mock_gov_user) + + @pytest.fixture def mock_notifications(requests_mock): url = client._build_absolute_uri("/gov-users/notifications/") @@ -1605,7 +1621,6 @@ def mock_case_statuses(requests_mock): "priority": 14, }, {"id": "00000000-0000-0000-0000-000000000008", "key": "withdrawn", "value": "Withdrawn", "priority": 15}, - {"id": "00000000-0000-0000-0000-000000000009", "key": "closed", "value": "Closed", "priority": 16}, {"id": "00000000-0000-0000-0000-000000000010", "key": "registered", "value": "Registered", "priority": 17}, { "id": "00000000-0000-0000-0000-000000000011",