diff --git a/M01_MasterData/M01_MasterData_Router.py b/M01_MasterData/M01_MasterData_Router.py index c16cebed8..f90545143 100644 --- a/M01_MasterData/M01_MasterData_Router.py +++ b/M01_MasterData/M01_MasterData_Router.py @@ -21,7 +21,6 @@ from M01_MasterData import M01_MasterData_Store as store from M01_MasterData import M01_MasterData_Store_List as store_list from M01_MasterData import M01_MasterData_RateSheet as rate_sheet from M01_MasterData import M01_MasterData_Store_Make as make -from M01_MasterData import M01_MasterData_Store_Revise as revise from M01_MasterData import M01_MasterData_Store_Sheet as sheet import master_basis as mbs # noqa: E402 (`store` 가 scripts 를 길에 둠) @@ -174,9 +173,11 @@ def get_parts(group: str, detail: str = "") -> dict: @router.get("/logic") def get_logic(key: str) -> dict: - """`지문` = 줄 바탕 지문(계산 칸 · `Store_Revise.row_print`) — M02 덮개 「M01 개정」 비교 값.""" + """`지문` = 수식 문서 셈 칸 지문(`M02_Doc_Copy.doc_fp` · 855 L2 ⓐ) — 이름표 · 비고 고침은 안 바꿈.""" + from M02_MasterTemplete import M02_Doc_Copy as doc_copy # M02 가 M01 을 부름 — 늦게 + out = _call(store.logic, key) - return {**out, "지문": revise.row_print(out["logic"])} + return {**out, "지문": doc_copy.doc_fp(doc_screen.docs().get(key))} @router.get("/logic/source") diff --git a/resources/tester/test_713_1_revise.py b/resources/tester/test_713_1_revise.py index 837b0b9fd..859b384c3 100644 --- a/resources/tester/test_713_1_revise.py +++ b/resources/tester/test_713_1_revise.py @@ -73,17 +73,22 @@ def test_같은_줄_다시_보냄은_그대로(client: TestClient) -> None: def test_확인하면_저장_지문은_계산_칸만(client: TestClient) -> None: + """`/logic` 지문 = 수식 문서 셈 칸 지문(855 L2 ⓐ) — 비고 고침은 그대로 · 문서 금액 줄 고침은 바뀜.""" + from M02_MasterTemplete import M02_Doc_Copy as doc_copy + one = client.get("/api/m01/logic", params={"key": KEY}).json() base, print0 = one["logic"], one["지문"] - assert print0 == revise.row_print(base) + doc = client.get("/api/m01/logic/doc", params={"key": KEY}).json() + assert print0 == doc_copy.doc_fp(doc["문서"]) body = {"files": [_part(client, "edit", {**base, "비고": "개정 시험"})], "개정확인": True} assert client.post("/api/m01/save", json=body).status_code == 200 again = client.get("/api/m01/logic", params={"key": KEY}).json() assert again["logic"]["비고"] == "개정 시험" and again["지문"] == print0 # 비고 = 지문 밖 - hop = [dict(x) for x in base["호표"]] - hop[0]["수량"] = f"({hop[0]['수량']}) * 2" - body = {"files": [_part(client, "edit", {**again["logic"], "호표": hop})], "개정확인": True} - assert client.post("/api/m01/save", json=body).status_code == 200, "계산 칸 고침" + doc = client.get("/api/m01/logic/doc", params={"key": KEY}).json() + line = doc["문서"]["금액"][0] + line["수량"] = f"({line['수량']}) × 2" + res = client.post("/api/m01/logic/doc/save", json={"문서": doc["문서"], "판": doc["판"]}) + assert res.status_code == 200, res.text assert client.get("/api/m01/logic", params={"key": KEY}).json()["지문"] != print0