From 711619ec5896e0ec07dc6ec5a3efcd24d5325f90 Mon Sep 17 00:00:00 2001 From: SeSo Date: Wed, 16 Oct 2024 13:29:22 -0700 Subject: [PATCH] fix: fix operation registration back navigation Signed-off-by: SeSo --- .../registration/api/v1/_facilities/facility_id.py | 4 ++-- .../api/v1/_operations/_operation_id/facilities.py | 2 +- .../v1/facility_designated_operation_timeline.py | 2 ++ .../endpoints/v1/_facilities/test_facility_id.py | 12 +----------- .../registration/FacilityInformationForm.tsx | 1 + .../registration/FacilityInformationPage.tsx | 5 +---- .../registration/RegistrationSubmissionForm.tsx | 1 + 7 files changed, 9 insertions(+), 18 deletions(-) diff --git a/bc_obps/registration/api/v1/_facilities/facility_id.py b/bc_obps/registration/api/v1/_facilities/facility_id.py index 6ab99c16ac..00cab8de96 100644 --- a/bc_obps/registration/api/v1/_facilities/facility_id.py +++ b/bc_obps/registration/api/v1/_facilities/facility_id.py @@ -22,7 +22,7 @@ @router.get( - "/facilities/{facility_id}", + "/facilities/{uuid:facility_id}", response={200: FacilityOut, custom_codes_4xx: Message}, tags=FACILITY_TAGS, description="""Retrieves the details of a specific facility by its ID. The endpoint checks if the current user is authorized to access the facility. @@ -36,7 +36,7 @@ def get_facility(request: HttpRequest, facility_id: UUID) -> Tuple[Literal[200], @router.put( - "/facilities/{facility_id}", + "/facilities/{uuid:facility_id}", response={200: FacilityOut, custom_codes_4xx: Message}, tags=FACILITY_TAGS, description=""" diff --git a/bc_obps/registration/api/v1/_operations/_operation_id/facilities.py b/bc_obps/registration/api/v1/_operations/_operation_id/facilities.py index 3cdb89d57b..b00822470d 100644 --- a/bc_obps/registration/api/v1/_operations/_operation_id/facilities.py +++ b/bc_obps/registration/api/v1/_operations/_operation_id/facilities.py @@ -20,7 +20,7 @@ @router.get( - "/operations/{operation_id}/facilities", + "/operations/{uuid:operation_id}/facilities", response={200: List[FacilityDesignatedOperationTimelineOut], custom_codes_4xx: Message}, tags=FACILITY_TAGS, description="""Retrieves a paginated list of facilities based on the provided filters. diff --git a/bc_obps/registration/schema/v1/facility_designated_operation_timeline.py b/bc_obps/registration/schema/v1/facility_designated_operation_timeline.py index 3b381372a2..1f80898d41 100644 --- a/bc_obps/registration/schema/v1/facility_designated_operation_timeline.py +++ b/bc_obps/registration/schema/v1/facility_designated_operation_timeline.py @@ -1,3 +1,4 @@ +from uuid import UUID from registration.models.facility_designated_operation_timeline import FacilityDesignatedOperationTimeline from ninja import FilterSchema, ModelSchema, Field from typing import Optional @@ -7,6 +8,7 @@ class FacilityDesignatedOperationTimelineOut(ModelSchema): facility__name: str = Field(..., alias="facility.name") facility__type: str = Field(..., alias="facility.type") facility__bcghg_id: Optional[str] = Field(None, alias="facility.bcghg_id") + facility__id: UUID = Field(..., alias="facility.id") class Meta: model = FacilityDesignatedOperationTimeline diff --git a/bc_obps/registration/tests/endpoints/v1/_facilities/test_facility_id.py b/bc_obps/registration/tests/endpoints/v1/_facilities/test_facility_id.py index 829cc32738..62657ebc97 100644 --- a/bc_obps/registration/tests/endpoints/v1/_facilities/test_facility_id.py +++ b/bc_obps/registration/tests/endpoints/v1/_facilities/test_facility_id.py @@ -89,16 +89,6 @@ def test_facilities_endpoint_unauthorized_roles_cannot_get(self): ) assert response.status_code == 401 - def test_get_facility_with_invalid_facility_id(self): - response = TestUtils.mock_get_with_auth_role( - self, endpoint=custom_reverse_lazy("get_facility", kwargs={"facility_id": '99999'}), role_name="cas_admin" - ) - assert response.status_code == 422 - assert ( - response.json().get('detail')[0].get('msg') - == 'Input should be a valid UUID, invalid length: expected length 32 for simple format, found 5' - ) - def test_industry_users_can_get_their_own_facilities(self): operator = operator_baker() @@ -113,7 +103,7 @@ def test_industry_users_can_get_their_own_facilities(self): role_name="industry_user", ) assert response.status_code == 200 - response.json().get('name') is not None + assert response.json().get('name') is not None def test_industry_users_cannot_get_other_users_facilities(self): facility = facility_baker() diff --git a/bciers/apps/registration/app/components/operations/registration/FacilityInformationForm.tsx b/bciers/apps/registration/app/components/operations/registration/FacilityInformationForm.tsx index fce1052313..eb91b27f9d 100644 --- a/bciers/apps/registration/app/components/operations/registration/FacilityInformationForm.tsx +++ b/bciers/apps/registration/app/components/operations/registration/FacilityInformationForm.tsx @@ -148,6 +148,7 @@ const FacilityInformationForm = ({ return (