fix(backend/activities): end activities when they get transferred

backend/timed/tracking/serializers.py

@@ -8,6 +8,7 @@
 from django.contrib.auth import get_user_model
 from django.db.models import BooleanField, Case, Q, When
 from django.utils.duration import duration_string
+from django.utils.timezone import datetime
 from django.utils.translation import gettext_lazy as _
 from rest_framework_json_api import relations, serializers
 from rest_framework_json_api.relations import ResourceRelatedField
@@ -68,6 +69,20 @@ def validate_running_activity():
 
         return data
 
+    def update(
+        self, instance: models.Activity, validated_data: dict
+    ) -> models.Activity:
+        """Update an activity.
+
+        Ensure that transferring an activity ends it.
+        """
+        to_time = validated_data.get("to_time", instance.to_time)
+
+        if validated_data.get("transferred", instance.transferred) and not to_time:
+            validated_data["to_time"] = datetime.now().time()
+
+        return super().update(instance, validated_data)
+
     class Meta:
         """Meta information for the activity serializer."""
 

backend/timed/tracking/tests/test_activity.py

@@ -355,3 +355,32 @@ def test_activity_set_to_time_none(internal_employee_client, activity_factory):
 
     res = internal_employee_client.patch(url, data)
     assert res.status_code == status.HTTP_400_BAD_REQUEST
+
+
+def test_activity_transfer_ends_it(internal_employee_client):
+    """Test that transferring activities ends them."""
+
+    activity = ActivityFactory.create(
+        user=internal_employee_client.user,
+        transferred=False,
+        to_time=None,
+    )
+
+    data = {
+        "data": {
+            "type": "activities",
+            "id": activity.id,
+            "attributes": {"transferred": True},
+        }
+    }
+
+    url = reverse("activity-detail", args=[activity.id])
+    response = internal_employee_client.patch(url, data)
+    assert response.status_code == status.HTTP_200_OK
+
+    json = response.json()
+
+    assert json["data"]["attributes"]["to-time"]
+
+    activity.refresh_from_db()
+    assert activity.to_time