Реализовано API для колонок с перемещением, добавлен WS consumer

Toksi86 · Toksi86 · commit 2afa7f696d61 · 2025-11-25T14:27:07.000+05:00
diff --git a/kanban/consumers.py b/kanban/consumers.py
@@ -0,0 +1,35 @@
+from channels.generic.websocket import AsyncJsonWebsocketConsumer
+
+
+class KanbanConsumer(AsyncJsonWebsocketConsumer):
+    async def connect(self):
+        user = self.scope.get("user")
+        if not user or user.is_anonymous:
+            return await self.close(403)
+
+        # Подписываем на все проекты, где пользователь лидер или коллаборатор
+        project_ids = set()
+        project_ids.update(user.leaders_projects.values_list("id", flat=True))
+        collaborator_projects = user.collaborations.values_list("project_id", flat=True)
+        project_ids.update(collaborator_projects)
+
+        for project_id in project_ids:
+            await self.channel_layer.group_add(f"kanban_{project_id}", self.channel_name)
+
+        await self.accept(subprotocol=self.scope.get("subprotocols", [None])[0])
+
+    async def disconnect(self, close_code):
+        user = self.scope.get("user")
+        if not user or user.is_anonymous:
+            return
+        project_ids = set()
+        project_ids.update(user.leaders_projects.values_list("id", flat=True))
+        project_ids.update(user.collaborations.values_list("project_id", flat=True))
+        for project_id in project_ids:
+            await self.channel_layer.group_discard(
+                f"kanban_{project_id}", self.channel_name
+            )
+
+    async def kanban_event(self, event):
+        payload = event.get("payload", {})
+        await self.send_json(payload)
diff --git a/kanban/routing.py b/kanban/routing.py
@@ -0,0 +1,7 @@
+from django.urls import path
+
+from kanban.consumers import KanbanConsumer
+
+websocket_urlpatterns = [
+    path("ws/kanban/", KanbanConsumer.as_asgi()),
+]
diff --git a/kanban/serializers.py b/kanban/serializers.py
@@ -48,37 +48,30 @@ def create(self, validated_data):
 
 
 class BoardColumnSerializer(serializers.ModelSerializer):
-    board = serializers.PrimaryKeyRelatedField(queryset=Board.objects.all())
+    board = serializers.PrimaryKeyRelatedField(
+        queryset=Board.objects.all(), write_only=True
+    )
+    board_id = serializers.IntegerField(source="board.id", read_only=True)
     tasks_count = serializers.IntegerField(read_only=True)
+    order = serializers.IntegerField(read_only=True)
 
     class Meta:
         model = BoardColumn
         fields = (
             "id",
             "board",
+            "board_id",
             "name",
             "order",
             "tasks_count",
             "created_at",
             "updated_at",
         )
-        read_only_fields = ("id", "tasks_count", "created_at", "updated_at")
-
-    def validate_board(self, board: Board):
-        request = self.context.get("request")
-        user = getattr(request, "user", None)
-        if not user or not user.is_authenticated:
-            raise serializers.ValidationError("Требуется аутентификация")
-
-        if board.project.leader_id == user.id:
-            return board
-
-        is_member = Collaborator.objects.filter(
-            project_id=board.project_id,
-            user_id=user.id,
-        ).exists()
-        if not is_member:
-            raise serializers.ValidationError(
-                "Пользователь не является участником проекта"
-            )
-        return board
+        read_only_fields = (
+            "id",
+            "tasks_count",
+            "order",
+            "created_at",
+            "updated_at",
+            "board_id",
+        )
diff --git a/kanban/tests/test_column_api.py b/kanban/tests/test_column_api.py
@@ -19,15 +19,16 @@ def test_list_columns_returns_board_columns(self):
         response = self.client.get(self.url)
         self.assertEqual(response.status_code, status.HTTP_200_OK)
         self.assertGreaterEqual(len(response.data), 1)
-        self.assertEqual(response.data[0]["board"], self.board.id)
+        self.assertEqual(response.data[0]["board_id"], self.board.id)
 
     def test_create_column(self):
-        payload = {"board": self.board.id, "name": "In Progress", "order": 5}
+        payload = {"board": self.board.id, "name": "In Progress"}
         response = self.client.post(self.url, payload, format="json")
         self.assertEqual(response.status_code, status.HTTP_201_CREATED)
         column_id = response.data["id"]
         column = BoardColumn.objects.get(id=column_id)
         self.assertEqual(column.name, "In Progress")
+        self.assertEqual(column.order, self.board.columns.count())
 
     def test_cannot_create_column_in_foreign_project(self):
         foreign_leader = CustomUser.objects.create(
@@ -41,7 +42,7 @@ def test_cannot_create_column_in_foreign_project(self):
         foreign_board = Board.objects.create(
             project=foreign_project, name="Foreign Board"
         )
-        payload = {"board": foreign_board.id, "name": "Forbidden", "order": 1}
+        payload = {"board": foreign_board.id, "name": "Forbidden"}
         response = self.client.post(self.url, payload, format="json")
         self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
 
diff --git a/kanban/views.py b/kanban/views.py
@@ -1,8 +1,10 @@
-from django.db.models import Q
+from django.db.models import Q, Max
+from drf_yasg import openapi
 from drf_yasg.utils import swagger_auto_schema
-from rest_framework import permissions, viewsets
+from rest_framework import permissions, status, viewsets
+from rest_framework.decorators import action
+from rest_framework.exceptions import ValidationError
 from rest_framework.response import Response
-from rest_framework import status
 
 from kanban.models import Board, BoardColumn
 from kanban.serializers import BoardSerializer, BoardColumnSerializer
@@ -15,6 +17,8 @@ class BoardViewSet(viewsets.ModelViewSet):
 
     def get_queryset(self):
         user = self.request.user
+        if not user.is_authenticated:
+            return Board.objects.none()
         collaborator_projects = Collaborator.objects.filter(user=user).values(
             "project_id"
         )
@@ -55,13 +59,23 @@ def update(self, request, *args, **kwargs):
     def destroy(self, request, *args, **kwargs):
         return super().destroy(request, *args, **kwargs)
 
+    @swagger_auto_schema(tags=["Kanban Boards"])
+    @action(detail=True, methods=["get"], url_path="columns")
+    def columns(self, request, pk=None):
+        board = self.get_object()
+        columns = board.columns.order_by("order", "id")
+        serializer = BoardColumnSerializer(columns, many=True)
+        return Response(serializer.data)
+
 
 class BoardColumnViewSet(viewsets.ModelViewSet):
     serializer_class = BoardColumnSerializer
     permission_classes = [permissions.IsAuthenticated]
 
     def get_queryset(self):
         user = self.request.user
+        if not user.is_authenticated:
+            return BoardColumn.objects.none()
         collaborator_projects = Collaborator.objects.filter(user=user).values(
             "project_id"
         )
@@ -104,3 +118,92 @@ def destroy(self, request, *args, **kwargs):
             if isinstance(exc, ValidationError):
                 return Response(exc.messages, status=status.HTTP_400_BAD_REQUEST)
             raise
+
+    def perform_create(self, serializer):
+        board = serializer.validated_data.get("board")
+        if not board:
+            raise ValidationError("Укажите board")
+
+        user = self.request.user
+        collaborator_projects = set(
+            Collaborator.objects.filter(user=user).values_list("project_id", flat=True)
+        )
+        if not (
+            board.project.leader_id == user.id
+            or board.project_id in collaborator_projects
+        ):
+            raise ValidationError("Пользователь не является участником проекта")
+
+        next_order = (
+            BoardColumn.objects.filter(board=board).aggregate(Max("order"))["order__max"]
+            or 0
+        )
+        serializer.save(board=board, order=next_order + 1)
+
+    @swagger_auto_schema(
+        methods=["post"],
+        tags=["Kanban Columns"],
+        operation_summary="Переместить колонку",
+        operation_description="Изменяет порядок колонки внутри доски.",
+        request_body=openapi.Schema(
+            type=openapi.TYPE_OBJECT,
+            properties={"new_order": openapi.Schema(type=openapi.TYPE_INTEGER)},
+            required=["new_order"],
+        ),
+    )
+    @action(detail=True, methods=["post"], url_path="move")
+    def move(self, request, pk=None):
+        from django.db import transaction
+        from channels.layers import get_channel_layer
+        from asgiref.sync import async_to_sync
+        from kanban.models import BoardColumn
+
+        try:
+            new_order = int(request.data.get("new_order"))
+        except (TypeError, ValueError):
+            return Response(
+                {"detail": "new_order должен быть числом"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+
+        column = (
+            BoardColumn.objects.select_related("board", "board__project")
+            .select_for_update()
+            .get(pk=pk)
+        )
+
+        with transaction.atomic():
+            columns = list(
+                BoardColumn.objects.filter(board=column.board)
+                .select_for_update()
+                .order_by("order", "id")
+            )
+            columns = [c for c in columns if c.id != column.id]
+            insert_index = max(0, min(new_order - 1, len(columns)))
+            columns.insert(insert_index, column)
+
+            # Шаг 1: временно сдвигаем порядки, чтобы не ловить UNIQUE при массовом обновлении
+            for idx, col in enumerate(columns, start=1):
+                col.order = idx + 1000
+            BoardColumn.objects.bulk_update(columns, ["order"])
+
+            # Шаг 2: выставляем финальные порядки
+            for idx, col in enumerate(columns, start=1):
+                col.order = idx
+
+            BoardColumn.objects.bulk_update(columns, ["order"])
+
+        channel_layer = get_channel_layer()
+        payload = {
+            "action": "column.reordered",
+            "board_id": column.board_id,
+            "project_id": column.board.project_id,
+            "columns": [{"id": c.id, "order": c.order, "name": c.name} for c in columns],
+        }
+        async_to_sync(channel_layer.group_send)(
+            f"kanban_{column.board.project_id}",
+            {"type": "kanban.event", "payload": payload},
+        )
+
+        serializer = self.get_serializer(columns, many=True)
+        return Response(serializer.data, status=status.HTTP_200_OK)
diff --git a/procollab/websocket_routing.py b/procollab/websocket_routing.py
@@ -1,4 +1,6 @@
 from chats.routing import websocket_urlpatterns as chat_websocket_urlpatterns
+from kanban.routing import websocket_urlpatterns as kanban_websocket_urlpatterns
 
 websocket_urlpatterns = []
 websocket_urlpatterns += chat_websocket_urlpatterns
+websocket_urlpatterns += kanban_websocket_urlpatterns
