mc_578_ds_sync

src/api/endpoints/url/get/query.py

@@ -3,7 +3,6 @@
 from sqlalchemy import select, exists, RowMapping, func
 from sqlalchemy.dialects.postgresql import aggregate_order_by
 from sqlalchemy.ext.asyncio import AsyncSession
-from sqlalchemy.orm import selectinload
 
 from src.api.endpoints.url.get.dto import GetURLsResponseInfo, GetURLsResponseErrorInfo, GetURLsResponseInnerInfo
 from src.db.client.helpers import add_standard_limit_and_offset

src/core/tasks/scheduled/impl/sync_to_ds/impl/data_sources/update/queries/cte.py

@@ -18,7 +18,7 @@ def __init__(self):
                 URL,
                 URL.id == DSAppLinkDataSource.url_id,
             )
-            .outerjoin(
+            .join(
                 URLRecordType,
                 URL.id == URLRecordType.url_id,
             )

src/core/tasks/url/manager.py

@@ -52,9 +52,7 @@ async def _run_task(self, entry: URLTaskEntry) -> None:
         while meets_prereq:
             print(f"Running {operator.task_type.value} Task")
             if count > TASK_REPEAT_THRESHOLD:
-                message = f"Task {operator.task_type.value} has been run more than {TASK_REPEAT_THRESHOLD} times in a row. Task loop terminated."
-                print(message)
-                await self.handler.post_to_discord(message=message)
+                await self._alert_task_repeat_threshold_exceeded(operator)
                 break
             run_info: TaskOperatorRunInfo = await operator.run_task()
             await self.conclude_task(run_info)
@@ -63,6 +61,11 @@ async def _run_task(self, entry: URLTaskEntry) -> None:
             count += 1
             meets_prereq = await operator.meets_task_prerequisites()
 
+    async def _alert_task_repeat_threshold_exceeded(self, operator):
+        message = f"Task {operator.task_type.value} has been run more than {TASK_REPEAT_THRESHOLD} times in a row. Task loop terminated."
+        print(message)
+        await self.handler.post_to_discord(message=message)
+
     async def trigger_task_run(self) -> None:
         await self.task_trigger.trigger_or_rerun()
 

src/db/models/impl/__init__.py

@@ -1,3 +1,4 @@
 
 from .link.location_batch.sqlalchemy import LinkLocationBatch
-from .link.batch_url.sqlalchemy import LinkBatchURL
+from .link.batch_url.sqlalchemy import LinkBatchURL
+from .anon_session.sqlalchemy import AnonymousSession

tests/manual/core/tasks/scheduled/ds_app_sync/data_sources/update/test_prereq.py

@@ -0,0 +1,13 @@
+import pytest
+
+from src.core.tasks.scheduled.impl.sync_to_ds.impl.data_sources.update.queries.prereq import \
+    DSAppSyncDataSourcesUpdatePrerequisitesQueryBuilder
+from src.db.client.async_ import AsyncDatabaseClient
+
+
+@pytest.mark.asyncio
+async def test_prereq(adb_client_test: AsyncDatabaseClient):
+    await adb_client_test.run_query_builder(
+        DSAppSyncDataSourcesUpdatePrerequisitesQueryBuilder()
+    )
+