feat(project): weekly meetings editable by anyone, admin completes to lock
Meeting write APIs now accept any project user; deleting a meeting and the
new POST /api/goals/meetings/{week}/complete (complete/reopen) stay admin
only. A completed meeting (migration 022: completed_at, completed_by)
rejects edits with 409; last-week result fields follow the next meeting's
lock instead. The page shows a complete button / locked badge.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -2573,6 +2573,41 @@ class ProjectStore:
|
||||
self._meeting_v20_ok = True
|
||||
return ok
|
||||
|
||||
def _meeting_v22(self, conn: Any) -> bool:
|
||||
"""마이그레이션 022 — 회의 완료(goal_meetings.completed_at, 수정 잠금)."""
|
||||
if getattr(self, "_meeting_v22_ok", False):
|
||||
return True
|
||||
ok = self._column_exists(conn, "goal_meetings", "completed_at")
|
||||
if ok:
|
||||
self._meeting_v22_ok = True
|
||||
return ok
|
||||
|
||||
def _check_meeting_open(self, conn: Any, week_start: Any) -> None:
|
||||
"""그 주차 회의록이 완료(잠금)됐으면 MeetingLocked. 022 전이면 잠금 없음."""
|
||||
if not self._meeting_v22(conn):
|
||||
return
|
||||
row = conn.execute("SELECT completed_at FROM goal_meetings WHERE week_start = %s", (week_start,)).fetchone()
|
||||
if row and row["completed_at"] is not None:
|
||||
raise store.MeetingLocked()
|
||||
|
||||
def set_meeting_completed(self, *, week_start: date, done: bool, by: str = "") -> dict[str, Any]:
|
||||
"""회의 완료(잠금)·완료 해제 — 관리자만(라우터). 바뀐 상태를 돌려준다."""
|
||||
with self._pool.connection() as conn:
|
||||
self._require_meetings(conn)
|
||||
if not self._meeting_v22(conn):
|
||||
raise store.MeetingMigration022Needed()
|
||||
row = conn.execute(
|
||||
"UPDATE goal_meetings SET completed_at = CASE WHEN %s THEN COALESCE(completed_at, now()) ELSE NULL END, "
|
||||
"completed_by = CASE WHEN %s THEN %s ELSE '' END, updated_at = now() "
|
||||
"WHERE week_start = %s RETURNING completed_at, completed_by",
|
||||
(done, done, store.norm_str(by, lower=True), week_start),
|
||||
).fetchone()
|
||||
if row is None:
|
||||
raise KeyError(str(week_start))
|
||||
return {"completed": row["completed_at"] is not None,
|
||||
"completed_at": row["completed_at"].astimezone(KST).isoformat(timespec="minutes") if row["completed_at"] else "",
|
||||
"completed_by": row["completed_by"] or ""}
|
||||
|
||||
def meetings_v20(self) -> bool:
|
||||
with self._pool.connection() as conn:
|
||||
return self._table_exists(conn, "goal_meetings") and self._meeting_v20(conn)
|
||||
@@ -2585,14 +2620,16 @@ class ProjectStore:
|
||||
self._meeting_cells_ok = True
|
||||
return ok
|
||||
|
||||
def _locked_meeting_items(self, conn: Any, item_id: int) -> list[dict[str, Any]]:
|
||||
"""글 저장·이동·병합·줄 변경이 같은 주 잠금을 공유한다."""
|
||||
def _locked_meeting_items(self, conn: Any, item_id: int, *, check_open: bool = True) -> list[dict[str, Any]]:
|
||||
"""글 저장·이동·병합·줄 변경이 같은 주 잠금을 공유한다. check_open — 회의 완료(022)된 주면 MeetingLocked."""
|
||||
me = conn.execute("SELECT week_start FROM goal_meeting_items WHERE id = %s", (item_id,)).fetchone()
|
||||
if me is None:
|
||||
raise KeyError(item_id)
|
||||
if not conn.execute("SELECT week_start FROM goal_meetings WHERE week_start = %s FOR UPDATE",
|
||||
(me["week_start"],)).fetchone():
|
||||
raise KeyError(item_id)
|
||||
if check_open:
|
||||
self._check_meeting_open(conn, me["week_start"])
|
||||
rows = conn.execute(f"SELECT {self._meeting_cols(conn)} FROM goal_meeting_items "
|
||||
"WHERE week_start = %s ORDER BY sort_order, id FOR UPDATE", (me["week_start"],)).fetchall()
|
||||
if not any(int(r["id"]) == item_id for r in rows):
|
||||
@@ -2655,6 +2692,9 @@ class ProjectStore:
|
||||
keyed = self._meeting_keys(conn)
|
||||
cell_merges = self._meeting_cells(conn)
|
||||
result_notes = self._meeting_v20(conn)
|
||||
v22 = self._meeting_v22(conn)
|
||||
done_row = conn.execute("SELECT completed_at, completed_by FROM goal_meetings WHERE week_start = %s",
|
||||
(week_start,)).fetchone() if v22 else None
|
||||
head = conn.execute(
|
||||
"SELECT week_start, week_target, attendees, notes, updated_by, updated_at "
|
||||
"FROM goal_meetings WHERE week_start = %s", (week_start,),
|
||||
@@ -2695,6 +2735,11 @@ class ProjectStore:
|
||||
"line_keys": keyed,
|
||||
"cell_merges": cell_merges,
|
||||
"result_notes": result_notes,
|
||||
"can_complete": v22,
|
||||
"completed": bool(done_row and done_row["completed_at"] is not None),
|
||||
"completed_at": done_row["completed_at"].astimezone(KST).strftime("%Y-%m-%d %H:%M")
|
||||
if done_row and done_row["completed_at"] else "",
|
||||
"completed_by": (done_row["completed_by"] or "") if done_row else "",
|
||||
}
|
||||
|
||||
def create_meeting(self, *, week_start: date, sections: list[tuple[str, str]], created_by: str = "") -> bool:
|
||||
@@ -2804,6 +2849,7 @@ class ProjectStore:
|
||||
return
|
||||
with self._pool.connection() as conn:
|
||||
self._require_meetings(conn)
|
||||
self._check_meeting_open(conn, week_start)
|
||||
row = conn.execute(
|
||||
f"UPDATE goal_meetings SET {', '.join(sets)}, updated_by = %s, updated_at = now() "
|
||||
"WHERE week_start = %s RETURNING week_start",
|
||||
@@ -2830,6 +2876,7 @@ class ProjectStore:
|
||||
"SELECT 1 FROM goal_meetings WHERE week_start = %s FOR UPDATE", (week_start,)
|
||||
).fetchone():
|
||||
raise KeyError(str(week_start))
|
||||
self._check_meeting_open(conn, week_start)
|
||||
rows = conn.execute(
|
||||
f"SELECT {self._meeting_cols(conn)} FROM goal_meeting_items WHERE week_start = %s "
|
||||
"ORDER BY sort_order, id", (week_start,),
|
||||
@@ -2902,13 +2949,18 @@ class ProjectStore:
|
||||
self._require_meetings(conn)
|
||||
if "result_note" in fields and not self._meeting_v20(conn):
|
||||
raise store.MeetingMigration020Needed()
|
||||
result_only = bool(fields) and set(fields) <= {"result_note", "result_amount", "status"}
|
||||
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)
|
||||
rows = self._locked_meeting_items(conn, item_id, check_open=not result_only)
|
||||
if result_only:
|
||||
# 지난주 결과는 다음 주 회의에서 적는다 — 그 회의록(바로 다음 주차)이 완료됐으면 잠금
|
||||
own = next(r for r in rows if int(r["id"]) == item_id)["week_start"]
|
||||
self._check_meeting_open(conn, store.week_period(own)[1] + timedelta(days=1))
|
||||
if "content" in fields:
|
||||
self._require_meeting_cell_visible(rows, item_id)
|
||||
if sets:
|
||||
|
||||
Reference in New Issue
Block a user