atomic action remove object, coverage

Author: mahenzon

fastapi_jsonapi/atomic/atomic.py

@@ -132,7 +132,13 @@ async def view_atomic(
                 # response.data.id
                 results.append({"data": response.data})
             elif operation.action == "remove":
-                pass
+                assert isinstance(operation.view, DetailViewBase)
+                view: "DetailViewBase" = operation.view
+                response = await view.process_delete_object(
+                    dl=dl,
+                    obj_id=operation.data.id,
+                )
+                results.append({"data": response.data})
             else:
                 msg = f"unknown action {operation.action!r}"
                 raise ValueError(msg)

fastapi_jsonapi/views/detail_view.py

@@ -75,7 +75,13 @@ async def handle_delete_resource(
         **extra_view_deps,
     ):
         dl: "BaseDataLayer" = await self.get_data_layer(extra_view_deps)
+        return await self.process_delete_object(dl=dl, obj_id=obj_id)
 
+    async def process_delete_object(
+        self,
+        dl: "BaseDataLayer",
+        obj_id: str,
+    ):
         view_kwargs = {dl.url_id_field: obj_id}
         db_object = await dl.get_object(view_kwargs=view_kwargs, qs=self.query_params)
 

tests/conftest.py

@@ -23,6 +23,7 @@
     child_4,
     computer_1,
     computer_2,
+    computer_factory,
     p1_c1_association,
     p1_c2_association,
     p2_c1_association,

tests/fixtures/entities.py

@@ -1,4 +1,4 @@
-from typing import List
+from typing import Awaitable, Callable, List
 
 from pytest import fixture  # noqa
 from pytest_asyncio import fixture as async_fixture
@@ -171,7 +171,7 @@ def user_1_post_for_comments(user_1_posts: List[Post]) -> Post:
     return user_1_posts[0]
 
 
-@async_fixture
+@async_fixture()
 async def computer_1(async_session: AsyncSession):
     computer = Computer(name="Halo")
 
@@ -185,7 +185,7 @@ async def computer_1(async_session: AsyncSession):
     await async_session.commit()
 
 
-@async_fixture
+@async_fixture()
 async def computer_2(async_session: AsyncSession):
     computer = Computer(name="Nestor")
 
@@ -199,6 +199,18 @@ async def computer_2(async_session: AsyncSession):
     await async_session.commit()
 
 
+@async_fixture()
+async def computer_factory(async_session: AsyncSession) -> Callable[[str | None], Awaitable[Computer]]:
+    async def factory(name: str | None = None) -> Computer:
+        computer = Computer(name=name or fake.word())
+        async_session.add(computer)
+        await async_session.commit()
+        await async_session.refresh(computer)
+        return computer
+
+    return factory
+
+
 @async_fixture()
 async def user_2_comment_for_one_u1_post(async_session: AsyncSession, user_2, user_1_post_for_comments):
     post = user_1_post_for_comments

tests/test_atomic/test_delete_objects.py

@@ -0,0 +1,84 @@
+import logging
+from typing import Awaitable, Callable
+
+from httpx import AsyncClient
+from pytest import mark  # noqa
+from sqlalchemy import select
+from sqlalchemy.ext.asyncio import AsyncSession
+from sqlalchemy.sql.functions import count
+from starlette import status
+
+from tests.models import Computer
+from tests.schemas import ComputerAttributesBaseSchema
+
+pytestmark = mark.asyncio
+
+logging.basicConfig(level=logging.DEBUG)
+
+
+class TestAtomicDeleteObjects:
+    async def test_delete_two_objects(
+        self,
+        client: AsyncClient,
+        async_session: AsyncSession,
+        computer_factory: Callable[..., Awaitable[Computer]],
+    ):
+        computer_1 = await computer_factory()
+        computer_2 = await computer_factory()
+
+        computers_ids = [
+            computer_1.id,
+            computer_2.id,
+        ]
+        stmt_computers = select(count(Computer.id)).where(
+            Computer.id.in_(computers_ids),
+        )
+        computers_count = await async_session.scalar(stmt_computers)
+        assert computers_count == len(computers_ids)
+
+        data_atomic_request = {
+            "atomic:operations": [
+                {
+                    "op": "remove",
+                    "data": {
+                        "id": str(computer_1.id),
+                        "type": "computer",
+                    },
+                },
+                {
+                    "op": "remove",
+                    "data": {
+                        "id": str(computer_2.id),
+                        "type": "computer",
+                    },
+                },
+            ],
+        }
+        response = await client.post("/operations", json=data_atomic_request)
+        assert response.status_code == status.HTTP_200_OK, response.text
+        response_data = response.json()
+        assert "atomic:results" in response_data, response_data
+        results = response_data["atomic:results"]
+        assert results
+
+        computers_count = await async_session.scalar(stmt_computers)
+        assert computers_count == 0
+
+        assert results == [
+            {
+                "data": {
+                    "id": str(computer_1.id),
+                    "type": "computer",
+                    "attributes": ComputerAttributesBaseSchema.from_orm(computer_1),
+                },
+                "meta": None,
+            },
+            {
+                "data": {
+                    "id": str(computer_2.id),
+                    "type": "computer",
+                    "attributes": ComputerAttributesBaseSchema.from_orm(computer_2),
+                },
+                "meta": None,
+            },
+        ]