Move errata record creation to dramatiq task

Author: Kwaizer

alws/dramatiq/__init__.py

@@ -35,6 +35,7 @@
     bulk_errata_release,
     bulk_new_errata_release,
     create_new_errata,
+    create_errata,
     release_errata,
     release_new_errata,
     reset_records_threshold,

alws/dramatiq/errata.py

@@ -7,6 +7,7 @@
     bulk_errata_records_release,
     bulk_new_errata_records_release,
     create_new_errata_record,
+    create_errata_record,
     release_errata_record,
     release_new_errata_record,
     reset_matched_erratas_packages_threshold,
@@ -21,6 +22,10 @@ async def _create_new_errata(errata):
      await create_new_errata_record(errata)
 
 
+async def _create_errata(errata):
+    await create_errata_record(errata)
+
+
 async def _release_new_errata_record(
     record_id: str, platform_id: int, force: bool
 ):
@@ -68,6 +73,19 @@ def create_new_errata(errata):
     )
 
 
+@dramatiq.actor(
+    max_retries=0,
+    priority=0,
+    queue_name="errata",
+    time_limit=DRAMATIQ_TASK_TIMEOUT,
+)
+def create_errata(errata):
+    event_loop.run_until_complete(setup_all())
+    event_loop.run_until_complete(
+        _create_errata(errata)
+    )
+
+
 @dramatiq.actor(
     max_retries=0,
     priority=0,

alws/routers/errata.py

@@ -17,6 +17,7 @@
     bulk_errata_release,
     bulk_new_errata_release,
     create_new_errata,
+    create_errata,
     release_errata,
     release_new_errata,
     reset_records_threshold,
@@ -39,22 +40,35 @@
 async def create_new_errata_record(
     errata: errata_schema.BaseErrataRecord
 ):
-    create_new_errata.send(errata)
+    try:
+        errata_data = errata.model_dump()
+
+        # Convert date fields to strings
+        errata_data["issued_date"] = errata_data["issued_date"].isoformat()
+        errata_data["updated_date"] = errata_data["updated_date"].isoformat()
 
-    message = f"Record {errata.id} is scheduled for creation"
-    return {"ok": message}
+        create_new_errata.send(errata_data)
+
+        return {"ok": True}
+    except ValueError as e:
+        return {"ok": False, "error": str(e)}
 
 
 @router.post("/", response_model=errata_schema.CreateErrataResponse)
 async def create_errata_record(
-    errata: errata_schema.BaseErrataRecord,
-    db: AsyncSession = Depends(AsyncSessionDependency(key=get_async_db_key())),
+    errata: errata_schema.BaseErrataRecord
 ):
-    record = await errata_crud.create_errata_record(
-        db,
-        errata,
-    )
-    return {"ok": bool(record)}
+    try:
+        errata_data = errata.model_dump()
+
+        errata_data["issued_date"] = errata_data["issued_date"].isoformat()
+        errata_data["updated_date"] = errata_data["updated_date"].isoformat()
+
+        create_errata.send(errata_data)
+
+        return {"ok": True}
+    except ValueError as e:
+        return {"ok": False, "error": str(e)}
 
 
 @public_router.get("/", response_model=errata_schema.ErrataRecord)

alws/schemas/errata_schema.py

@@ -132,6 +132,7 @@ class CompactErrataRecord(BaseModel):
 
 class CreateErrataResponse(BaseModel):
     ok: bool
+    error: Optional[str] = None
 
 
 class ChangeErrataPackageStatusResponse(BaseModel):

tests/fixtures/errata.py

@@ -4,7 +4,8 @@
 import pytest
 from sqlalchemy.ext.asyncio import AsyncSession
 
-from alws.crud.errata import create_errata_record
+from alws.crud.errata import create_errata_record, create_new_errata_record
+from alws.dramatiq.errata import create_new_errata
 from alws.schemas.errata_schema import BaseErrataRecord
 
 
@@ -107,15 +108,26 @@ async def create_errata(
     async_session: AsyncSession,
     errata_create_payload: typing.Dict[str, typing.Any],
 ):
-    await create_errata_record(
-        async_session,
-        BaseErrataRecord(**errata_create_payload),
-    )
+    await create_errata_record(errata_create_payload)
     await async_session.commit()
     yield
     await async_session.rollback()
 
 
+@pytest.fixture
+async def create_errata_dramatiq(
+    async_session: AsyncSession,
+    errata_create_payload: typing.Dict[str, typing.Any],
+    monkeypatch,
+):
+    async def func(*args, **kwargs):
+        await create_new_errata_record(errata_create_payload)
+
+    monkeypatch.setattr(create_new_errata, "send", func)
+    await create_new_errata.send(errata_create_payload)
+    await async_session.commit()
+    yield
+
 @pytest.fixture
 def pulp_updateinfos():
     return [

tests/test_api/test_errata.py

@@ -1,7 +1,4 @@
-from datetime import datetime
-
 import pytest
-
 from tests.mock_classes import BaseAsyncTestCase
 
 
@@ -35,7 +32,9 @@ async def test_get_updateinfo_xml(
     async def test_list_errata_all_records(
         self,
         errata_create_payload,
+        create_errata_dramatiq
     ):
+
         response = await self.make_request("get", "/api/v1/errata/all/")
         errata = response.json()
         assert (