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:
@@ -2647,6 +2647,10 @@ def _goal_call(fn: Any, *args: Any, **kwargs: Any) -> Any:
|
||||
raise HTTPException(status_code=503, detail=_GOALS_017_MSG)
|
||||
except store.MeetingCellMigrationNeeded:
|
||||
raise HTTPException(status_code=503, detail="회의록 셀 병합은 project_db 마이그레이션 019 적용 후 사용할 수 있습니다.")
|
||||
except store.MeetingLocked:
|
||||
raise HTTPException(status_code=409, detail="회의가 완료되어 수정할 수 없습니다. 관리자가 [완료 해제]하면 다시 고칠 수 있습니다.")
|
||||
except store.MeetingMigration022Needed:
|
||||
raise HTTPException(status_code=503, detail="회의 완료 기능은 project_db 마이그레이션 022 적용 후 사용할 수 있습니다.")
|
||||
except store.MeetingMigration020Needed:
|
||||
raise HTTPException(status_code=503, detail="새 주차·결과 글·주차별 목표는 project_db 마이그레이션 020 적용 후 사용할 수 있습니다.")
|
||||
except store.GoalCellConflict as exc:
|
||||
@@ -3293,7 +3297,7 @@ def api_get_meeting(request: Request, week_start: str, year: int, month: int) ->
|
||||
@router.post("/api/goals/meetings/{week_start}")
|
||||
def api_create_meeting(request: Request, week_start: str, payload: dict[str, Any] = Body(default={})) -> JSONResponse:
|
||||
"""회의록 만들기(관리자) — 앞선 회의록 줄을 이어받거나, 처음이면 그 해 목표 표 업무 영역 + 기본 양식 줄."""
|
||||
user = _require_admin(request)
|
||||
user = _require_user(request)
|
||||
st = _db_or_503(request)
|
||||
ws = _goal_call(store.validate_period_start, week_start)
|
||||
year = _goal_call(store.validate_goal_year, payload.get("year") or ws.year)
|
||||
@@ -3304,7 +3308,7 @@ def api_create_meeting(request: Request, week_start: str, payload: dict[str, Any
|
||||
|
||||
@router.put("/api/goals/meetings/{week_start}")
|
||||
def api_update_meeting(request: Request, week_start: str, payload: dict[str, Any] = Body(...)) -> JSONResponse:
|
||||
user = _require_admin(request)
|
||||
user = _require_user(request)
|
||||
st = _db_or_503(request)
|
||||
ws = _goal_call(store.validate_week_start, week_start)
|
||||
fields = {k: payload[k] for k in ("week_target", "attendees", "notes") if k in payload}
|
||||
@@ -3338,6 +3342,17 @@ def api_open_meeting_board(request: Request, week_start: str) -> JSONResponse:
|
||||
return JSONResponse({"ok": True, "url": board["url"], "created": board["created"], "title": title})
|
||||
|
||||
|
||||
@router.post("/api/goals/meetings/{week_start}/complete")
|
||||
def api_complete_meeting(request: Request, week_start: str, payload: dict[str, Any] = Body(default={})) -> JSONResponse:
|
||||
"""회의 완료(수정 잠금) {done: true} · 완료 해제 {done: false} — 관리자만(2026-10-07, 마이그레이션 022)."""
|
||||
user = _require_admin(request)
|
||||
st = _db_or_503(request)
|
||||
ws = _goal_call(store.validate_week_start, week_start)
|
||||
done = payload.get("done", True) is not False
|
||||
out = _goal_call(st.set_meeting_completed, week_start=ws, done=done, by=user["email"])
|
||||
return JSONResponse({"ok": True, **out})
|
||||
|
||||
|
||||
@router.delete("/api/goals/meetings/{week_start}")
|
||||
def api_delete_meeting(request: Request, week_start: str) -> JSONResponse:
|
||||
_require_admin(request)
|
||||
@@ -3350,7 +3365,7 @@ def api_delete_meeting(request: Request, week_start: str) -> JSONResponse:
|
||||
@router.post("/api/goals/meetings/{week_start}/items")
|
||||
def api_add_meeting_item(request: Request, week_start: str, payload: dict[str, Any] = Body(...)) -> JSONResponse:
|
||||
"""줄 추가 {section, label?, ref_item_id?, place?: above|below} — 기준 줄 위/아래, 없으면 구역 끝(새 구역이면 맨 끝)."""
|
||||
user = _require_admin(request)
|
||||
user = _require_user(request)
|
||||
st = _db_or_503(request)
|
||||
ws = _goal_call(store.validate_week_start, week_start)
|
||||
ref = payload.get("ref_item_id")
|
||||
@@ -3369,7 +3384,7 @@ def api_add_meeting_item(request: Request, week_start: str, payload: dict[str, A
|
||||
def api_update_meeting_item(request: Request, item_id: int, payload: dict[str, Any] = Body(...)) -> JSONResponse:
|
||||
"""줄 칸 하나 — label·content·target_amount·result_amount(숫자 아니면 글 — 021)·result_note(020)·status·marketplace_code.
|
||||
지난주 결과(글·금액)는 이번 회의 화면에서 지난 주차 줄(prev)에 저장한다."""
|
||||
user = _require_admin(request)
|
||||
user = _require_user(request)
|
||||
st = _db_or_503(request)
|
||||
keys = ("label", "content", "target_amount", "result_amount", "result_note", "status", "marketplace_code")
|
||||
item = _goal_call(st.update_meeting_item, item_id=item_id,
|
||||
@@ -3379,7 +3394,7 @@ def api_update_meeting_item(request: Request, item_id: int, payload: dict[str, A
|
||||
|
||||
@router.delete("/api/goals/meeting-items/{item_id}")
|
||||
def api_delete_meeting_item(request: Request, item_id: int) -> JSONResponse:
|
||||
_require_admin(request)
|
||||
_require_user(request)
|
||||
st = _db_or_503(request)
|
||||
_goal_call(st.delete_meeting_item, item_id=item_id)
|
||||
return JSONResponse({"ok": True})
|
||||
@@ -3387,7 +3402,7 @@ def api_delete_meeting_item(request: Request, item_id: int) -> JSONResponse:
|
||||
|
||||
@router.post("/api/goals/meeting-cells/move")
|
||||
def api_move_meeting_cell(request: Request, payload: dict[str, Any] = Body(...)) -> JSONResponse:
|
||||
user = _require_admin(request)
|
||||
user = _require_user(request)
|
||||
st = _db_or_503(request)
|
||||
if not all(k in payload for k in ("source_item", "target_item", "source_body", "target_body")):
|
||||
raise HTTPException(status_code=400, detail="원본·대상 셀과 예상 내용을 함께 보내 주세요.")
|
||||
@@ -3398,7 +3413,7 @@ def api_move_meeting_cell(request: Request, payload: dict[str, Any] = Body(...))
|
||||
|
||||
@router.post("/api/goals/meeting-cells/merge")
|
||||
def api_merge_meeting_cells(request: Request, payload: dict[str, Any] = Body(...)) -> JSONResponse:
|
||||
user = _require_admin(request)
|
||||
user = _require_user(request)
|
||||
result = _goal_call(_db_or_503(request).merge_meeting_cells, item_from=payload.get("item_from"),
|
||||
item_to=payload.get("item_to"), updated_by=user["email"])
|
||||
return JSONResponse({"ok": True, **result})
|
||||
@@ -3406,14 +3421,14 @@ def api_merge_meeting_cells(request: Request, payload: dict[str, Any] = Body(...
|
||||
|
||||
@router.delete("/api/goals/meeting-items/{item_id}/cell-merge")
|
||||
def api_unmerge_meeting_cell(request: Request, item_id: int) -> JSONResponse:
|
||||
user = _require_admin(request)
|
||||
user = _require_user(request)
|
||||
_goal_call(_db_or_503(request).unmerge_meeting_cell, item_id=item_id, updated_by=user["email"])
|
||||
return JSONResponse({"ok": True})
|
||||
|
||||
|
||||
@router.post("/api/goals/meeting-items/{item_id}/move")
|
||||
def api_move_meeting_item(request: Request, item_id: int, payload: dict[str, Any] = Body(...)) -> JSONResponse:
|
||||
_require_admin(request)
|
||||
_require_user(request)
|
||||
st = _db_or_503(request)
|
||||
_goal_call(st.move_meeting_item, item_id=item_id, direction=int(payload.get("direction") or 0))
|
||||
return JSONResponse({"ok": True})
|
||||
|
||||
Reference in New Issue
Block a user