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:
2026-10-07 11:40:30 +09:00
parent 7417e661e0
commit 9528f735b8
19 changed files with 150 additions and 35 deletions
+29
View File
@@ -208,6 +208,35 @@ class MeetingCellTests(unittest.TestCase):
self.assertEqual(client.post("/project/api/goals/meeting-cells/merge", json=dict(item_from=1, item_to=2)).status_code, 503)
self.assertEqual(client.post(url, json=self.payload).status_code, 200, "Move/formatting work without 019")
def test_amount_cells_accept_text_after_021_and_result_note_reaches_store(self):
"""정량 목표·결과 — 숫자면 원 정수 칸, 글(예: 20개)이면 글 칸(021). 지난주 결과 글(result_note, 020)은 API 를 거쳐 저장된다."""
self.st._column_exists = lambda conn, table, col: col in {"content_row_span", "result_note", "target_text"}
for r in self.conn.rows.values():
r.update(result_note="", target_text="", result_text="")
out = self.st.update_meeting_item(item_id=1, fields={"target_amount": "20개", "result_amount": "120만"})
self.assertEqual((out["target_amount"], out["target_text"]), (None, "20개"))
self.assertEqual((out["result_amount"], out["result_text"]), (1_200_000, ""))
out = self.st.update_meeting_item(item_id=1, fields={"target_amount": "1,000"})
self.assertEqual((out["target_amount"], out["target_text"]), (1000, ""), "숫자로 바꾸면 글은 지운다")
with self.assertRaises(ValueError):
self.st.update_meeting_item(item_id=1, fields={"target_amount": "가" * 101})
app = FastAPI()
app.include_router(api.router)
app.state.project_store = self.st
client = TestClient(app)
with patch.object(api, "_require_user", return_value=dict(role="admin", email="admin@test.local")):
r = client.put("/project/api/goals/meeting-items/2", json={"result_note": "잘함", "result_amount": "3박스"})
self.assertEqual(r.status_code, 200, r.text)
self.assertEqual(self.conn.rows[2]["result_note"], "잘함")
self.assertEqual((self.conn.rows[2]["result_amount"], self.conn.rows[2]["result_text"]), (None, "3박스"))
# 021 전 — 글은 예전처럼 숫자 오류(400), 숫자는 그대로 저장
for k in ("_meeting_v21_ok", "_meeting_v20_ok"):
self.st.__dict__.pop(k, None)
self.st._column_exists = lambda conn, table, col: col == "content_row_span"
with self.assertRaises(ValueError):
self.st.update_meeting_item(item_id=3, fields={"target_amount": "20개"})
self.assertEqual(self.st.update_meeting_item(item_id=3, fields={"target_amount": "5"})["target_amount"], 5)
def test_rendered_meeting_keeps_merge_geometry_and_escapes_rich_text(self):
from pathlib import Path
from jinja2 import ChoiceLoader, DictLoader, Environment, FileSystemLoader