feat(project): allow text in meeting target/result cells; fix result note save
- Target and result cells accept text such as "20개". Values that parse
as amounts still go to the integer columns; anything else goes to the
new target_text/result_text columns (migration 021).
- Fix: PUT /api/goals/meeting-items/{id} dropped result_note, so the
last-week result text was never saved.
- Update meeting nav test to the month-bounded week numbering.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -2536,7 +2536,17 @@ class ProjectStore:
|
||||
def _meeting_cols(self, conn: Any) -> str:
|
||||
return (self._MEETING_ITEM_COLS + (", line_key" if self._meeting_keys(conn) else "")
|
||||
+ (", content_row_span" if self._meeting_cells(conn) else "")
|
||||
+ (", result_note" if self._meeting_v20(conn) else ""))
|
||||
+ (", result_note" if self._meeting_v20(conn) else "")
|
||||
+ (", target_text, result_text" if self._meeting_v21(conn) else ""))
|
||||
|
||||
def _meeting_v21(self, conn: Any) -> bool:
|
||||
"""마이그레이션 021 — 정량 목표·결과 글(target_text·result_text, 예: "20개")."""
|
||||
if getattr(self, "_meeting_v21_ok", False):
|
||||
return True
|
||||
ok = self._column_exists(conn, "goal_meeting_items", "target_text")
|
||||
if ok:
|
||||
self._meeting_v21_ok = True
|
||||
return ok
|
||||
|
||||
def _meeting_v20(self, conn: Any) -> bool:
|
||||
"""마이그레이션 020 — 결과 글 칸(result_note)·월요일이 아닌 주차 시작일·주차별 목표(goal_week_targets)."""
|
||||
@@ -2845,13 +2855,20 @@ class ProjectStore:
|
||||
if "content" in fields:
|
||||
sets.append("content = %s")
|
||||
params.append(store.validate_meeting_content(fields["content"]))
|
||||
# 정량 목표·결과 — 숫자로 읽히면(1,200,000 · 120만) 원 정수 칸, 아니면(예: "20개") 글 칸(021). 둘 중 하나만 채운다.
|
||||
texts: list[tuple[str, str, str]] = [] # (글 칸, 글, 021 이 없을 때 낼 오류)
|
||||
for k in ("target_amount", "result_amount"):
|
||||
if k in fields:
|
||||
v = store.validate_meeting_amount(fields[k])
|
||||
try:
|
||||
v, text, err = store.validate_meeting_amount(fields[k]), "", ""
|
||||
except ValueError as exc:
|
||||
v, err = None, str(exc)
|
||||
text = store.validate_meeting_text(fields[k], limit=store.MEETING_AMOUNT_TEXT_MAX, what="정량 목표·결과")
|
||||
if k == "target_amount" and v is not None and v < 0:
|
||||
raise ValueError("목표 금액은 0 이상이어야 합니다.")
|
||||
sets.append(f"{k} = %s")
|
||||
params.append(v)
|
||||
texts.append((k.replace("_amount", "_text"), text, err))
|
||||
if "status" in fields:
|
||||
sets.append("status = %s")
|
||||
params.append(store.validate_meeting_status(fields["status"]))
|
||||
@@ -2869,6 +2886,12 @@ class ProjectStore:
|
||||
self._require_meetings(conn)
|
||||
if "result_note" in fields and not self._meeting_v20(conn):
|
||||
raise store.MeetingMigration020Needed()
|
||||
if self._meeting_v21(conn):
|
||||
for col, text, _err in texts:
|
||||
sets.append(f"{col} = %s")
|
||||
params.append(text)
|
||||
elif any(text for _c, text, _e in texts):
|
||||
raise ValueError(next(e for _c, t, e in texts if t)) # 021 전 — 예전처럼 숫자만
|
||||
rows = self._locked_meeting_items(conn, item_id)
|
||||
if "content" in fields:
|
||||
self._require_meeting_cell_visible(rows, item_id)
|
||||
|
||||
Reference in New Issue
Block a user