2427 internal users can transfer a facility or operation

bc_obps/common/tests/endpoints/auth/test_endpoint_permissions.py

@@ -345,7 +345,6 @@ class TestEndpointPermissions(TestCase):
             },
         ],
         "cas_analyst": [
-            {"method": "get", "endpoint_name": "list_operations_by_operator_id", "kwargs": {"operator_id": mock_uuid}},
             {"method": "post", "endpoint_name": "create_transfer_event"},
         ],
     }

bc_obps/registration/api/v2/_operators/__init__.py

@@ -1,2 +0,0 @@
-# ruff: noqa: F401
-from ._operator_id.operations import list_operations_by_operator_id

bc_obps/registration/schema/v1/facility_designated_operation_timeline.py

@@ -9,7 +9,7 @@ class FacilityDesignatedOperationTimelineOut(ModelSchema):
     facility__type: str = Field(..., alias="facility.type")
     facility__bcghg_id__id: Optional[str] = Field(None, alias="facility.bcghg_id.id")
     facility__id: UUID = Field(..., alias="facility.id")
-    # Using two below fields for rendering a list of facilities alogn with their locations for transfer event
+    # Using two below fields for rendering a list of facilities along with their locations for transfer event
     facility__latitude_of_largest_emissions: Optional[float] = Field(
         None, alias="facility.latitude_of_largest_emissions"
     )

bc_obps/registration/tests/utils/baker_recipes.py

@@ -150,6 +150,7 @@
     operator=foreign_key(operator),
     status=cycle([status for status in OperationDesignatedOperatorTimeline.Statuses]),
     start_date=datetime.now(ZoneInfo("UTC")),
+    end_date=datetime.now(ZoneInfo("UTC")),
 )
 
 

bc_obps/service/operation_designated_operator_timeline_service.py

@@ -1,23 +1,10 @@
 from datetime import datetime
 from typing import Optional
 from uuid import UUID
-from django.db.models import QuerySet
 from registration.models import OperationDesignatedOperatorTimeline
 
 
 class OperationDesignatedOperatorTimelineService:
-    @classmethod
-    def list_timeline_by_operator_id(
-        cls,
-        operator_id: UUID,
-    ) -> QuerySet[OperationDesignatedOperatorTimeline]:
-        """
-        List active timelines belonging to a specific operator.
-        """
-        return OperationDesignatedOperatorTimeline.objects.filter(
-            operator_id=operator_id, end_date__isnull=True
-        ).distinct()
-
     @classmethod
     def get_current_timeline(
         cls, operator_id: UUID, operation_id: UUID

bc_obps/service/operation_service_v2.py

@@ -443,3 +443,19 @@ def generate_bcghg_id(cls, user_guid: UUID, operation_id: UUID) -> BcGreenhouseG
         operation.save(update_fields=['bcghg_id'])
 
         return operation.bcghg_id
+
+    @classmethod
+    @transaction.atomic()
+    def update_operator(cls, user_guid: UUID, operation: Operation, operator_id: UUID) -> Operation:
+        """
+        Update the operator for the operation
+        At the time of implementation, this is only used for transferring operations between operators and,
+        is only available to cas_analyst users
+        """
+        user = UserDataAccessService.get_by_guid(user_guid)
+        if not user.is_cas_analyst():
+            raise Exception(UNAUTHORIZED_MESSAGE)
+        operation.operator_id = operator_id
+        operation.save(update_fields=["operator_id"])
+        operation.set_create_or_update(user_guid)
+        return operation

bc_obps/service/tests/test_facility_designated_operation_timeline_service.py

@@ -116,6 +116,8 @@ class TestFacilityDesignatedOperationTimelineService:
     @staticmethod
     def test_get_current_timeline():
         timeline_with_no_end_date = baker.make_recipe('utils.facility_designated_operation_timeline', end_date=None)
+        # another timeline for the same facility to make sure it is not returned
+        baker.make_recipe('utils.facility_designated_operation_timeline', facility=timeline_with_no_end_date.facility)
         result_found = FacilityDesignatedOperationTimelineService.get_current_timeline(
             timeline_with_no_end_date.operation_id, timeline_with_no_end_date.facility_id
         )

bc_obps/service/tests/test_operation_designated_operator_timeline_service.py

@@ -1,4 +1,3 @@
-from itertools import cycle
 from unittest.mock import patch, MagicMock
 from zoneinfo import ZoneInfo
 import pytest
@@ -12,37 +11,17 @@
 
 
 class TestOperationDesignatedOperatorTimelineService:
-    @staticmethod
-    def test_list_timeline_by_operator_id():
-        operator = baker.make_recipe('utils.operator')
-        # timeline records without end date
-        baker.make_recipe(
-            'utils.operation_designated_operator_timeline',
-            operator=operator,
-            operation=cycle(baker.make_recipe('utils.operation', _quantity=2)),
-            _quantity=2,
-        )
-        # timeline records with end date
-        baker.make_recipe(
-            'utils.operation_designated_operator_timeline', operator=operator, end_date=datetime.now(ZoneInfo("UTC"))
-        )
-
-        timelines = OperationDesignatedOperatorTimelineService.list_timeline_by_operator_id(operator.id)
-        assert timelines.count() == 2
-        assert all(timeline.end_date is None for timeline in timelines)
-        assert all(timeline.operator_id == operator.id for timeline in timelines)
-
     @staticmethod
     def test_get_current_timeline():
-        timeline_with_no_end_date = baker.make_recipe('utils.operation_designated_operator_timeline')
+        timeline_with_no_end_date = baker.make_recipe('utils.operation_designated_operator_timeline', end_date=None)
+        # another timeline for the same operation to make sure it is not returned
+        baker.make_recipe('utils.operation_designated_operator_timeline', operation=timeline_with_no_end_date.operation)
         result_found = OperationDesignatedOperatorTimelineService.get_current_timeline(
             timeline_with_no_end_date.operator_id, timeline_with_no_end_date.operation_id
         )
         assert result_found == timeline_with_no_end_date
 
-        timeline_with_end_date = baker.make_recipe(
-            'utils.operation_designated_operator_timeline', end_date=datetime.now(ZoneInfo("UTC"))
-        )
+        timeline_with_end_date = baker.make_recipe('utils.operation_designated_operator_timeline')
         result_not_found = OperationDesignatedOperatorTimelineService.get_current_timeline(
             timeline_with_end_date.operator_id, timeline_with_end_date.operation_id
         )

bc_obps/service/tests/test_operation_service_v2.py

@@ -1,4 +1,6 @@
 from datetime import datetime, timedelta
+from unittest.mock import patch, MagicMock
+from uuid import uuid4
 from zoneinfo import ZoneInfo
 
 from registration.models.contact import Contact
@@ -883,3 +885,27 @@ def test_removes_operation_representative():
         assert operation.updated_by == approved_user_operator.user
         # confirm the contact was only removed from the operation, not removed from the db
         assert Contact.objects.filter(id=2).exists()
+
+
+class TestUpdateOperationsOperator:
+    @staticmethod
+    @patch("service.data_access_service.user_service.UserDataAccessService.get_by_guid")
+    def test_unauthorized_user_cannot_update_operations_operator(mock_get_by_guid):
+        cas_admin = baker.make_recipe('utils.cas_admin')
+        mock_get_by_guid.return_value = cas_admin
+        operation = MagicMock()
+        operator_id = uuid4()
+        with pytest.raises(Exception, match="Unauthorized."):
+            OperationServiceV2.update_operator(cas_admin.user_guid, operation, operator_id)
+
+    @staticmethod
+    @patch("service.data_access_service.user_service.UserDataAccessService.get_by_guid")
+    @patch("registration.models.Operation.set_create_or_update")
+    def test_update_operations_operator_success(mock_get_by_guid, mock_set_create_or_update):
+        cas_analyst = baker.make_recipe('utils.cas_analyst')
+        mock_get_by_guid.return_value = cas_analyst
+        operation = baker.make_recipe('utils.operation')
+        operator = baker.make_recipe('utils.operator')
+        OperationServiceV2.update_operator(cas_analyst.user_guid, operation, operator.id)
+        mock_set_create_or_update.assert_called_once()
+        assert operation.operator == operator

bc_obps/service/tests/test_transfer_event_service.py

@@ -28,19 +28,6 @@ def test_list_transfer_events():
 
     @staticmethod
     def test_validate_no_overlapping_transfer_events():
-        operation = baker.make_recipe('utils.operation')
-        baker.make_recipe(
-            'utils.transfer_event',
-            operation=operation,
-            status=TransferEvent.Statuses.TO_BE_TRANSFERRED,
-        )
-        facilities = baker.make_recipe('utils.facility', _quantity=2)
-        baker.make_recipe(
-            'utils.transfer_event',
-            facilities=facilities,
-            status=TransferEvent.Statuses.COMPLETE,
-        )
-
         # Scenario 1: No overlapping operation or facility
         new_operation = baker.make_recipe('utils.operation')
         new_facilities = baker.make_recipe('utils.facility', _quantity=2)
@@ -52,10 +39,22 @@ def test_validate_no_overlapping_transfer_events():
             pytest.fail(f"Unexpected exception raised: {e}")
 
         # Scenario 2: Overlapping operation
+        operation = baker.make_recipe('utils.operation')
+        baker.make_recipe(
+            'utils.transfer_event',
+            operation=operation,
+            status=TransferEvent.Statuses.TO_BE_TRANSFERRED,
+        )
         with pytest.raises(Exception, match="An active transfer event already exists for the selected operation."):
             TransferEventService.validate_no_overlapping_transfer_events(operation_id=operation.id)
 
         # Scenario 3: Overlapping facilities
+        facilities = baker.make_recipe('utils.facility', _quantity=2)
+        baker.make_recipe(
+            'utils.transfer_event',
+            facilities=facilities,
+            status=TransferEvent.Statuses.COMPLETE,
+        )
         with pytest.raises(
             Exception,
             match="One or more facilities in this transfer event are already part of an active transfer event.",
@@ -106,6 +105,26 @@ def test_create_transfer_event_operation_missing_operation(cls, mock_get_by_guid
         with pytest.raises(Exception, match="Operation is required for operation transfer events."):
             TransferEventService.create_transfer_event(cas_analyst.user_guid, payload)
 
+    @classmethod
+    @patch("service.transfer_event_service.TransferEventService.validate_no_overlapping_transfer_events")
+    @patch("service.data_access_service.user_service.UserDataAccessService.get_by_guid")
+    def test_create_transfer_event_operation_using_the_same_operator(cls, mock_get_by_guid, mock_validate_no_overlap):
+        cas_analyst = baker.make_recipe("utils.cas_analyst")
+        payload_with_same_from_operator_and_to_operator = cls._get_transfer_event_payload_for_operation()
+        payload_with_same_from_operator_and_to_operator.to_operator = (
+            payload_with_same_from_operator_and_to_operator.from_operator
+        )
+
+        mock_user = MagicMock()
+        mock_user.is_cas_analyst.return_value = True
+        mock_get_by_guid.return_value = cas_analyst
+        mock_validate_no_overlap.return_value = None
+
+        with pytest.raises(Exception, match="Operations cannot be transferred within the same operator."):
+            TransferEventService.create_transfer_event(
+                cas_analyst.user_guid, payload_with_same_from_operator_and_to_operator
+            )
+
     @classmethod
     @patch("service.transfer_event_service.TransferEventService.validate_no_overlapping_transfer_events")
     @patch("service.data_access_service.user_service.UserDataAccessService.get_by_guid")
@@ -188,6 +207,22 @@ def test_create_transfer_event_facility_missing_required_fields(cls, mock_get_by
         ):
             TransferEventService.create_transfer_event(cas_analyst.user_guid, payload_without_to_operation)
 
+    @classmethod
+    @patch("service.transfer_event_service.TransferEventService.validate_no_overlapping_transfer_events")
+    @patch("service.data_access_service.user_service.UserDataAccessService.get_by_guid")
+    def test_create_transfer_event_facility_between_the_same_operation(cls, mock_get_by_guid, mock_validate_no_overlap):
+        cas_analyst = baker.make_recipe("utils.cas_analyst")
+        payload_with_same_from_and_to_operation = cls._get_transfer_event_payload_for_facility()
+        payload_with_same_from_and_to_operation.to_operation = payload_with_same_from_and_to_operation.from_operation
+
+        mock_user = MagicMock()
+        mock_user.is_cas_analyst.return_value = True
+        mock_get_by_guid.return_value = cas_analyst
+        mock_validate_no_overlap.return_value = None
+
+        with pytest.raises(Exception, match="Facilities cannot be transferred within the same operation."):
+            TransferEventService.create_transfer_event(cas_analyst.user_guid, payload_with_same_from_and_to_operation)
+
     @classmethod
     @patch("service.transfer_event_service.TransferEventService.validate_no_overlapping_transfer_events")
     @patch("service.data_access_service.user_service.UserDataAccessService.get_by_guid")
@@ -448,8 +483,10 @@ def test_process_facilities_transfer(
     @patch(
         "service.transfer_event_service.OperationDesignatedOperatorTimelineDataAccessService.create_operation_designated_operator_timeline"
     )
+    @patch("service.operation_service_v2.OperationServiceV2.update_operator")
     def test_process_operation_transfer(
         self,
+        mock_update_operator,
         mock_create_timeline,
         mock_set_timeline,
         mock_get_current_timeline,
@@ -483,6 +520,7 @@ def test_process_operation_transfer(
         mock_get_current_timeline.return_value = None
         mock_set_timeline.reset_mock()  # Reset mock for the next call
         mock_create_timeline.reset_mock()  # Reset mock for the next call
+        mock_update_operator.reset_mock()  # Reset mock for the next call
 
         # Call the method under test for the second scenario (no existing timeline)
         TransferEventService._process_operation_transfer(transfer_event, user_guid)
@@ -500,3 +538,8 @@ def test_process_operation_transfer(
 
         # Verify that set_timeline_status_and_end_date was not called, since the timeline did not exist
         mock_set_timeline.assert_not_called()
+        mock_update_operator.assert_called_once_with(
+            user_guid,
+            transfer_event.operation,
+            transfer_event.to_operator.id,
+        )

bc_obps/service/transfer_event_service.py

@@ -20,6 +20,7 @@
 from service.data_access_service.user_service import UserDataAccessService
 from service.facility_designated_operation_timeline_service import FacilityDesignatedOperationTimelineService
 from service.operation_designated_operator_timeline_service import OperationDesignatedOperatorTimelineService
+from service.operation_service_v2 import OperationServiceV2
 
 logger = logging.getLogger(__name__)
 
@@ -107,6 +108,10 @@ def create_transfer_event(cls, user_guid: UUID, payload: TransferEventCreateIn)
             if not payload.operation:
                 raise Exception("Operation is required for operation transfer events.")
 
+            # make sure that the from_operator and to_operator are different(we can't transfer operations within the same operator)
+            if payload.from_operator == payload.to_operator:
+                raise Exception("Operations cannot be transferred within the same operator.")
+
             prepared_payload.update(
                 {
                     "operation_id": payload.operation,
@@ -120,6 +125,10 @@ def create_transfer_event(cls, user_guid: UUID, payload: TransferEventCreateIn)
                     "Facilities, from_operation, and to_operation are required for facility transfer events."
                 )
 
+            # make sure that the from_operation and to_operation are different(we can't transfer facilities within the same operation)
+            if payload.from_operation == payload.to_operation:
+                raise Exception("Facilities cannot be transferred within the same operation.")
+
             prepared_payload.update(
                 {
                     "from_operation_id": payload.from_operation,
@@ -248,3 +257,6 @@ def _process_operation_transfer(cls, event: TransferEvent, user_guid: UUID) -> N
                 "status": OperationDesignatedOperatorTimeline.Statuses.ACTIVE,
             },
         )
+
+        # update the operation's operator
+        OperationServiceV2.update_operator(user_guid, event.operation, event.to_operator.id)  # type: ignore # we are sure that operation is not None