89ad338024
- Subproject tasks via parent /tasks are re-filtered by current access (FULL/READ kept)
- PUT /api/projects/order: every id must be manageable; bad/duplicate ids -> 400, all-or-nothing
- Inbox, web alert popup, PC notifier open tasks via /project/t/{id}; embed=1 survives redirect;
old /p/{home}?task= redirects READ users to the linked project
- Project page / snapshot / workload include the opened archived or sub project only
- Alerts: DB-side filters + oldest-first paging (no 50-row cut); badges counted without caps;
my tasks keep every open task (completed capped)
- Meeting results: next-week meeting open, or own meeting open when no next meeting;
header edits + result checks under row locks (FOR UPDATE / FOR SHARE)
- Inbox panel waits for the task window save (same retry/discard flow) before switching/closing;
read failures stay unread
- Attachment upload removes only its own file on DB failure
- New project modal: create once, retry only failed member assignments
- update_task / update_project: locked-row validation in one transaction; completion hints from real transition
- Creator added as explicit member when another owner is chosen
- _once lock lifetime managed by refcount (no leak on failure)
- Section default assignee must still be a registered project user; follower add uses can_assign
- Docs (PROJECT_MODULE 6-15, help), tests (DB-less, real PostgreSQL, jsdom, Chrome)
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
116 lines
5.8 KiB
Python
116 lines
5.8 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("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 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()
|