From 0291a19347b08d5abdcb4bb15849a925057423cd Mon Sep 17 00:00:00 2001 From: umsangdon Date: Wed, 18 Nov 2026 09:39:25 +0900 Subject: [PATCH] =?UTF-8?q?refactor(858=205-8=20=E2=91=A0):=20=EC=84=9C?= =?UTF-8?q?=EA=B3=A0=20=EA=B0=90=EC=8C=88=20=EA=B1=B7=EC=9D=8C=20=E2=80=94?= =?UTF-8?q?=20=EB=B6=80=EB=A5=B4=EB=8A=94=20=EC=AA=BD=EC=9D=B4=20=ED=95=9C?= =?UTF-8?q?=20=EB=B2=8C=EC=9D=84=20=EB=B0=94=EB=A1=9C=20=EB=B6=80=EB=A6=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 쓰는 곳: `Labor_Ref.refuse_used` 감쌈 지움 → Router_Layers · Store.delete 가 `Library_Uses.refuse_used` · `MyMachine._uses` · `Material_Own.uses` 지움 → `Library_Uses.machines` · `materials` - 권한: `Library_Delete.can_write` 별칭 · `Library_Same_Router._can_write` 지움 → `Layer_Access.can_write` - 층 폴더: `MyMachine_Router._folder` 감쌈 지움 → `Router_Items._root(…, personal=MINE)`(MyMachine_Look 도) - 화면: Material_Pick `OwnRow` 지움 → 내 재료 Api `MyMaterial` 꼴 - 시험: 797_1 · 840_4 · 821_1 · 733_3 · 735_1 이 감쌈 대신 한 벌을 부름 · 갈아 끼움(monkeypatch)은 `access.can_write` Co-Authored-By: Claude Opus 5.5 --- M02_MasterTemplete/M02_Labor_Ref.py | 8 ------- M02_MasterTemplete/M02_Library_Delete.py | 7 ++----- M02_MasterTemplete/M02_Library_Same_Router.py | 8 ++----- .../M02_MasterTemplete_Router_Layers.py | 3 ++- .../M02_MasterTemplete_Store.py | 4 ++-- M02_MasterTemplete/M02_Material_Own.py | 11 +++------- M02_MasterTemplete/M02_Material_Pick.ts | 21 ++++++------------- M02_MasterTemplete/M02_MyMachine.py | 14 ++++--------- M02_MasterTemplete/M02_MyMachine_Look.py | 12 +++++------ M02_MasterTemplete/M02_MyMachine_Router.py | 15 +++++++------ .../tester/test_733_3_library_same_merge.py | 2 +- resources/tester/test_735_1_library_delete.py | 2 +- resources/tester/test_797_1_import_links.py | 3 +-- resources/tester/test_821_1_my_machine.py | 10 +++++---- resources/tester/test_840_4_my_material.py | 3 ++- 15 files changed, 45 insertions(+), 78 deletions(-) diff --git a/M02_MasterTemplete/M02_Labor_Ref.py b/M02_MasterTemplete/M02_Labor_Ref.py index c363d7921..575075ef5 100644 --- a/M02_MasterTemplete/M02_Labor_Ref.py +++ b/M02_MasterTemplete/M02_Labor_Ref.py @@ -450,14 +450,6 @@ def summaries(folder: Path, rows: list[dict[str, Any]]) -> None: row.update(summary(folder, row["종류"], row["이름"], expand, files)) -# ── 쓰는 곳 · 지우기 ────────────────────────────────────────────────── -def refuse_used(folder: Path, kind: str, key: str) -> None: - """쓰는 곳이 있으면 409 — 쓰는 곳 색인 한 벌(`M02_Library_Uses` · 858 5-5).""" - from M02_MasterTemplete import M02_Library_Uses as uses - - uses.refuse_used(folder, kind, key) - - # ── 층 사이 복사 ────────────────────────────────────────────────────── def origin_mark(doc: dict[str, Any], ref: Ref) -> dict[str, Any]: """복사 문서의 `본뜬` — 실무자료 본뜬(키 · 전국자재 …)은 지키고 원본 참조는 `복사원본` 칸에 둠.""" diff --git a/M02_MasterTemplete/M02_Library_Delete.py b/M02_MasterTemplete/M02_Library_Delete.py index 61329df94..887b270fd 100644 --- a/M02_MasterTemplete/M02_Library_Delete.py +++ b/M02_MasterTemplete/M02_Library_Delete.py @@ -34,9 +34,6 @@ _ADD = re.compile(r"^add:#(\d+)(.*)$") _PATCH = ("덮개", "고름", "자재표시") -can_write = access.can_write # 쓰기 판단 한 벌(858-B) — 이름은 5-8 에서 걷음 - - def _hits(doc: dict[str, Any], rids: dict[str, str]) -> list[tuple[str, str]]: """문서 안 지울 참조 줄 — [(줄, 키)].""" out = [] @@ -84,7 +81,7 @@ def users(session: dict[str, Any] | None, kind: str, gone: list[str]) -> list[di if not hits: continue at = refs.where(path.parent.parent) - ok = can_write(session, at) + ok = access.can_write(session, at) name = doc.get("일위대가번") or doc.get("이름") or path.stem if ukind == "labor" and (title := _columns(path.parent.parent, memo).get(path.stem)): name = f"{title} · {name}" @@ -259,7 +256,7 @@ def undo(session: dict[str, Any], folder: Path, kind: str, rec: dict[str, Any]) at = (one.get("층"), one.get("주인")) path = refs.folder_of(*at) / str(one.get("종류")) / f"{one.get('이름')}.json" try: - if not can_write(session, at) or not path.is_file(): + if not access.can_write(session, at) or not path.is_file(): raise store.StoreError(403, "권한 밖 · 없음") raw = path.read_bytes() if store.version_of(raw) != one.get("뒤판"): diff --git a/M02_MasterTemplete/M02_Library_Same_Router.py b/M02_MasterTemplete/M02_Library_Same_Router.py index d17ee2a0f..6d1d14901 100644 --- a/M02_MasterTemplete/M02_Library_Same_Router.py +++ b/M02_MasterTemplete/M02_Library_Same_Router.py @@ -88,10 +88,6 @@ def _docs(at: refs.Here, kind: str) -> list[tuple[str, dict[str, Any]]]: # ── 쓰는 곳 ─────────────────────────────────────────────────────────── -def _can_write(session: Session, at: refs.Here) -> bool: - return access.can_write(session, at) - - def _retarget(doc: dict[str, Any], olds: set[str], new: refs.Ref) -> dict[str, Any]: """문서의 `olds` 참조를 모두 `new` 로(규격 열 수량 열쇠까지 · `M02_Labor_Ref` 한 벌).""" done: dict[str, refs.Ref] = {} @@ -229,7 +225,7 @@ def _merge(session: Session, folder: Path, kind: str, body: MergeBody) -> dict[s for path, (ukind, olds) in by_file.items(): at = refs.where(path.parent.parent) why = "" - if not (_can_write(session, at) and refs.readable(at, keep)): + if not (access.can_write(session, at) and refs.readable(at, keep)): why = "권한 밖" else: try: @@ -306,7 +302,7 @@ def _undo(session: Session, folder: Path, kind: str, key: str) -> dict[str, Any] at = (one.get("층"), one.get("주인")) user = refs.folder_of(*at) / str(one.get("종류")) / f"{one.get('이름')}.json" try: - if not _can_write(session, at) or not user.is_file(): + if not access.can_write(session, at) or not user.is_file(): raise store.StoreError(403, "권한 밖 · 없음") _rewrite(user, str(one.get("종류")), {refs.ref_id(keep)}, new) back += 1 diff --git a/M02_MasterTemplete/M02_MasterTemplete_Router_Layers.py b/M02_MasterTemplete/M02_MasterTemplete_Router_Layers.py index 5dc148576..545a675c5 100644 --- a/M02_MasterTemplete/M02_MasterTemplete_Router_Layers.py +++ b/M02_MasterTemplete/M02_MasterTemplete_Router_Layers.py @@ -28,6 +28,7 @@ from M02_MasterTemplete import M02_Labor_Ref as refs from M02_MasterTemplete import M02_Layer_Access as access from M02_MasterTemplete import M02_Layer_Index as index from M02_MasterTemplete import M02_Library_Flat as flat +from M02_MasterTemplete import M02_Library_Uses as library_uses from M02_MasterTemplete import M02_MasterTemplete_Items as items_store from M02_MasterTemplete import M02_MasterTemplete_Router_Items as items_router from M02_MasterTemplete import M02_MasterTemplete_Store as store @@ -387,7 +388,7 @@ async def delete_layer_template( except ValueError as error: raise _bad(error) from error try: # 서고 문서를 담은 일위대가 · 사전조합이 있으면 409(50-3) - await asyncio.to_thread(refs.refuse_used, folder, kind, name) + await asyncio.to_thread(library_uses.refuse_used, folder, kind, name) except store.StoreError as error: raise HTTPException(status_code=error.status, detail=error.detail) from error if not 판: diff --git a/M02_MasterTemplete/M02_MasterTemplete_Store.py b/M02_MasterTemplete/M02_MasterTemplete_Store.py index e80ba2f86..66d83c9cb 100644 --- a/M02_MasterTemplete/M02_MasterTemplete_Store.py +++ b/M02_MasterTemplete/M02_MasterTemplete_Store.py @@ -215,9 +215,9 @@ def delete(kind: str, name: str, version: str | None = None) -> None: if (kind, name) in IN_USE: raise StoreError(409, f"쓰는 양식이라 못 지움 「{name}」 — {IN_USE[(kind, name)]}") if kind in layers.LIBRARY_KINDS: - from M02_MasterTemplete import M02_Labor_Ref as refs + from M02_MasterTemplete import M02_Library_Uses as library_uses - refs.refuse_used(root(), kind, name) + library_uses.refuse_used(root(), kind, name) with _LOCK: if not path.is_file(): raise StoreError(404, f"없는 양식 「{name}」") diff --git a/M02_MasterTemplete/M02_Material_Own.py b/M02_MasterTemplete/M02_Material_Own.py index ea946596b..daf39703f 100644 --- a/M02_MasterTemplete/M02_Material_Own.py +++ b/M02_MasterTemplete/M02_Material_Own.py @@ -148,20 +148,15 @@ def update( return got -def uses(folder: str | Path, key: str) -> list[dict[str, Any]]: - """쓰는 문서 — 쓰는 곳 색인 한 벌(`M02_Library_Uses.materials` · 858 5-5).""" +def remove(folder: str | Path, key: str) -> None: + """내 재료 지움 — 쓰는 문서가 있으면 409(그 줄을 먼저 바꿈 · 쓰는 곳 = `M02_Library_Uses.materials`).""" from M02_MasterTemplete import M02_Library_Uses as library_uses - return library_uses.materials(folder, [key])[key] - - -def remove(folder: str | Path, key: str) -> None: - """내 재료 지움 — 쓰는 문서가 있으면 409(그 줄을 먼저 바꿈).""" with store._LOCK: doc = read(folder) if not any(r.get("키") == key for r in doc["줄"]): raise store.StoreError(404, f"없는 내 재료 「{key}」") - if used := uses(folder, key): + if used := library_uses.materials(folder, [key])[key]: names = " · ".join(str(u["이름"]) for u in used[:3]) raise store.StoreError(409, f"쓰는 곳 {len(used)} — {names} · 그 줄을 먼저 바꿈") doc["줄"] = [r for r in doc["줄"] if r.get("키") != key] diff --git a/M02_MasterTemplete/M02_Material_Pick.ts b/M02_MasterTemplete/M02_Material_Pick.ts index 3e2933f3c..b407673ab 100644 --- a/M02_MasterTemplete/M02_Material_Pick.ts +++ b/M02_MasterTemplete/M02_Material_Pick.ts @@ -11,7 +11,7 @@ import { createButton, createInputField, el, showToast } from "@ui/ui_template_elements"; import { openModal } from "@ui/ui_template_modal"; import { searchMaterials } from "../M01_MasterData/M01_MasterData_Api_Fetch"; -import { addMyMaterial, listMyMaterials } from "./M02_MyMaterial_Api"; +import { addMyMaterial, listMyMaterials, type MyMaterial } from "./M02_MyMaterial_Api"; import { createUnitPick, NO_UNIT } from "@ui/ui_template_unit_pick"; import { createBadge } from "@ui/ui_template_badge"; import { createText } from "@ui/ui_template_text"; @@ -25,15 +25,6 @@ export interface MaterialItem { 단위: string | null; } -/** 개인 자재 한 줄(서버 `개인자재.json` 꼴) */ -export interface OwnRow { - 키: string; - 이름: string; - 규격: string; - 단위: string; - 값: number | null; -} - /** 개인 층 주인(148-3 · 지금 층이면 null) — 넘기면 개인 자재 · [신규 자재] */ export interface OwnLayer { owner: string | null; @@ -60,21 +51,21 @@ const TEXT = { needName: "품명 · 단위는 꼭 적음", }; -const toItem = (r: OwnRow): MaterialItem => ({ +const toItem = (r: MyMaterial): MaterialItem => ({ 코드: r.키, 이름: r.이름, 규격: r.규격, 단위: r.단위, }); /** 찾기 낱말이 모두 이름 · 규격 · 키에 듦(M01 찾기와 같은 규칙) */ -const matches = (r: OwnRow, words: string[]): boolean => { +const matches = (r: MyMaterial, words: string[]): boolean => { const hay = `${r.이름} ${r.규격} ${r.키}`.toLowerCase(); return words.every((w) => hay.includes(w)); }; /** 자재 고르기 창 — 고르면 `done` 부르고 닫음 · `own` = 개인 층(개인 자재 · [신규 자재]) */ export function pickMaterial(done: (item: MaterialItem) => void, own?: OwnLayer): void { - let mine: OwnRow[] = []; + let mine: MyMaterial[] = []; const loaded = own ? listMyMaterials(own.owner) .then((d) => void (mine = d.줄)) @@ -167,7 +158,7 @@ export function pickMaterial(done: (item: MaterialItem) => void, own?: OwnLayer) export function openNewMaterial( owner: string | null, seed: string, - saved: (row: OwnRow) => void, + saved: (row: MyMaterial) => void, ): void { openModal({ title: TEXT.newMat, @@ -193,7 +184,7 @@ export function openNewMaterial( function newForm( own: OwnLayer, seed: string, - saved: (row: OwnRow) => void, + saved: (row: MyMaterial) => void, back: () => void, backLabel: string = TEXT.back, ): HTMLElement { diff --git a/M02_MasterTemplete/M02_MyMachine.py b/M02_MasterTemplete/M02_MyMachine.py index a2e9b8526..e6137860b 100644 --- a/M02_MasterTemplete/M02_MyMachine.py +++ b/M02_MasterTemplete/M02_MyMachine.py @@ -32,6 +32,7 @@ from typing import Any from common_util.common_util_json import atomic_write_json from M01_MasterData import M01_MasterData_Store as m01 +from M02_MasterTemplete import M02_Library_Uses as library_uses from M02_MasterTemplete import M02_MasterTemplete_Store as store from M02_MasterTemplete import M02_Template_Layers as layers @@ -471,20 +472,13 @@ def delete(key: str) -> dict[str, Any]: """지움 — 이미 만든 단가산출은 사본의 마지막 값 그대로(「지운키」).""" _user() _old(key) - used = _uses().get(key, []) + used = library_uses.machines().get(key, []) with _LOCK: _old(key) (_dir() / f"{key}.json").unlink(missing_ok=True) return {"지움": key, "쓰는곳": used} -def _uses() -> dict[str, list[dict]]: - """{내 기계 키: [{키, 이름}]} — 쓰는 곳 색인 한 벌(`M02_Library_Uses.machines` · 858 5-5).""" - from M02_MasterTemplete import M02_Library_Uses as library_uses - - return library_uses.machines() - - def same(name: Any, spec: Any, skip: str = "") -> list[dict]: """같은 이름 · 규격 알림 — M01 기계 · 이 층 내 기계(표기 정규화 `M02_Machine_Find.norm`).""" from M02_MasterTemplete.M02_Machine_Find import norm @@ -516,12 +510,12 @@ def one(key: str) -> dict[str, Any]: got = next((r for r in rows() if r["키"] == key), None) if got is None: raise _bad(f"없는 내 기계 「{key}」", 404) - return answer(got, _uses().get(key, [])) + return answer(got, library_uses.machines().get(key, [])) def listing() -> dict[str, Any]: """목록 — 줄마다 시간당 · 쓰는곳수(넣은 차례).""" - index, used = whole(), _uses() + index, used = whole(), library_uses.machines() return { "줄": [ {**r, "시간당": hourly(engine(r), index), "쓰는곳수": len(used.get(r["키"], []))} diff --git a/M02_MasterTemplete/M02_MyMachine_Look.py b/M02_MasterTemplete/M02_MyMachine_Look.py index a6bfa6b9e..9779221c8 100644 --- a/M02_MasterTemplete/M02_MyMachine_Look.py +++ b/M02_MasterTemplete/M02_MyMachine_Look.py @@ -10,7 +10,7 @@ GET `/api/m02/layers/{층}/my-items?owner=` = 내 품목 — 그 층 단가산 (이름 · 규격 · 단위 · 값) 묶음마다 쓰는 단가산출. POST `/api/m02/machine-sheet?owner=` 몸 {줄, 본?, 덮음?, 개인?} = 기계 보기(840-2 · `M02_MyMachine_Sheet` · 쓰기 없음 · 개인 = 그 개인 층 · 아니면 M01 만). -권한 = 내 기계 길과 같음(`M02_MyMachine_Router._folder` — 개인 층 · 본인 · 맡은 회사 관리자 읽기). +권한 = 내 기계 길과 같음(`Router_Items._root` 개인 층만 `M02_MyMachine_Router.MINE` — 개인 층 · 본인 · 맡은 회사 관리자 읽기). ⚠ 등록은 `main.py`(로그인만). """ @@ -26,8 +26,8 @@ from common_util.common_util_auth import verify_session from M01_MasterData import M01_MasterData_Store as m01 from M02_MasterTemplete import M02_MasterTemplete_Store as store from M02_MasterTemplete import M02_MyMachine as mym -from M02_MasterTemplete.M02_MasterTemplete_Router_Items import Session, _call -from M02_MasterTemplete.M02_MyMachine_Router import _folder +from M02_MasterTemplete.M02_MasterTemplete_Router_Items import Session, _call, _root +from M02_MasterTemplete.M02_MyMachine_Router import MINE router = APIRouter(prefix="/api/m02", tags=["M02 My Machine Look"]) DIRECT = ("숫자", "입력") # 단가 변수 연결 — 값을 줄에 바로 적은 것 @@ -120,14 +120,14 @@ def get_lists() -> dict: def get_find( layer: str, q: str = "", owner: str | None = None, session: Session = Depends(verify_session) ) -> dict: - return {"rows": _call(_folder(session, layer, owner), find, q)} + return {"rows": _call(_root(session, layer, owner, personal=MINE), find, q)} @router.get("/layers/{layer}/my-items") def get_items( layer: str, owner: str | None = None, session: Session = Depends(verify_session) ) -> dict: - return {"rows": _call(_folder(session, layer, owner), items)} + return {"rows": _call(_root(session, layer, owner, personal=MINE), items)} class SheetBody(BaseModel): @@ -144,5 +144,5 @@ def post_sheet( """기계 보기(840-2 · `M02_MyMachine_Sheet`) — 개인 = 내 기계(그 층) · 아니면 M01 기계만 · 쓰기 없음.""" from M02_MasterTemplete import M02_MyMachine_Sheet as ms - folder = _folder(session, "personal", owner) if body.개인 else store.FOLDER + folder = _root(session, "personal", owner, personal=MINE) if body.개인 else store.FOLDER return _call(folder, ms.sheet, body.줄, body.본, body.덮음, body.개인) diff --git a/M02_MasterTemplete/M02_MyMachine_Router.py b/M02_MasterTemplete/M02_MyMachine_Router.py index c7226c8c4..a473c7203 100644 --- a/M02_MasterTemplete/M02_MyMachine_Router.py +++ b/M02_MasterTemplete/M02_MyMachine_Router.py @@ -36,20 +36,19 @@ class MachineBody(BaseModel): 판: str | None = None # 고치기 — 화면이 연 판(854-1 · 다르면 409) -def _folder(session: Session, layer: str, owner: str | None, write: bool = False): - return _root(session, layer, owner, write=write, personal="내 기계는 개인 층만") +MINE = "내 기계는 개인 층만" # 층 폴더 한 벌 `_root` 의 개인 층만 글(858 5-2) @router.get(PATH) def my_machines(layer: str, owner: str | None = None, session: Session = Depends(verify_session)): - return _call(_folder(session, layer, owner), mym.listing) + return _call(_root(session, layer, owner, personal=MINE), mym.listing) @router.get(PATH + "/{key}") def my_machine( layer: str, key: str, owner: str | None = None, session: Session = Depends(verify_session) ): - return _call(_folder(session, layer, owner), mym.one, key) + return _call(_root(session, layer, owner, personal=MINE), mym.one, key) @router.post(PATH) @@ -59,7 +58,7 @@ def my_machine_create( owner: str | None = None, session: Session = Depends(verify_session), ): - return _call(_folder(session, layer, owner, True), mym.create_own, body.줄, body.본뜬) + return _call(_root(session, layer, owner, True, MINE), mym.create_own, body.줄, body.본뜬) @router.put(PATH + "/{key}") @@ -70,7 +69,7 @@ def my_machine_update( owner: str | None = None, session: Session = Depends(verify_session), ): - return _call(_folder(session, layer, owner, True), mym.update_own, key, body.줄, body.판) + return _call(_root(session, layer, owner, True, MINE), mym.update_own, key, body.줄, body.판) @router.post(PATH + "/{key}/impact") @@ -82,14 +81,14 @@ def my_machine_impact( session: Session = Depends(verify_session), ): """[저장] 전 영향 — 쓰는 단가산출 · 따로 고쳐 둔 곳(848-5 · 쓰기 없음).""" - return _call(_folder(session, layer, owner), impact.impact, key, body.줄) + return _call(_root(session, layer, owner, personal=MINE), impact.impact, key, body.줄) @router.delete(PATH + "/{key}") def my_machine_delete( layer: str, key: str, owner: str | None = None, session: Session = Depends(verify_session) ): - return _call(_folder(session, layer, owner, True), mym.delete, key) + return _call(_root(session, layer, owner, True, MINE), mym.delete, key) # ── 내 재료(858 5-6 · `Labor_Router` 에서 옮김) ────────────────────────── diff --git a/resources/tester/test_733_3_library_same_merge.py b/resources/tester/test_733_3_library_same_merge.py index 56edcabe6..16c58f684 100644 --- a/resources/tester/test_733_3_library_same_merge.py +++ b/resources/tester/test_733_3_library_same_merge.py @@ -87,7 +87,7 @@ def test_권한_밖이면_안_지움(api, world, monkeypatch): a = _make(me, 이름="가", 바탕={"로직": PCT}) c = _make(me, 이름="다", 바탕={"로직": PCT}) top = _user(me, [c]) - monkeypatch.setattr(same_router, "_can_write", lambda session, at: False) + monkeypatch.setattr(same_router.access, "can_write", lambda session, at: False) 판 = api.get(URL.format("personal")).json()["판"] res = _merge(api, {**MINE, "키": a}, [c], 판) left = res.json()["남김"] diff --git a/resources/tester/test_735_1_library_delete.py b/resources/tester/test_735_1_library_delete.py index fc141d4e9..427dfc052 100644 --- a/resources/tester/test_735_1_library_delete.py +++ b/resources/tester/test_735_1_library_delete.py @@ -123,7 +123,7 @@ def test_쓰는곳_없으면_그냥_지움_기록은_남음(api, world): def test_권한_밖이면_409_목록_아무것도_안_바뀜(api, world, monkeypatch): me, sk, _top = _world(world) - monkeypatch.setattr(deleting, "can_write", lambda session, at: False) + monkeypatch.setattr(deleting.access, "can_write", lambda session, at: False) res = _tree(api, SK_TREE, op="delete", 대상=[{"키": sk}], 확인=True) assert res.status_code == 409 detail = res.json()["detail"] diff --git a/resources/tester/test_797_1_import_links.py b/resources/tester/test_797_1_import_links.py index 9c270f506..aabe169a9 100644 --- a/resources/tester/test_797_1_import_links.py +++ b/resources/tester/test_797_1_import_links.py @@ -19,7 +19,6 @@ import pytest from M01_MasterData import M01_MasterData_Store as m01 from M02_MasterTemplete import M02_Hopyo_Store as hs -from M02_MasterTemplete import M02_Labor_Ref as refs from M02_MasterTemplete import M02_Library_Uses as library_uses from M02_MasterTemplete import M02_Machine_Hourly as machine from M02_MasterTemplete import M02_MasterTemplete_Store as store @@ -145,7 +144,7 @@ def test_nested_stmate_follows_inner(world) -> None: assert fh.make(folder, KEY, 2200)["이름"] == made["이름"] # 다시 올려도 같은 SK assert library_uses.users(ref) # 쓰는 곳에 바깥 SK with pytest.raises(store.StoreError) as why: - refs.refuse_used(folder, "sangeun", ref["키"]) + library_uses.refuse_used(folder, "sangeun", ref["키"]) assert why.value.status == 409 # 안쪽이 바뀌면 따라감 — 안쪽 단가 줄 하나 두 배 sub = _read(ref["키"]) diff --git a/resources/tester/test_821_1_my_machine.py b/resources/tester/test_821_1_my_machine.py index afa99fe9e..4399d291e 100644 --- a/resources/tester/test_821_1_my_machine.py +++ b/resources/tester/test_821_1_my_machine.py @@ -186,12 +186,14 @@ def test_rights(world): user = {"role": "USER", "company_id": 7, "user_id": 42} boss = {"role": "ADMIN", "company_id": 7, "user_id": 1} with pytest.raises(HTTPException) as e: - route._folder(user, "personal", "7/43", True) + route._root(user, "personal", "7/43", True, route.MINE) assert e.value.status_code == 403 with pytest.raises(HTTPException) as e: - route._folder(user, "company", None, True) + route._root(user, "company", None, True, route.MINE) assert e.value.status_code == 404 - assert route._folder(user, "personal", None, True) == world["personal"] - assert route._folder(boss, "personal", "7/42") == world["personal"] # 맡은 회사 관리자 읽기 + assert route._root(user, "personal", None, True, route.MINE) == world["personal"] + assert ( + route._root(boss, "personal", "7/42", personal=route.MINE) == world["personal"] + ) # 맡은 회사 관리자 읽기 with pytest.raises(store.StoreError): # 개인 층 아닌 자리에서 만들기 _at(world["company"], mym.create, _easy()) diff --git a/resources/tester/test_840_4_my_material.py b/resources/tester/test_840_4_my_material.py index f81acc4e6..9b9f385f7 100644 --- a/resources/tester/test_840_4_my_material.py +++ b/resources/tester/test_840_4_my_material.py @@ -12,6 +12,7 @@ from __future__ import annotations import pytest from M01_MasterData import M01_MasterData_Store as m01 +from M02_MasterTemplete import M02_Library_Uses as library_uses from M02_MasterTemplete import M02_MasterTemplete_Store as store from M02_MasterTemplete import M02_Material_Own as own from resources.tester.test_m02_labor_ref import world # noqa: F401 — 같은 임시 층 @@ -67,7 +68,7 @@ def test_sk_reads_and_follows(world): assert _at(me, path.read, sk)["셈"]["계"] == 2000 _at(me, own.update, me, code, {"이름": NAME, "규격": "y", "단위": "kg", "값": 1500}) assert _at(me, path.read, sk)["셈"]["계"] == 3000 # 값 바꿈 → 따라옴 - assert [u["키"] for u in _at(me, own.uses, me, code)] == [sk] + assert [u["키"] for u in library_uses.materials(me, [code])[code]] == [sk] assert _at(me, _code, own.remove, me, code) == 409 # 쓰는 곳 있음 _at(me, store.delete, "sangeun", sk) aside = me / "_합친것" / f"{sk}.json" # 파생 · 보관 폴더 = 쓰는 곳 아님