[ENG-401] fix: token queue should respect sub queues while calling serve next

care/emr/api/viewsets/scheduling/token.py

@@ -81,17 +81,27 @@ def perform_create(self, instance):
             super().perform_create(instance)
 
     def validate_data(self, instance, model_obj=None):
-        if (
-            model_obj
-            and instance.sub_queue
-            and model_obj.sub_queue
-            and instance.sub_queue != model_obj.sub_queue.external_id
-        ):
-            existing_current = TokenSubQueue.objects.filter(
-                current_token=model_obj
-            ).exists()
-            if existing_current:
-                raise ValidationError("Sub Queue already has a current token")
+        if model_obj and instance.sub_queue:
+            if (
+                model_obj.sub_queue
+                and instance.sub_queue != model_obj.sub_queue.external_id
+            ):
+                existing_current = TokenSubQueue.objects.filter(
+                    current_token=model_obj
+                ).exists()
+                if existing_current:
+                    raise ValidationError("Sub Queue already has a current token")
+
+            if (
+                instance.sub_queue
+                and instance.status == TokenStatusOptions.IN_PROGRESS.value
+            ):
+                new_current = get_object_or_404(
+                    TokenSubQueue,
+                    external_id=instance.sub_queue,
+                )
+                if new_current.current_token and new_current.current_token != model_obj:
+                    raise ValidationError("Sub Queue already has a current token")
 
         return super().validate_data(instance, model_obj)
 
@@ -100,18 +110,34 @@ def perform_update(self, instance):
             raise ValidationError("Sub Queue and Queue are not in the same facility")
         with transaction.atomic():
             obj = self.get_object()
-            if obj.sub_queue and obj.sub_queue != instance.sub_queue:
-                if (
-                    instance.sub_queue
-                    and obj.sub_queue.resource != instance.sub_queue.resource
-                ):
-                    raise ValidationError(
-                        "Sub Queue and Queue are not in the same resource"
-                    )
-                # Clear current token if the sub queue is changed
-                if obj.sub_queue.current_token == obj:
-                    obj.sub_queue.current_token = None
-                    obj.sub_queue.save(update_fields=["current_token", "modified_date"])
+            if (
+                instance.sub_queue
+                and obj.sub_queue != instance.sub_queue
+                and instance.status == TokenStatusOptions.IN_PROGRESS.value
+            ):
+                raise ValidationError(
+                    "Use set_next endpoint to change the sub queue of a token"
+                )
+            if (
+                obj.sub_queue
+                and obj.sub_queue != instance.sub_queue
+                and instance.sub_queue
+                and obj.sub_queue.resource != instance.sub_queue.resource
+            ):
+                raise ValidationError(
+                    "Sub Queue and Queue are not in the same resource"
+                )
+            # Clear current token if the sub queue is changed
+            if (
+                obj.sub_queue
+                and obj.sub_queue.current_token == obj
+                and (
+                    obj.sub_queue != instance.sub_queue
+                    or instance.status != TokenStatusOptions.IN_PROGRESS.value
+                )
+            ):
+                obj.sub_queue.current_token = None
+                obj.sub_queue.save(update_fields=["current_token", "modified_date"])
             super().perform_update(instance)
 
     def perform_destroy(self, instance):

care/emr/api/viewsets/scheduling/token_queue.py

@@ -232,9 +232,10 @@ def set_next_token_to_subqueue(self, request, *args, **kwargs):
             ).order_by("created_date")
             if category:
                 tokens_qs = tokens_qs.filter(category=category)
-            if tokens_qs.exists():
-                next_token = tokens_qs.first()
-            else:
+            tokens_in_waiting_qs = tokens_qs.filter(sub_queue__isnull=True)
+            tokens_in_calling_qs = tokens_qs.filter(sub_queue=sub_queue)
+            next_token = tokens_in_calling_qs.first() or tokens_in_waiting_qs.first()
+            if next_token is None:
                 raise ValidationError("No tokens found")
             sub_queue.current_token = next_token
             sub_queue.save()

care/emr/tests/test_token_api.py

@@ -275,7 +275,7 @@ def test_update_token_as_superuser(self):
             name="Sub Queue 1",
         )
         token_data = {
-            "status": TokenStatusOptions.IN_PROGRESS,
+            "status": TokenStatusOptions.CREATED,
             "note": "Token is in progress",
             "sub_queue": subqueue.external_id,
         }
@@ -289,7 +289,7 @@ def test_update_token_as_superuser(self):
             format="json",
         )
         self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.data["status"], TokenStatusOptions.IN_PROGRESS.value)
+        self.assertEqual(response.data["status"], TokenStatusOptions.CREATED.value)
 
     def test_update_token_as_user_with_permission(self):
         """Test updating a token as a user with permission."""
@@ -311,7 +311,7 @@ def test_update_token_as_user_with_permission(self):
             name="Sub Queue 1",
         )
         token_data = {
-            "status": TokenStatusOptions.IN_PROGRESS,
+            "status": TokenStatusOptions.CREATED,
             "note": "Token is in progress",
             "sub_queue": subqueue.external_id,
         }
@@ -325,7 +325,7 @@ def test_update_token_as_user_with_permission(self):
             format="json",
         )
         self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.data["status"], TokenStatusOptions.IN_PROGRESS.value)
+        self.assertEqual(response.data["status"], TokenStatusOptions.CREATED.value)
 
     def test_update_token_as_user_without_permission(self):
         """Test updating a token as a user without permission."""