feat(project): 4-tier roles (super/admin/pro/user), meeting header 구분

- app.store: role "pro" (ROLES, ROLE_LABELS); admin page grade select
  Admin / Pro user / User, super admin fixed to one account.
- project.access: role_of, is_pro, is_project_admin.
- router: _require_admin -> _require_pro (goals, meetings complete/delete,
  members, reorder, trash restore, assignable users); new project and
  project edit/owner change need Pro user+; task delete open to any member;
  project/section delete = Admin+ or creator; comment edit/delete of others
  and workload summary = Pro user+. Templates get pj_pro / pj_admin.
- Weekly meeting table first header "구역" -> "구분".
- Docs (CLAUDE.md, PROJECT_MODULE 6-14, overview, help page) and tests.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
2026-10-12 01:10:25 +09:00
parent 061f18d081
commit 5d054e59b6
26 changed files with 600 additions and 285 deletions
+1 -1
View File
@@ -688,7 +688,7 @@ function titleVal(d) { return d.getElementById("pj-t-title").value; }
// ── 대시보드 담당자별 작업 합계 — 사람마다 메인·하위 세로 막대(완료/전체), 막대 → 오른쪽 업무 목록, 항목 → 편집 창 ──
{
const env = makeEnv(); baseRoutes(env);
env.d.querySelector(".pj-project-view").dataset.isAdmin = "true";
env.d.querySelector(".pj-project-view").dataset.isPro = "true";
let asked = null;
env.route("GET", /\/project\/api\/projects\/1\/subtasks-summary\?scope=project$/, function (u) {
asked = u;
+2 -2
View File
@@ -46,7 +46,7 @@ def board() -> dict:
def goals_ctx(admin: bool) -> dict:
return {
"user": {"email": ME, "is_super_admin": False}, "is_admin": admin, "nav_projects": [], "goal_years": [2026],
"user": {"email": ME, "is_super_admin": False}, "is_admin": admin, "pj_pro": admin, "pj_admin": admin, "nav_projects": [], "goal_years": [2026],
"goal_year_active": 2026, "my_open_total": 0, "mention_unread": 0, "color_palette": ["#4573d2"],
"project_icons": ["folder"], "goals_enabled": True, "goal_year": 2026, "board": board(),
"months": list(range(1, 13)),
@@ -104,7 +104,7 @@ def meeting_view(err: bool) -> dict:
def meeting_ctx(admin: bool, err: bool, can_sync: bool = True) -> dict:
view = meeting_view(err)
ctx = {
"user": {"email": ME, "is_super_admin": False}, "is_admin": admin, "nav_projects": [], "goal_years": [2026],
"user": {"email": ME, "is_super_admin": False}, "is_admin": admin, "pj_pro": admin, "pj_admin": admin, "nav_projects": [], "goal_years": [2026],
"goal_year_active": 2026, "my_open_total": 0, "mention_unread": 0, "color_palette": ["#4573d2"],
"project_icons": ["folder"], "goal_year": 2026, "goal_month": 9, "meetings_enabled": True,
"weeks": [{"start": "2026-09-28", "end": "2026-10-04", "n": 4, "label": "9/28~10/4", "has": True, "now": False,
+1 -1
View File
@@ -56,7 +56,7 @@ def main() -> None:
def render_one(env, name: str, admin: bool) -> None:
html = env.get_template("project/project.html").render(
user={"email": ME, "is_super_admin": False}, is_admin=admin, can_manage=True,
user={"email": ME, "is_super_admin": False}, is_admin=admin, pj_pro=admin, pj_admin=admin, can_manage=True,
project=PROJECTS[0], current_project_id=1, stages=STAGES[1], tasks=TASKS,
members=[{"user_email": ME, "role": "member"}, {"user_email": "bob@test.local", "role": "member"}],
projects_meta=PROJECTS, nav_projects=PROJECTS, stages_by_project=STAGES, board_stage_names=["할 일", "완료"],
+2 -2
View File
@@ -34,7 +34,7 @@ class SubtaskSummaryTests(unittest.TestCase):
self.st = FakeStore()
def call(self, scope):
with patch.object(api, "_require_user", return_value={"email": "me@test"}), \
with patch.object(api, "_require_user", return_value={"email": "me@test", "role": "pro"}), \
patch.object(api, "_db_or_503", return_value=self.st), \
patch.object(api, "_require_manage", return_value=None), \
patch.object(api, "_accessible_project_ids", return_value=None):
@@ -52,7 +52,7 @@ class SubtaskSummaryTests(unittest.TestCase):
self.assertEqual(self.st.asked_projects, [1, 2]) # 서브프로젝트(5) 제외 — 스냅샷과 같은 범위
def test_no_access_is_rejected(self):
with patch.object(api, "_require_user", return_value={"email": "me@test"}), \
with patch.object(api, "_require_user", return_value={"email": "me@test", "role": "pro"}), \
patch.object(api, "_db_or_503", return_value=self.st), \
patch.object(api, "_require_manage", side_effect=HTTPException(403)):
self.assertEqual(self.client.get("/project/api/projects/1/subtasks-summary").status_code, 403)
+1 -1
View File
@@ -261,7 +261,7 @@ class MeetingCellTests(unittest.TestCase):
DictLoader({"erp_base.html": "{% block head_extra %}{% endblock %}{% block content %}{% endblock %}"}),
FileSystemLoader(root / "app/modules/project/templates")]), autoescape=True)
html = env.get_template("project/goal_meeting.html").render(
user=dict(email="test@local"), is_admin=True, goal_year=2026, goal_month=9,
user=dict(email="test@local"), is_admin=True, pj_pro=True, goal_year=2026, goal_month=9,
meetings_enabled=True, week="2026-09-28", week_end="2026-10-04", prev_week="2026-09-21",
prev_week_end="2026-09-27", meeting_status=store.MEETING_STATUS, pj_kr_holidays={},
nav_projects=[], goal_years=[2026], color_palette=[], project_icons=[], meet_members=[], month_plan=None, **view)
+15 -11
View File
@@ -89,6 +89,7 @@ if ENABLED:
RUN = uuid.uuid4().hex[:6]
ADMIN = USERS.add(f"admin-{RUN}@test.local", role="admin")
PRO = USERS.add(f"pro-{RUN}@test.local", role="pro") # Pro user(2026-10-12)
SUPER = USERS.add("king@dbxcorp.co.kr", role="admin", super_=True)
ALICE = USERS.add(f"alice-{RUN}@test.local")
BOB = USERS.add(f"bob-{RUN}@test.local")
@@ -118,18 +119,19 @@ def _count(sql: str, *args) -> int:
# ════════════════════════════════════════════════════════════
# [07] 소유자 변경은 관리자만
# [07] 프로젝트 수정·소유자 변경은 Pro user 이상(2026-10-12)
# ════════════════════════════════════════════════════════════
def test_owner_change_admin_only():
# 관리자도 멤버가 아닌 프로젝트는 못 다룬다(2026-10-07) — 소유자를 남에게 넘긴 뒤에도 바꿀 수 있게 멤버로 둔다
p = _project("P-owner", ADMIN, (BOB, ADMIN))
p = _project("P-owner", ADMIN, (BOB, ADMIN, PRO))
r = req("PUT", f"/project/api/projects/{p['id']}", BOB, json={"owner_email": BOB})
assert r.status_code == 403, r.text
assert ST.get_project(project_id=p["id"])["owner_email"] == ADMIN
r = req("PUT", f"/project/api/projects/{p['id']}", BOB, json={"owner_email": CAROL, "name": "x"})
assert r.status_code == 403 and ST.get_project(project_id=p["id"])["name"] != "x"
# 같은 값을 같이 보내는 건(화면 저장) 통과
assert req("PUT", f"/project/api/projects/{p['id']}", BOB, json={"owner_email": ADMIN, "name": "ok"}).status_code == 200
# User 는 이름만 바꾸는 것도 안 된다, Pro user 멤버는 된다(같은 소유자 값을 같이 보내는 화면 저장 포함)
assert req("PUT", f"/project/api/projects/{p['id']}", BOB, json={"name": "no"}).status_code == 403
assert req("PUT", f"/project/api/projects/{p['id']}", PRO, json={"owner_email": ADMIN, "name": "ok"}).status_code == 200
# 관리자: 모듈 권한 없는 사람은 소유자 불가, 정상 사용자는 가능
assert req("PUT", f"/project/api/projects/{p['id']}", ADMIN, json={"owner_email": EVE}).status_code == 400
assert req("PUT", f"/project/api/projects/{p['id']}", ADMIN, json={"owner_email": CAROL}).status_code == 200
@@ -137,10 +139,10 @@ def test_owner_change_admin_only():
# 소유자에서 빠지면(관리자가 다시 바꿈) 멤버가 아닌 CAROL 은 관리 권한을 잃는다
assert req("PUT", f"/project/api/projects/{p['id']}", ADMIN, json={"owner_email": ADMIN}).status_code == 200
assert req("GET", f"/project/api/projects/{p['id']}/snapshot", CAROL).status_code == 403
# 생성: 비관리자가 남을 소유자로 지정 → 거절, 본인·미지정 → 본인이 소유자
assert req("POST", "/project/api/projects", BOB, json={"name": "n1", "owner_email": CAROL}).status_code == 403
r = req("POST", "/project/api/projects", BOB, json={"name": "n2"})
assert r.status_code == 201 and r.json()["project"]["owner_email"] == BOB
# 생성: User 는 새 프로젝트 불가, Pro user 는 본인·미지정 → 본인이 소유자
assert req("POST", "/project/api/projects", BOB, json={"name": "n1"}).status_code == 403
r = req("POST", "/project/api/projects", PRO, json={"name": "n2"})
assert r.status_code == 201 and r.json()["project"]["owner_email"] == PRO
# ════════════════════════════════════════════════════════════
@@ -152,8 +154,10 @@ def test_delete_requires_current_access():
t = req("POST", f"/project/api/projects/{p['id']}/tasks", ALICE, json={"title": "alice task", "stage_id": s["id"]}).json()["task"]
ST.add_comment(task_id=t["id"], author_email=ALICE, author_name="a", body="hi")
trash_before = _count("SELECT COUNT(*) AS n FROM project_trash")
# 현재 멤버인 타인 → 생성자 규칙으로 거절
assert req("DELETE", f"/project/api/tasks/{t['id']}", BOB).status_code == 403
# 작업 삭제는 멤버 누구나(2026-10-12) — 남(BOB)이 만든 작업도 ALICE 가 지울 수 있다
t_bob = req("POST", f"/project/api/projects/{p['id']}/tasks", BOB, json={"title": "bob task", "stage_id": s["id"]}).json()["task"]
assert req("DELETE", f"/project/api/tasks/{t_bob['id']}", ALICE).status_code == 200
trash_before = _count("SELECT COUNT(*) AS n FROM project_trash")
# 멤버에서 빠진 생성자 → 거절, 행·댓글·휴지통 변화 없음
ST.remove_member(project_id=p["id"], user_email=ALICE)
assert req("DELETE", f"/project/api/tasks/{t['id']}", ALICE).status_code == 403
@@ -360,7 +364,7 @@ def test_date_range_validation():
assert req("PUT", pu, BOB, json={"start_date": "2026-11-01", "due_date": "2026-10-01"}).status_code == 400
assert req("PUT", pu, BOB, json={"due_date": "2026-10-01"}).status_code == 200
assert req("PUT", pu, BOB, json={"start_date": "2026-11-01"}).status_code == 400
assert req("POST", "/project/api/projects", BOB, json={"name": "d", "start_date": "2026-11-02", "due_date": "2026-11-01"}).status_code == 400
assert req("POST", "/project/api/projects", PRO, json={"name": "d", "start_date": "2026-11-02", "due_date": "2026-11-01"}).status_code == 400
# ════════════════════════════════════════════════════════════
+200
View File
@@ -0,0 +1,200 @@
"""관리자 등급(2026-10-12) — 수퍼관리자 > Admin > Pro user > User 별 프로젝트·목표·회의록 권한. DB 없이."""
import importlib
import tempfile
import unittest
from unittest.mock import MagicMock, patch
from fastapi import FastAPI
from fastapi.testclient import TestClient
from app.modules.project import access
from app.store import SUPER_ADMIN_EMAIL, UserStore, is_admin
api = importlib.import_module("app.modules.project.router")
SUPER = {"email": SUPER_ADMIN_EMAIL, "role": "admin"}
ADMIN = {"email": "admin@test.local", "role": "admin"}
PRO = {"email": "pro@test.local", "role": "pro"}
USER = {"email": "user@test.local", "role": "user"}
OUTSIDER_PRO = {"email": "pro2@test.local", "role": "pro"} # 프로젝트 1 멤버가 아닌 Pro user
class FakeStore(MagicMock):
"""프로젝트 1 = admin·pro·user 멤버(pro2 는 아님). 나머지 메서드는 MagicMock 이 받아 준다."""
MEMBERS = {1: {"admin@test.local", "pro@test.local", "user@test.local"}}
def is_member(self, project_id, user_email):
return user_email in self.MEMBERS.get(int(project_id), set())
def get_project(self, project_id):
return {"id": project_id, "name": "P1", "owner_email": "admin@test.local", "created_by": "admin@test.local"}
def get_task(self, task_id):
# 남(admin)이 만든 작업
return {"id": task_id, "project_id": 1, "title": "t", "created_by": "admin@test.local"}
def get_stage(self, stage_id):
return {"id": stage_id, "project_id": 1, "created_by": "admin@test.local"}
def task_link_scope(self, task_ids):
return {}
class RoleHelperTests(unittest.TestCase):
def test_role_of(self):
self.assertEqual(access.role_of(SUPER), "super")
self.assertEqual(access.role_of(ADMIN), "admin")
self.assertEqual(access.role_of(PRO), "pro")
self.assertEqual(access.role_of(USER), "user")
self.assertEqual(access.role_of({"email": "x@test.local", "role": "weird"}), "user")
self.assertEqual(access.role_of(None), "user")
def test_pro_and_admin_flags(self):
self.assertEqual([access.is_pro(u) for u in (SUPER, ADMIN, PRO, USER)], [True, True, True, False])
self.assertEqual([access.is_project_admin(u) for u in (SUPER, ADMIN, PRO, USER)], [True, True, False, False])
# pro 는 프로젝트 모듈 밖(관리자 페이지 등)에서는 관리자가 아니다
self.assertFalse(is_admin(PRO))
def test_can_delete_project_or_section(self):
self.assertTrue(api._can_delete(ADMIN, "someone@test.local"))
self.assertTrue(api._can_delete(SUPER, "someone@test.local"))
self.assertFalse(api._can_delete(PRO, "someone@test.local"))
self.assertTrue(api._can_delete(PRO, "pro@test.local"))
self.assertTrue(api._can_delete(USER, "USER@test.local"))
# 만든 사람 기록이 없는 옛 데이터 — Admin 이상만
self.assertTrue(api._can_delete(ADMIN, ""))
self.assertFalse(api._can_delete(PRO, ""))
self.assertFalse(api._can_delete(USER, None))
def test_role_ctx(self):
self.assertEqual(api._role_ctx(PRO), {"is_admin": False, "pj_pro": True, "pj_admin": False})
self.assertEqual(api._role_ctx(ADMIN), {"is_admin": True, "pj_pro": True, "pj_admin": True})
self.assertEqual(api._role_ctx(USER), {"is_admin": False, "pj_pro": False, "pj_admin": False})
class UserStoreRoleTests(unittest.TestCase):
def setUp(self):
d = tempfile.mkdtemp(prefix="users-")
self.us = UserStore(__import__("pathlib").Path(d) / "users.json")
def test_pro_role_saved_and_validated(self):
rec = self.us.create_user(email="p@test.local", role="pro")
self.assertEqual(rec["role"], "pro")
self.assertFalse(any(rec["modules"].values())) # pro 도 모듈은 기본 꺼짐(user 와 같음)
rec = self.us.update_permissions(email="p@test.local", role="user", modules=None)
self.assertEqual(rec["role"], "user")
with self.assertRaises(ValueError):
self.us.create_user(email="x@test.local", role="super")
with self.assertRaises(PermissionError):
self.us.update_permissions(email=SUPER_ADMIN_EMAIL, role="pro", modules=None)
class RoleApiTests(unittest.TestCase):
def setUp(self):
self.st = FakeStore()
p = patch.object(access, "can_use_module", side_effect=lambda u: bool(u))
p.start()
self.addCleanup(p.stop)
app = FastAPI()
app.include_router(api.router)
app.state.data_dir = tempfile.mkdtemp(prefix="pj-roles-")
self.client = TestClient(app)
def call(self, who, method, url, **kw):
with patch.object(api, "_require_user", return_value=who), patch.object(api, "_db_or_503", return_value=self.st):
return self.client.request(method, url, **kw)
def test_create_project_pro_and_up(self):
self.st.create_project.return_value = {"id": 9, "name": "n"}
self.assertEqual(self.call(USER, "POST", "/project/api/projects", json={"name": "n"}).status_code, 403)
for who in (PRO, ADMIN):
self.assertEqual(self.call(who, "POST", "/project/api/projects", json={"name": "n"}).status_code, 201)
def test_subproject_any_member(self):
self.st.create_project.return_value = {"id": 10, "name": "s"}
r = self.call(USER, "POST", "/project/api/projects/1/subprojects", json={"name": "s"})
self.assertEqual(r.status_code, 201, r.text)
def test_edit_project_pro_member_only(self):
self.st.update_project.return_value = {"id": 1, "name": "x"}
self.assertEqual(self.call(USER, "PUT", "/project/api/projects/1", json={"name": "x"}).status_code, 403)
self.assertEqual(self.call(OUTSIDER_PRO, "PUT", "/project/api/projects/1", json={"name": "x"}).status_code, 403)
self.assertEqual(self.call(PRO, "PUT", "/project/api/projects/1", json={"name": "x"}).status_code, 200)
def test_owner_change_by_pro(self):
self.st.update_project.return_value = {"id": 1}
with patch.object(api, "_check_owner_candidate"):
r = self.call(PRO, "PUT", "/project/api/projects/1", json={"owner_email": "user@test.local"})
self.assertEqual(r.status_code, 200, r.text)
def test_delete_project_admin_any_pro_own(self):
self.st.delete_project.return_value = []
self.assertEqual(self.call(PRO, "DELETE", "/project/api/projects/1").status_code, 403) # admin 이 만든 것
self.assertEqual(self.call(ADMIN, "DELETE", "/project/api/projects/1").status_code, 200)
def test_members_pro_in_own_project(self):
self.st.add_member.return_value = {"user_email": "x@test.local"}
body = {"user_email": "x@test.local"}
self.assertEqual(self.call(USER, "POST", "/project/api/projects/1/members", json=body).status_code, 403)
self.assertEqual(self.call(OUTSIDER_PRO, "POST", "/project/api/projects/1/members", json=body).status_code, 403)
self.assertEqual(self.call(PRO, "POST", "/project/api/projects/1/members", json=body).status_code, 201)
self.assertEqual(self.call(PRO, "DELETE", "/project/api/projects/1/members/x@test.local").status_code, 200)
def test_reorder_pro_and_up(self):
body = {"ordered_ids": [1]}
self.assertEqual(self.call(USER, "PUT", "/project/api/projects/order", json=body).status_code, 403)
self.assertEqual(self.call(PRO, "PUT", "/project/api/projects/order", json=body).status_code, 200)
def test_section_delete_admin_any_others_creator(self):
self.assertEqual(self.call(PRO, "DELETE", "/project/api/projects/1/stages/5").status_code, 403)
self.assertEqual(self.call(USER, "DELETE", "/project/api/projects/1/stages/5").status_code, 403)
self.assertEqual(self.call(ADMIN, "DELETE", "/project/api/projects/1/stages/5").status_code, 200)
def test_task_delete_any_member(self):
self.st.delete_task.return_value = ([7], None)
r = self.call(USER, "DELETE", "/project/api/tasks/7") # 남이 만든 작업도
self.assertEqual(r.status_code, 200, r.text)
self.assertEqual(self.call(OUTSIDER_PRO, "DELETE", "/project/api/tasks/7").status_code, 403)
def test_comment_edit_passes_pro_flag(self):
self.st.get_comment.return_value = {"id": 3, "task_id": 7, "author_email": "admin@test.local"}
self.st.update_comment.return_value = {"id": 3}
for who, flag in ((PRO, True), (USER, False)):
self.st.update_comment.reset_mock()
with patch.object(api, "_comment_task_access"):
self.call(who, "PUT", "/project/api/comments/3", json={"body": "b"})
self.assertEqual(self.st.update_comment.call_args.kwargs["is_admin"], flag)
def test_workload_summary_pro_only(self):
self.st.list_tasks_for_projects.return_value = []
self.st.list_subtasks_of.return_value = []
self.assertEqual(self.call(USER, "GET", "/project/api/projects/1/subtasks-summary").status_code, 403)
self.assertEqual(self.call(PRO, "GET", "/project/api/projects/1/subtasks-summary").status_code, 200)
def test_trash_restore_pro(self):
self.st.list_trash.return_value = [{"id": 4, "project_id": 1}]
self.st.list_projects.return_value = [{"id": 1}]
self.st.restore_trash.return_value = {"restored": 1}
self.assertEqual(self.call(USER, "POST", "/project/api/trash/4/restore").status_code, 403)
self.assertEqual(self.call(PRO, "POST", "/project/api/trash/4/restore").status_code, 200)
def test_goals_input_pro_and_up(self):
body = {"metric": "sales", "kind": "target", "month": 1, "value": "10"}
self.assertEqual(self.call(USER, "PUT", "/project/api/goals/2026/metrics", json=body).status_code, 403)
self.assertEqual(self.call(PRO, "PUT", "/project/api/goals/2026/metrics", json=body).status_code, 200)
self.assertEqual(self.call(USER, "POST", "/project/api/goals/years", json={"year": 2027}).status_code, 403)
self.assertEqual(self.call(PRO, "POST", "/project/api/goals/years", json={"year": 2027}).status_code, 201)
self.assertEqual(self.call(USER, "DELETE", "/project/api/goals/2027").status_code, 403)
self.assertEqual(self.call(PRO, "DELETE", "/project/api/goals/2027").status_code, 200)
def test_meeting_complete_and_delete_pro(self):
self.st.set_meeting_completed.return_value = {"completed": True}
for url, method, kw in (("/project/api/goals/meetings/2026-10-12/complete", "POST", {"json": {"done": True}}),
("/project/api/goals/meetings/2026-10-12", "DELETE", {})):
self.assertEqual(self.call(USER, method, url, **kw).status_code, 403)
self.assertEqual(self.call(PRO, method, url, **kw).status_code, 200)
if __name__ == "__main__":
unittest.main()