[DOP-19793] Add test & fix validator

Author: Ilyas Gasanov

docker-compose.test.yml

@@ -91,7 +91,7 @@ services:
         condition: service_healthy
       rabbitmq:
         condition: service_healthy
-    profiles: [worker, s3, oracle, hdfs, hive, all]
+    profiles: [worker, scheduler, s3, oracle, hdfs, hive, all]
 
   test-postgres:
     image: postgres

syncmaster/db/models/group.py

@@ -77,7 +77,7 @@ class Group(Base, TimestampMixin, DeletableMixin):
 
     owner: Mapped[User] = relationship(User)
     members: Mapped[list[User]] = relationship(User, secondary="user_group")
-    queue: Mapped[Queue] = relationship(back_populates="group")
+    queue: Mapped[Queue] = relationship(back_populates="group", cascade="all, delete-orphan")
 
     search_vector: Mapped[str] = mapped_column(
         TSVECTOR,

syncmaster/schemas/v1/queue.py

@@ -1,7 +1,6 @@
 # SPDX-FileCopyrightText: 2023-2024 MTS PJSC
 # SPDX-License-Identifier: Apache-2.0
-from pydantic import BaseModel, Field, constr, model_validator
-from pydantic.json_schema import SkipJsonSchema
+from pydantic import BaseModel, Field, computed_field, constr
 
 from syncmaster.schemas.v1.page import PageSchema
 
@@ -13,14 +12,11 @@ class CreateQueueSchema(BaseModel):
     )
     group_id: int = Field(..., description="Queue owner group id")
     description: str = Field(default="", description="Additional description")
-    slug: SkipJsonSchema[str] = Field(description="Generated slug for unique queue identification")
-
-    @model_validator(mode="before")
-    def generate_slug(cls, values):
-        if "group_id" not in values or "name" not in values:
-            raise ValueError("Fields name and group_id are required")
-        values["slug"] = f"{values["group_id"]}-{values["name"]}"
-        return values
+
+    @computed_field
+    @property
+    def slug(self) -> str:
+        return f"{self.group_id}-{self.name}"
 
 
 class ReadQueueSchema(BaseModel):

tests/test_unit/conftest.py

@@ -170,7 +170,7 @@ async def user_with_many_roles(session: AsyncSession, settings: Settings, simple
 
 
 @pytest_asyncio.fixture
-async def empty_group(session: AsyncSession, settings) -> MockGroup:
+async def empty_group(session: AsyncSession, settings) -> AsyncGenerator[MockGroup, None]:
     owner = await create_user(
         session=session,
         username="empty_group_owner",
@@ -196,7 +196,7 @@ async def empty_group(session: AsyncSession, settings) -> MockGroup:
 
 
 @pytest_asyncio.fixture
-async def group(session: AsyncSession, settings: Settings) -> MockGroup:
+async def group(session: AsyncSession, settings: Settings) -> AsyncGenerator[MockGroup, None]:
     owner = await create_user(
         session=session,
         username="notempty_group_owner",
@@ -240,7 +240,7 @@ async def group(session: AsyncSession, settings: Settings) -> MockGroup:
 async def mock_group(
     session: AsyncSession,
     settings: Settings,
-):
+) -> AsyncGenerator[MockGroup, None]:
     group_owner = await create_user(
         session=session,
         username=f"{secrets.token_hex(5)}_group_connection_owner",

tests/test_unit/test_queue/test_create_queue.py

@@ -399,3 +399,45 @@ async def test_maintainer_plus_can_not_create_queue_with_duplicate_name_error(
             "details": None,
         },
     }
+
+
+async def test_maintainer_plus_can_create_queues_with_the_same_name_but_diff_groups(
+    client: AsyncClient,
+    session: AsyncSession,
+    role_maintainer_plus: UserTestRoles,
+    mock_group: MockGroup,
+    group: MockGroup,
+):
+    # Arrange
+    mock_group_user = mock_group.get_member_of_role(role_maintainer_plus)
+    group_user = group.get_member_of_role(role_maintainer_plus)
+
+    # Act
+    await client.post(
+        "v1/queues",
+        headers={"Authorization": f"Bearer {mock_group_user.token}"},
+        json={
+            "name": "New_queue",
+            "description": "Some interesting description",
+            "group_id": mock_group.group.id,
+        },
+    )
+    result = await client.post(
+        "v1/queues",
+        headers={"Authorization": f"Bearer {group_user.token}"},
+        json={
+            "name": "New_queue",
+            "description": "Some interesting description",
+            "group_id": group.group.id,
+        },
+    )
+
+    # Assert
+    assert result.status_code == 200
+    assert result.json() == {
+        "id": result.json()["id"],
+        "name": "New_queue",
+        "description": "Some interesting description",
+        "group_id": group.group.id,
+        "slug": f"{group.group.id}-New_queue",
+    }