feat(performance): 앞날 입력·계산식 칸·기간 합계 맨 위
- 매출 수동 입력·광고비 날짜 칸과 엑셀·광고 보고서 업로드에서 오늘 이후 날짜 허용 - 이번달 등 일자별 표의 기간 합계 행을 제목 행 바로 아래로 - 날짜 칸에 = 없이 1000+2000 계산식 입력(formula.parse_amount), 식은 마이그레이션 008 formula 열에 저장해 파랑 굵은 숫자·다시 누르면 식 - 광고비 탭 직접 입력값은 굵게 해제(굵게는 계산식만) Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -51,11 +51,12 @@ def test_rocket_report_reads_date_and_col19(content, name):
|
||||
def test_rocket_report_errors_block_everything():
|
||||
bad = ROCKET_CSV + "2026년 13월 40일,RETAIL,,,,,,,,,,,1,0,1,1,1,0,1\n" # 날짜 오류
|
||||
bad += "2026년 10월 08일,RETAIL,,,,,,,,,,,1,0,1,1,1,0,abc\n" # 금액이 숫자 아님
|
||||
bad += "2026년 10월 20일,RETAIL,,,,,,,,,,,1,0,1,1,1,0,5\n" # 앞으로의 날짜
|
||||
bad += "2026년 10월 20일,RETAIL,,,,,,,,,,,1,0,1,1,1,0,5\n" # 앞으로의 날짜 — 됨(2026-10-21)
|
||||
res = ads.parse_coupang_rocket(bad.encode("utf-8"), today=TODAY)
|
||||
joined = " / ".join(res.errors)
|
||||
assert len(res.errors) == 3, res.errors
|
||||
assert "날짜를 읽을 수 없습니다" in joined and "숫자가 아닙니다" in joined and "앞으로의 날짜" in joined
|
||||
assert len(res.errors) == 2, res.errors
|
||||
assert "날짜를 읽을 수 없습니다" in joined and "숫자가 아닙니다" in joined and "앞으로의 날짜" not in joined
|
||||
assert (date(2026, 10, 20), 5) in res.entries
|
||||
|
||||
|
||||
def test_coupang_report_date_rows_col19_summed_empty_skipped():
|
||||
@@ -130,12 +131,12 @@ def test_ad_dashboard_month():
|
||||
assert ctx["api_cells"] == []
|
||||
day1 = next(r for r in ctx["table"] if r.get("date") == "2026-10-01")
|
||||
assert day1["cells"]["coupang_rocket"]["gross"] == 220000 and day1["total"]["gross"] == 220000
|
||||
assert ctx["table"][-1]["kind"] == "total" and ctx["table"][-1]["total"]["gross"] == 270000
|
||||
assert ctx["table"][0]["kind"] == "total" and ctx["table"][0]["total"]["gross"] == 270000 # 기간 합계 = 맨 위
|
||||
# ROAS = 그 쇼핑몰 매출 ÷ 광고비 — 로켓 10/1: 550,000 ÷ 220,000 = 250%, 구글 10/2: 카페24 그날 매출 0 → 0%
|
||||
assert day1["roas"]["coupang_rocket"] == 250 and day1["roas"]["google"] is None
|
||||
day2 = next(r for r in ctx["table"] if r.get("date") == "2026-10-02")
|
||||
assert day2["roas"]["google"] is None # 구글·메타는 ROAS 계산 안 함(따로 입력)
|
||||
total = ctx["table"][-1]
|
||||
total = ctx["table"][0]
|
||||
assert total["roas"]["coupang_rocket"] == 300 and total["roas"]["google"] is None # 660,000÷220,000
|
||||
assert total["roas_total"] == 1000 # 2,700,000 ÷ 270,000 (합계 = sales_codes)
|
||||
m = {r["code"]: r for r in ctx["month"]["rows"]}
|
||||
@@ -158,7 +159,7 @@ def test_ad_dashboard_year_and_missing_table():
|
||||
|
||||
def test_ad_spend_endpoints(monkeypatch):
|
||||
"""라우터: 업로드 정상 → 한 번에 저장(source=upload), 잘못된 줄 → 400 + 목록·저장 안 함, 양식 없는 채널 400,
|
||||
칸 저장(source=manual)·지우기, 모르는 채널 404, 앞으로의 날 400, 005 미적용 503."""
|
||||
칸 저장(source=manual)·지우기·계산식, 모르는 채널 404, 앞으로의 날도 됨, 005 미적용 503."""
|
||||
import importlib
|
||||
|
||||
from fastapi import FastAPI
|
||||
@@ -179,7 +180,8 @@ def test_ad_spend_endpoints(monkeypatch):
|
||||
self.saved.extend((code, d, a, source) for d, a in entries)
|
||||
return len(entries)
|
||||
|
||||
def set_ad_spend(self, code, day, amount, *, source="manual", user=""):
|
||||
def set_ad_spend(self, code, day, amount, *, source="manual", user="", formula=None):
|
||||
self.formula = formula
|
||||
self.set_ad_spend_bulk(code, [(day, amount)], source=source, user=user)
|
||||
|
||||
store = Store()
|
||||
@@ -208,7 +210,10 @@ def test_ad_spend_endpoints(monkeypatch):
|
||||
assert client.put("/performance/api/ad-spend/meta/2026-10-11", json={"amount": ""}).status_code == 200
|
||||
assert store.saved == [("meta", date(2026, 10, 12), 33000, "manual"), ("meta", date(2026, 10, 11), None, "manual")]
|
||||
assert client.put("/performance/api/ad-spend/cafe24/2026-10-12", json={"amount": 1}).status_code == 404
|
||||
assert client.put("/performance/api/ad-spend/meta/2026-10-14", json={"amount": 1}).status_code == 400
|
||||
assert client.put("/performance/api/ad-spend/meta/2026-10-14", json={"amount": 1}).status_code == 200 # 앞날도 됨
|
||||
store.saved.clear()
|
||||
r = client.put("/performance/api/ad-spend/meta/2026-10-12", json={"amount": "(10000+5000)×2"})
|
||||
assert r.json()["amount"] == 30000 and r.json()["formula"] == "(10000+5000)*2" and store.formula == "(10000+5000)*2"
|
||||
assert client.put("/performance/api/ad-spend/meta/2026-10-12", json={"amount": "abc"}).status_code == 400
|
||||
store.missing = True
|
||||
r = client.put("/performance/api/ad-spend/meta/2026-10-12", json={"amount": 1})
|
||||
@@ -237,7 +242,7 @@ def test_naver_report_reads_date_cost_roas_and_metrics():
|
||||
bad = NAVER_CSV + "0_미라네주방,38461,2026.09.22.,1,0,0,0,0,0,0,0,1\n0_미라네주방,38461,2026.09.20.,abc,0,0,0,0,0,0,0,1\n"
|
||||
bad += "0_미라네주방,38461,2026.09.19.,5,0,0,0,0,0,0,0,x\n0_미라네주방,38461,2026.10.20.,5,0,0,0,0,0,0,0,1\n"
|
||||
errs = " / ".join(ads.parse_naver(bad.encode("utf-8"), today=TODAY).errors)
|
||||
assert "겹칩니다" in errs and "총비용이 숫자가 아닙니다" in errs and "ROAS" in errs and "앞으로의 날짜" in errs
|
||||
assert "겹칩니다" in errs and "총비용이 숫자가 아닙니다" in errs and "ROAS" in errs and "앞으로의 날짜" not in errs
|
||||
|
||||
|
||||
def test_naver_report_finds_columns_by_header():
|
||||
|
||||
@@ -151,3 +151,50 @@ def test_kpi_is_net_only():
|
||||
ctx = dashboard.build_dashboard(_Store(), kind="week", anchor=TODAY, today=TODAY)
|
||||
assert [k["key"] for k in ctx["kpis"]] == ["net"]
|
||||
assert ctx["kpis"][0]["value"] == 2_600_000 + 1_234_567
|
||||
|
||||
|
||||
def test_pages_render_formula_cells_future_inputs_and_total_on_top(monkeypatch):
|
||||
"""2026-10-21 — 계산식 칸(is-formula·data-formula), 오늘 뒤 날짜도 입력 칸, 이번달 기간 합계 = 제목 행 바로 아래."""
|
||||
import importlib
|
||||
|
||||
from fastapi import FastAPI
|
||||
from fastapi.testclient import TestClient
|
||||
|
||||
from app.modules.performance import common
|
||||
|
||||
perf_router = importlib.import_module("app.modules.performance.router")
|
||||
|
||||
class _S(_Store):
|
||||
def list_marketplaces(self):
|
||||
return [{**m, "manual_input": m["code"] == "coupang"} for m in super().list_marketplaces()]
|
||||
|
||||
def manual_amounts(self, start, end, codes, *, active_only=True):
|
||||
return {(date(2026, 10, 5), "coupang"): 600_000}
|
||||
|
||||
def manual_formulas(self, start, end, codes):
|
||||
return {(date(2026, 10, 5), "coupang"): "500000+100000"}
|
||||
|
||||
def ad_formulas(self, start, end):
|
||||
return {(date(2026, 10, 5), "meta"): "20000+30000"}
|
||||
|
||||
class _Creds:
|
||||
def configured_codes(self, adapters):
|
||||
return {}
|
||||
|
||||
store = _S()
|
||||
monkeypatch.setattr(common, "guard", lambda request, admin=False: (store, {"email": "king@x", "name": "King", "is_admin": True}))
|
||||
monkeypatch.setattr(common, "services", lambda request, st: (_Creds(), None))
|
||||
monkeypatch.setattr(perf_router, "today_kst", lambda: TODAY)
|
||||
app = FastAPI()
|
||||
app.include_router(perf_router.router)
|
||||
client = TestClient(app)
|
||||
|
||||
for url, code, fx in (("/performance/?period=month&d=2026-10-07", "coupang", "500000+100000"),
|
||||
("/performance/ads?period=month&d=2026-10-07", "meta", "20000+30000")):
|
||||
r = client.get(url)
|
||||
assert r.status_code == 200, r.text
|
||||
body = r.text.split("<tbody>", 1)[1].split("</tbody>", 1)[0]
|
||||
assert body.lstrip().startswith('<tr class="perf-row-total') and "기간 합계" in body.split("</tr>", 1)[0]
|
||||
cell = body.split(f'data-manual-code="{code}" data-date="2026-10-05"', 1)
|
||||
assert len(cell) == 2 and "is-formula" in cell[0].rsplit("<td", 1)[1] and f'data-formula="{fx}"' in cell[1].split(">", 1)[0]
|
||||
assert f'data-manual-code="{code}" data-date="2026-10-20"' in body # 오늘(10/7) 뒤 날짜도 입력 칸
|
||||
|
||||
@@ -0,0 +1,28 @@
|
||||
"""날짜 칸 계산식(formula.parse_amount) — = 없이 1000+2000 을 바로 계산(2026-10-21)."""
|
||||
from __future__ import annotations
|
||||
|
||||
import pytest
|
||||
|
||||
from app.modules.performance.formula import FormulaError, parse_amount
|
||||
|
||||
|
||||
@pytest.mark.parametrize("raw, expected", [
|
||||
("", (None, None)), (None, (None, None)), (" ", (None, None)),
|
||||
("12,000", (12000, None)), (87000, (87000, None)), ("-5000", (-5000, None)), ("1,234원", (1234, None)),
|
||||
("1000+2000", (3000, "1000+2000")),
|
||||
("1,000 + 2,000 * 2", (5000, "1000+2000*2")),
|
||||
("(10000+5000)×2", (30000, "(10000+5000)*2")),
|
||||
("10000÷3", (3333, "10000/3")),
|
||||
("10001/2", (5001, "10001/2")), # 반올림
|
||||
("=500-200", (300, "500-200")), # 엑셀 버릇 = 도 됨
|
||||
("-100+50", (-50, "-100+50")),
|
||||
("1.5*1000", (1500, "1.5*1000")),
|
||||
])
|
||||
def test_parse_amount(raw, expected):
|
||||
assert parse_amount(raw) == expected
|
||||
|
||||
|
||||
@pytest.mark.parametrize("raw", ["abc", "1000+", "*5", "(1+2", "1+2)", "5/0", "1e5", "1000+2000a", "1" * 201])
|
||||
def test_parse_amount_errors(raw):
|
||||
with pytest.raises(FormulaError):
|
||||
parse_amount(raw)
|
||||
@@ -64,14 +64,14 @@ def test_errors_reject_everything_with_cell_refs():
|
||||
("날짜", "쿠팡(로켓)", "오늘의집"),
|
||||
("2026-10-10", "abc", 100),
|
||||
("엉터리", 1, None),
|
||||
("2026-10-14", 1, None), # 앞으로의 날짜
|
||||
("2026-10-14", 1, None), # 앞으로의 날짜 — 됨(2026-10-21)
|
||||
(None, 5, None), # 날짜 없음
|
||||
("2026-10-11", 7, None),
|
||||
("2026-10-11", 8, None), # 같은 날 두 번
|
||||
])
|
||||
joined = "\n".join(res.errors)
|
||||
assert "B2" in joined and "A3" in joined and "A4" in joined and "5행" in joined and "B7" in joined
|
||||
assert len(res.errors) == 5
|
||||
assert "B2" in joined and "A3" in joined and "A4" not in joined and "5행" in joined and "B7" in joined
|
||||
assert len(res.errors) == 4
|
||||
|
||||
|
||||
def test_header_problems():
|
||||
|
||||
@@ -187,7 +187,8 @@ def test_main_table_month_and_year():
|
||||
cells = _cells_for(list(calc.daterange(p.start, p.end)), ["a"])
|
||||
rows = calc.main_table(p, ["a"], cells, today=date(2026, 9, 30))
|
||||
weeks = [r for r in rows if r["kind"] == "week"]
|
||||
assert rows[-1]["kind"] == "total" and rows[-1]["total"]["gross"] == 300_000
|
||||
assert rows[0]["kind"] == "total" and rows[0]["total"]["gross"] == 300_000 # 기간 합계 = 맨 위(2026-10-21)
|
||||
assert rows[1]["kind"] == "day" and rows[-1]["kind"] == "week"
|
||||
assert sum(w["total"]["gross"] for w in weeks) == 300_000
|
||||
assert weeks[0]["from"] == "2026-09-01" and weeks[0]["to"] == "2026-09-06" # 첫 주는 월 시작부터
|
||||
y = calc.resolve_period("year", date(2026, 9, 10))
|
||||
@@ -2095,7 +2096,7 @@ def test_manual_input_marketplaces_skip_sync_even_with_api():
|
||||
|
||||
|
||||
def test_manual_sale_api_rules():
|
||||
"""수동 입력 API — 그 쇼핑몰 수동 입력이 켜져 있을 때만, 오늘까지, 숫자(쉼표 허용), 비우면 지움, 002 미적용이면 503.
|
||||
"""수동 입력 API — 그 쇼핑몰 수동 입력이 켜져 있을 때만, 앞날도 됨, 숫자(쉼표 허용)·계산식, 비우면 지움, 002 미적용이면 503.
|
||||
켜고 끄기(PUT marketplaces)는 관리자 전용 그대로, manual_input 도 받는다."""
|
||||
from fastapi import HTTPException
|
||||
|
||||
@@ -2113,10 +2114,11 @@ def test_manual_sale_api_rules():
|
||||
def list_marketplaces(self):
|
||||
return [{"code": "coupang", "manual_input": True}, {"code": "naver", "manual_input": False}]
|
||||
|
||||
def set_manual_sale(self, code, day, amount, *, user=""):
|
||||
def set_manual_sale(self, code, day, amount, *, user="", formula=None):
|
||||
if self.missing:
|
||||
raise ManualMigrationNeeded()
|
||||
self.saved.append((code, day, amount, user))
|
||||
self.formula = formula
|
||||
|
||||
def api_amount(self, code, day):
|
||||
return 50000
|
||||
@@ -2150,7 +2152,11 @@ def test_manual_sale_api_rules():
|
||||
assert body["manual"] == 87000 and body["amount"] == 87000 and body["api_amount"] == 50000
|
||||
body = __import__("json").loads(router.api_manual_sale(None, "coupang", "2026-10-11", {"amount": ""}).body)
|
||||
assert st.saved[-1][2] is None and body["manual"] is None and body["amount"] == 50000 # 지움 → API 값
|
||||
assert status_of(lambda: router.api_manual_sale(None, "coupang", "2026-10-13", {"amount": 1}))[0] == 400 # 앞날
|
||||
assert status_of(lambda: router.api_manual_sale(None, "coupang", "2026-10-13", {"amount": 1}))[0] == 200 # 앞날도 됨
|
||||
assert st.formula is None
|
||||
body = __import__("json").loads(router.api_manual_sale(None, "coupang", "2026-10-12", {"amount": "1,000+2000*2"}).body)
|
||||
assert st.saved[-1][2] == 5000 and st.formula == "1000+2000*2" and body["formula"] == "1000+2000*2"
|
||||
assert status_of(lambda: router.api_manual_sale(None, "coupang", "2026-10-12", {"amount": "1/0"}))[0] == 400
|
||||
code, msg = status_of(lambda: router.api_manual_sale(None, "naver", "2026-10-12", {"amount": 1}))
|
||||
assert code == 400 and "수동 입력" in msg # 꺼진 쇼핑몰
|
||||
assert status_of(lambda: router.api_manual_sale(None, "coupang", "2026-10-12", {"amount": "abc"}))[0] == 400
|
||||
|
||||
Reference in New Issue
Block a user