[DOP-25451] Use PUT /v1/groups/:id instead of PATCH

Author: dolfinus

docs/changelog/0.2.2.rst

@@ -4,6 +4,7 @@
 Breaking
 --------
 
+- Use ``PUT /v1/qroups/:id`` instead of ``PATCH /v1/qroups/:id``.
 - Use ``PUT /v1/queues/:id`` instead of ``PATCH /v1/queues/:id``.
 - Minimal queue name is 3 symbols instead of 1.
 

syncmaster/db/repositories/group.py

@@ -15,7 +15,6 @@
 from syncmaster.exceptions.group import (
     AlreadyIsGroupMemberError,
     AlreadyIsNotGroupMemberError,
-    GroupAdminNotFoundError,
     GroupAlreadyExistsError,
     GroupNotFoundError,
 )
@@ -364,7 +363,7 @@ def _raise_error(self, err: DBAPIError) -> NoReturn:  # noqa: WPS238
         constraint = err.__cause__.__cause__.constraint_name
 
         if constraint == "fk__group__owner_id__user":
-            raise GroupAdminNotFoundError from err
+            raise UserNotFoundError from err
 
         if constraint == "uq__group__name":
             raise GroupAlreadyExistsError from err

syncmaster/exceptions/group.py

@@ -7,10 +7,6 @@ class GroupNameAlreadyExistsError(SyncmasterError):
     pass
 
 
-class GroupAdminNotFoundError(SyncmasterError):
-    pass
-
-
 class GroupAlreadyExistsError(SyncmasterError):
     pass
 

syncmaster/schemas/v1/__init__.py

@@ -55,7 +55,6 @@
     FullUserSchema,
     ReadGroupMember,
     ReadUserSchema,
-    UpdateUserSchema,
     UserPageSchema,
     UserPageSchemaAsGroupMember,
 )
@@ -100,7 +99,6 @@
     "JSONLine",
     "Parquet",
     "ReadUserSchema",
-    "UpdateUserSchema",
     "FullUserSchema",
     "ReadGroupMember",
     "UserPageSchema",

syncmaster/schemas/v1/users.py

@@ -1,16 +1,12 @@
 # SPDX-FileCopyrightText: 2023-2024 MTS PJSC
 # SPDX-License-Identifier: Apache-2.0
-from pydantic import BaseModel, ConfigDict, constr
+from pydantic import BaseModel, ConfigDict
 
 from syncmaster.db.models import GroupMemberRole
 from syncmaster.db.utils import Pagination
 from syncmaster.schemas.v1.page import MetaPageSchema, PageSchema
 
 
-class UpdateUserSchema(BaseModel):
-    username: constr(pattern=r"^[_a-z0-9]+$")  # noqa: F722
-
-
 class ReadGroupMember(BaseModel):
     id: int
     username: str

syncmaster/server/api/v1/groups.py

@@ -92,7 +92,7 @@ async def read_group(
     )
 
 
-@router.patch("/groups/{group_id}")
+@router.put("/groups/{group_id}")
 async def update_group(  # noqa: WPS217
     group_id: int,
     group_data: UpdateGroupSchema,

syncmaster/server/handler.py

@@ -25,7 +25,6 @@
     AlreadyIsGroupMemberError,
     AlreadyIsGroupOwnerError,
     AlreadyIsNotGroupMemberError,
-    GroupAdminNotFoundError,
     GroupAlreadyExistsError,
     GroupNotFoundError,
 )
@@ -165,13 +164,6 @@ async def syncmsater_exception_handler(request: Request, exc: SyncmasterError):
             content=content,
         )
 
-    if isinstance(exc, GroupAdminNotFoundError):
-        content.code = "not_found"
-        content.message = "Admin not found"
-        return exception_json_response(
-            status=status.HTTP_404_NOT_FOUND,
-            content=content,
-        )
     if isinstance(exc, GroupAlreadyExistsError):
         content.code = "conflict"
         content.message = "Group name already taken"

tests/test_unit/test_groups/test_create_group.py

@@ -30,12 +30,18 @@ async def test_simple_user_can_create_group(
     assert result.status_code == 200, result.json()
 
     group = (await session.scalars(select(Group).where(Group.name == group_name))).one()
-    assert result.json() == {
-        "id": group.id,
-        "name": group_name,
-        "description": "description of new test group",
-        "owner_id": simple_user.user.id,
-    }
+    assert (
+        result.json()
+        == {
+            "id": group.id,
+            "owner_id": simple_user.user.id,
+        }
+        | group_data
+    )
+
+    assert group.name == group_data["name"]
+    assert group.description == group_data["description"]
+    assert group.owner_id == simple_user.user.id
 
 
 async def test_simple_user_cannot_create_group_twice(