diff --git a/app/modules/performance/CLAUDE.md b/app/modules/performance/CLAUDE.md index 6a74367..3db2c09 100644 --- a/app/modules/performance/CLAUDE.md +++ b/app/modules/performance/CLAUDE.md @@ -46,6 +46,11 @@ - 일자별 표 **기간 합계 행은 맨 위**(제목 행 바로 아래, 2026-10-21 `calc.main_table`) — 매출·광고비 공통, 연간 보기 "연간 합계"는 그대로 맨 아래. - 열 순서 카페24·네이버·쿠팡(윙)·쿠팡(로켓)·오늘의집·G마켓·카카오·GS샵·11번가·롯데ON·토스·애터미아자몰(마이그레이션 003). - 쿠팡(로켓)·애터미아자몰은 **수동 입력 전용**(`adapters/manual.py`, `manual_only` — 매출 업데이트에서 빠지고 인증 설정·연결 테스트 없음, 수동 입력 늘 켜짐). +- **직접 추가 쇼핑몰·그룹·순서 드래그**(2026-10-22, 마이그레이션 009 `is_custom`·`is_group`·`parent_code`) — 설정 [+ 쇼핑몰 추가(수동 입력)] + (코드 `custom_…`, `get_adapter` 가 `CustomManualAdapter` = 수동 입력 전용)·[+ 그룹 추가](`group_…`, 매출 없음·`include_in_sales` 꺼짐), + 직접 추가 쇼핑몰만 그룹 select 로 묶음, 이름 변경·삭제(삭제 = 그 쇼핑몰 수동 입력·수수료도). 매출 실적 표 그룹 열 = 보이는 하위 합계(일 합계엔 안 더함), + ▾/▸ 하위 열 접기(localStorage). ⠿ 드래그 → `PUT /api/marketplace-order` → `sort_order`, 화면 순서는 `dashboard.ordered_marketplaces` + (그룹 바로 뒤 하위) 한 곳. 상세 `docs/PERFORMANCE_MODULE.md` "직접 추가 쇼핑몰·그룹". ## 매출 실적 화면 (2026-10-19) diff --git a/app/modules/performance/adapters/manual.py b/app/modules/performance/adapters/manual.py index 57efd4a..bf5fc56 100644 --- a/app/modules/performance/adapters/manual.py +++ b/app/modules/performance/adapters/manual.py @@ -23,3 +23,10 @@ class CoupangRocketAdapter(ManualOnlyAdapter): class AtomyAzmallAdapter(ManualOnlyAdapter): code = "atomy" name = "애터미아자몰" + + +class CustomManualAdapter(ManualOnlyAdapter): + """실적 설정에서 사용자가 직접 추가한 쇼핑몰(마이그레이션 009, 코드 custom_…) — 이름은 DB(perf_marketplaces.name).""" + + def __init__(self, code: str) -> None: + self.code = code diff --git a/app/modules/performance/adapters/registry.py b/app/modules/performance/adapters/registry.py index c51ae43..aecab54 100644 --- a/app/modules/performance/adapters/registry.py +++ b/app/modules/performance/adapters/registry.py @@ -14,7 +14,7 @@ from .gmarket import GmarketAdapter from .gsshop import GsshopAdapter from .kakao import KakaoAdapter from .lotteon import LotteonAdapter -from .manual import AtomyAzmallAdapter, CoupangRocketAdapter +from .manual import AtomyAzmallAdapter, CoupangRocketAdapter, CustomManualAdapter from .naver import NaverAdapter from .ohouse import OhouseAdapter from .toss import TossAdapter @@ -36,10 +36,18 @@ _ADAPTERS: tuple[MarketplaceAdapter, ...] = ( ) _BY_CODE = {a.code: a for a in _ADAPTERS} +# 실적 설정에서 직접 추가한 행(마이그레이션 009) — 쇼핑몰은 수동 입력 전용 어댑터, 그룹은 어댑터 없음(매출 없음) +CUSTOM_PREFIX = "custom_" +GROUP_PREFIX = "group_" + def all_adapters() -> tuple[MarketplaceAdapter, ...]: return _ADAPTERS def get_adapter(code: str) -> MarketplaceAdapter | None: - return _BY_CODE.get(code) + """코드 → 어댑터. 직접 추가 쇼핑몰(custom_…)은 수동 입력 전용 어댑터, 그룹·모르는 코드는 None.""" + adapter = _BY_CODE.get(code) + if adapter is None and code.startswith(CUSTOM_PREFIX): + return CustomManualAdapter(code) + return adapter diff --git a/app/modules/performance/dashboard.py b/app/modules/performance/dashboard.py index 7a510d3..5d13d0d 100644 --- a/app/modules/performance/dashboard.py +++ b/app/modules/performance/dashboard.py @@ -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()} diff --git a/app/modules/performance/db.py b/app/modules/performance/db.py index 0aeb3e5..85232e5 100644 --- a/app/modules/performance/db.py +++ b/app/modules/performance/db.py @@ -30,6 +30,10 @@ class ManualMigrationNeeded(Exception): """수동 입력(마이그레이션 002: perf_marketplaces.manual_input · perf_manual_sales)이 아직 적용되지 않음.""" +class CustomMigrationNeeded(Exception): + """직접 추가 쇼핑몰·그룹(마이그레이션 009: perf_marketplaces.is_custom · is_group · parent_code)이 아직 적용되지 않음.""" + + def _set_formulas(conn: Any, table: str, key_col: str, date_col: str, rows: list[tuple[str, date, str | None]]) -> None: """날짜 칸 계산식(마이그레이션 008) 덮어쓰기 — 식이 없으면 지움. 008 미적용이면 조용히 건너뛴다 @@ -103,6 +107,72 @@ class PerformanceDBStore: raise ManualMigrationNeeded() from None return {k: _iso(v) for k, v in row.items()} if row else None + # ── 직접 추가 쇼핑몰·그룹(마이그레이션 009) ── + def add_custom_marketplace(self, code: str, name: str, *, is_group: bool) -> dict[str, Any]: + """맨 뒤 순서로 추가. 쇼핑몰 = 수동 입력 전용(manual_input), 그룹 = 매출 없음(include_in_sales 꺼 둠).""" + try: + with self._pool.connection() as conn: + row = conn.execute( + "INSERT INTO perf_marketplaces (code, name, sort_order, manual_input, include_in_sales, is_custom, is_group) " + "SELECT %s, %s, COALESCE(MAX(sort_order), 0) + 10, %s, %s, TRUE, %s FROM perf_marketplaces RETURNING *", + (code, name, not is_group, not is_group, is_group), + ).fetchone() + except pg_errors.UndefinedColumn: + raise CustomMigrationNeeded() from None + return {k: _iso(v) for k, v in row.items()} + + def rename_marketplace(self, code: str, name: str) -> dict[str, Any] | None: + with self._pool.connection() as conn: + row = conn.execute("UPDATE perf_marketplaces SET name = %s WHERE code = %s RETURNING *", (name, code)).fetchone() + return {k: _iso(v) for k, v in row.items()} if row else None + + def set_marketplace_parent(self, code: str, parent_code: str | None) -> dict[str, Any] | None: + try: + with self._pool.connection() as conn: + row = conn.execute("UPDATE perf_marketplaces SET parent_code = %s WHERE code = %s RETURNING *", + (parent_code, code)).fetchone() + except pg_errors.UndefinedColumn: + raise CustomMigrationNeeded() from None + return {k: _iso(v) for k, v in row.items()} if row else None + + def delete_custom_marketplace(self, code: str) -> bool: + """직접 추가 행 삭제 — 그 쇼핑몰 수동 입력·수수료·상태·(테스트) 매출 행도 함께, 그룹이면 하위 쇼핑몰은 그룹 없음으로. + 기본 쇼핑몰(is_custom = FALSE)은 지우지 않는다.""" + with self._pool.connection() as conn: + with conn.transaction(): + row = conn.execute("SELECT is_custom FROM perf_marketplaces WHERE code = %s FOR UPDATE", (code,)).fetchone() + if not row or not row.get("is_custom"): + return False + conn.execute("UPDATE perf_marketplaces SET parent_code = NULL WHERE parent_code = %s", (code,)) + for table in ("perf_manual_sales", "perf_commission_rates", "perf_credentials", + "perf_connection_status", "perf_sales_events", "perf_sync_runs"): + conn.execute(f"DELETE FROM {table} WHERE marketplace_code = %s", (code,)) + conn.execute("DELETE FROM perf_marketplaces WHERE code = %s", (code,)) + return True + + def manual_day_count(self, code: str) -> int: + """수동 입력해 둔 날 수 — 직접 추가 쇼핑몰 삭제 확인 문구용.""" + try: + with self._pool.connection() as conn: + row = conn.execute("SELECT COUNT(*) AS n FROM perf_manual_sales WHERE marketplace_code = %s", + (code,)).fetchone() + except pg_errors.UndefinedTable: + return 0 + return int(row["n"] or 0) + + def reorder_marketplaces(self, codes: list[str]) -> None: + """설정 화면 드래그 순서 — 받은 순서대로 sort_order 10, 20, … (목록에 없는 행은 그 뒤 예전 순서).""" + with self._pool.connection() as conn: + with conn.transaction(): + rest = [r["code"] for r in conn.execute( + "SELECT code FROM perf_marketplaces WHERE NOT (code = ANY(%s)) ORDER BY sort_order, code", (codes,) + ).fetchall()] + with conn.cursor() as cur: + cur.executemany( + "UPDATE perf_marketplaces SET sort_order = %s WHERE code = %s AND sort_order IS DISTINCT FROM %s", + [((i + 1) * 10, c, (i + 1) * 10) for i, c in enumerate([*codes, *rest])], + ) + # ════════════════════════════════════════════════════════════ # 수수료율 이력 # ════════════════════════════════════════════════════════════ diff --git a/app/modules/performance/router.py b/app/modules/performance/router.py index 32a3685..930bc92 100644 --- a/app/modules/performance/router.py +++ b/app/modules/performance/router.py @@ -25,7 +25,11 @@ JSON API — 모듈 권한 JSON API — 관리자 GET|PUT /performance/api/ad-sources/{code}/credentials 광고 API 인증정보(마이그레이션 007, 암호화 저장·비밀 원문 없음) POST /performance/api/ad-sources/{code}/test 광고 API 연결 테스트(저장값 또는 새 입력값) - PUT /performance/api/marketplaces/{code} 사용/매출 집계/수동 입력 여부 + PUT /performance/api/marketplaces/{code} 사용/매출 집계/수동 입력 여부, 직접 추가 행 이름·그룹(009) + POST /performance/api/marketplaces 쇼핑몰(수동 입력 전용)·그룹 직접 추가(009) + DELETE /performance/api/marketplaces/{code} 직접 추가 쇼핑몰·그룹 삭제(그 쇼핑몰 수동 입력·수수료도) + PUT /performance/api/marketplace-order 쇼핑몰 순서(설정 드래그 — 매출 실적 열 순서) + GET /performance/api/marketplaces/{code}/manual-days 수동 입력해 둔 날 수(삭제 확인 문구) POST /performance/api/marketplaces/{code}/rates 수수료율(적용 시작일) DELETE /performance/api/marketplaces/{code}/rates/{id} GET /performance/api/marketplaces/{code}/credentials 입력칸 + 저장 여부(비밀 원문 없음) @@ -72,6 +76,9 @@ AD_MIGRATION_HELP_007 = ("광고 API 연동(구글 광고) 인증정보를 저 def _ad_migration_help(exc: Exception) -> str: text = str(exc) return AD_MIGRATION_HELP_007 if "007" in text else AD_MIGRATION_HELP_006 if "006" in text else AD_MIGRATION_HELP +CUSTOM_MIGRATION_HELP = ("쇼핑몰 직접 추가·그룹을 쓰려면 performance_db 마이그레이션 009" + "(scripts/sql/performance_db_009_custom_marketplaces.sql)를 먼저 적용해야 합니다.") +MAX_MARKET_NAME = 30 MANUAL_MIGRATION_HELP = ("수동 입력을 쓰려면 performance_db 마이그레이션 002(scripts/sql/performance_db_002_manual_sales.sql)를 " "먼저 적용해야 합니다.") @@ -451,9 +458,9 @@ def api_manual_upload(request: Request, file: UploadFile = File(...)) -> JSONRes store, user = common.require_store(request) # 날짜 칸 수동 입력과 같은 권한(모듈 권한자 누구나) content = file.file.read(manual_upload.MAX_FILE_BYTES + 1) - known = {a.code: a for a in all_adapters()} - markets = [m for m in store.list_marketplaces() if m["code"] in known and m["enabled"]] - extra = {m["code"]: (known[m["code"]].name, _short_name(m["name"])) for m in markets} + # 직접 추가 쇼핑몰(009)도 대상 — 어댑터 = 수동 입력 전용(이름은 DB), 그룹 행은 어댑터가 없어 빠진다 + markets = [m for m in store.list_marketplaces() if get_adapter(m["code"]) is not None and m["enabled"]] + extra = {m["code"]: tuple(n for n in (get_adapter(m["code"]).name, _short_name(m["name"])) if n) for m in markets} try: res = manual_upload.parse_workbook(content, markets=markets, today=today_kst(), extra_names=extra) except manual_upload.UploadError as exc: @@ -730,15 +737,120 @@ def api_ad_source_sync(request: Request, code: str, payload: dict[str, Any] = Bo # ════════════════════════════════════════════════════════════ # JSON API — 설정(수수료율은 모듈 권한자 누구나, 나머지는 관리자) # ════════════════════════════════════════════════════════════ +def _market_or_404(store: Any, code: str) -> dict[str, Any]: + """DB 행(그룹 포함).""" + m = next((x for x in store.list_marketplaces() if x["code"] == code), None) + if m is None or (get_adapter(code) is None and not m.get("is_group")): + raise HTTPException(status_code=404, detail="알 수 없는 쇼핑몰입니다.") + return m + + +def _clean_market_name(store: Any, raw: Any, *, code: str = "") -> str: + """직접 추가 행 이름 — 엑셀 업로드 머리글로도 쓰여 다른 쇼핑몰·그룹과 겹치면 안 된다.""" + name = " ".join(str(raw or "").split()) + if not name: + raise HTTPException(status_code=400, detail="이름을 입력하세요.") + if len(name) > MAX_MARKET_NAME: + raise HTTPException(status_code=400, detail=f"이름은 {MAX_MARKET_NAME}자까지입니다.") + if any(m["code"] != code and m["name"].strip().lower() == name.lower() for m in store.list_marketplaces()): + raise HTTPException(status_code=400, detail=f"같은 이름({name})이 이미 있습니다.") + return name + + +def _set_parent(store: Any, code: str, parent: str | None) -> dict[str, Any] | None: + from .db import CustomMigrationNeeded # noqa: WPS433 + + if parent: + g = next((x for x in store.list_marketplaces() if x["code"] == parent), None) + if g is None or not g.get("is_group"): + raise HTTPException(status_code=400, detail="그룹을 찾지 못했습니다.") + try: + return store.set_marketplace_parent(code, parent or None) + except CustomMigrationNeeded: + raise HTTPException(status_code=503, detail=CUSTOM_MIGRATION_HELP) from None + + +@router.post("/api/marketplaces") +def api_add_marketplace(request: Request, payload: dict[str, Any] = Body(...)) -> JSONResponse: + """직접 추가(009) — kind="shop" 수동 입력 전용 쇼핑몰(맨 뒤, 사용·매출 집계·수동 입력 켬), kind="group" 그룹.""" + import secrets # noqa: WPS433 + + from .adapters.registry import CUSTOM_PREFIX, GROUP_PREFIX # noqa: WPS433 + from .db import CustomMigrationNeeded # noqa: WPS433 + + store, _ = common.require_store(request, admin=True) + kind = payload.get("kind") or "shop" + if kind not in ("shop", "group"): + raise HTTPException(status_code=400, detail="kind 는 shop 또는 group 입니다.") + name = _clean_market_name(store, payload.get("name")) + code = (GROUP_PREFIX if kind == "group" else CUSTOM_PREFIX) + secrets.token_hex(4) + try: + row = store.add_custom_marketplace(code, name, is_group=kind == "group") + except CustomMigrationNeeded: + raise HTTPException(status_code=503, detail=CUSTOM_MIGRATION_HELP) from None + if kind == "shop" and payload.get("parent_code"): + row = _set_parent(store, code, str(payload["parent_code"])) or row + return JSONResponse({"marketplace": row}) + + +@router.delete("/api/marketplaces/{code}") +def api_delete_marketplace(request: Request, code: str) -> JSONResponse: + """직접 추가한 쇼핑몰·그룹만 — 쇼핑몰이면 수동 입력 매출·수수료율도 지운다, 그룹이면 하위 쇼핑몰은 그룹 없음.""" + store, _ = common.require_store(request, admin=True) + m = _market_or_404(store, code) + if not m.get("is_custom"): + raise HTTPException(status_code=400, detail="기본 쇼핑몰은 삭제할 수 없습니다(사용을 끄세요).") + if not store.delete_custom_marketplace(code): + raise HTTPException(status_code=404, detail="알 수 없는 쇼핑몰입니다.") + return JSONResponse({"ok": True}) + + +@router.get("/api/marketplaces/{code}/manual-days") +def api_manual_days(request: Request, code: str) -> JSONResponse: + """수동 입력해 둔 날 수 — 직접 추가 쇼핑몰 삭제 확인 문구용.""" + store, _ = common.require_store(request, admin=True) + _market_or_404(store, code) + return JSONResponse({"days": store.manual_day_count(code)}) + + +@router.put("/api/marketplace-order") +def api_marketplace_order(request: Request, payload: dict[str, Any] = Body(...)) -> JSONResponse: + """설정 드래그 순서 — 화면에 보이는 순서(그룹 뒤에 하위) 그대로 codes. 매출 실적 열 순서가 된다.""" + store, _ = common.require_store(request, admin=True) + known = {m["code"] for m in store.list_marketplaces()} + codes = [str(c) for c in (payload.get("codes") or []) if str(c) in known] + if len(set(codes)) != len(codes): + raise HTTPException(status_code=400, detail="순서 목록에 같은 쇼핑몰이 두 번 있습니다.") + if not codes: + raise HTTPException(status_code=400, detail="순서 목록이 비었습니다.") + store.reorder_marketplaces(codes) + return JSONResponse({"ok": True}) + + @router.put("/api/marketplaces/{code}") def api_update_marketplace(request: Request, code: str, payload: dict[str, Any] = Body(...)) -> JSONResponse: store, _ = common.require_store(request, admin=True) - _code_or_404(store, code) + m = _market_or_404(store, code) from .db import ManualMigrationNeeded # noqa: WPS433 adapter = get_adapter(code) if adapter is not None and adapter.manual_only and payload.get("manual_input") is False: raise HTTPException(status_code=400, detail="수동 입력 전용 쇼핑몰은 수동 입력을 끌 수 없습니다.") + # 직접 추가 행(009) — 이름·그룹. 그룹으로 묶을 수 있는 건 직접 추가한 쇼핑몰만(그룹 안에 그룹 없음) + if "name" in payload or "parent_code" in payload: + if not m.get("is_custom"): + raise HTTPException(status_code=400, detail="기본 쇼핑몰은 이름·그룹을 바꿀 수 없습니다.") + if "parent_code" in payload and m.get("is_group"): + raise HTTPException(status_code=400, detail="그룹은 다른 그룹에 넣을 수 없습니다.") + row = None + if "name" in payload: + row = store.rename_marketplace(code, _clean_market_name(store, payload.get("name"), code=code)) + if "parent_code" in payload: + row = _set_parent(store, code, str(payload.get("parent_code") or "") or None) + if not any(k in payload for k in ("enabled", "include_in_sales", "manual_input")): + return JSONResponse({"marketplace": row}) + if m.get("is_group"): + raise HTTPException(status_code=400, detail="그룹은 이름만 바꿀 수 있습니다.") try: row = store.update_marketplace( @@ -891,7 +1003,7 @@ def api_sample_data(request: Request, payload: dict[str, Any] = Body(...)) -> JS start, end = end, start if (end - start).days > 400: raise HTTPException(status_code=400, detail="테스트 데이터는 한 번에 400일까지 만들 수 있습니다.") - codes = [m["code"] for m in store.list_marketplaces() if m["enabled"]] + codes = [m["code"] for m in store.list_marketplaces() if m["enabled"] and get_adapter(m["code"]) is not None] _, sync = common.services(request, store) n = sync.generate_samples(start, end, codes) return JSONResponse({"generated": n, "sample_count": store.sample_count()}) diff --git a/app/modules/performance/templates/performance/ads.html b/app/modules/performance/templates/performance/ads.html index dee2934..4aee597 100644 --- a/app/modules/performance/templates/performance/ads.html +++ b/app/modules/performance/templates/performance/ads.html @@ -1,6 +1,6 @@ {% extends "erp_base.html" %} -{% block head_extra %}{% endblock %} +{% block head_extra %}{% endblock %} {#- ROAS 덧붙임 — "광고비(ROAS%)". 광고비가 없으면 아무것도 안 붙는다. -#} {%- macro roas(p) -%}{%- if p is not none -%}({{ "{:,}".format(p) }}%){%- endif -%}{%- endmacro -%} @@ -238,4 +238,4 @@ } | tojson }} {% endblock %} -{% block scripts %}{% endblock %} +{% block scripts %}{% endblock %} diff --git a/app/modules/performance/templates/performance/index.html b/app/modules/performance/templates/performance/index.html index 66109e7..a8f2fd7 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 -%} @@ -139,7 +139,11 @@ {% if period_kind == 'year' %}월{% else %}날짜{% endif %} - {% for c in codes %}{{ short_names[c] }}{% if c in manual_codes %} ✎{% endif %}{% endfor %} + {#- 그룹(2026-10-22) — 그룹 열 = 보이는 하위 쇼핑몰 합계, ▾ 로 하위 열 접기/펴기(이 브라우저에 기억) -#} + {% for col in cols %}{% set c = col.code %} + {% if col.kind == 'group' %}{{ short_names[c] }} + {% else %}{{ short_names[c] }}{% if c in manual_codes %} ✎{% endif %}{% endif %} + {% endfor %} {% if period_kind == 'year' %}월 합계{% else %}일 합계{% endif %} @@ -149,16 +153,20 @@ {{ r.label }}{% if r.holiday %}{{ r.holiday }}{% endif %} - {% for c in codes %} + {% for col in cols %} + {% set c = col.code %} {% set m = r.cells[c] %} - {% if r.kind == 'day' and c in manual_codes %} + {% set gattr %}{% if col.kind == 'child' %} data-group-child="{{ col.group }}"{% endif %}{% endset %} + {% if col.kind == 'group' %} + {{ m3(m) }} + {% elif r.kind == 'day' and c in manual_codes %} {% set is_manual = (r.date ~ '|' ~ c) in manual_cells %} {% set fx = (formula_cells or {}).get(r.date ~ '|' ~ c) %} - {{ m3(m) }}{{ adl(r.ads[c]) }} {% else %} - {{ m3(m) }}{{ adl(r.ads[c]) }} {% endif %} {% endfor %} @@ -275,4 +283,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 3cbd98f..1047f26 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 -%} @@ -41,10 +41,30 @@ {% if is_admin %}{% endif %} - - {% for r in rows %} - - {{ r.name }} + {# 드래그 단위(2026-10-22) = tbody 하나 — 그룹 없는 행 하나 또는 그룹 + 하위 쇼핑몰(하위는 그 안에서만 순서 변경) #} + {% for b in blocks %} + + {% for r in [b.row] + b.children %} + {% if r.is_group %} + + + {% if is_admin %}{% endif %} + {{ r.name }} 그룹 + + 하위 쇼핑몰 {{ r.children }}곳 — 매출 실적에서 그룹 열 = 하위 쇼핑몰 매출 합계(수수료도 쇼핑몰별 요율로 계산해 합침) + {% if is_admin %} + + + + + {% endif %} + + {% else %} + + + {% if is_admin %}{% endif %} + {% if r.parent %}{% endif %}{{ r.name }}{% if r.is_custom %} 직접 추가{% endif %} + {% if is_admin %}