Merge remote-tracking branch 'origin/sub_laptop_5' into sub_laptop_2

# Conflicts:
#	B04_PreProcess/B04_PreProcess_Router_Basins.py
#	B08_Quantity/B08_Quantity_Router_Summary.py

B04_PreProcess/B04_PreProcess_Router_Basins.py

@@ -20,12 +20,13 @@ import math
 from typing import Any
 from uuid import UUID
 
-from fastapi import APIRouter
+from fastapi import APIRouter, Depends
 from fastapi.responses import JSONResponse
 
 from B04_PreProcess.B04_PreProcess_Engine_Watershed_Export import drainage_dir
 from B05_Profile.B05_Profile_Structures_Schema import structure_type_map
 from B06_Section.B06_Section_Engine_Culvert import pipe_wall_min_height_m
+from common_util.common_util_auth import get_optional_session
 from common_util.common_util_drainage_context import DrainageContext, load_drainage_context
 from common_util.common_util_drainage_detail import DrainageDetail, build_detail
 from common_util.common_util_drainage_pipes import (
@@ -422,7 +423,9 @@ async def delete_pipe_points(project_id: UUID) -> dict[str, Any] | JSONResponse:
 
 @router.put("/{project_id}/drainage/pipe-points", response_model=None)
 async def put_pipe_points(
-    project_id: UUID, payload: dict[str, Any] | None = None
+    project_id: UUID,
+    payload: dict[str, Any] | None = None,
+    session: dict[str, Any] | None = Depends(get_optional_session),  # 가져온이(142-2)
 ) -> dict[str, Any] | JSONResponse:
     """관 지점을 정본으로 확정하고 세부유역 산출물까지 함께 남긴다(모델 확정 시점)."""
     resolved = await _resolve(project_id, payload, use_stored=True)
@@ -443,9 +446,12 @@ async def put_pipe_points(
     )
     # 지정한 집계 항목을 프로젝트에 복사 · 안 쓰는 복사본 지움(PLAN 21-3 · 실패해도 저장 유지)
     from common_util.common_util_storage import resolve_stored_project_path
-    from M02_MasterTemplete.M02_Item_Snapshot import safe_sync
+    from M02_MasterTemplete.M02_Item_Snapshot import importer, safe_sync
 
-    await asyncio.to_thread(safe_sync, resolve_stored_project_path(context.stored_path))
+    failed = await asyncio.to_thread(
+        safe_sync, resolve_stored_project_path(context.stored_path), importer(session)
+    )
     result = _payload(project_id, context, detail, points, saved=True)
     result["saved_count"] = saved
+    result["snapshot_failed"] = failed  # 못 만든 구조물 조합 복사본(142-2) — [저장] 알림
     return result