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

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

@@ -81,17 +81,21 @@ 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
+            ):
+                raise ValidationError("Use set_next endpoint to assign a token.")
 
         return super().validate_data(instance, model_obj)
 
@@ -100,18 +104,29 @@ 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"
+            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 (
+                        obj.status == TokenStatusOptions.IN_PROGRESS.value
+                        and instance.status != TokenStatusOptions.IN_PROGRESS.value
                     )
-                # 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"])
+                )
+            ):
+                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):
@@ -181,6 +196,8 @@ def get_queryset(self):
     @action(detail=True, methods=["POST"])
     def set_next(self, request, *args, **kwargs):
         obj = self.get_object()
+        if obj.status != TokenStatusOptions.CREATED.value:
+            raise ValidationError("Token in serving state cannot be set next")
         request_obj = SetCurrentTokenRequest(**request.data)
         queue = obj.queue
         self.authorize_update(None, obj)
@@ -193,5 +210,6 @@ def set_next(self, request, *args, **kwargs):
             sub_queue.current_token = obj
             sub_queue.save()
             obj.status = TokenStatusOptions.IN_PROGRESS.value
+            obj.sub_queue = sub_queue
             obj.save()
         return Response(self.get_retrieve_pydantic_model().serialize(obj).to_json())

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

@@ -228,13 +228,14 @@ def set_next_token_to_subqueue(self, request, *args, **kwargs):
             )
         with Lock(f"queue:next_token:{obj.id}"), transaction.atomic():
             tokens_qs = Token.objects.filter(
-                queue=obj, status__in=[TokenStatusOptions.CREATED.value]
+                queue=obj,
+                status__in=[TokenStatusOptions.CREATED.value],
+                sub_queue__isnull=True,
             ).order_by("created_date")
             if category:
                 tokens_qs = tokens_qs.filter(category=category)
-            if tokens_qs.exists():
-                next_token = tokens_qs.first()
-            else:
+            next_token = tokens_qs.first()
+            if not next_token:
                 raise ValidationError("No tokens found")
             sub_queue.current_token = next_token
             sub_queue.save()

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

@@ -1,22 +1,26 @@
 from django.db import transaction
 from django_filters import CharFilter, FilterSet
 from django_filters.rest_framework import DjangoFilterBackend
+from rest_framework.decorators import action
 from rest_framework.exceptions import PermissionDenied, ValidationError
+from rest_framework.response import Response
 
 from care.emr.api.viewsets.base import EMRModelViewSet
 from care.emr.api.viewsets.scheduling.schedule import (
     get_or_create_resource,
     get_schedulable_resource,
     validate_resource,
 )
-from care.emr.models.scheduling.token import TokenSubQueue
+from care.emr.models.scheduling.token import Token, TokenSubQueue
+from care.emr.resources.scheduling.token.spec import TokenReadSpec, TokenStatusOptions
 from care.emr.resources.scheduling.token_sub_queue.spec import (
     TokenSubQueueBaseSpec,
     TokenSubQueueCreateSpec,
     TokenSubQueueReadSpec,
 )
 from care.facility.models import Facility
 from care.security.authorization.base import AuthorizationController
+from care.utils.lock import Lock
 from care.utils.shortcuts import get_object_or_404
 
 
@@ -124,3 +128,22 @@ def get_queryset(self):
             self.can_read_resource_token(resource)
             queryset = queryset.filter(resource=resource)
         return queryset
+
+    @action(detail=True, methods=["POST"])
+    def set_next_token(self, request, *args, **kwargs):
+        obj = self.get_object()
+        self.authorize_update(None, obj)
+
+        with Lock(f"sub_queue:next_token:{obj.id}"), transaction.atomic():
+            tokens_qs = Token.objects.filter(
+                sub_queue=obj, status__in=[TokenStatusOptions.CREATED.value]
+            ).order_by("created_date")
+            next_token = tokens_qs.first()
+            if not next_token:
+                raise ValidationError("No tokens found")
+            obj.current_token = next_token
+            obj.save()
+            next_token.status = TokenStatusOptions.IN_PROGRESS.value
+            next_token.sub_queue = obj
+            next_token.save()
+        return Response(TokenReadSpec.serialize(next_token).to_json())

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."""
@@ -342,7 +342,7 @@ def test_update_token_as_user_without_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,
         }