feat(performance): 직접 추가 쇼핑몰(수동 입력)·쇼핑몰 그룹·설정 드래그 순서

- 마이그레이션 009: perf_marketplaces.is_custom·is_group·parent_code
- 설정: [+ 쇼핑몰 추가(수동 입력)]·[+ 그룹 추가], 이름 변경·삭제, 직접 추가 쇼핑몰 그룹 select
- custom_ 코드는 registry.get_adapter 가 수동 입력 전용 어댑터(CustomManualAdapter)로
- 매출 실적 표: 그룹 열 = 보이는 하위 쇼핑몰 합계(일 합계엔 안 더함), ▾/▸ 하위 열 접기(localStorage)
- 설정 표 ⠿ 드래그 → PUT /api/marketplace-order → sort_order, 화면 순서는 ordered_marketplaces 한 곳
- 테스트: test_custom_groups.py, perf_groups.browser.test.js

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
2026-10-22 10:57:03 +09:00
parent 5ef9a55d91
commit e3a8649b41
18 changed files with 948 additions and 44 deletions
+87 -19
View File
@@ -11,13 +11,50 @@ from typing import Any, Mapping, Sequence
from . import calc
from .adapters.base import STATUS_LABELS
from .adapters.registry import all_adapters, get_adapter
from .adapters.registry import get_adapter
def _sales_marketplaces(store: Any) -> list[dict[str, Any]]:
"""대시보드 열 = 사용 ON + 매출 집계 ON 인 쇼핑몰(설정 순서)."""
known = {a.code for a in all_adapters()}
return [m for m in store.list_marketplaces() if m["enabled"] and m["include_in_sales"] and m["code"] in known]
def ordered_marketplaces(markets: Sequence[Mapping[str, Any]]) -> list[Mapping[str, Any]]:
"""화면 순서(설정 드래그 = sort_order) — 그룹(009) 바로 뒤에 그 하위 쇼핑몰(하위끼리도 sort_order).
목록에 그룹이 없는 하위 쇼핑몰은 그룹 없음처럼 제자리. markets 는 sort_order 순(list_marketplaces)."""
groups = {m["code"] for m in markets if m.get("is_group")}
children: dict[str, list[Mapping[str, Any]]] = {}
for m in markets:
if m.get("parent_code") in groups and not m.get("is_group"):
children.setdefault(m["parent_code"], []).append(m)
out: list[Mapping[str, Any]] = []
for m in markets:
if m.get("parent_code") in groups and not m.get("is_group"):
continue
out.append(m)
out.extend(children.get(m["code"], ()))
return out
def _sales_marketplaces(store: Any, rows: Sequence[Mapping[str, Any]] | None = None) -> list[dict[str, Any]]:
"""대시보드 열 = 사용 ON + 매출 집계 ON 인 쇼핑몰(설정 순서 — 그룹 하위는 그룹 자리). 그룹 행은 빠진다(매출 없음)."""
rows = ordered_marketplaces(store.list_marketplaces() if rows is None else rows)
return [m for m in rows if m["enabled"] and m["include_in_sales"] and get_adapter(m["code"]) is not None]
def _group_columns(store_rows: Sequence[Mapping[str, Any]], codes: Sequence[str]) -> tuple[list[dict[str, Any]], dict[str, list[str]]]:
"""일자별 표 열 — 그룹(009)은 보이는 하위 쇼핑몰이 하나라도 있을 때 하위 열 바로 앞에 그룹 합계 열.
[{code, kind: shop|group|child, group}], 그룹 → 보이는 하위 코드."""
groups = {m["code"]: m for m in store_rows if m.get("is_group")}
parent = {m["code"]: m.get("parent_code") for m in store_rows if m.get("parent_code") in groups}
members: dict[str, list[str]] = {}
cols: list[dict[str, Any]] = []
for c in codes:
g = parent.get(c)
if g is None:
cols.append({"code": c, "kind": "shop", "group": ""})
continue
if g not in members:
members[g] = []
cols.append({"code": g, "kind": "group", "group": g})
members[g].append(c)
cols.append({"code": c, "kind": "child", "group": g})
return cols, members
def display_status(marketplace: Mapping[str, Any], status_row: Mapping[str, Any] | None,
@@ -123,11 +160,17 @@ def build_dashboard(store: Any, *, kind: str, anchor: date, today: date,
custom_from: date | None = None, custom_to: date | None = None,
selected: Sequence[str] = (), holidays: Mapping[str, str] | None = None,
configured: Mapping[str, bool] | None = None) -> dict[str, Any]:
markets = _sales_marketplaces(store)
store_rows = store.list_marketplaces()
markets = _sales_marketplaces(store, store_rows)
all_codes = [m["code"] for m in markets]
codes = [c for c in all_codes if c in set(selected)] or all_codes
names = {m["code"]: m["name"] for m in markets}
short = {c: _short_name(names[c]) for c in all_codes}
# 그룹(009) — 그룹 열 = 보이는 하위 쇼핑몰 합계(표 열만, 합계·그래프·누적은 쇼핑몰 기준 그대로)
cols, group_members = _group_columns(store_rows, codes)
for m in store_rows:
if m["code"] in group_members:
names[m["code"]] = short[m["code"]] = m["name"]
period = calc.resolve_period(kind, anchor, custom_from=custom_from, custom_to=custom_to)
cmp_start, cmp_end, cmp_label = period.compare_range(today)
@@ -187,6 +230,10 @@ def build_dashboard(store: Any, *, kind: str, anchor: date, today: date,
m_qs = "" if len(codes) == len(all_codes) else "".join(f"&m={c}" for c in codes)
table = calc.main_table(period, codes, cells, today=today, holidays=holidays)
_ad_lines(store, table, codes, cells, period, q_start, q_end)
for r in table:
for g, members in group_members.items():
r["cells"][g] = calc.total(calc.Money(gross=r["cells"][c]["gross"], commission=r["cells"][c]["commission"])
for c in members).as_dict()
def url(kind: str, anchor_d: date | None = None, start: date | None = None, end: date | None = None) -> str:
if kind == "custom":
@@ -221,6 +268,8 @@ def build_dashboard(store: Any, *, kind: str, anchor: date, today: date,
"period_kind": period.kind,
"today": today.isoformat(),
"codes": codes,
"cols": cols,
"group_members": group_members,
"all_codes": all_codes,
"names": names,
"short_names": short,
@@ -258,32 +307,51 @@ def build_settings(store: Any, *, configured: Mapping[str, bool], key_info: Mapp
today = today_kst()
via_cafe24 = set(MARKET_MAP.values()) # 카페24 마켓 통합관리 경유로 매출이 들어오는 쇼핑몰
rows = []
by_code = {m["code"]: m for m in store.list_marketplaces()}
for adapter in all_adapters():
m = by_code.get(adapter.code)
if m is None:
store_rows = store.list_marketplaces()
groups = [{"code": m["code"], "name": m["name"]} for m in store_rows if m.get("is_group")]
group_codes = {g["code"] for g in groups}
for m in ordered_marketplaces(store_rows):
code = m["code"]
parent = m.get("parent_code") if m.get("parent_code") in group_codes else ""
if m.get("is_group"):
# 그룹(009) — 매출·수수료·연결 없음, 하위 쇼핑몰 합계는 매출 실적 화면에서
rows.append({"code": code, "name": m["name"], "is_group": True, "is_custom": True, "parent": "",
"children": sum(1 for x in store_rows if x.get("parent_code") == code)})
continue
st_row = statuses.get(adapter.code) or {}
st = display_status(m, st_row, configured.get(adapter.code, False))
cur_rate = calc.rate_on(rates, adapter.code, today)
has_rate = bool(rates.get(adapter.code))
adapter = get_adapter(code)
if adapter is None:
continue
st_row = statuses.get(code) or {}
st = display_status(m, st_row, configured.get(code, False))
cur_rate = calc.rate_on(rates, code, today)
has_rate = bool(rates.get(code))
rows.append({
"code": adapter.code, "name": m["name"], "enabled": m["enabled"],
"code": code, "name": m["name"], "enabled": m["enabled"],
"is_group": False, "is_custom": bool(m.get("is_custom")), "parent": parent,
"include_in_sales": m["include_in_sales"], "manual_input": bool(m.get("manual_input")),
"rate": _fmt_rate(cur_rate) if has_rate else "",
"rate_history": len(rates.get(adapter.code, ())),
"rate_history": len(rates.get(code, ())),
"auth_type": adapter.auth_type, "shared": adapter.uses_shared_integration,
"manual_only": adapter.manual_only,
"implemented": adapter.implemented, "note": adapter.note, "docs_url": adapter.docs_url,
"configured": configured.get(adapter.code, False),
"via_cafe24": adapter.code in via_cafe24,
"configured": configured.get(code, False),
"via_cafe24": code in via_cafe24,
"status": st, "status_label": STATUS_LABELS.get(st, st),
"last_test_at": st_row.get("last_test_at"), "last_test_ok": st_row.get("last_test_ok"),
"last_sync_at": st_row.get("last_sync_at"), "last_success_sync_at": st_row.get("last_success_sync_at"),
"last_error": st_row.get("last_error") or "", "last_error_at": st_row.get("last_error_at"),
})
# 드래그 단위 — 그룹 없는 행 하나 또는 그룹 + 하위 쇼핑몰(하위는 그 안에서만 순서 변경)
blocks: list[dict[str, Any]] = []
for r in rows:
if r["parent"] and blocks and blocks[-1]["row"]["code"] == r["parent"]:
blocks[-1]["children"].append(r)
else:
blocks.append({"row": r, "children": []})
stale = {v: n for v, n in key_versions_in_use.items() if key_info.get("current_version") and v != key_info["current_version"]}
return {"rows": rows, "key_info": key_info, "key_versions_in_use": dict(key_versions_in_use),
return {"rows": rows, "blocks": blocks, "groups": groups,
"custom_ready": bool(store_rows) and "is_custom" in store_rows[0],
"key_info": key_info, "key_versions_in_use": dict(key_versions_in_use),
"stale_key_rows": sum(stale.values()), "sample_count": sample_count,
"default_sample_from": today.replace(month=1, day=1).isoformat(),
"default_sample_to": today.isoformat()}