feat(project): 회의록 머리 한 칸(월 계획 숫자+결정사항) · 회의록 표 구역선만 굵은 검정·나머지 회색 · 주차 목표 두 칸(유통·인플/카페24·네이버)

- 회의록 머리: 한 줄 = 월 계획 숫자 | 결정사항 제목, 아래 전체 = 결정사항(크게), 월 계획 상세 제거
- 회의록 표: 구역 처음·끝 가로선만 굵은 검정, 나머지 선 모두 회색
- 연간 목표 주차별 매출 목표 입력: 주차마다 유통·인플 / 카페24·네이버 두 칸, 머리글은 전체 목표 아래 — 마이그레이션 project_db 030(value_dist·value_mall, value=합계)

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
2026-10-19 18:15:21 +09:00
parent 897d19ca1c
commit bff71eeeba
20 changed files with 240 additions and 72 deletions
+41 -3
View File
@@ -3878,6 +3878,24 @@ class ProjectStore:
with self._pool.connection() as conn:
return self._table_exists(conn, "goal_week_targets")
def week_split_enabled(self) -> bool:
"""마이그레이션 030 — 주차 목표 두 칸(유통·인플 value_dist / 카페24·네이버 value_mall)."""
with self._pool.connection() as conn:
return self._table_exists(conn, "goal_week_targets") and self._column_exists(conn, "goal_week_targets", "value_dist")
def goal_week_target_parts(self, *, start: date, end: date) -> dict[str, dict[str, float | None]]:
"""주차 시작일 → {total, dist, mall}. 030 미적용이면 dist·mall 은 None(합계만)."""
with self._pool.connection() as conn:
if not self._table_exists(conn, "goal_week_targets"):
return {}
split = self._column_exists(conn, "goal_week_targets", "value_dist")
cols = "week_start, value" + (", value_dist, value_mall" if split else "")
rows = conn.execute(f"SELECT {cols} FROM goal_week_targets WHERE week_start BETWEEN %s AND %s ORDER BY week_start",
(start, end)).fetchall()
f = lambda v: None if v is None else float(v) # noqa: E731
return {r["week_start"].isoformat(): {"total": f(r["value"]), "dist": f(r.get("value_dist")), "mall": f(r.get("value_mall"))}
for r in rows}
def goal_week_targets(self, *, start: date, end: date) -> dict[str, float]:
"""기간 안 주차 시작일 → 목표(매출 단위). 020 미적용이면 빈 값."""
with self._pool.connection() as conn:
@@ -3890,7 +3908,7 @@ class ProjectStore:
return {r["week_start"].isoformat(): float(r["value"]) for r in rows}
def set_goal_week_targets(
self, *, year: int, month: int, values: dict[date, float | None], month_value: float | None,
self, *, year: int, month: int, values: dict[date, Any], month_value: float | None,
updated_by: str = ""
) -> float | None:
"""그 달 주차별 목표 저장(None = 지움) + 월 매출 목표(goal_metrics sales/target)는 month_value 그대로
@@ -3908,12 +3926,32 @@ class ProjectStore:
raise store.MeetingMigration020Needed()
if not conn.execute("SELECT 1 FROM goal_years WHERE year = %s FOR UPDATE", (year,)).fetchone():
raise KeyError(year)
split = self._column_exists(conn, "goal_week_targets", "value_dist")
for d, v in values.items():
# v = 합계 하나(예전 화면) 또는 (유통·인플, 카페24·네이버) — 030 이 있으면 두 칸 + 합계, 둘 다 비면 지움
dist = mall = None
if isinstance(v, tuple):
dist, mall = v
if split and dist is None and mall is None:
v = None
elif not split:
raise store.MeetingMigration030Needed()
else:
v = (dist or 0) + (mall or 0)
if v is None:
conn.execute("DELETE FROM goal_week_targets WHERE week_start = %s", (d,))
continue
if v < 0 or (dist is not None and dist < 0) or (mall is not None and mall < 0):
raise ValueError("주차 목표는 0 이상이어야 합니다.")
if split:
conn.execute(
"INSERT INTO goal_week_targets (week_start, year, month, value, value_dist, value_mall, updated_by) "
"VALUES (%s,%s,%s,%s,%s,%s,%s) ON CONFLICT (week_start) DO UPDATE "
"SET value = EXCLUDED.value, value_dist = EXCLUDED.value_dist, value_mall = EXCLUDED.value_mall, "
"updated_by = EXCLUDED.updated_by, updated_at = now()",
(d, year, m, v, dist, mall, who),
)
else:
if v < 0:
raise ValueError("주차 목표는 0 이상이어야 합니다.")
conn.execute(
"INSERT INTO goal_week_targets (week_start, year, month, value, updated_by) "
"VALUES (%s,%s,%s,%s,%s) ON CONFLICT (week_start) DO UPDATE "