diff --git a/app/modules/performance/adapters/base.py b/app/modules/performance/adapters/base.py index 3f90796..f9496ac 100644 --- a/app/modules/performance/adapters/base.py +++ b/app/modules/performance/adapters/base.py @@ -130,12 +130,30 @@ class CredentialAccessor(Protocol): def has(self, key: str) -> bool: ... +class Progress: + """수집 진행 알림(매출 업데이트 창의 진행 막대용). 기본은 아무것도 하지 않는다 — sync 가 진행 상황을 모으는 + 객체(jobs.ShopProgress)로 바꿔 넣는다. + + 어댑터: 조회를 시작하기 전에 plan(전체 단계 수, 단위) → 단계 하나(하루·조회 구간)를 끝낼 때마다 + step(items=그 단계에서 받은 건수). 하다가 할 일이 늘면 add(늘어난 단계 수).""" + + def plan(self, total: int, unit: str = "단계") -> None: + return None + + def add(self, n: int) -> None: + return None + + def step(self, n: int = 1, *, items: int = 0) -> None: + return None + + @dataclass class AdapterContext: code: str credentials: CredentialAccessor app_state: Any = None # 공통 연동 계층 재사용(예: 카페24 토큰 저장소) timeout_sec: float = 20.0 + progress: Progress = field(default_factory=Progress) # ════════════════════════════════════════════════════════════ diff --git a/app/modules/performance/adapters/cafe24.py b/app/modules/performance/adapters/cafe24.py index cc1af94..5df8ad4 100644 --- a/app/modules/performance/adapters/cafe24.py +++ b/app/modules/performance/adapters/cafe24.py @@ -299,17 +299,25 @@ class Cafe24Adapter(MarketplaceAdapter): def paid_orders(self, ctx: AdapterContext, start: date, end: date) -> Iterable[dict[str, Any]]: for s, e in _chunks(start, end): - yield from self._paged(ctx, "/admin/orders", "orders", - {"start_date": s.isoformat(), "end_date": e.isoformat(), - "date_type": "pay_date", "embed": "items"}, ORDER_LIMIT) + n = 0 + for o in self._paged(ctx, "/admin/orders", "orders", + {"start_date": s.isoformat(), "end_date": e.isoformat(), + "date_type": "pay_date", "embed": "items"}, ORDER_LIMIT): + n += 1 + yield o + ctx.progress.step(items=n) def refunds(self, ctx: AdapterContext, start: date, end: date, date_type: str = "refund_date") -> Iterable[dict[str, Any]]: """환불 목록. date_type: refund_date(환불완료일, 기본) / accepted_refund_date(환불접수일).""" for s, e in _chunks(start, end): - yield from self._paged(ctx, "/admin/refunds", "refunds", - {"start_date": s.isoformat(), "end_date": e.isoformat(), - "date_type": date_type}, REFUND_LIMIT) + n = 0 + for r in self._paged(ctx, "/admin/refunds", "refunds", + {"start_date": s.isoformat(), "end_date": e.isoformat(), + "date_type": date_type}, REFUND_LIMIT): + n += 1 + yield r + ctx.progress.step(items=n) def claim_items(self, ctx: AdapterContext, day: date) -> dict[str, Any]: """그날 취소완료·반품완료·교환완료된 주문의 클레임 품목(대조 전용). 환불 API 에 안 잡히는 건 @@ -372,9 +380,11 @@ class Cafe24Adapter(MarketplaceAdapter): found: dict[str, dict[str, Any]] = {} for date_type in NO_RECORD_DATE_TYPES: for s, e in _chunks(start, end): + scanned = 0 for o in self._paged(ctx, "/admin/orders", "orders", {"start_date": s.isoformat(), "end_date": e.isoformat(), "date_type": date_type, "embed": "items"}, ORDER_LIMIT): + scanned += 1 if NO_RECORD_CHANNEL not in (_key(o.get("market_id")), _key(o.get("order_place_id"))): continue oid = str(o.get("order_id") or "") @@ -416,10 +426,12 @@ class Cafe24Adapter(MarketplaceAdapter): "item_payment_amount": _won(i.get("payment_amount")), "coupon": _won(i.get("coupon_discount_price")), } + ctx.progress.step(items=scanned) if not found: return [] lo = start - timedelta(days=REFUND_LOOKAROUND_DAYS) hi = max(end, min(end + timedelta(days=REFUND_LOOKAROUND_DAYS), today_kst())) + ctx.progress.add(2 * len(list(_chunks(lo, hi)))) # 환불 목록 대조(완료일·접수일) — 찾은 게 있을 때만 refunded = {str(r.get("order_id") or "") for dt in ("refund_date", "accepted_refund_date") for r in self.refunds(ctx, lo, hi, dt)} return [c for c in found.values() if c["order_id"] not in refunded] @@ -445,6 +457,9 @@ class Cafe24Adapter(MarketplaceAdapter): # ── 수집(어댑터 공통 흐름) ────────────────────────────── def fetch_orders(self, ctx: AdapterContext, start: date, end: date) -> Iterable[dict[str, Any]]: + # 진행 막대: 60일 구간마다 결제 주문 1 + 환불 1 + 환불 없는 취소·반품(취소일·반품완료일) 2 + c = len(list(_chunks(start, end))) + ctx.progress.plan(c * (2 + len(NO_RECORD_DATE_TYPES)), "구간") yield from self.paid_orders(ctx, start, end) def fetch_refunds(self, ctx: AdapterContext, start: date, end: date) -> Iterable[dict[str, Any]]: diff --git a/app/modules/performance/adapters/elevenst.py b/app/modules/performance/adapters/elevenst.py index 43e50db..a5936d5 100644 --- a/app/modules/performance/adapters/elevenst.py +++ b/app/modules/performance/adapters/elevenst.py @@ -160,6 +160,10 @@ def _day(value: Any) -> date | None: return None +def _n_chunks(lo: date, hi: date) -> int: + return max(0, ((hi - lo).days + PROBE_CHUNK_DAYS) // PROBE_CHUNK_DAYS) + + class ElevenstAdapter(MarketplaceAdapter): code = "elevenst" name = "11번가" @@ -183,7 +187,9 @@ class ElevenstAdapter(MarketplaceAdapter): while s <= hi: e = min(hi, s + timedelta(days=PROBE_CHUNK_DAYS - 1)) ds, de = s.strftime("%Y%m%d"), e.strftime("%Y%m%d") - yield from xml_records(self._get(ctx, tmpl.format(s=f"{ds}0000", e=f"{de}2359", ds=ds, de=de))) + rows = xml_records(self._get(ctx, tmpl.format(s=f"{ds}0000", e=f"{de}2359", ds=ds, de=de))) + ctx.progress.step(items=len(rows)) + yield from rows s = e + timedelta(days=1) def fetch_orders(self, ctx: AdapterContext, start: date, end: date) -> Iterable[dict[str, Any]]: @@ -202,6 +208,9 @@ class ElevenstAdapter(MarketplaceAdapter): "discount": 0, "ship": 0, "names": [], "opt": "", "raw": {}}) settle_hi = max(end, min(end + timedelta(days=SETTLE_LOOKAHEAD_DAYS), today)) + hi = max(end, min(end + timedelta(days=LOOKAHEAD_DAYS), today)) + # 진행 막대: 7일 구간마다 한 번 — 정산 내역 + 주문 상태 목록 4개 + ctx.progress.plan(_n_chunks(start, settle_hi) + len(ORDER_PATHS) * _n_chunks(start, hi), "구간") for r in self._pages(ctx, SETTLEMENT_PATH, start, settle_hi): oid, day = str(r.get("ordNo") or ""), _day(r.get("ordStlEndDt")) if not oid or day is None or not (start <= day <= end): @@ -218,7 +227,6 @@ class ElevenstAdapter(MarketplaceAdapter): o["raw"]["stlDy"] = r.get("stlDy") settled = set(orders) - hi = max(end, min(end + timedelta(days=LOOKAHEAD_DAYS), today)) seen: set[str] = set() for tmpl in ORDER_PATHS: status = ORDER_STATUS[tmpl.split("/")[3]] diff --git a/app/modules/performance/adapters/naver.py b/app/modules/performance/adapters/naver.py index 258bd4f..92d4ef2 100644 --- a/app/modules/performance/adapters/naver.py +++ b/app/modules/performance/adapters/naver.py @@ -342,9 +342,12 @@ class NaverAdapter(MarketplaceAdapter): return out def _items(self, ctx: AdapterContext, start: date, end: date) -> Iterable[dict[str, Any]]: + ctx.progress.plan((end - start).days + 1, "일") # 진행 막대: 하루 = 한 단계 d = start while d <= end: - yield from self._day_items(ctx, d) + rows = self._day_items(ctx, d) + ctx.progress.step(items=len(rows)) + yield from rows d += timedelta(days=1) # ── 수집 ────────────────────────────────────────────── diff --git a/app/modules/performance/jobs.py b/app/modules/performance/jobs.py new file mode 100644 index 0000000..1dda5be --- /dev/null +++ b/app/modules/performance/jobs.py @@ -0,0 +1,174 @@ +"""매출 업데이트 진행 상황 — 백그라운드 수집 작업(쇼핑몰별 진행 막대)을 메모리에 둔다. + +- [매출 업데이트]·[과거 매출 가져오기]는 수집을 백그라운드 스레드로 돌리고 작업 번호를 바로 돌려준다. + 화면은 GET /performance/api/sync/jobs/{id} 를 0.8초마다 불러 쇼핑몰별·전체 진행 막대를 그린다. +- 어댑터가 ctx.progress.plan()/step() 으로 알린 단계를 ShopProgress 가 모은다(쇼핑몰마다 단위가 다르다 — + 네이버 "일", 11번가·카페24 "구간"). +- 웹 프로세스 하나(uvicorn 단일 워커) 기준 — 워커를 여러 개로 늘리면 진행 상황을 DB 로 옮겨야 한다. + 서버를 다시 켜면 진행 중 작업 정보는 사라진다(수집 결과는 DB 에 이미 저장된 만큼 남음). +""" + +from __future__ import annotations + +import threading +import time +import uuid +from datetime import date +from typing import Any + +from .adapters.base import Progress + +MAX_JOBS = 20 +_LOCK = threading.Lock() +_JOBS: dict[str, "SyncJob"] = {} + +# 끝났지만 막대에서 빼는 쇼핑몰(수집할 수 없어 바로 끝난 것) — 전체 진행률 계산에서 제외 +PASSIVE_STATUS = frozenset({"not_implemented", "not_configured"}) + + +class ShopProgress(Progress): + """쇼핑몰 하나의 진행 상황. state: waiting → running → saving → done | error | skipped.""" + + def __init__(self, code: str, name: str, *, active: bool = True) -> None: + self.code, self.name, self.active = code, name, active + self.state = "waiting" + self.done = self.total = self.items = self.upserted = 0 + self.unit = "단계" + self.status = self.label = self.message = "" + self.started_at = self.finished_at = 0.0 + self._lock = threading.Lock() + + # ── 어댑터가 부르는 쪽(Progress) ── + def plan(self, total: int, unit: str = "단계") -> None: + with self._lock: + self.total, self.unit, self.done = max(0, int(total)), unit or "단계", 0 + + def add(self, n: int) -> None: + with self._lock: + self.total += max(0, int(n)) + + def step(self, n: int = 1, *, items: int = 0) -> None: + with self._lock: + self.done += max(0, int(n)) + self.items += max(0, int(items)) + if self.total and self.done > self.total: # 계획보다 많이 돌면 전체를 늘려 100% 를 넘지 않게 + self.total = self.done + + # ── sync 가 부르는 쪽 ── + def start(self) -> None: + with self._lock: + self.state, self.started_at = "running", time.time() + + def saving(self) -> None: + with self._lock: + self.state = "saving" + + def finish(self, *, upserted: int, message: str = "") -> None: + with self._lock: + self.state, self.upserted, self.message, self.status = "done", int(upserted), message, "ok" + if self.total: + self.done = self.total + self.finished_at = time.time() + + def fail(self, *, status: str, label: str, message: str) -> None: + with self._lock: + self.state, self.status, self.label, self.message = "error", status, label, message + if status in PASSIVE_STATUS: + self.active = False + self.finished_at = time.time() + + def skip(self, message: str) -> None: + with self._lock: + self.state, self.status, self.message = "skipped", "running", message + self.finished_at = time.time() + + @property + def finished(self) -> bool: + return self.state in ("done", "error", "skipped") + + def fraction(self) -> float: + if self.finished: + return 1.0 + if self.state == "saving": + return 0.98 + if self.state == "running" and self.total: + return min(0.97, self.done / self.total) + return 0.0 + + def snapshot(self) -> dict[str, Any]: + with self._lock: + return { + "code": self.code, "name": self.name, "active": self.active, "state": self.state, + "done": self.done, "total": self.total, "unit": self.unit, "items": self.items, + "upserted": self.upserted, "status": self.status, "label": self.label, "message": self.message, + "fraction": round(self.fraction(), 4), + "elapsed": round((self.finished_at or time.time()) - self.started_at, 1) if self.started_at else 0, + } + + +class SyncJob: + def __init__(self, *, user: str, start: date | None, end: date | None) -> None: + self.id = uuid.uuid4().hex[:12] + self.user, self.start, self.end = user, start, end + self.created_at = time.time() + self.finished_at = 0.0 + self.shops: list[ShopProgress] = [] + self.error = "" + self.last_update_at: str | None = None + self._lock = threading.Lock() + + def set_targets(self, targets: list[tuple[str, str, bool]], start: date, end: date) -> dict[str, ShopProgress]: + with self._lock: + self.start, self.end = start, end + self.shops = [ShopProgress(code, name, active=active) for code, name, active in targets] + return {s.code: s for s in self.shops} + + def finish(self, *, error: str = "", last_update_at: str | None = None) -> None: + with self._lock: + self.error, self.last_update_at, self.finished_at = error, last_update_at, time.time() + + @property + def finished(self) -> bool: + return bool(self.finished_at) + + def snapshot(self) -> dict[str, Any]: + with self._lock: + shops = [s.snapshot() for s in self.shops] + active = [s for s in shops if s["active"]] + return { + "id": self.id, "finished": self.finished, "error": self.error, + "from": self.start.isoformat() if self.start else None, "to": self.end.isoformat() if self.end else None, + "elapsed": round((self.finished_at or time.time()) - self.created_at, 1), + "last_update_at": self.last_update_at, "shops": shops, + "overall": { + "shops": len(active), "finished": sum(1 for s in active if s["state"] in ("done", "error", "skipped")), + "fraction": round(sum(s["fraction"] for s in active) / len(active), 4) if active else + (1.0 if self.finished else 0.0), + "items": sum(s["items"] for s in shops), "upserted": sum(s["upserted"] for s in shops), + }, + } + + +def create_job(*, user: str, start: date | None, end: date | None) -> SyncJob: + job = SyncJob(user=user, start=start, end=end) + with _LOCK: + _JOBS[job.id] = job + if len(_JOBS) > MAX_JOBS: # 오래된 끝난 작업부터 정리 + for jid, j in sorted(_JOBS.items(), key=lambda kv: kv[1].created_at): + if len(_JOBS) <= MAX_JOBS: + break + if j.finished: + del _JOBS[jid] + return job + + +def get_job(job_id: str) -> SyncJob | None: + with _LOCK: + return _JOBS.get(job_id) + + +def running_job() -> SyncJob | None: + """지금 돌고 있는 작업(가장 최근). 없으면 None — 다른 사람이 누른 업데이트도 같이 보여 주려고.""" + with _LOCK: + live = [j for j in _JOBS.values() if not j.finished] + return max(live, key=lambda j: j.created_at) if live else None diff --git a/app/modules/performance/router.py b/app/modules/performance/router.py index cbec390..9a29687 100644 --- a/app/modules/performance/router.py +++ b/app/modules/performance/router.py @@ -5,6 +5,9 @@ GET /performance/settings 실적 설정(관리자) JSON API — 모듈 권한 POST /performance/api/sync 매출 업데이트(사용 중인 쇼핑몰 전부, 쇼핑몰별 실패 격리) + background=true 면 백그라운드로 돌리고 작업 번호를 바로 돌려줌 + GET /performance/api/sync/jobs/{id} 매출 업데이트 진행 상황(쇼핑몰별·전체 진행 막대) + GET /performance/api/sync/current 지금 돌고 있는 업데이트(없으면 null) GET /performance/api/events 금액 클릭 상세(쇼핑몰+기간) JSON API — 관리자 PUT /performance/api/marketplaces/{code} 사용/매출 집계 여부 @@ -155,10 +158,65 @@ def api_sync(request: Request, payload: dict[str, Any] = Body(default={})) -> JS if days > MAX_USER_SYNC_DAYS and not is_admin(user): raise HTTPException(status_code=403, detail=f"{MAX_USER_SYNC_DAYS}일보다 긴 기간은 관리자만 가져올 수 있습니다.") + if payload.get("background"): + return JSONResponse(_start_background_sync(store, sync, start=start, end=end, codes=codes or None, + user=user["email"])) results = sync.sync_all(start=start, end=end, codes=codes or None, user=user["email"]) return JSONResponse({"results": results, "last_update_at": store.last_update_at()}) +def _start_background_sync(store: Any, sync: Any, *, start: date | None, end: date | None, + codes: list[str] | None, user: str) -> dict[str, Any]: + """수집을 스레드로 돌리고 작업 번호를 바로 돌려준다. 이미 돌고 있는 업데이트가 있으면 새로 시작하지 않고 + 그 작업을 보여 준다(같은 쇼핑몰 동시 실행은 어차피 막혀 있다).""" + import logging # noqa: WPS433 + import threading # noqa: WPS433 + + from . import jobs # noqa: WPS433 + + live = jobs.running_job() + if live is not None: + return {"job": live.snapshot(), "joined": True} + job = jobs.create_job(user=user, start=start, end=end) + + def run() -> None: + error = "" + try: + sync.sync_all(start=start, end=end, codes=codes, user=user, job=job) + except Exception as exc: # noqa: BLE001 — 스레드 밖으로 새지 않게, 화면에는 "오류"로 + logging.getLogger("performance.sync").exception("background sync failed") + error = f"업데이트 중 오류: {type(exc).__name__}" + last = None + try: + last = store.last_update_at() + except Exception: # noqa: BLE001 + pass + job.finish(error=error, last_update_at=last) + + threading.Thread(target=run, name=f"perf-sync-{job.id}", daemon=True).start() + return {"job": job.snapshot(), "joined": False} + + +@router.get("/api/sync/jobs/{job_id}") +def api_sync_job(request: Request, job_id: str) -> JSONResponse: + common.require_store(request) + from . import jobs # noqa: WPS433 + + job = jobs.get_job(job_id) + if job is None: + raise HTTPException(status_code=404, detail="진행 상황을 찾을 수 없습니다(서버가 다시 시작됐을 수 있습니다).") + return JSONResponse({"job": job.snapshot()}) + + +@router.get("/api/sync/current") +def api_sync_current(request: Request) -> JSONResponse: + common.require_store(request) + from . import jobs # noqa: WPS433 + + job = jobs.running_job() + return JSONResponse({"job": job.snapshot() if job else None}) + + @router.get("/api/events") def api_events(request: Request, code: str, from_: str = Query(..., alias="from"), to: str | None = None) -> JSONResponse: store, _ = common.require_store(request) diff --git a/app/modules/performance/sync.py b/app/modules/performance/sync.py index 12f01d8..f5de380 100644 --- a/app/modules/performance/sync.py +++ b/app/modules/performance/sync.py @@ -94,18 +94,29 @@ class SyncService: # ── 동기화 ────────────────────────────────────────────── def sync_marketplace(self, code: str, start: date, end: date, *, trigger: str = "manual", - user: str = "") -> dict[str, Any]: + user: str = "", progress: Any = None) -> dict[str, Any]: + """progress: jobs.ShopProgress(매출 업데이트 창 진행 막대) — 없으면 알리지 않는다.""" adapter = get_adapter(code) result: dict[str, Any] = {"code": code, "ok": False, "skipped": False, "fetched": 0, "upserted": 0} if adapter is None: + if progress is not None: + progress.fail(status="api_error", label=STATUS_LABELS["api_error"], message="알 수 없는 쇼핑몰입니다.") return {**result, "status": "api_error", "message": "알 수 없는 쇼핑몰입니다."} run_id = self._store.start_run(code, trigger=trigger, range_from=start, range_to=end, user=user) if run_id is None: + if progress is not None: + progress.skip("이미 다른 업데이트가 진행 중입니다.") return {**result, "skipped": True, "status": "running", "message": "이미 업데이트 중입니다."} + if progress is not None: + progress.start() ctx = None try: ctx = self._ctx(adapter, user=user) + if progress is not None: + ctx.progress = progress fetched, events = adapter.collect(ctx, start, end) + if progress is not None: + progress.saving() known = ctx.credentials.known_secrets() rows = [event_row(ev, known) for ev in events] # 다른 쇼핑몰 열로 보낸 사건 — 등록된 쇼핑몰이 아니면 이 쇼핑몰 열에 둔다(합계가 빠지지 않게). @@ -121,6 +132,8 @@ class SyncService: upserted = self._store.upsert_events(code, rows) self._store.finish_run(run_id, ok=True, fetched=fetched, upserted=upserted) self._store.record_sync(code, status="ok", ok=True) + if progress is not None: + progress.finish(upserted=upserted, message=f"{upserted}건 반영") return {**result, "ok": True, "status": "ok", "fetched": fetched, "upserted": upserted, "message": f"{upserted}건 반영"} except Exception as exc: # noqa: BLE001 — 한 쇼핑몰 실패가 전체를 멈추지 않게 @@ -128,15 +141,32 @@ class SyncService: logger.warning("performance sync %s failed: %s %s", code, status, message) self._store.finish_run(run_id, ok=False, error=message) self._store.record_sync(code, status=status, ok=False, error=message) + if progress is not None: + progress.fail(status=status, label=STATUS_LABELS.get(status, status), message=message) return {**result, "status": status, "label": STATUS_LABELS.get(status, status), "message": message} def sync_all(self, *, start: date | None = None, end: date | None = None, codes: list[str] | None = None, - trigger: str = "manual", user: str = "") -> list[dict[str, Any]]: + trigger: str = "manual", user: str = "", job: Any = None) -> list[dict[str, Any]]: + """job: jobs.SyncJob — 주면 쇼핑몰마다 진행 상황(ShopProgress)을 채운다(매출 업데이트 창).""" end = end or today_kst() start = start or (end - timedelta(days=sync_days() - 1)) enabled = {m["code"] for m in self._store.list_marketplaces() if m["enabled"]} - targets = [a.code for a in all_adapters() if a.code in enabled and (not codes or a.code in codes)] - return [self.sync_marketplace(c, start, end, trigger=trigger, user=user) for c in targets] + targets = [a for a in all_adapters() if a.code in enabled and (not codes or a.code in codes)] + progress: dict[str, Any] = {} + if job is not None: + # 수집이 구현되고 인증정보가 있는 쇼핑몰만 막대로(active), 나머지는 "건너뜀" 한 줄로 — 바로 끝나는 + # 쇼핑몰이 전체 진행률을 부풀리거나, 아직 차례가 안 와서 진행률을 낮추지 않게. + def ready(a: MarketplaceAdapter) -> bool: + if not a.implemented: + return False + try: + return a.is_configured(self._ctx(a, user=user)) + except Exception: # noqa: BLE001 — 확인이 안 되면 일단 막대로(실제 결과는 수집 때 나온다) + return True + + progress = job.set_targets([(a.code, a.name, ready(a)) for a in targets], start, end) + return [self.sync_marketplace(a.code, start, end, trigger=trigger, user=user, progress=progress.get(a.code)) + for a in targets] # ── 쇼핑몰 화면과 대조 ──────────────────────────────── def reconcile(self, code: str, day: date, *, to: date | None = None, user: str = "") -> dict[str, Any]: diff --git a/app/modules/performance/templates/performance/index.html b/app/modules/performance/templates/performance/index.html index 2b66da0..04d346f 100644 --- a/app/modules/performance/templates/performance/index.html +++ b/app/modules/performance/templates/performance/index.html @@ -1,6 +1,6 @@ {% extends "erp_base.html" %} -{% block head_extra %}{% endblock %} +{% block head_extra %}{% endblock %} {%- macro won(v) -%} {%- if v is none -%} @@ -239,4 +239,4 @@ } | tojson }} {% endblock %} -{% block scripts %}{% endblock %} +{% block scripts %}{% endblock %} diff --git a/app/modules/performance/templates/performance/settings.html b/app/modules/performance/templates/performance/settings.html index e431b23..a7d83f4 100644 --- a/app/modules/performance/templates/performance/settings.html +++ b/app/modules/performance/templates/performance/settings.html @@ -1,6 +1,6 @@ {% extends "erp_base.html" %} -{% block head_extra %}{% endblock %} +{% block head_extra %}{% endblock %} {%- macro when(v) -%}{{ (v or '')[:16] | replace('T', ' ') or '—' }}{%- endmacro -%} @@ -175,4 +175,4 @@ {% endblock %} -{% block scripts %}{% endblock %} +{% block scripts %}{% endblock %} diff --git a/app/modules/performance/tests/test_performance.py b/app/modules/performance/tests/test_performance.py index f542030..dcbb364 100644 --- a/app/modules/performance/tests/test_performance.py +++ b/app/modules/performance/tests/test_performance.py @@ -1148,6 +1148,56 @@ def test_naver_reconcile_hides_personal(): assert any("결제 뒤 취소·반품(매출 포함)" in p["label"] for p in rec["probes"]) +def test_sync_job_progress(): + """매출 업데이트 진행 창: 쇼핑몰별 단계(네이버 = 일)·받은 건수·상태, 전체 진행률. + 수집이 없는 쇼핑몰(연동 준비 중)·인증정보 없는 쇼핑몰은 막대에서 빼고(active=False) 전체 진행률에 넣지 않는다.""" + import bcrypt + import httpx + + from app.modules.performance import jobs + from app.modules.performance.adapters import naver as nv + + mid = {} + job = jobs.create_job(user="king@x", start=None, end=None) + + def get(url, params=None, headers=None, timeout=None): + day = params["from"][:10] + if day == "2026-09-10": # 둘째 날을 받는 중 — 진행 상황 중간 모습 + mid.update(job.snapshot()) + rows = [_naver_item("A" + day, "P" + day, day, 10000), _naver_item("B" + day, "Q" + day, day, 5000)] + return httpx.Response(200, json={"data": {"contents": rows, "pagination": {"hasNext": False}}}) + + st = FakeStore() + st.markets = [m for m in st.markets if m["code"] in ("naver", "ohouse", "elevenst")] + creds = CredentialService(st, lambda: ring()) + creds.save(next(a for a in all_adapters() if a.code == "naver"), + {"client_id": "app-id", "client_secret": bcrypt.gensalt(rounds=4).decode()}) + orig = (httpx.post, httpx.get, nv.CALL_INTERVAL_SEC) + httpx.post = lambda url, data=None, timeout=None, headers=None: httpx.Response(200, json={"access_token": "T", "expires_in": 10799}) + httpx.get, nv.CALL_INTERVAL_SEC = get, 0 + try: + SyncService(st, creds).sync_all(start=date(2026, 9, 9), end=date(2026, 9, 10), user="king@x", job=job) + finally: + httpx.post, httpx.get, nv.CALL_INTERVAL_SEC = orig + job.finish(last_update_at="2026-09-30T10:00:00") + + m = {s["code"]: s for s in mid["shops"]} + assert m["naver"]["state"] == "running" and (m["naver"]["done"], m["naver"]["total"], m["naver"]["unit"]) == (1, 2, "일") + assert m["naver"]["items"] == 2 and m["naver"]["fraction"] == 0.5 + assert mid["overall"]["shops"] == 1 and mid["overall"]["fraction"] == 0.5 and not mid["finished"] + + snap = job.snapshot() + s = {x["code"]: x for x in snap["shops"]} + assert s["naver"]["state"] == "done" and s["naver"]["upserted"] == 4 and s["naver"]["items"] == 4 + assert s["naver"]["done"] == s["naver"]["total"] == 2 and s["naver"]["fraction"] == 1.0 + assert s["ohouse"]["state"] == "error" and s["ohouse"]["status"] in ("not_implemented", "not_configured") + assert not s["ohouse"]["active"] + assert s["elevenst"]["state"] == "error" and s["elevenst"]["status"] == "not_configured" and not s["elevenst"]["active"] + assert snap["finished"] and snap["overall"] == {"shops": 1, "finished": 1, "fraction": 1.0, "items": 4, "upserted": 4} + assert snap["from"] == "2026-09-09" and snap["to"] == "2026-09-10" + assert jobs.get_job(job.id) is job and jobs.running_job() is None + + if __name__ == "__main__": os.environ.pop("APP_ENCRYPTION_KEY", None) n = 0 diff --git a/app/static/performance.css b/app/static/performance.css index 1231438..d54a598 100644 --- a/app/static/performance.css +++ b/app/static/performance.css @@ -229,3 +229,34 @@ td.is-link:hover { background: #eef2ff; text-decoration: underline; } .perf-ev-table thead th { background: var(--perf-soft, #fafafa); box-shadow: 0 1px 0 var(--perf-line, #e5e5e5); } /* 취소 행 — 행 전체를 기울임 + 취소선 + 회색 */ .perf-ev-table tr.is-cancel td { font-style: italic; text-decoration: line-through; color: #9a9a9a; } + +/* ── 매출 업데이트 진행 창 — 쇼핑몰별·전체 진행 막대(runSyncWithProgress) ── */ +.perf-prog-card { width: min(640px, 100%); } +.perf-prog-row { + display: grid; grid-template-columns: 150px 1fr 44px; align-items: center; column-gap: 10px; row-gap: 3px; + padding: 9px 0; border-bottom: 1px solid var(--perf-line); +} +.perf-prog-name { font-size: 13px; font-weight: 600; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; } +.perf-prog-bar { height: 10px; border-radius: 999px; background: #eef0f3; overflow: hidden; } +.perf-prog-bar > span { + display: block; height: 100%; border-radius: inherit; background: var(--perf-sat); + transition: width .5s ease; +} +.perf-prog-pct { font-size: 12px; text-align: right; font-variant-numeric: tabular-nums; color: var(--color-midtone-gray); } +.perf-prog-text { grid-column: 2 / -1; font-size: 12px; color: var(--color-midtone-gray); overflow-wrap: anywhere; } +.perf-prog-row.is-done .perf-prog-bar > span { background: var(--perf-up); } +.perf-prog-row.is-error .perf-prog-bar > span { background: var(--perf-down); } +.perf-prog-row.is-error .perf-prog-text { color: var(--perf-down); } +.perf-prog-row.is-skip .perf-prog-bar > span { background: #b8bec7; } +/* 진행 중인 막대에 흐르는 빗금 — 멈춘 게 아니라는 표시 */ +.perf-prog-row:not(.is-done):not(.is-error):not(.is-skip) .perf-prog-bar > span { + background-image: linear-gradient(45deg, rgba(255,255,255,.22) 25%, transparent 25%, transparent 50%, + rgba(255,255,255,.22) 50%, rgba(255,255,255,.22) 75%, transparent 75%, transparent); + background-size: 16px 16px; animation: perf-prog-flow 1s linear infinite; +} +@keyframes perf-prog-flow { from { background-position: 0 0; } to { background-position: 16px 0; } } +.perf-prog-row.is-total { border-bottom: none; border-top: 2px solid var(--perf-line); margin-top: 4px; padding-top: 12px; } +.perf-prog-row.is-total .perf-prog-name { font-weight: 700; } +.perf-prog-row.is-total .perf-prog-bar { height: 14px; } +.perf-prog-row.is-total .perf-prog-pct { font-weight: 700; color: inherit; } +@media (max-width: 560px) { .perf-prog-row { grid-template-columns: 1fr 44px; } .perf-prog-name { grid-column: 1 / -1; } .perf-prog-text { grid-column: 1 / -1; } } diff --git a/app/static/performance.js b/app/static/performance.js index 075043c..16af264 100644 --- a/app/static/performance.js +++ b/app/static/performance.js @@ -76,6 +76,103 @@ return { card: card, body: body, foot: foot, close: close }; } + // ── 매출 업데이트 진행 창 — 서버가 백그라운드로 수집(POST /api/sync background)하는 동안 + // GET /api/sync/jobs/{id} 를 0.8초마다 불러 쇼핑몰별·전체 진행 막대를 그린다. + // 창을 닫아도 수집은 서버에서 계속된다. 끝나면 resolve(마지막 상태), 호출 자체가 실패하면 reject. + const SHOP_STATE = { waiting: "대기", running: "수집 중", saving: "저장 중", done: "완료", error: "실패", skipped: "건너뜀" }; + function fmtSec(sec) { + sec = Math.max(0, Math.round(sec || 0)); + return Math.floor(sec / 60) + ":" + String(sec % 60).padStart(2, "0"); + } + function progressRow(name, fraction, text, cls) { + const pct = Math.round((fraction || 0) * 100); + return '
' + + '
' + esc(name) + "
" + + '
' + + '
' + + '
' + pct + "%
" + + '
' + text + "
"; + } + function shopText(s) { + let t = SHOP_STATE[s.state] || s.state; + if (s.state === "running" && s.total) t += " " + fmt(s.done) + "/" + fmt(s.total) + s.unit; + if (s.items && s.state !== "done") t += " · 받은 자료 " + fmt(s.items) + "건"; + if (s.state === "done") t += " · " + fmt(s.upserted) + "건 반영"; + if (s.state === "error") t += " · " + (s.label ? s.label + " — " : "") + (s.message || ""); + if (s.state === "skipped") t += " · " + (s.message || ""); + let html = esc(t); + if (s.elapsed && s.state !== "waiting") html += ' (' + fmtSec(s.elapsed) + ")"; + return html; + } + function renderSyncJob(box, job, joined) { + const active = job.shops.filter(function (s) { return s.active; }); + const passive = job.shops.filter(function (s) { return !s.active; }); + const o = job.overall; + let html = joined ? '

이미 진행 중인 업데이트를 보여 줍니다.

' : ""; + html += '

기간 ' + esc(job.from || "") + " ~ " + esc(job.to || "") + + " · 경과 " + fmtSec(job.elapsed) + (job.finished ? "" : " · 창을 닫아도 서버에서 계속 진행됩니다") + "

"; + html += active.map(function (s) { + const cls = s.state === "error" ? "is-error" : s.state === "done" ? "is-done" : s.state === "skipped" ? "is-skip" : ""; + return progressRow(s.name, s.fraction, shopText(s), cls); + }).join(""); + html += progressRow("전체", o.fraction, + esc(fmt(o.finished) + "/" + fmt(o.shops) + " 쇼핑몰 완료" + + (o.items ? " · 받은 자료 " + fmt(o.items) + "건" : "") + (job.finished ? " · " + fmt(o.upserted) + "건 반영" : "")), + "is-total" + (job.finished ? " is-done" : "")); + if (passive.length) { + html += '

건너뜀: ' + esc(passive.map(function (s) { + return s.name + (s.label ? "(" + s.label + ")" : ""); + }).join(", ")) + "

"; + } + if (job.error) html += '

' + esc(job.error) + "

"; + box.innerHTML = html; + } + function runSyncWithProgress(payload, title) { + return new Promise(function (resolve, reject) { + let timer = null, closed = false, last = null; + const m = openModal(title || "매출 업데이트", { narrow: true, onClose: function () { closed = true; clearTimeout(timer); if (last) resolve(last); } }); + m.card.classList.add("perf-prog-card"); + m.body.innerHTML = '

업데이트를 시작하는 중…

'; + const closeBtn = el("button", { type: "button", class: "erp-btn erp-btn-outline" }, "닫기"); + closeBtn.addEventListener("click", m.close); + m.foot.appendChild(closeBtn); + api("POST", "/performance/api/sync", Object.assign({ background: true }, payload)).then(function (res) { + last = res.job; + const joined = res.joined; + renderSyncJob(m.body, res.job, joined); + async function poll() { + if (closed) return; + try { + const r = await api("GET", "/performance/api/sync/jobs/" + encodeURIComponent(res.job.id)); + last = r.job; + renderSyncJob(m.body, r.job, joined); + if (r.job.finished) { + closeBtn.textContent = "확인"; + closeBtn.className = "erp-btn erp-btn-primary"; + return; + } + } catch (err) { + m.body.insertAdjacentHTML("beforeend", '

' + esc(err.message) + "

"); + return; + } + timer = setTimeout(poll, 800); + } + timer = setTimeout(poll, 500); + }).catch(function (err) { + m.body.innerHTML = '

' + esc(err.message) + "

"; + closed = true; + reject(err); + }); + }); + } + // 끝난 작업 → 기존 결과 줄(반영/실패/건너뜀)에 쓰던 모양 + function jobResults(job) { + return (job && job.shops || []).map(function (s) { + return { code: s.code, name: s.name, ok: s.state === "done", skipped: s.state === "skipped", + upserted: s.upserted, status: s.status, label: s.label, message: s.message, finished: s.state !== "waiting" && s.state !== "running" && s.state !== "saving" }; + }); + } + // ════════════════════════════════════════════════════ // 대시보드 // ════════════════════════════════════════════════════ @@ -129,13 +226,16 @@ // 지금 보고 있는 기간(오늘까지)을 가져온다 — "이번달"이면 1일부터 오늘까지. const from = data.period_start, to = data.period_end < data.today ? data.period_end : data.today; if (from > data.today) throw new Error("앞으로의 기간은 가져올 수 없습니다."); - const res = await api("POST", "/performance/api/sync", { from: from, to: to }); + // 진행 창(쇼핑몰별·전체 막대) — 창을 닫아도 서버에서 계속된다. + const job = await runSyncWithProgress({ from: from, to: to }, "매출 업데이트 " + from + " ~ " + to); + const res = { results: jobResults(job).filter(function (r) { return r.finished; }), last_update_at: job && job.last_update_at }; + const running = job && !job.finished; // 실패(빨강)는 인증 실패·API 오류처럼 손봐야 하는 것만. 인증정보를 아직 안 넣은 쇼핑몰(미설정)과 // 수집을 아직 만들지 않은 쇼핑몰(연동 준비 중)은 회색 한 줄로 이름만. const ok = [], bad = [], pending = [], unset = [], busy = []; let changed = 0; (res.results || []).forEach(function (r) { - const name = (data.names || {})[r.code] || r.code; + const name = (data.names || {})[r.code] || r.name || r.code; if (r.skipped) busy.push(name); else if (r.ok) { ok.push(name + " " + fmt(r.upserted) + "건"); changed += r.upserted; } else if (r.status === "not_implemented") pending.push(name); @@ -148,6 +248,7 @@ if (busy.length) parts.push("이미 진행 중 " + esc(busy.join(", "))); if (pending.length) parts.push('연동 준비 중: ' + esc(pending.join(", ")) + ""); if (unset.length) parts.push('인증정보 미설정: ' + esc(unset.join(", ")) + ""); + if (running) parts.unshift("업데이트가 아직 진행 중입니다 — 끝나면 다시 [매출 업데이트]를 눌러 결과를 보세요"); resultBox.innerHTML = parts.join(" · ") || "업데이트할 쇼핑몰이 없습니다."; resultBox.className = "perf-notice" + (bad.length ? " is-warn" : " is-ok"); resultBox.hidden = false; @@ -155,7 +256,7 @@ const lu = document.querySelector("#perf-last-update b"); if (lu) lu.textContent = res.last_update_at.slice(0, 16).replace("T", " "); } - if (changed > 0) setTimeout(function () { location.reload(); }, 1200); + if (changed > 0 && !running) setTimeout(function () { location.reload(); }, 800); } catch (err) { resultBox.textContent = "업데이트 실패: " + err.message; resultBox.className = "perf-notice is-warn"; @@ -891,10 +992,12 @@ backfill.textContent = "가져오는 중…"; box.hidden = true; try { - const res = await api("POST", "/performance/api/sync", { from: from, to: to }); + const job = await runSyncWithProgress({ from: from, to: to }, "과거 매출 가져오기 " + from + " ~ " + to); + const res = { results: jobResults(job).filter(function (r) { return r.finished; }) }; const ok = [], bad = [], rest = []; + if (job && !job.finished) rest.push("(아직 진행 중 — 창을 닫았습니다. 끝나면 대시보드에 반영됩니다)"); (res.results || []).forEach(function (r) { - const name = names[r.code] || r.code; + const name = names[r.code] || r.name || r.code; if (r.ok) ok.push(name + " " + fmt(r.upserted) + "건"); else if (r.skipped) rest.push(name + "(이미 진행 중)"); else if (r.status === "not_implemented" || r.status === "not_configured") rest.push(name); diff --git a/docs/PERFORMANCE_MODULE.md b/docs/PERFORMANCE_MODULE.md index d98fb92..2363142 100644 --- a/docs/PERFORMANCE_MODULE.md +++ b/docs/PERFORMANCE_MODULE.md @@ -187,6 +187,13 @@ - **대시보드 [매출 업데이트]** = 지금 보고 있는 기간(오늘까지)을 `POST /api/sync {from, to}` 로 다시 가져온다 ("이번달"이면 1일~오늘). 모듈 권한자는 92일까지, 더 긴 기간(올해 등, 최대 366일)은 관리자만. - **과거 매출 가져오기**(설정 화면, 관리자): 같은 API 로 임의 기간(최대 366일). 같은 사건은 덮어써서 여러 번 해도 중복 없음. +- **진행 창**(두 버튼 공통, `runSyncWithProgress`): `POST /api/sync {…, background: true}` → 수집을 스레드로 돌리고 작업 번호를 + 바로 돌려줌 → 화면이 `GET /api/sync/jobs/{id}` 를 0.8초마다 불러 **쇼핑몰별 막대 + 전체 막대**를 그린다(`jobs.py`, 메모리 보관 — + uvicorn 단일 워커 기준, 서버 재시작 시 진행 정보만 사라짐). 어댑터가 `ctx.progress.plan(전체, 단위)`/`step(items=)`/`add(n)` 로 + 알린다 — 네이버 = 일, 11번가 = 7일 구간(정산 + 주문 상태 4개), 카페24 = 60일 구간(결제·환불·환불 없는 취소 2종, 대조 필요 시 +). + 상태: 대기 → 수집 중 n/전체 · 받은 자료 → 저장 중 → 완료 n건 반영 | 실패 | 건너뜀. 수집이 없거나 인증정보가 없는 쇼핑몰은 + 막대에서 빼고 "건너뜀" 한 줄(전체 진행률에 안 넣음). 전체 = 막대 쇼핑몰 진행률 평균. 이미 돌고 있는 업데이트가 있으면 새로 시작하지 + 않고 그 진행 상황을 보여 준다(`GET /api/sync/current`). 창을 닫아도 수집은 계속된다. - 카페24 **환불합계 규칙(확정, 2026-09-29 실데이터)**: 카페24 "일별 매출내역" 환불합계 = 환불 목록의 (실제 환불액 + 적립금·예치금 환불) + 환불 목록에 없는 취소·반품(네이버페이 등, 취소일 기준). 9/26 = 178,220 + 1,080 + 네이버페이 취소 96,500 = 275,800, 9/27 = 145,000 + 네이버페이 55,800 = 200,800 으로 일치. 대조 도구에 환불합계 후보(값 입력 시 일치 줄 강조)·환불 건별·