- 길 지움(화면 TS · 다른 서버 모듈 · 시험 세 곳에서 다시 찾음 · /openapi.json 524 → 509 뜻한 15 만): GET /groups · /sections · /table/options · /logic/combos · POST /logic/new · /logic/edit · /logic/delete · /logic/draft · /logic/sheet · /logic/sheet/check · /logic/equation(+ preview · links · save) · /logic/doc/links - 본체 지움: M01_MasterData_Sheet.py · Equation.read · preview · save · Store_Make.sections · _counts · table_options · logic_edit · logic_delete · _own_only · logic_draft · Store.groups · Store_Combo.combo_preview · scripts/master_draft.py(지운 /logic/draft 만 부름) - 남김: Equation.export_row · edit_row · links(M02 Sangeun_Equation 이 부름) · Doc.candidates(M02 /doc/links) · Store_Make._all_sections(M02 Hopyo_Clause) · logic_new(복사 · 수식 저장이 씀) · combos_of_logic(Doc.users) · combo_inputs(알약 규칙 입구 · 시험) · master_combo.run(M02 시험 대조 값) · /alias/suggest(main.py 가 따로 끼움 · 승인 화면과 한 벌) - 화면 입구 지움: Api_Fetch.fetchGroups · GroupInfo · fetchSubs · Logic_Api.draftLogic + Draft 타입 6 - 시험: test_m01_draft 지움(죽은 해석기 · 길만 봄) · test_794_1 시트 길 시험 지우고 /save 다시 셈 시험만 남김 · test_796_1 수식 길 시험 지움 · test_800_2 는 살아 있는 export_row · edit_row 로 같은 셈 · test_m01_make 는 죽은 길 대신 /save · logic_new 로 같은 결과 · test_m01_combo 미리 보기 시험 지움 · /logic/combos 는 combos_of_logic 로 · test_m01_api · test_802_3 · test_799_2 · test_717_1(+helper) 죽은 길 줄만 고침 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
208 lines
9.4 KiB
Python
208 lines
9.4 KiB
Python
"""M01 「만들기」 — 절로 표 거르기 · 소유 거름 · 자체 로직(만들기 · 본뜨기 · `/save` 고치기 · 지우기) · 끝수.
|
|
|
|
계약 `resources/master_data/_화면_계약.md` 2장·5장·6장. 임시 폴더 사본에서 씀.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import shutil
|
|
from decimal import Decimal
|
|
from pathlib import Path
|
|
|
|
import pytest
|
|
from fastapi import FastAPI
|
|
from fastapi.testclient import TestClient
|
|
|
|
from M01_MasterData import M01_MasterData_Router as router_module
|
|
from M01_MasterData import M01_MasterData_Store as store
|
|
from M01_MasterData import M01_MasterData_Store_Make as make
|
|
|
|
REAL = store.FOLDER
|
|
LABOR = "LB000002" # 보통인부
|
|
SAMPLE = "GF000219" # 산림 13-4-1 메쌓기(인력)
|
|
|
|
|
|
@pytest.fixture
|
|
def client(tmp_path: Path, monkeypatch) -> TestClient:
|
|
for path in REAL.glob("*.json"):
|
|
if not path.name.startswith("_") or path.name == store.mk.BOOK.name:
|
|
shutil.copy(path, tmp_path / path.name)
|
|
shutil.copytree(REAL / "기계", tmp_path / "기계") # 기계 = 폴더(826-2)
|
|
monkeypatch.setattr(store, "FOLDER", tmp_path)
|
|
app = FastAPI()
|
|
app.include_router(router_module.router)
|
|
return TestClient(app)
|
|
|
|
|
|
def _get(client: TestClient, url: str, **params) -> dict:
|
|
res = client.get(url, params=params)
|
|
assert res.status_code == 200, res.text
|
|
return res.json()
|
|
|
|
|
|
def _post(client: TestClient, url: str, body: dict, want: int = 200) -> dict:
|
|
res = client.post(url, json=body)
|
|
assert res.status_code == want, res.text
|
|
return res.json()
|
|
|
|
|
|
def _draft(끝수=None) -> dict:
|
|
"""보통인부 1/7 인 한 줄짜리 초안 — 저장 안 함."""
|
|
return {
|
|
"원문번호": "",
|
|
"이름": "시험 초안",
|
|
"결과단위": "원/㎡",
|
|
"출처": "자체",
|
|
"소유": "현장",
|
|
"입력": [],
|
|
"중간": [],
|
|
"호표": [
|
|
{
|
|
"종류": "인력",
|
|
"요소": LABOR,
|
|
"이름": "보통인부",
|
|
"단위": "인",
|
|
"수량": "1 / 7",
|
|
"비목": "노무비",
|
|
}
|
|
],
|
|
"덧줄": [],
|
|
"끝수": 끝수,
|
|
}
|
|
|
|
|
|
def _new(owner: str) -> dict:
|
|
"""새 자체 로직 — 화면 길(`/logic/copy` · `/logic/formula/save`)이 함께 쓰는 `logic_new`."""
|
|
return make.logic_new(_draft(), owner)
|
|
|
|
|
|
def _own_save(client: TestClient, change: dict, version: str, want: int = 200) -> dict:
|
|
"""자체 로직 고치기 · 지우기 = M01 [저장](`/save`) 한 길."""
|
|
body = {"files": [{"file": make.OWN, "version": version, "changes": [change]}]}
|
|
return _post(client, "/api/m01/save", body, want)
|
|
|
|
|
|
# ── 끝수 ──────────────────────────────────────────────────────────────
|
|
def test_끝수_묶음이_계에_붙고_글자는_안_붙는다(client: TestClient) -> None:
|
|
plain = _post(client, "/api/m01/calc", {"key": "", "inputs": {}, "row": _draft()})
|
|
assert plain["ok"] is True, plain
|
|
raw = Decimal(str(plain["sums"]["계"]))
|
|
assert raw == 24581 # 172068 / 7 = 24,581.14 → 줄 0.1 원 · 소계 1 원 버림(751-3 · 품셈 1-2-2)
|
|
|
|
cut = _post(
|
|
client,
|
|
"/api/m01/calc",
|
|
{"key": "", "inputs": {}, "row": _draft({"대상": "계", "자리": -1, "방법": "올림"})},
|
|
)
|
|
assert Decimal(str(cut["sums"]["계"])) == 24590 # 로직 끝수 묶음 = 1-2-2 버림 뒤 한 번 더
|
|
assert cut["sums"]["노무비"] == cut["sums"]["계"] # 비목 합마다 끊고 계 = 그 합
|
|
|
|
text = _post(client, "/api/m01/calc", {"key": "", "inputs": {}, "row": _draft("원 미만 버림")})
|
|
assert Decimal(str(text["sums"]["계"])) == raw # 글자 끝수는 설명일 뿐
|
|
|
|
|
|
def test_끝수_묶음_모양을_검사가_잡는다() -> None:
|
|
bad = {"키": "GX000001", "원문번호": "", "호표": [], "끝수": {"대상": "줄", "방법": "내림"}}
|
|
found = store.cm.mf.check_logic(store.cm.master(REAL), bad)[0]
|
|
assert any("대상" in x for x in found) and any("방법" in x for x in found)
|
|
|
|
|
|
# ── 절 거르기 ─────────────────────────────────────────────────────────
|
|
def test_절로_표_거르기(client: TestClient) -> None:
|
|
hits = _get(client, "/api/m01/tables", group="소요량", section="13-4", size=500)["tables"]
|
|
assert hits and all(store.in_section(t["원문번호"], "13-4") for t in hits)
|
|
assert not store.in_section("13-40", "13-4") and store.in_section("13-4", "13-4")
|
|
|
|
|
|
def test_로직_목록을_소유로_거른다(client: TestClient) -> None:
|
|
every = _get(client, "/api/m01/logics")["logics"]
|
|
assert all("소유" in x for x in every)
|
|
only = _get(client, "/api/m01/logics", owner="공용")["logics"]
|
|
assert only and all(x["소유"] == "공용" for x in only)
|
|
assert _get(client, "/api/m01/logics", owner="현장")["logics"] == []
|
|
|
|
|
|
# ── 자체 로직 ─────────────────────────────────────────────────────────
|
|
def test_자체_로직_만들기_본뜨기_고치기_지우기(client: TestClient) -> None:
|
|
made = _new("현장")
|
|
assert made["key"].startswith("GX") and made["file"] == make.OWN
|
|
assert made["logic"]["구분"] == "자체" and made["logic"]["소유"] == "현장"
|
|
assert (store.FOLDER / make.OWN).is_file()
|
|
|
|
again = _new("현장")
|
|
assert again["key"] != made["key"] # 원문번호가 같아도 키는 하나씩
|
|
|
|
copied = _post(client, "/api/m01/logic/copy", {"key": SAMPLE, "이름": "메쌓기 본뜸"})
|
|
assert copied["key"] != SAMPLE and f"{SAMPLE} 를 본뜸" in copied["logic"]["비고"]
|
|
assert copied["logic"]["이름"] == "메쌓기 본뜸" and copied["logic"]["소유"] == "현장"
|
|
assert copied["logic"]["상세구분"] == "13장 구조물"
|
|
|
|
fixed = dict(copied["logic"], 이름="고친 이름")
|
|
change = {"op": "edit", "key": copied["key"], "row": fixed}
|
|
_own_save(client, change, copied["version"])
|
|
done = _get(client, "/api/m01/logic", key=copied["key"])
|
|
assert done["logic"]["이름"] == "고친 이름" and done["logic"]["키"] == copied["key"]
|
|
|
|
_own_save(client, change, copied["version"], want=409) # 옛 판
|
|
|
|
gone = _own_save(client, {"op": "delete", "key": copied["key"]}, done["version"])
|
|
assert gone["files"][0]["file"] == make.OWN
|
|
assert client.get("/api/m01/logic", params={"key": copied["key"]}).status_code == 404
|
|
|
|
|
|
def test_모르는_소유는_400(client: TestClient) -> None:
|
|
with pytest.raises(store.StoreError) as caught:
|
|
make.logic_new(_draft(), "남의것")
|
|
assert caught.value.status == 400
|
|
|
|
|
|
def test_만든_자체_로직이_시험_계산에_돈다(client: TestClient) -> None:
|
|
made = _new("공용")
|
|
got = _post(client, "/api/m01/calc", {"key": made["key"], "inputs": {}})
|
|
assert got["ok"] is True and Decimal(str(got["sums"]["노무비"])) > 0
|
|
listed = _get(client, "/api/m01/logics", owner="공용")["logics"]
|
|
assert made["key"] in [x["키"] for x in listed]
|
|
|
|
|
|
def test_일위대가가_담은_로직은_못_지운다(client: TestClient, tmp_path: Path, monkeypatch) -> None:
|
|
"""39-1d — 로직 지우기 검사 = 모든 층(마스터 · 회사 · 개인) labor 담은로직 + 실무문서(마스터
|
|
일위대가 조합) · 쓰는 곳을 알림 · 다 빼면 지워짐(임시 storage · 임시 마스터)."""
|
|
import json
|
|
|
|
from config import config_system
|
|
from M02_MasterTemplete import M02_Template_Layers as layers
|
|
|
|
system, storage = tmp_path / "system", tmp_path / "storage"
|
|
monkeypatch.setattr(layers, "SYSTEM_ROOT", system)
|
|
monkeypatch.setattr(config_system, "STORAGE_BASE_DIR", str(storage))
|
|
made = _new("현장")
|
|
key = made["key"]
|
|
docs = {
|
|
"회사 3": storage / "3/templates/labor/item1.json",
|
|
"개인 3/15": storage / "3/15/templates/labor/item2.json",
|
|
"마스터": system / "labor/item3.json",
|
|
}
|
|
for at, path in enumerate(docs.values()):
|
|
path.parent.mkdir(parents=True)
|
|
doc = {"일위대가번": f"SU-00000{at}", "담은로직": [{"로직": SAMPLE}, {"로직": key}]}
|
|
path.write_text(json.dumps(doc, ensure_ascii=False), encoding="utf-8")
|
|
combos = store.FOLDER / store.mcb.FILE
|
|
raw = json.loads(combos.read_text(encoding="utf-8"))
|
|
raw["줄"].append({**raw["줄"][0], "키": "UA999999", "담은로직": [{"로직": key, "메모": None}]})
|
|
combos.write_text(json.dumps(raw, ensure_ascii=False), encoding="utf-8")
|
|
|
|
def delete(want: int) -> dict:
|
|
version = _get(client, "/api/m01/logic", key=key)["version"]
|
|
return _own_save(client, {"op": "delete", "key": key}, version, want)
|
|
|
|
errors = " ".join(delete(422)["detail"]["errors"])
|
|
for where in docs:
|
|
assert f"일위대가 {where} 「SU-" in errors and key in errors # 어디서 쓰는지 알림
|
|
assert store.mcb.FILE in errors # 실무문서(마스터 일위대가 조합)
|
|
for path in docs.values(): # 일위대가에서 뺌 — 실무문서만 남음
|
|
path.write_text(json.dumps({"담은로직": [{"로직": SAMPLE}]}), encoding="utf-8")
|
|
assert "일위대가 " not in " ".join(delete(422)["detail"]["errors"])
|
|
raw["줄"].pop()
|
|
combos.write_text(json.dumps(raw, ensure_ascii=False), encoding="utf-8")
|
|
assert delete(200)["files"][0]["file"] == make.OWN # 쓰는 곳 0 = 지워짐
|