ODS 完成

etl_billiards/tasks/inventory_change_task.py

@@ -3,7 +3,7 @@
 
 import json
 
-from .base_task import BaseTask
+from .base_task import BaseTask, TaskContext
 from loaders.facts.inventory_change import InventoryChangeLoader
 from models.parsers import TypeParser
 
@@ -14,56 +14,56 @@ class InventoryChangeTask(BaseTask):
     def get_task_code(self) -> str:
         return "INVENTORY_CHANGE"
 
-    def execute(self) -> dict:
-        self.logger.info("开始执行 INVENTORY_CHANGE 任务")
-        window_start, window_end, _ = self._get_time_window()
-        params = {
-            "storeId": self.config.get("app.store_id"),
-            "startTime": TypeParser.format_timestamp(window_start, self.tz),
-            "endTime": TypeParser.format_timestamp(window_end, self.tz),
+    def extract(self, context: TaskContext) -> dict:
+        params = self._merge_common_params(
+            {
+                "siteId": context.store_id,
+                "startTime": TypeParser.format_timestamp(context.window_start, self.tz),
+                "endTime": TypeParser.format_timestamp(context.window_end, self.tz),
+            }
+        )
+        records, _ = self.api.get_paginated(
+            endpoint="/GoodsStockManage/QueryGoodsOutboundReceipt",
+            params=params,
+            page_size=self.config.get("api.page_size", 200),
+            data_path=("data",),
+            list_key="queryDeliveryRecordsList",
+        )
+        return {"records": records}
+
+    def transform(self, extracted: dict, context: TaskContext) -> dict:
+        parsed, skipped = [], 0
+        for raw in extracted.get("records", []):
+            mapped = self._parse_change(raw, context.store_id)
+            if mapped:
+                parsed.append(mapped)
+            else:
+                skipped += 1
+        return {
+            "records": parsed,
+            "fetched": len(extracted.get("records", [])),
+            "skipped": skipped,
         }
 
-        try:
-            records, _ = self.api.get_paginated(
-                endpoint="/Inventory/ChangeList",
-                params=params,
-                page_size=self.config.get("api.page_size", 200),
-                data_path=("data", "queryDeliveryRecordsList"),
-            )
+    def load(self, transformed: dict, context: TaskContext) -> dict:
+        loader = InventoryChangeLoader(self.db)
+        inserted, updated, loader_skipped = loader.upsert_changes(transformed["records"])
+        return {
+            "fetched": transformed["fetched"],
+            "inserted": inserted,
+            "updated": updated,
+            "skipped": transformed["skipped"] + loader_skipped,
+            "errors": 0,
+        }
 
-            parsed = []
-            for raw in records:
-                mapped = self._parse_change(raw)
-                if mapped:
-                    parsed.append(mapped)
-
-            loader = InventoryChangeLoader(self.db)
-            inserted, updated, skipped = loader.upsert_changes(parsed)
-
-            self.db.commit()
-            counts = {
-                "fetched": len(records),
-                "inserted": inserted,
-                "updated": updated,
-                "skipped": skipped,
-                "errors": 0,
-            }
-            self.logger.info(f"INVENTORY_CHANGE 完成: {counts}")
-            return self._build_result("SUCCESS", counts)
-        except Exception:
-            self.db.rollback()
-            self.logger.error("INVENTORY_CHANGE 失败", exc_info=True)
-            raise
-
-    def _parse_change(self, raw: dict) -> dict | None:
+    def _parse_change(self, raw: dict, store_id: int) -> dict | None:
         change_id = TypeParser.parse_int(
             raw.get("siteGoodsStockId") or raw.get("site_goods_stock_id")
         )
         if not change_id:
-            self.logger.warning("跳过缺少变动 id 的库存记录: %s", raw)
+            self.logger.warning("跳过缺少库存变动ID的记录: %s", raw)
             return None
 
-        store_id = self.config.get("app.store_id")
         return {
             "store_id": store_id,
             "change_id": change_id,