ee09e8bfd1
- 구분 cell: right-click or ⋯ menu → 구역 위로 / 구역 아래로 / 구역 끝에 줄 추가
- POST /api/goals/meeting-items/{id}/move-section swaps the contiguous section block
with its neighbour under the meeting lock (row order and merges follow; 409 after completion)
- Next meetings inherit the new order; help + docs; tests (DB-less, real PostgreSQL, jsdom)
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
152 lines
8.1 KiB
Python
152 lines
8.1 KiB
Python
"""주간 회의록 — 누구나 수정, 회의 완료(022)면 잠금. 지난주 결과는 다음 주 회의록이 열려 있는 동안만. DB 없이."""
|
|
import importlib
|
|
import unittest
|
|
from contextlib import contextmanager
|
|
from datetime import date
|
|
from types import SimpleNamespace
|
|
from unittest.mock import patch
|
|
|
|
from fastapi import FastAPI
|
|
from fastapi.testclient import TestClient
|
|
|
|
from app.modules.project import store
|
|
from app.modules.project.db import ProjectStore
|
|
from tests.test_project_meeting_cells import Connection, Result
|
|
|
|
api = importlib.import_module("app.modules.project.router")
|
|
|
|
|
|
class LockConnection(Connection):
|
|
def __init__(self):
|
|
super().__init__()
|
|
self.completed = set() # 완료된 주차 시작일
|
|
# 있는 회의록 — 9/28 주차(9/28~9/30)와 바로 다음 주차(10/1, 목요일 시작 — 달이 바뀐다)
|
|
self.meetings = {date(2026, 9, 28), date(2026, 10, 1)}
|
|
self.shared = [] # FOR SHARE 로 잠근 주차(다음 회의록)
|
|
|
|
def execute(self, sql, params=()):
|
|
if sql.startswith("SELECT completed_at FROM goal_meetings WHERE week_start = %s"):
|
|
if sql.endswith("FOR SHARE"):
|
|
assert self.depth > 0, "다음 회의록 잠금은 트랜잭션 안에서"
|
|
self.shared.append(params[0])
|
|
if params[0] not in self.meetings:
|
|
return Result([])
|
|
return Result([{"completed_at": "done" if params[0] in self.completed else None}])
|
|
if sql.startswith("SELECT id, week_start") and "FROM goal_meeting_items" in sql and "ORDER BY sort_order" in sql:
|
|
self.calls.append((sql, params)) # 실제 쿼리처럼 sort_order 순으로(기본 모형은 ORDER BY 를 무시한다)
|
|
return Result(dict(r) for r in sorted(self.rows.values(), key=lambda r: (r["sort_order"], r["id"]))
|
|
if r["week_start"] == params[0])
|
|
if sql.startswith("UPDATE goal_meetings SET"):
|
|
assert self.locked and self.depth > 0, "머리 변경은 회의록 행을 잠근 트랜잭션 안에서"
|
|
self.calls.append((sql, params))
|
|
return Result([{"week_start": params[-1]}])
|
|
return super().execute(sql, params)
|
|
|
|
|
|
class MeetingLockTests(unittest.TestCase):
|
|
def setUp(self):
|
|
self.conn = LockConnection()
|
|
|
|
@contextmanager
|
|
def connection():
|
|
yield self.conn
|
|
|
|
self.st = ProjectStore.__new__(ProjectStore)
|
|
self.st._pool = SimpleNamespace(connection=connection)
|
|
self.st._table_exists = lambda conn, name: True
|
|
self.st._column_exists = lambda conn, table, col: col in {"content_row_span", "completed_at", "result_note"}
|
|
for r in self.conn.rows.values():
|
|
r["result_note"] = ""
|
|
|
|
def test_completed_meeting_rejects_edits(self):
|
|
self.conn.completed.add(date(2026, 9, 28))
|
|
with self.assertRaises(store.MeetingLocked):
|
|
self.st.update_meeting_item(item_id=1, fields={"content": "x"})
|
|
with self.assertRaises(store.MeetingLocked):
|
|
self.st.move_meeting_item(item_id=2, direction=1)
|
|
|
|
def test_last_week_result_follows_next_meeting(self):
|
|
# 9/28 주차(9/28~9/30)가 완료돼도 다음 주차(10/1) 회의록이 열려 있으면 결과는 적을 수 있다
|
|
self.conn.completed.add(date(2026, 9, 28))
|
|
out = self.st.update_meeting_item(item_id=1, fields={"result_note": "잘 됨", "result_amount": "100"})
|
|
self.assertEqual((out["result_note"], out["result_amount"]), ("잘 됨", 100))
|
|
self.assertEqual(self.conn.shared, [date(2026, 10, 1)]) # 달이 바뀐 다음 주차(목요일 시작)를 잠그고 확인
|
|
self.conn.completed.add(date(2026, 10, 1))
|
|
with self.assertRaises(store.MeetingLocked):
|
|
self.st.update_meeting_item(item_id=1, fields={"result_note": "늦게"})
|
|
|
|
def test_completed_week_without_next_meeting_is_locked(self):
|
|
# 예전엔 다음 주차 회의록이 없으면 완료된 회의록의 결과도 고칠 수 있었다
|
|
self.conn.meetings.discard(date(2026, 10, 1))
|
|
self.conn.completed.add(date(2026, 9, 28))
|
|
with self.assertRaises(store.MeetingLocked):
|
|
self.st.update_meeting_item(item_id=1, fields={"result_note": "다음 회의 전"})
|
|
self.assertEqual(self.conn.rows[1]["result_note"], "")
|
|
|
|
def test_open_week_without_next_meeting_accepts_result(self):
|
|
self.conn.meetings.discard(date(2026, 10, 1))
|
|
out = self.st.update_meeting_item(item_id=1, fields={"result_note": "이번 주 결과"})
|
|
self.assertEqual(out["result_note"], "이번 주 결과")
|
|
|
|
def test_header_update_checks_lock_inside_row_lock(self):
|
|
self.st.update_meeting(week_start=date(2026, 9, 28), fields={"notes": "메모"})
|
|
sqls = [s for s, _ in self.conn.calls]
|
|
lock = next(i for i, s in enumerate(sqls) if s.startswith("SELECT week_start FROM goal_meetings") and "FOR UPDATE" in s)
|
|
upd = next(i for i, s in enumerate(sqls) if s.startswith("UPDATE goal_meetings SET"))
|
|
self.assertLess(lock, upd)
|
|
self.conn.completed.add(date(2026, 9, 28))
|
|
with self.assertRaises(store.MeetingLocked):
|
|
self.st.update_meeting(week_start=date(2026, 9, 28), fields={"notes": "잠김"})
|
|
self.assertEqual(sum(1 for s, _ in self.conn.calls if s.startswith("UPDATE goal_meetings SET")), 1)
|
|
|
|
def order(self):
|
|
return [r["id"] for r in sorted(self.conn.rows.values(), key=lambda r: r["sort_order"])]
|
|
|
|
def test_move_section_swaps_whole_blocks(self):
|
|
# 1·2·3 = 상품, 4 = 유통 → 유통을 위로 = 4,1,2,3 (상품 안 순서·병합은 그대로 따라감)
|
|
self.conn.rows[1]["content_row_span"] = 2
|
|
self.st.move_meeting_section(item_id=4, direction=-1)
|
|
self.assertEqual(self.order(), [4, 1, 2, 3])
|
|
self.assertEqual(self.conn.rows[1]["content_row_span"], 2)
|
|
self.st.move_meeting_section(item_id=4, direction=-1) # 맨 위 — 그대로
|
|
self.assertEqual(self.order(), [4, 1, 2, 3])
|
|
self.st.move_meeting_section(item_id=2, direction=1) # 상품(이제 맨 아래)의 아무 줄로 아래로 — 그대로
|
|
self.assertEqual(self.order(), [4, 1, 2, 3])
|
|
self.st.move_meeting_section(item_id=4, direction=1)
|
|
self.assertEqual(self.order(), [1, 2, 3, 4])
|
|
|
|
def test_move_section_locked_after_completion(self):
|
|
self.conn.completed.add(date(2026, 9, 28))
|
|
with self.assertRaises(store.MeetingLocked):
|
|
self.st.move_meeting_section(item_id=4, direction=-1)
|
|
|
|
def test_move_section_api(self):
|
|
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="user", email="member@test.local")):
|
|
self.assertEqual(client.post("/project/api/goals/meeting-items/4/move-section", json={"direction": 0}).status_code, 400)
|
|
self.assertEqual(client.post("/project/api/goals/meeting-items/4/move-section", json={"direction": -1}).status_code, 200)
|
|
self.assertEqual(self.order(), [4, 1, 2, 3])
|
|
self.assertEqual(client.post("/project/api/goals/meeting-items/99/move-section", json={"direction": 1}).status_code, 404)
|
|
|
|
def test_anyone_edits_but_only_admin_completes(self):
|
|
app = FastAPI()
|
|
app.include_router(api.router)
|
|
app.state.project_store = self.st
|
|
client = TestClient(app)
|
|
member = dict(role="user", email="member@test.local")
|
|
with patch.object(api, "_require_user", return_value=member):
|
|
r = client.put("/project/api/goals/meeting-items/1", json={"content": "누구나"})
|
|
self.assertEqual(r.status_code, 200, r.text)
|
|
self.assertEqual(client.post("/project/api/goals/meetings/2026-09-28/complete", json={"done": True}).status_code, 403)
|
|
self.conn.completed.add(date(2026, 9, 28))
|
|
r = client.put("/project/api/goals/meeting-items/1", json={"content": "잠김"})
|
|
self.assertEqual(r.status_code, 409, r.text)
|
|
self.assertIn("회의가 완료", r.json()["detail"])
|
|
|
|
|
|
if __name__ == "__main__":
|
|
unittest.main()
|