chore(853-2): 걸음 0 묶음 ② — 옛 시스템 전용 길 아홉(M02_MasterTemplete_Router) 걷음

- 길: GET · PUT · DELETE /api/m02/templates* · structure-combos · structures/numbers · POST structures/{열} · structures/{열}/copy · area/{열}/copy — 화면은 모두 /layers/{층}/… (Api_Fetch scoped) · TS · 다른 서버 모듈 · B0x 부르는 곳 0
- main.py 등록 두 줄 지움
- 시험 여섯(store · structure · structure_combo · combo_branch · empty_master · spreadsheet_store)은 같은 저장소를 살아 있는 /layers/system 길로 보게 옮김 — 도우미 helper_m02_system_client(시스템 관리자 세션) · 층 길과 다른 점만 고침(목록 = 양식 칸 · 지우기 = 판 대조 · 없는 종류 400 · 묶음 아닌 몸 422)
- 검증: /openapi.json 508 → 499(뜻한 9 만) · 빌더 --check 같음 · 핵심 시험 99 통과 · 관련 시험 245 통과

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
2026-11-17 11:51:55 +09:00
co-authored by Claude Opus 5.5
parent b4f8515b5d
commit 37643e4d09
11 changed files with 234 additions and 228 deletions
@@ -1,76 +0,0 @@
"""M02 마스터 템플릿 API — 시스템 층(계약 `6_계약.md` 서버 길 첫 묶음).
⚠ 권한은 등록하는 쪽(`main.py`)이 `system_admin_only` 로 붙임.
"""
from __future__ import annotations
from typing import Any
from fastapi import APIRouter, HTTPException, Query
from pydantic import BaseModel
from M02_MasterTemplete import M02_MasterTemplete_Store as store
router = APIRouter(prefix="/api/m02", tags=["M02 MasterTemplete"])
class SaveBody(BaseModel):
판: str = ""
문서: Any
def _call(fn, *args):
try:
return fn(*args)
except store.StoreError as e:
raise HTTPException(status_code=e.status, detail=e.detail) from e
@router.get("/templates")
def get_templates() -> list[dict]:
return _call(store.list_all)
@router.get("/structures/numbers")
def get_structure_numbers() -> dict:
return _call(store.structure_numbers)
@router.get("/structure-combos")
def get_structure_combos() -> dict:
"""구조물집계표조합 — 구조물 열마다 줄 하나(키 SS · 제목행 · 번호 · 바인딩) · 읽기만."""
return _call(store.read_combos)
@router.post("/structures/{column}")
def post_structure(column: str) -> dict:
"""구조물 도면 새로 — 열 id 하나 · 도번 자동 · 빈 면적산출도 · 이미 있으면 409."""
return _call(store.create_structure, column)
# 복사 가져오기 — 다른 열(`from`) 내용을 받는 열로 · 번호 · 열은 받는 쪽 그대로
@router.post("/structures/{column}/copy")
def post_structure_copy(column: str, source: str = Query(alias="from")) -> dict:
return _call(store.copy_from, "structure", column, source)
@router.post("/area/{column}/copy")
def post_area_copy(column: str, source: str = Query(alias="from")) -> dict:
return _call(store.copy_from, "area", column, source)
@router.get("/templates/{kind}/{name}")
def get_template(kind: str, name: str) -> dict:
return _call(store.read, kind, name)
@router.put("/templates/{kind}/{name}")
def put_template(kind: str, name: str, body: SaveBody) -> dict:
return _call(store.write, kind, name, body.판, body.문서, True) # 화면 [저장](26-7e)
@router.delete("/templates/{kind}/{name}")
def delete_template(kind: str, name: str, 판: str | None = None) -> dict:
_call(store.delete, kind, name, 판)
return {"ok": True}
@@ -1,6 +1,6 @@
"""M02 구조물 도면에 얹는 도각 길(`/structure-frame` · 56장) — B07 시스템 양식 도각을 그대로 다시 쓴다.
양식을 읽고 쓰는 길은 `M02_MasterTemplete_Router.py`(시스템 층)·`_Router_Layers.py`(층)가 맡는다.
양식을 읽고 쓰는 길은 `_Router_Layers.py`(층 · 시스템 층 포함)가 맡는다.
"""
from fastapi import APIRouter
@@ -2,7 +2,7 @@
⚠ 등록은 `main.py`(로그인만) · 층 권한은 `M02_Layer_Access`(양식 길 `Router_Layers` 와 한 벌 ·
PLAN 27-1c) · `owner` = 회사 `{C}` · 개인 `{C}/{U}`(없으면 자기 층) · 회사 없음 = 409.
옛 길(`/api/m02/structures/…` 등 · `M02_MasterTemplete_Router.py`)은 시스템 층 별칭으로 그대로.
시스템 층도 이 길(`/layers/system/…`) — 옛 시스템 전용 길(`M02_MasterTemplete_Router.py`)은 걷음(894).
회사 · 개인 층은 처음 부를 때 빈 뼈대를 만듦(`Items.ensure`).
일위대가 갈라 내기(PLAN 27-2c): 새 조합은 그 층에(마스터 UA · 회사 UC · 개인 UP) · 층 쓰기 권한 ·
첫 진입 뒤 구조물집계표가 이미 있어 같은 이름 새로 쓰기(판 없이)는 409 그대로.
+1 -3
View File
@@ -100,7 +100,6 @@ from M01_MasterData.M01_MasterData_Router import router as m01_master_data_route
from M02_MasterTemplete.M02_Hopyo_Router import router as m02_hopyo_router
from M02_MasterTemplete import M02_San_Basis_Index as san_basis_index
from M02_MasterTemplete.M02_Labor_Router import router as m02_labor_router
from M02_MasterTemplete.M02_MasterTemplete_Router import router as m02_master_template_router
from M02_MasterTemplete.M02_MasterTemplete_Router_Combos import router as m02_combos_router
from M02_MasterTemplete.M02_MasterTemplete_Router_Drawing import router as m02_drawing_router
from M02_MasterTemplete.M02_MasterTemplete_Router_Items import router as m02_items_router
@@ -557,8 +556,7 @@ app.include_router(
__import__("M02_MasterTemplete.DataFlow.M02_DF_Router", fromlist=["router"]).router,
dependencies=protected,
)
# 마스터 템플릿 — 시스템 층은 시스템 관리자만 · 층(회사·개인·프로젝트)·도면 길은 로그인만(권한은 길 안에서).
app.include_router(m02_master_template_router, dependencies=system_admin_only)
# 마스터 템플릿 층(시스템·회사·개인·프로젝트)·도면 길은 로그인만(권한은 길 안에서) · 옛 시스템 전용 길은 걷음(894).
# 구조물 옵션 보이기 · 그룹(PLAN 46) — 고쳐 씀은 시스템 관리자 · 읽기는 로그인만
app.include_router(m02_so_router, dependencies=system_admin_only)
app.include_router(m02_so_read_router, dependencies=protected)
@@ -0,0 +1,38 @@
"""M02 시스템 층 시험 도우미 — 살아 있는 층 길(`/api/m02/layers/system/…` · `Router_Items` · `Router_Layers`)을
시스템 관리자 세션으로 띄움 · 시스템 층 폴더 = `folder`(`store.FOLDER` · `layers.SYSTEM_ROOT` 둘 다).
옛 시스템 전용 길(`M02_MasterTemplete_Router` · `/api/m02/templates` 등)은 894 에서 걷음 — 그 길로 저장소를
보던 시험이 이 도우미로 같은 저장소 함수를 부름.
"""
from __future__ import annotations
from pathlib import Path
from fastapi import FastAPI
from fastapi.testclient import TestClient
from common_util.common_util_auth import verify_session
from M02_MasterTemplete import M02_MasterTemplete_Router_Items as items_router
from M02_MasterTemplete import M02_MasterTemplete_Router_Layers as layers_router
from M02_MasterTemplete import M02_MasterTemplete_Store as store
from M02_MasterTemplete import M02_Template_Layers as layers
SYS = "/api/m02/layers/system"
ADMIN = {"user_id": 1, "company_id": 1, "role": "SYSTEM_ADMIN", "is_master": True}
def system_client(folder: Path, monkeypatch, *more) -> TestClient:
"""`more` = 같이 띄울 라우터 모듈(`router` 속성)."""
monkeypatch.setattr(store, "FOLDER", folder)
monkeypatch.setattr(layers, "SYSTEM_ROOT", folder)
app = FastAPI()
for module in (items_router, layers_router, *more):
app.include_router(module.router)
app.dependency_overrides[verify_session] = lambda: dict(ADMIN)
return TestClient(app)
def drop(client: TestClient, url: str):
"""층 지우기 = 지금 판을 같이 보냄(판 대조)."""
return client.delete(url, params={"판": client.get(url).json()["판"]})
@@ -8,13 +8,11 @@
import json
import pytest
from fastapi import FastAPI
from fastapi.testclient import TestClient
from common_util import common_util_spreadsheet as spreadsheet
from M02_MasterTemplete import M02_MasterTemplete_Router as router_module
from M02_MasterTemplete import M02_MasterTemplete_Store as store
from M02_MasterTemplete import M02_Template_Layers as layers
from resources.tester.helper_m02_system_client import system_client
from resources.tester.test_m02_structure import write_sample_table
SERVER = {"s1": {"A1": {"수": "42"}}}
@@ -31,9 +29,7 @@ def client(tmp_path, monkeypatch):
return {**clean, "계산값": SERVER}
monkeypatch.setattr(spreadsheet, "with_server_values", fake)
app = FastAPI()
app.include_router(router_module.router)
return TestClient(app)
return system_client(tmp_path, monkeypatch)
def _write(folder, kind, column, doc):
@@ -63,15 +59,15 @@ def test_옛_산출근거를_면적산출로_옮기고_번호_8자리(client, tm
def test_새_구조물_도면은_면적_진짜_빈_시트_같은_8자리(client):
made1 = client.post("/api/m02/structures/rv").json()["문서"]
made2 = client.post("/api/m02/structures/pv_b").json()["문서"]
made1 = client.post("/api/m02/layers/system/structures/rv").json()["문서"]
made2 = client.post("/api/m02/layers/system/structures/pv_b").json()["문서"]
# 새 항목 번호 = 자리 뜻 없는 일련번호(PLAN 26-1)
assert made1["도번"] == "SD-000001" and made2["도번"] == "SD-000002"
for kind, key, head in (("area", "면적번", "SA"),):
doc = client.get(f"/api/m02/templates/{kind}/pv_b").json()["문서"]
doc = client.get(f"/api/m02/layers/system/templates/{kind}/pv_b").json()["문서"]
assert doc[key] == f"{head}-000002"
assert doc["시트"][0]["칸"] == {} and doc["서식"] == [{}] # 머리 줄 없음
numbers = client.get("/api/m02/structures/numbers").json()
numbers = client.get("/api/m02/layers/system/structures/numbers").json()
assert numbers["pv_b"] == {
"도번": "SD-000002",
"일위대가번": "SU-000002",
@@ -82,22 +78,25 @@ def test_새_구조물_도면은_면적_진짜_빈_시트_같은_8자리(client)
@pytest.mark.parametrize(("kind", "key", "head"), [("area", "면적번", "SA")])
def test_다른_열_내용을_복사해_가져옴_연결도_같이(client, kind, key, head):
store.renumber()
got = client.get(f"/api/m02/templates/{kind}/rv").json()
got = client.get(f"/api/m02/layers/system/templates/{kind}/rv").json()
got["문서"]["시트"][0]["칸"] = {"A1": {"식": "1+1"}}
got["문서"]["연결"] = LINKS
client.put(f"/api/m02/templates/{kind}/rv", json=got)
r = client.post(f"/api/m02/{kind}/ms/copy", params={"from": "rv"})
client.put(f"/api/m02/layers/system/templates/{kind}/rv", json=got)
r = client.post(f"/api/m02/layers/system/{kind}/ms/copy", params={"from": "rv"})
assert r.status_code == 200
ms = client.get(f"/api/m02/templates/{kind}/ms").json()["문서"]
ms = client.get(f"/api/m02/layers/system/templates/{kind}/ms").json()["문서"]
assert (ms["시트"][0]["칸"], ms["연결"]) == ({"A1": {"식": "1+1"}}, LINKS)
assert (ms[key], ms["열"]) == (f"{head}-000010", "ms") # 번호 · 열은 받는 쪽 그대로
assert ms["계산값"] == SERVER # 서버가 다시 풂
assert client.post(f"/api/m02/{kind}/ms/copy", params={"from": "없는열"}).status_code == 404
assert (
client.post(f"/api/m02/layers/system/{kind}/ms/copy", params={"from": "없는열"}).status_code
== 404
)
def test_저장은_서버_계산값만_적음_연결_두고_번호는_서버_것(client):
store._ensure("area", "rv")
got = client.get("/api/m02/templates/area/rv").json()
got = client.get("/api/m02/layers/system/templates/area/rv").json()
number = got["문서"]["면적번"]
doc = {
**got["문서"],
@@ -105,32 +104,40 @@ def test_저장은_서버_계산값만_적음_연결_두고_번호는_서버_것
"연결": LINKS,
"면적번": "x",
}
saved = client.put("/api/m02/templates/area/rv", json={"판": got["판"], "문서": doc})
saved = client.put(
"/api/m02/layers/system/templates/area/rv", json={"판": got["판"], "문서": doc}
)
assert saved.status_code == 200
now = client.get("/api/m02/templates/area/rv").json()["문서"]
now = client.get("/api/m02/layers/system/templates/area/rv").json()["문서"]
assert (now["계산값"], now["연결"], now["면적번"]) == (SERVER, LINKS, number)
# 뼈대 없는 문서 · 판이 다르면 막음
bad = client.put("/api/m02/templates/area/rv", json={"판": saved.json()["판"], "문서": {}})
bad = client.put(
"/api/m02/layers/system/templates/area/rv", json={"판": saved.json()["판"], "문서": {}}
)
assert bad.status_code == 400
stale = client.put("/api/m02/templates/area/rv", json={"판": got["판"], "문서": doc})
stale = client.put(
"/api/m02/layers/system/templates/area/rv", json={"판": got["판"], "문서": doc}
)
assert stale.status_code == 409
def test_못_풀면_저장을_막음(client, monkeypatch):
store._ensure("area", "rv")
got = client.get("/api/m02/templates/area/rv").json()
got = client.get("/api/m02/layers/system/templates/area/rv").json()
def broken(_book):
raise spreadsheet.RecalcError("스프레드시트 계산 실패 — 시험")
monkeypatch.setattr(spreadsheet, "with_server_values", broken)
r = client.put("/api/m02/templates/area/rv", json={"판": got["판"], "문서": got["문서"]})
r = client.put(
"/api/m02/layers/system/templates/area/rv", json={"판": got["판"], "문서": got["문서"]}
)
assert r.status_code == 503
assert client.get("/api/m02/templates/area/rv").json()["판"] == got["판"]
assert client.get("/api/m02/layers/system/templates/area/rv").json()["판"] == got["판"]
def test_층_규칙과_프로젝트_복사(client, tmp_path, monkeypatch):
client.post("/api/m02/structures/rv")
client.post("/api/m02/layers/system/structures/rv")
for kind in ("area",):
doc = store.read(kind, "rv")["문서"]
layers.check_skeleton(kind, doc)
+19 -19
View File
@@ -9,18 +9,15 @@ import json
import shutil
import pytest
from fastapi import FastAPI
from fastapi.testclient import TestClient
from M01_MasterData import M01_MasterData_Store as m01
from M01_MasterData import M01_MasterData_Store_Combo as combo_store
from M02_MasterTemplete import M02_MasterTemplete_Store as store
from M02_MasterTemplete.M02_MasterTemplete_Router import router
from resources.tester.helper_m02_system_client import system_client
from resources.tester.test_m02_structure import write_sample_table
REAL = m01.FOLDER
A, B, C = "GF000219", "GF000220", "GF000211" # 돌쌓기 메쌓기(인력 · 장비) · 채집(인력)
TABLE = "/api/m02/templates/table/구조물집계표"
TABLE = "/api/m02/layers/system/templates/table/구조물집계표"
@pytest.fixture()
@@ -40,10 +37,7 @@ def client(tmp_path, monkeypatch):
template = tmp_path / "template"
template.mkdir()
write_sample_table(template)
monkeypatch.setattr(store, "FOLDER", template)
app = FastAPI()
app.include_router(router)
return TestClient(app)
return system_client(template, monkeypatch)
def _source(client) -> str:
@@ -71,16 +65,20 @@ def test_갈라_내기_키_적기_길은_은퇴(client):
"""39-1d — 일위대가 정본 = 열마다 labor 문서 · 갈라 내기 · 키 적기 길 없음."""
ua = _source(client)
body = {"본뜬키": ua, "담은로직": [{"로직": A}], "이름": "", "판": ""}
assert client.post("/api/m02/structures/rv/combo", json=body).status_code == 404
assert client.post("/api/m02/layers/system/structures/rv/combo", json=body).status_code == 404
use = {"종류": "일위대가", "키": ua, "판": ""}
assert client.post("/api/m02/structures/c1/use-combo", json=use).status_code == 404
assert (
client.post("/api/m02/layers/system/structures/c1/use-combo", json=use).status_code == 404
)
def test_분류_더하기로_복사한_열은_원본_키_세_파일_내용을_받음(client):
_source(client)
drawing = client.get("/api/m02/templates/structure/rv").json()
drawing = client.get("/api/m02/layers/system/templates/structure/rv").json()
marked = {**drawing["문서"], "도면": {"format": 6, "entities": [{"type": "line"}]}}
put = client.put("/api/m02/templates/structure/rv", json={"판": drawing["판"], "문서": marked})
put = client.put(
"/api/m02/layers/system/templates/structure/rv", json={"판": drawing["판"], "문서": marked}
)
assert put.status_code == 200
table = client.get(TABLE).json()
doc = table["문서"]
@@ -91,21 +89,23 @@ def test_분류_더하기로_복사한_열은_원본_키_세_파일_내용을_
saved = next(c for c in client.get(TABLE).json()["문서"]["열"] if c["id"] == "c9")
assert "본뜬열" not in saved # 뗌
assert not saved.get("일위대가") # 열 키는 안 받음 — 일위대가는 labor 문서로 복사(39-1b)
copy = client.get("/api/m02/templates/structure/c9").json()["문서"]
copy = client.get("/api/m02/layers/system/templates/structure/c9").json()["문서"]
assert copy["도면"]["entities"] == [{"type": "line"}] and copy["열"] == "c9"
numbers = client.get("/api/m02/structures/numbers").json()
numbers = client.get("/api/m02/layers/system/structures/numbers").json()
assert numbers["c9"]["도번"] != numbers["rv"]["도번"] # 새 번호
assert numbers["c9"]["면적번"][2:] == numbers["c9"]["도번"][2:]
for kind in ("area",):
assert client.get(f"/api/m02/templates/{kind}/c9").json()["문서"]["열"] == "c9"
assert (
client.get(f"/api/m02/layers/system/templates/{kind}/c9").json()["문서"]["열"] == "c9"
)
# 그 뒤로는 열마다 따로 — 원본을 고쳐도 복사본은 그대로
drawing = client.get("/api/m02/templates/structure/rv").json()
drawing = client.get("/api/m02/layers/system/templates/structure/rv").json()
client.put(
"/api/m02/templates/structure/rv",
"/api/m02/layers/system/templates/structure/rv",
json={
"판": drawing["판"],
"문서": {**drawing["문서"], "도면": marked["도면"] | {"entities": []}},
},
)
again = client.get("/api/m02/templates/structure/c9").json()["문서"]
again = client.get("/api/m02/layers/system/templates/structure/c9").json()["문서"]
assert again["도면"]["entities"] == [{"type": "line"}]
+11 -7
View File
@@ -19,7 +19,6 @@ from fastapi.testclient import TestClient
from common_util.common_util_auth import verify_session
from config import config_system
from M02_MasterTemplete import M02_Item_Copy as copies
from M02_MasterTemplete import M02_MasterTemplete_Router as main_router
from M02_MasterTemplete import M02_MasterTemplete_Router_Items as items_router
from M02_MasterTemplete import M02_MasterTemplete_Router_Layers as layers_router
from M02_MasterTemplete import M02_MasterTemplete_Store as store
@@ -65,7 +64,7 @@ def empty(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> dict[str, Any]:
gone = empty_master(system)
session = {"user_id": 42, "company_id": 7, "role": "SYSTEM_ADMIN", "is_master": True}
app = FastAPI()
for module in (main_router, items_router, layers_router, so_router):
for module in (items_router, layers_router, so_router):
app.include_router(module.router)
app.dependency_overrides[verify_session] = lambda: session
return {"client": TestClient(app), "system": system, "gone": gone}
@@ -74,11 +73,11 @@ def empty(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> dict[str, Any]:
def test_지운_뒤_항목_0_틀은_남음(empty):
system, client = empty["system"], empty["client"]
assert len(empty["gone"]) == 51
table = client.get("/api/m02/templates/table/구조물집계표").json()["문서"]
table = client.get("/api/m02/layers/system/templates/table/구조물집계표").json()["문서"]
assert [c["id"] for c in table["열"]] == ["no", "sta", "memo"] and table["폴더"] == []
assert table["변수"] and table["쪽줄"] == 50 and table["합계줄"] and table["바인딩규칙"]
assert set(table["보기"]["열너비"]) <= {"no", "sta", "memo"}
combos = client.get("/api/m02/structure-combos").json()
combos = client.get("/api/m02/layers/system/structure-combos").json()
assert combos["줄"] == [] and combos["다음"] == 52
assert len(combos["지운번호"]) == 4 # 견본에 세 파일이 있던 넷(rv · c4 · pp_len · ms)
for kind in ("structure", "area"):
@@ -90,8 +89,10 @@ def test_빈_마스터에서_첫_화면_나무_새_항목_지우기(empty):
# M02 첫 화면 길 — 양식 목록 · 집계표 · 번호 · 장부 · 나무 · 옵션
listed = client.get("/api/m02/layers/system/templates").json()["양식"]
assert "구조물집계표" in [r["이름"] for r in listed]
assert "구조물집계표" in [r["이름"] for r in client.get("/api/m02/templates").json()]
assert client.get("/api/m02/structures/numbers").json() == {}
assert "구조물집계표" in [
r["이름"] for r in client.get("/api/m02/layers/system/templates").json()["양식"]
]
assert client.get("/api/m02/layers/system/structures/numbers").json() == {}
assert client.get("/api/m02/structure-options").status_code == 200
assert client.get("/api/m02/items").json() == []
groups = client.get("/api/m02/items?all=1").json() # 고르기 모달 — 마스터 0
@@ -112,7 +113,10 @@ def test_빈_마스터에서_첫_화면_나무_새_항목_지우기(empty):
now = client.post(url, json={"판": now["판"], "op": "delete", "키": item["key"]}).json()
assert now["items"] == [] and now["폴더"] == [["옹벽"]]
now = client.post(url, json={"판": now["판"], "op": "delete", "경로": ["옹벽"]}).json()
assert now["폴더"] == [] and client.get("/api/m02/structure-combos").json()["다음"] == 53
assert (
now["폴더"] == []
and client.get("/api/m02/layers/system/structure-combos").json()["다음"] == 53
)
def test_마스터를_비워도_프로젝트_복사본_계산_그대로(world): # noqa: F811 — 고정물
+63 -39
View File
@@ -1,61 +1,69 @@
"""M02 시스템 층 저장소·길 — 새로·저장·다시 열기·지우기·409 (사본 폴더로)."""
import pytest
from fastapi import FastAPI
from fastapi.testclient import TestClient
from M02_MasterTemplete import M02_MasterTemplete_Store as store
from M02_MasterTemplete import M02_Template_Layers as layers
from M02_MasterTemplete.M02_MasterTemplete_Router import router
from resources.tester.helper_m02_system_client import drop, system_client
@pytest.fixture()
def client(tmp_path, monkeypatch):
for kind in store.KINDS:
(tmp_path / kind).mkdir()
monkeypatch.setattr(store, "FOLDER", tmp_path)
app = FastAPI()
app.include_router(router)
return TestClient(app)
return system_client(tmp_path, monkeypatch)
def test_new_save_reopen_delete_and_stale(client):
assert client.get("/api/m02/templates").json() == []
assert client.get("/api/m02/layers/system/templates").json()["양식"] == []
made = client.put("/api/m02/templates/table/집계표", json={"판": "", "문서": {"열": [1]}})
made = client.put(
"/api/m02/layers/system/templates/table/집계표", json={"판": "", "문서": {"열": [1]}}
)
assert made.status_code == 200
v1 = made.json()["판"]
assert (
client.put(
"/api/m02/templates/table/집계표", json={"판": "", "문서": {"열": []}}
"/api/m02/layers/system/templates/table/집계표", json={"판": "", "문서": {"열": []}}
).status_code
== 409
)
got = client.get("/api/m02/templates/table/집계표").json()
got = client.get("/api/m02/layers/system/templates/table/집계표").json()
assert got["판"] == v1 and got["문서"] == {"열": [1]}
saved = client.put("/api/m02/templates/table/집계표", json={"판": v1, "문서": {"열": [1, 2]}})
saved = client.put(
"/api/m02/layers/system/templates/table/집계표", json={"판": v1, "문서": {"열": [1, 2]}}
)
assert saved.status_code == 200 and saved.json()["판"] != v1
stale = client.put("/api/m02/templates/table/집계표", json={"판": v1, "문서": {"열": []}})
stale = client.put(
"/api/m02/layers/system/templates/table/집계표", json={"판": v1, "문서": {"열": []}}
)
assert stale.status_code == 409 and stale.json()["detail"]["stale"] == ["집계표"]
rows = client.get("/api/m02/templates").json()
rows = client.get("/api/m02/layers/system/templates").json()["양식"]
assert [(r["종류"], r["이름"]) for r in rows] == [("table", "집계표")]
assert client.delete("/api/m02/templates/table/집계표").status_code == 200
assert client.get("/api/m02/templates/table/집계표").status_code == 404
assert drop(client, "/api/m02/layers/system/templates/table/집계표").status_code == 200
assert client.get("/api/m02/layers/system/templates/table/집계표").status_code == 404
def test_bad_names_and_kinds(client):
for bad in ("a..b", ".숨김", "a%5Cb", "a%3Ab", "_밑줄", "가" * 81):
got = client.put(f"/api/m02/templates/table/{bad}", json={"판": "", "문서": {"열": []}})
got = client.put(
f"/api/m02/layers/system/templates/table/{bad}", json={"판": "", "문서": {"열": []}}
)
assert got.status_code == 400 and "쓸 수 없는" in got.json()["detail"]
assert client.put("/api/m02/templates/other/x", json={"판": "", "문서": {}}).status_code == 404
assert (
client.put(
"/api/m02/layers/system/templates/other/x", json={"판": "", "문서": {}}
).status_code
== 404
)
edge = "가" * 80 # 80자는 됨
assert (
client.put(
f"/api/m02/templates/table/{edge}", json={"판": "", "문서": {"열": []}}
f"/api/m02/layers/system/templates/table/{edge}", json={"판": "", "문서": {"열": []}}
).status_code
== 200
)
@@ -64,26 +72,34 @@ def test_bad_names_and_kinds(client):
def test_copy_is_independent_and_seeds_new_project(client, tmp_path, monkeypatch):
"""본떠 만들기 = 읽어 새 이름으로 새로 저장 — 원본은 안 바뀜 · 새 프로젝트 복사에 실림."""
doc = {"format": 6, "entities": [{"type": "line"}], "drawing_area": [1, 2, 3, 4]}
client.put("/api/m02/templates/drawing/원본", json={"판": "", "문서": doc})
got = client.get("/api/m02/templates/drawing/원본").json()
made = client.put("/api/m02/templates/drawing/복사", json={"판": "", "문서": got["문서"]})
client.put("/api/m02/layers/system/templates/drawing/원본", json={"판": "", "문서": doc})
got = client.get("/api/m02/layers/system/templates/drawing/원본").json()
made = client.put(
"/api/m02/layers/system/templates/drawing/복사", json={"판": "", "문서": got["문서"]}
)
assert made.status_code == 200
assert (
client.put("/api/m02/templates/drawing/복사", json={"판": "", "문서": doc}).status_code
client.put(
"/api/m02/layers/system/templates/drawing/복사", json={"판": "", "문서": doc}
).status_code
== 409
)
copy = client.get("/api/m02/templates/drawing/복사").json()
copy = client.get("/api/m02/layers/system/templates/drawing/복사").json()
assert copy["문서"] == doc and copy["판"] == got["판"] # 내용 같음
client.put(
"/api/m02/templates/drawing/복사",
"/api/m02/layers/system/templates/drawing/복사",
json={"판": copy["판"], "문서": {**doc, "entities": [{"type": "line"}, {"type": "arc"}]}},
)
assert client.get("/api/m02/templates/drawing/원본").json()["문서"] == doc # 원본 그대로
assert (
client.get("/api/m02/layers/system/templates/drawing/원본").json()["문서"] == doc
) # 원본 그대로
monkeypatch.setattr(layers, "SYSTEM_ROOT", tmp_path)
copied = layers.seed_project(tmp_path / "seed")
assert {"drawing/원본", "drawing/복사"} <= set(copied["작업본"])
client.delete("/api/m02/templates/drawing/복사")
assert [r["이름"] for r in client.get("/api/m02/templates").json()] == ["원본"]
drop(client, "/api/m02/layers/system/templates/drawing/복사")
assert [r["이름"] for r in client.get("/api/m02/layers/system/templates").json()["양식"]] == [
"원본"
]
def test_in_use_templates_not_deleted(client):
@@ -96,13 +112,16 @@ def test_in_use_templates_not_deleted(client):
doc = {"format": 6, "entities": [{"type": "line"}]}
for kind, name in store.IN_USE:
body = doc if kind == "drawing" else {"열": []}
client.put(f"/api/m02/templates/{kind}/{name}", json={"판": "", "문서": body})
got = client.delete(f"/api/m02/templates/{kind}/{name}")
client.put(f"/api/m02/layers/system/templates/{kind}/{name}", json={"판": "", "문서": body})
got = client.delete(f"/api/m02/layers/system/templates/{kind}/{name}")
assert got.status_code == 409 and "쓰는 양식" in got.json()["detail"]
assert client.get(f"/api/m02/templates/{kind}/{name}").status_code == 200
assert client.get(f"/api/m02/layers/system/templates/{kind}/{name}").status_code == 200
# 목록이 쓰는 곳을 실어 화면이 확인 창 전에 막음 · 안 쓰는 양식엔 없음
client.put("/api/m02/templates/drawing/아무도", json={"판": "", "문서": doc})
rows = {(r["종류"], r["이름"]): r for r in client.get("/api/m02/templates").json()}
client.put("/api/m02/layers/system/templates/drawing/아무도", json={"판": "", "문서": doc})
rows = {
(r["종류"], r["이름"]): r
for r in client.get("/api/m02/layers/system/templates").json()["양식"]
}
for key, use in store.IN_USE.items():
assert rows[key]["쓰는곳"] == use
assert "쓰는곳" not in rows[("drawing", "아무도")]
@@ -110,11 +129,16 @@ def test_in_use_templates_not_deleted(client):
def test_empty_doc_rejected_and_file_untouched(client):
good = {"format": 6, "entities": [{"type": "line"}]}
made = client.put("/api/m02/templates/drawing/도", json={"판": "", "문서": good})
made = client.put("/api/m02/layers/system/templates/drawing/도", json={"판": "", "문서": good})
v = made.json()["판"]
for bad in ({}, {"format": 6}, {"entities": "x"}, []):
r = client.put("/api/m02/templates/drawing/도", json={"판": v, "문서": bad})
assert r.status_code == 400
assert client.put("/api/m02/templates/table/표", json={"판": "", "문서": {}}).status_code == 400
assert client.get("/api/m02/templates/drawing/도").json()["문서"] == good
assert client.get("/api/m02/templates/table/표").status_code == 404
r = client.put("/api/m02/layers/system/templates/drawing/도", json={"판": v, "문서": bad})
assert r.status_code in (400, 422) # 묶음 아님(`[]`) = 몸 꼴 422
assert (
client.put(
"/api/m02/layers/system/templates/table/표", json={"판": "", "문서": {}}
).status_code
== 400
)
assert client.get("/api/m02/layers/system/templates/drawing/도").json()["문서"] == good
assert client.get("/api/m02/layers/system/templates/table/표").status_code == 404
+54 -43
View File
@@ -7,12 +7,10 @@
import json
import pytest
from fastapi import FastAPI
from fastapi.testclient import TestClient
from M02_MasterTemplete import M02_MasterTemplete_Store as store
from M02_MasterTemplete import M02_Template_Layers as layers
from M02_MasterTemplete.M02_MasterTemplete_Router import router
from resources.tester.helper_m02_system_client import drop, system_client
# 견본 구조물집계표 — 실제 마스터 양식은 사용자가 화면에서 고치므로 시험은 이 견본만 읽음
_SAMPLE_COLUMNS = [
@@ -57,10 +55,7 @@ def write_sample_table(folder) -> None:
@pytest.fixture()
def client(tmp_path, monkeypatch):
write_sample_table(tmp_path)
monkeypatch.setattr(store, "FOLDER", tmp_path)
app = FastAPI()
app.include_router(router)
return TestClient(app)
return system_client(tmp_path, monkeypatch)
def _num(code: str) -> dict:
@@ -73,7 +68,7 @@ def _num(code: str) -> dict:
def test_새로_도번_자동_409_없는_열(client):
made = client.post("/api/m02/structures/pp_len")
made = client.post("/api/m02/layers/system/structures/pp_len")
assert made.status_code == 200
doc = made.json()["문서"]
assert (doc["양식"], doc["종류"], doc["열"], doc["도번"]) == (
@@ -88,18 +83,25 @@ def test_새로_도번_자동_409_없는_열(client):
assert len(doc["도면"]["layers"]) == 1
# 면적산출은 구조물 문서 밖 — 같은 열 id 로 따로 한 통합문서 · 재료산출은 안 만듦
assert "산출근거" not in doc
assert client.get("/api/m02/templates/area/pp_len").json()["문서"]["종류"] == "통합문서"
assert client.get("/api/m02/templates/material/pp_len").status_code == 404
assert (
client.get("/api/m02/layers/system/templates/area/pp_len").json()["문서"]["종류"]
== "통합문서"
)
assert (
client.get("/api/m02/layers/system/templates/material/pp_len").status_code == 400
) # 없는 종류
assert client.post("/api/m02/structures/rv").json()["문서"]["도번"] == "SD-000002"
assert client.post("/api/m02/structures/pp_len").status_code == 409
assert client.post("/api/m02/structures/없는열").status_code == 404
assert client.post("/api/m02/structures/no").status_code == 404 # 글 열은 구조물 아님
assert client.get("/api/m02/structures/numbers").json() == {
assert client.post("/api/m02/layers/system/structures/rv").json()["문서"]["도번"] == "SD-000002"
assert client.post("/api/m02/layers/system/structures/pp_len").status_code == 409
assert client.post("/api/m02/layers/system/structures/없는열").status_code == 404
assert (
client.post("/api/m02/layers/system/structures/no").status_code == 404
) # 글 열은 구조물 아님
assert client.get("/api/m02/layers/system/structures/numbers").json() == {
"pp_len": _num("-000001"),
"rv": _num("-000002"),
}
rows = client.get("/api/m02/templates").json()
rows = client.get("/api/m02/layers/system/templates").json()["양식"]
assert {(r["종류"], r["이름"]) for r in rows if r["종류"] == "structure"} == {
("structure", "pp_len"),
("structure", "rv"),
@@ -107,35 +109,41 @@ def test_새로_도번_자동_409_없는_열(client):
def test_저장_뼈대_거름(client):
got = client.post("/api/m02/structures/pp_len").json()
got = client.post("/api/m02/layers/system/structures/pp_len").json()
doc = got["문서"]
doc["도면"]["entities"] = [{"type": "line"}]
saved = client.put("/api/m02/templates/structure/pp_len", json={"판": got["판"], "문서": doc})
saved = client.put(
"/api/m02/layers/system/templates/structure/pp_len", json={"판": got["판"], "문서": doc}
)
assert saved.status_code == 200 and saved.json()["판"] != got["판"]
for bad in ({}, {**doc, "도면": {}}, {**doc, "도면": {"entities": "x"}}, {**doc, "도면": []}):
r = client.put(
"/api/m02/templates/structure/pp_len", json={"판": saved.json()["판"], "문서": bad}
"/api/m02/layers/system/templates/structure/pp_len",
json={"판": saved.json()["판"], "문서": bad},
)
assert r.status_code == 400
assert client.get("/api/m02/templates/structure/pp_len").json()["문서"] == doc
now = client.get("/api/m02/templates/structure/pp_len").json()["판"]
assert client.get("/api/m02/layers/system/templates/structure/pp_len").json()["문서"] == doc
now = client.get("/api/m02/layers/system/templates/structure/pp_len").json()["판"]
client.put(
"/api/m02/templates/structure/pp_len", json={"판": now, "문서": {**doc, "도번": "SD9"}}
"/api/m02/layers/system/templates/structure/pp_len",
json={"판": now, "문서": {**doc, "도번": "SD9"}},
)
got = client.get("/api/m02/templates/structure/pp_len").json()["문서"]
got = client.get("/api/m02/layers/system/templates/structure/pp_len").json()["문서"]
assert got["도번"] == "SD-000001" # 번호는 서버 것 — 화면 값을 안 받음
def test_지워도_번호를_당기지_않음_짝은_같은_번호(client):
for column in ("pp_len", "rv", "ms"):
client.post(f"/api/m02/structures/{column}")
assert client.delete("/api/m02/templates/structure/rv").status_code == 200
numbers = client.get("/api/m02/structures/numbers").json()
client.post(f"/api/m02/layers/system/structures/{column}")
assert drop(client, "/api/m02/layers/system/templates/structure/rv").status_code == 200
numbers = client.get("/api/m02/layers/system/structures/numbers").json()
assert numbers["rv"] == {**_num("-000002"), "도번": ""} # 면적은 남아 번호를 쥠
assert numbers["ms"] == _num("-000003") # 다른 열 번호는 그대로
# 새 열 = 다음 일련번호(자리 뜻 없음) · 다시 만든 도면은 짝(면적산출) 번호를 이어 받음
assert client.post("/api/m02/structures/pp_cp").json()["문서"]["도번"] == "SD-000004"
assert client.post("/api/m02/structures/rv").json()["문서"]["도번"] == "SD-000002"
assert (
client.post("/api/m02/layers/system/structures/pp_cp").json()["문서"]["도번"] == "SD-000004"
)
assert client.post("/api/m02/layers/system/structures/rv").json()["문서"]["도번"] == "SD-000002"
def test_번호_없는_열은_열_차례로_일련번호_한_번_옮김(client, tmp_path):
@@ -149,7 +157,7 @@ def test_번호_없는_열은_열_차례로_일련번호_한_번_옮김(client,
)
done = store.renumber()
assert done["지움"] == ["structure/no"] # 글 열(NO · 측점 · 비고)은 구조물 아님
numbers = client.get("/api/m02/structures/numbers").json()
numbers = client.get("/api/m02/layers/system/structures/numbers").json()
assert set(numbers) == set(store._column_ids()) and "sta" not in numbers
expect = { # 구조물 열 차례 그대로 1 부터(제목행 자리 뜻 없음)
"rv": "-000001",
@@ -171,7 +179,7 @@ def test_번호_없는_열은_열_차례로_일련번호_한_번_옮김(client,
def test_집계표_저장_때_새_열은_만들고_지운_열은_같이_지움(client):
store.renumber()
got = client.get("/api/m02/templates/table/구조물집계표").json()
got = client.get("/api/m02/layers/system/templates/table/구조물집계표").json()
table = got["문서"]
table["열"] = [c for c in table["열"] if c["id"] != "pv_a"]
new = {"id": "pv_x", "머리": ["콘크리트포장", "T=(두께마다)", "X"], "단위": "m", "꼴": "수"}
@@ -180,13 +188,13 @@ def test_집계표_저장_때_새_열은_만들고_지운_열은_같이_지움(c
third = {"id": "pv_y", "머리": ["콘크리트포장", "T=(두께마다)", "B", "H=1"], "꼴": "수"}
table["열"] += [new, kind, text, third]
saved = client.put(
"/api/m02/templates/table/구조물집계표", json={"판": got["판"], "문서": table}
"/api/m02/layers/system/templates/table/구조물집계표", json={"판": got["판"], "문서": table}
)
assert saved.status_code == 200
numbers = client.get("/api/m02/structures/numbers").json()
numbers = client.get("/api/m02/layers/system/structures/numbers").json()
assert "pv_a" not in numbers and "note2" not in numbers
for kind_ in ("structure", "area"):
assert client.get(f"/api/m02/templates/{kind_}/pv_a").status_code == 404
assert client.get(f"/api/m02/layers/system/templates/{kind_}/pv_a").status_code == 404
# 새 열 = 열 차례로 다음 일련번호 · 지운 pv_a(5) 는 비워 둠(다른 번호를 안 당김)
assert numbers["pv_x"] == _num("-000014")
assert numbers["zz"] == _num("-000015")
@@ -197,35 +205,38 @@ def test_집계표_저장_때_새_열은_만들고_지운_열은_같이_지움(c
def test_지운_열_번호는_다음_저장에도_다시_안_줌(client):
"""가장 큰 번호 열(h_rip_m 13)을 지워 저장한 뒤 새 열을 더해도 13 을 다시 안 받음."""
store.renumber()
url = "/api/m02/templates/table/구조물집계표"
url = "/api/m02/layers/system/templates/table/구조물집계표"
got = client.get(url).json()
got["문서"]["열"] = [c for c in got["문서"]["열"] if c["id"] != "h_rip_m"]
assert client.put(url, json={"판": got["판"], "문서": got["문서"]}).status_code == 200
assert client.get("/api/m02/structure-combos").json()["지운번호"] == ["-000013"]
assert client.get("/api/m02/layers/system/structure-combos").json()["지운번호"] == ["-000013"]
got = client.get(url).json()
new = {"id": "pv_z", "머리": ["콘크리트포장", "T=(두께마다)", "Z", None], "꼴": "수"}
got["문서"]["열"].append(new)
assert client.put(url, json={"판": got["판"], "문서": got["문서"]}).status_code == 200
assert client.get("/api/m02/structures/numbers").json()["pv_z"] == _num("-000014")
assert client.get("/api/m02/layers/system/structures/numbers").json()["pv_z"] == _num("-000014")
def test_다른_열_도면을_복사해_가져옴(client):
store.renumber()
src = client.get("/api/m02/templates/structure/rv").json()
src = client.get("/api/m02/layers/system/templates/structure/rv").json()
src["문서"]["도면"]["entities"] = [{"type": "circle"}]
client.put("/api/m02/templates/structure/rv", json=src)
r = client.post("/api/m02/structures/ms/copy", params={"from": "rv"})
client.put("/api/m02/layers/system/templates/structure/rv", json=src)
r = client.post("/api/m02/layers/system/structures/ms/copy", params={"from": "rv"})
assert r.status_code == 200
ms = client.get("/api/m02/templates/structure/ms").json()["문서"]
ms = client.get("/api/m02/layers/system/templates/structure/ms").json()["문서"]
assert ms["도면"]["entities"] == [{"type": "circle"}]
assert (ms["도번"], ms["열"]) == ("SD-000010", "ms") # 번호 · 열은 받는 쪽 그대로
assert client.get("/api/m02/templates/structure/rv").json()["문서"]["도번"] == "SD-000001"
bad = client.post("/api/m02/structures/ms/copy", params={"from": "없는열"})
assert (
client.get("/api/m02/layers/system/templates/structure/rv").json()["문서"]["도번"]
== "SD-000001"
)
bad = client.post("/api/m02/layers/system/structures/ms/copy", params={"from": "없는열"})
assert bad.status_code == 404
def test_프로젝트_복사와_층_저장에_실림(client, tmp_path, monkeypatch):
doc = client.post("/api/m02/structures/pp_len").json()["문서"]
doc = client.post("/api/m02/layers/system/structures/pp_len").json()["문서"]
monkeypatch.setattr(layers, "SYSTEM_ROOT", tmp_path)
project = tmp_path / "project"
copied = layers.seed_project(project)
+15 -15
View File
@@ -7,26 +7,21 @@ import json
from pathlib import Path
import pytest
from fastapi import FastAPI
from fastapi.testclient import TestClient
from M02_MasterTemplete import M02_MasterTemplete_Book as book
from M02_MasterTemplete import M02_MasterTemplete_Store as store
from M02_MasterTemplete import M02_Template_Layers as layers
from M02_MasterTemplete.M02_MasterTemplete_Router import router
from resources.tester.helper_m02_system_client import system_client
from resources.tester.test_m02_structure import write_sample_table
ROOT = Path(__file__).resolve().parents[2]
TABLE = "/api/m02/templates/table/구조물집계표"
TABLE = "/api/m02/layers/system/templates/table/구조물집계표"
@pytest.fixture()
def client(tmp_path, monkeypatch):
write_sample_table(tmp_path)
monkeypatch.setattr(store, "FOLDER", tmp_path)
app = FastAPI()
app.include_router(router)
return TestClient(app)
return system_client(tmp_path, monkeypatch)
def _save_table(client, change) -> None:
@@ -36,12 +31,15 @@ def _save_table(client, change) -> None:
def _keys(client) -> dict[str, str]:
return {row["열"]: row["키"] for row in client.get("/api/m02/structure-combos").json()["줄"]}
return {
row["열"]: row["키"]
for row in client.get("/api/m02/layers/system/structure-combos").json()["줄"]
}
def test_처음_한_번_만듦_글_열_빼고_칸은_집계표_그대로(client, tmp_path):
assert not (tmp_path / store.COMBO_FILE).exists()
doc = client.get("/api/m02/structure-combos").json()
doc = client.get("/api/m02/layers/system/structure-combos").json()
assert (doc["그룹"], doc["다음"]) == ("구조물집계표조합", 14)
rows = doc["줄"]
assert [r["열"] for r in rows][:3] == ["rv", "c1", "pv_b"]
@@ -61,7 +59,9 @@ def test_처음_한_번_만듦_글_열_빼고_칸은_집계표_그대로(client,
def test_집계표_저장_때_새_열_지운_열_고친_열을_맞춤_키_유지(client):
before = _keys(client)
old_rv = next(
r for r in client.get("/api/m02/structure-combos").json()["줄"] if r["열"] == "rv"
r
for r in client.get("/api/m02/layers/system/structure-combos").json()["줄"]
if r["열"] == "rv"
)
def change(table):
@@ -73,7 +73,7 @@ def test_집계표_저장_때_새_열_지운_열_고친_열을_맞춤_키_유지
cols.insert(3, {"id": "new1", "머리": ["옹벽", None, None, None], "단위": "m", "꼴": "수"})
_save_table(client, change)
doc = client.get("/api/m02/structure-combos").json()
doc = client.get("/api/m02/layers/system/structure-combos").json()
rows = {r["열"]: r for r in doc["줄"]}
assert "h_rip_m" not in rows
assert rows["new1"]["키"] == "SS000014" # 지운 열의 SS000013 은 다시 안 씀
@@ -85,13 +85,13 @@ def test_집계표_저장_때_새_열_지운_열_고친_열을_맞춤_키_유지
assert (rv["단위"], rv["일위대가"]) == ("m", "UA000004")
assert (rv["바인딩"], rv["펼침"]) == ({"종류": "revetment"}, True)
# 번호는 파일과 같음 — 새 열도 [저장] 한 번에 SD · SA 가 섬
numbers = client.get("/api/m02/structures/numbers").json()
numbers = client.get("/api/m02/layers/system/structures/numbers").json()
assert {k: rows["new1"][k] for k in ("도번", "일위대가번", "면적번")} == numbers["new1"]
assert rows["new1"]["도번"].startswith("SD")
# 또 저장해도(바뀐 것 없음) 키 · 다음 그대로
_save_table(client, lambda table: None)
again = client.get("/api/m02/structure-combos").json()
again = client.get("/api/m02/layers/system/structure-combos").json()
assert (again["다음"], again["줄"]) == (15, doc["줄"])
@@ -102,7 +102,7 @@ def test_SS_머리글은_키대장과_안_겹침():
def test_새_프로젝트_복사에_실림(client, tmp_path, monkeypatch):
client.get("/api/m02/structure-combos")
client.get("/api/m02/layers/system/structure-combos")
monkeypatch.setattr(layers, "SYSTEM_ROOT", tmp_path)
copied = layers.seed_project(tmp_path / "project")
assert "구조물집계표조합" in copied["작업본"] and "구조물집계표조합" in copied["초기"]