feat(performance): 광고비 탭 [광고비 업데이트] 진행 창·자동 업데이트·업데이트 시각
- 채널별 [구글/메타 광고 불러오기] 버튼을 없애고 매출 탭과 같은 모양으로 마지막 업데이트 · 다음 업데이트까지(카운트다운) · [광고비 업데이트] - 진행 창 작업에 종류(sales/ads) 추가 — 광고 채널별 진행 막대(수집 → 저장 → 완료), 채널별 중지·전체 취소는 저장 직전까지, 진행 중이면 합류 - POST /api/ad-sync, GET /api/ad-sync/current - 자동 업데이트 회차에서 매출과 광고비를 동시에 각각 진행 창 작업으로 - 마지막 광고비 업데이트 = 광고 API 마지막 성공 가져오기 시각 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -57,16 +57,49 @@ def test_run_once_uses_job_and_skips_when_busy(monkeypatch):
|
||||
return "2026-10-13T09:00:05+09:00"
|
||||
|
||||
monkeypatch.setattr(SyncService, "sync_all", fake_sync_all)
|
||||
monkeypatch.setattr(jobs, "running_job", lambda: None)
|
||||
monkeypatch.setattr(jobs, "running_job", lambda kind="sales": None)
|
||||
res = au.run_once(Store(), None, today=date(2026, 10, 13), days=10)
|
||||
assert calls == [(date(2026, 10, 4), date(2026, 10, 13), "schedule", au.AUTO_USER, True)]
|
||||
# 광고 API 저장소 메서드가 없는 가짜 저장소 — 광고 가져오기는 조용히 빠지고 매출 결과는 그대로
|
||||
assert res == {"skipped": False, "from": "2026-10-04", "to": "2026-10-13", "ok": 1, "failed": ["toss"], "error": "",
|
||||
"ads": []}
|
||||
assert res == {"skipped": False, "sales_skipped": False, "ads_skipped": False, "from": "2026-10-04",
|
||||
"to": "2026-10-13", "ok": 1, "failed": ["toss"], "error": "", "ads": []}
|
||||
|
||||
monkeypatch.setattr(jobs, "running_job", lambda: object())
|
||||
monkeypatch.setattr(jobs, "running_job", lambda kind="sales": object())
|
||||
assert au.run_once(Store(), None, today=date(2026, 10, 13), days=10)["skipped"]
|
||||
assert len(calls) == 1
|
||||
# 광고비 업데이트만 돌고 있으면 매출은 그 회차에 그대로 돈다(종류별로 따로)
|
||||
monkeypatch.setattr(jobs, "running_job", lambda kind="sales": object() if kind == "ads" else None)
|
||||
res = au.run_once(Store(), None, today=date(2026, 10, 13), days=10)
|
||||
assert res["ads_skipped"] and not res["sales_skipped"] and len(calls) == 2
|
||||
|
||||
|
||||
def test_run_once_runs_ads_as_progress_job(monkeypatch):
|
||||
"""자동 회차의 광고비 = 광고비 진행 창 작업(kind=ads) — 채널별 진행·마지막 업데이트 시각."""
|
||||
from app.modules.performance import ad_sync, jobs
|
||||
from app.modules.performance.sync import SyncService
|
||||
|
||||
monkeypatch.setattr(SyncService, "sync_all", lambda self, **kw: [])
|
||||
seen = {}
|
||||
|
||||
def fake_all(self, start, end, *, user="", job=None):
|
||||
seen["job"] = job
|
||||
return [{"code": "google", "ok": True, "days": 10, "total": 1000}]
|
||||
|
||||
monkeypatch.setattr(ad_sync.AdSyncService, "sync_all", fake_all)
|
||||
|
||||
class Store:
|
||||
def last_update_at(self):
|
||||
return None
|
||||
|
||||
def ad_source_statuses(self):
|
||||
return {"google": {"last_success_sync_at": "2026-10-13T09:00:07+09:00"},
|
||||
"meta": {"last_success_sync_at": "2026-10-13T08:30:02+09:00"}}
|
||||
|
||||
monkeypatch.setattr(ad_sync, "ad_credentials", lambda store, ring: None)
|
||||
res = au.run_once(Store(), None, today=date(2026, 10, 13), days=10)
|
||||
job = seen["job"]
|
||||
assert job.kind == "ads" and job.finished and job.last_update_at == "2026-10-13T09:00:07+09:00"
|
||||
assert res["ads"] == [{"code": "google", "ok": True}] and jobs.running_job("ads") is None
|
||||
|
||||
|
||||
def test_startup_clears_orphan_running_runs(monkeypatch):
|
||||
|
||||
@@ -315,3 +315,93 @@ def test_sync_endpoint(monkeypatch):
|
||||
svc.conf = {"google": False}
|
||||
r = client.post("/performance/api/ad-sources/google/sync", json={})
|
||||
assert r.status_code == 400 and "설정" in r.json()["detail"]
|
||||
|
||||
|
||||
def test_sync_all_with_job_reports_channel_progress(monkeypatch):
|
||||
"""[광고비 업데이트](2026-10-20) — 채널별 진행 막대: 완료(일·광고비)·실패·중지(저장 안 함)."""
|
||||
from app.modules.performance import jobs
|
||||
from app.modules.performance.ad_sources.base import AdDay
|
||||
|
||||
store = FakeStore()
|
||||
src = ga.GoogleAdsSource()
|
||||
monkeypatch.setattr(src, "fetch_days", lambda ctx, s, e: [AdDay(date(2026, 10, 1), 1000, None, {}),
|
||||
AdDay(date(2026, 10, 2), 2000, None, {})])
|
||||
monkeypatch.setattr(ad_sync, "get_source", lambda code: src)
|
||||
svc = _service(store, src)
|
||||
job = jobs.create_job(user="king@x", start=None, end=None, kind="ads")
|
||||
res = svc.sync_all(date(2026, 10, 1), date(2026, 10, 2), user="king@x", job=job)
|
||||
assert res[0]["ok"] and job.kind == "ads"
|
||||
shop = job.snapshot()["shops"][0]
|
||||
assert shop["state"] == "done" and shop["upserted"] == 2 and shop["message"] == "광고비 ₩3,000" and shop["fraction"] == 1.0
|
||||
|
||||
# 수집 뒤 저장 직전에 [중지] → 저장하지 않음
|
||||
job2 = jobs.create_job(user="king@x", start=None, end=None, kind="ads")
|
||||
|
||||
def fetch_then_stop(ctx, s, e):
|
||||
job2.stop_shop("google")
|
||||
return [AdDay(date(2026, 10, 1), 1000, None, {})]
|
||||
|
||||
monkeypatch.setattr(src, "fetch_days", fetch_then_stop)
|
||||
before = len(store.replaced)
|
||||
res = svc.sync_all(date(2026, 10, 1), date(2026, 10, 1), job=job2)
|
||||
assert res[0].get("cancelled") and len(store.replaced) == before
|
||||
assert job2.snapshot()["shops"][0]["state"] == "cancelled"
|
||||
|
||||
# 실패 → 막대에 오류(상태·문구)
|
||||
def boom(ctx, s, e):
|
||||
raise AuthFailed("거부")
|
||||
|
||||
monkeypatch.setattr(src, "fetch_days", boom)
|
||||
job3 = jobs.create_job(user="king@x", start=None, end=None, kind="ads")
|
||||
svc.sync_all(date(2026, 10, 1), date(2026, 10, 1), job=job3)
|
||||
s3 = job3.snapshot()["shops"][0]
|
||||
assert s3["state"] == "error" and s3["status"] == "auth_failed"
|
||||
for j in (job, job2, job3):
|
||||
j.finish()
|
||||
|
||||
|
||||
def test_ad_sync_job_endpoint(monkeypatch):
|
||||
import importlib
|
||||
|
||||
from fastapi import FastAPI
|
||||
from fastapi.testclient import TestClient
|
||||
|
||||
from app.modules.performance import common, jobs
|
||||
|
||||
perf_router = importlib.import_module("app.modules.performance.router")
|
||||
ran = []
|
||||
|
||||
class Svc:
|
||||
conf = {"google": True, "meta": False}
|
||||
|
||||
def configured(self):
|
||||
return self.conf
|
||||
|
||||
monkeypatch.setattr(common, "require_store", lambda request, admin=False: (object(), {"email": "king@x"}))
|
||||
monkeypatch.setattr(perf_router, "today_kst", lambda: date(2026, 10, 15))
|
||||
monkeypatch.setattr(perf_router, "_ad_services", lambda store: (None, Svc()))
|
||||
monkeypatch.setattr(ad_sync, "run_ad_job", lambda store, ring, job, s, e, user="": ran.append((job.id, s, e, user)))
|
||||
app = FastAPI()
|
||||
app.include_router(perf_router.router)
|
||||
client = TestClient(app)
|
||||
|
||||
assert client.get("/performance/api/ad-sync/current").json() == {"job": None}
|
||||
r = client.post("/performance/api/ad-sync", json={"from": "2026-10-01", "to": "2026-10-31"})
|
||||
body = r.json()
|
||||
assert r.status_code == 200 and not body["joined"] and body["job"]["kind"] == "ads"
|
||||
assert body["job"]["to"] == "2026-10-15" # 오늘 뒤는 잘라냄
|
||||
import time
|
||||
for _ in range(50):
|
||||
if ran:
|
||||
break
|
||||
time.sleep(0.02)
|
||||
assert ran and ran[0][1:] == (date(2026, 10, 1), date(2026, 10, 15), "king@x")
|
||||
# 진행 중이면 새로 시작하지 않고 합류(매출 업데이트와 별개)
|
||||
r = client.post("/performance/api/ad-sync", json={})
|
||||
assert r.json()["joined"] and r.json()["job"]["id"] == body["job"]["id"]
|
||||
assert client.get("/performance/api/ad-sync/current").json()["job"]["id"] == body["job"]["id"]
|
||||
assert jobs.running_job("sales") is None or jobs.running_job("sales").kind == "sales"
|
||||
jobs.get_job(body["job"]["id"]).finish()
|
||||
Svc.conf = {"google": False}
|
||||
r = client.post("/performance/api/ad-sync", json={})
|
||||
assert r.status_code == 400 and "광고 API" in r.json()["detail"]
|
||||
|
||||
Reference in New Issue
Block a user