Fixed updating job/task status after changing job state

changelog.d/20240516_144912_boris_fixed_job_status.md

@@ -0,0 +1,4 @@
+### Fixed
+
+- Job's/task's status are not updated when job's state updated to completed and stage is already acceptance
+  (<https://github.com/cvat-ai/cvat/pull/7901>)

cvat/apps/engine/serializers.py

@@ -748,19 +748,19 @@ def create(self, validated_data):
         return job
 
     def update(self, instance, validated_data):
-        state = validated_data.get('state')
-        stage = validated_data.get('stage')
-        if stage:
+        stage = validated_data.get('stage', instance.stage)
+        state = validated_data.get('state', models.StateChoice.NEW if stage != instance.stage else instance.state)
+
+        if 'stage' in validated_data or 'state' in validated_data:
             if stage == models.StageChoice.ANNOTATION:
-                status = models.StatusChoice.ANNOTATION
+                validated_data['status'] = models.StatusChoice.ANNOTATION
             elif stage == models.StageChoice.ACCEPTANCE and state == models.StateChoice.COMPLETED:
-                status = models.StatusChoice.COMPLETED
+                validated_data['status'] = models.StatusChoice.COMPLETED
             else:
-                status = models.StatusChoice.VALIDATION
+                validated_data['status'] = models.StatusChoice.VALIDATION
 
-            validated_data['status'] = status
-            if stage != instance.stage and not state:
-                validated_data['state'] = models.StateChoice.NEW
+        if state != instance.state:
+            validated_data['state'] = state
 
         assignee = validated_data.get('assignee')
         if assignee is not None: