ODS 完成

etl_billiards/tasks/tables_task.py

@@ -3,7 +3,7 @@
 
 import json
 
-from .base_task import BaseTask
+from .base_task import BaseTask, TaskContext
 from loaders.dimensions.table import TableLoader
 from models.parsers import TypeParser
 
@@ -14,49 +14,48 @@ class TablesTask(BaseTask):
     def get_task_code(self) -> str:
         return "TABLES"
 
-    def execute(self) -> dict:
-        self.logger.info("开始执行 TABLES 任务")
-        params = {"storeId": self.config.get("app.store_id")}
+    def extract(self, context: TaskContext) -> dict:
+        params = self._merge_common_params({"siteId": context.store_id})
+        records, _ = self.api.get_paginated(
+            endpoint="/Table/GetSiteTables",
+            params=params,
+            page_size=self.config.get("api.page_size", 200),
+            data_path=("data",),
+            list_key="siteTables",
+        )
+        return {"records": records}
 
-        try:
-            records, _ = self.api.get_paginated(
-                endpoint="/Table/GetSiteTables",
-                params=params,
-                page_size=self.config.get("api.page_size", 200),
-                data_path=("data", "siteTables"),
-            )
+    def transform(self, extracted: dict, context: TaskContext) -> dict:
+        parsed, skipped = [], 0
+        for raw in extracted.get("records", []):
+            mapped = self._parse_table(raw, context.store_id)
+            if mapped:
+                parsed.append(mapped)
+            else:
+                skipped += 1
+        return {
+            "records": parsed,
+            "fetched": len(extracted.get("records", [])),
+            "skipped": skipped,
+        }
 
-            parsed = []
-            for raw in records:
-                mapped = self._parse_table(raw)
-                if mapped:
-                    parsed.append(mapped)
+    def load(self, transformed: dict, context: TaskContext) -> dict:
+        loader = TableLoader(self.db)
+        inserted, updated, loader_skipped = loader.upsert_tables(transformed["records"])
+        return {
+            "fetched": transformed["fetched"],
+            "inserted": inserted,
+            "updated": updated,
+            "skipped": transformed["skipped"] + loader_skipped,
+            "errors": 0,
+        }
 
-            loader = TableLoader(self.db)
-            inserted, updated, skipped = loader.upsert_tables(parsed)
-
-            self.db.commit()
-            counts = {
-                "fetched": len(records),
-                "inserted": inserted,
-                "updated": updated,
-                "skipped": skipped,
-                "errors": 0,
-            }
-            self.logger.info(f"TABLES 完成: {counts}")
-            return self._build_result("SUCCESS", counts)
-        except Exception:
-            self.db.rollback()
-            self.logger.error("TABLES 失败", exc_info=True)
-            raise
-
-    def _parse_table(self, raw: dict) -> dict | None:
+    def _parse_table(self, raw: dict, store_id: int) -> dict | None:
         table_id = TypeParser.parse_int(raw.get("id"))
         if not table_id:
             self.logger.warning("跳过缺少 table_id 的台桌记录: %s", raw)
             return None
 
-        store_id = self.config.get("app.store_id")
         return {
             "store_id": store_id,
             "table_id": table_id,