From ab217b8e8c1d38dcbd6d978402e06b4270c89ee0 Mon Sep 17 00:00:00 2001 From: umsangdon Date: Tue, 17 Nov 2026 19:03:02 +0900 Subject: [PATCH] =?UTF-8?q?refactor(858-5-2):=20=EC=B8=B5=20=ED=8F=B4?= =?UTF-8?q?=EB=8D=94=20=C2=B7=20=EC=B8=B5=20=ED=8C=90=EC=A0=95=20=ED=95=9C?= =?UTF-8?q?=20=EB=B2=8C=20=E2=80=94=20=EA=B0=9C=EC=9D=B8=20=EC=B8=B5?= =?UTF-8?q?=EB=A7=8C=20=EC=98=B5=EC=85=98=EC=9D=84=20`=5Froot`=20=EB=A1=9C?= =?UTF-8?q?=20=C2=B7=20=EB=82=B4=20=EA=B8=B0=EA=B3=84=20=EC=B8=B5=20?= =?UTF-8?q?=ED=8C=90=EC=A0=95=20=3D=20`Labor=5FRef.where`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - `Router_Items._root` 에 `personal`(개인 층만 받는 종류의 그 밖 층 404 글) — 층 폴더 찾기 한 길 - `MyMachine_Router._folder` = `_root(..., personal=…)` 한 줄(감쌈 껍데기는 5-8 에서 걷음 · 부르는 곳 그대로) - `MyMachine._user` 경로 부모 이름 판정 → `Labor_Ref.where`(같은 답 · 잠금 · 판 · 번호 장부 · `create` 꼴 그대로) - `Material_Own._personal` 은 이미 `where` — 고침 없음 · `Hopyo_Router._root` 는 857 몫이라 안 고침 - 지킴: test_858_shelf_golden 지문 50 갈래 같음(다시 뜨지 않음) · 관련 시험 252 통과 · test_855_golden · typecheck 0 · openapi 길 480 그대로 Co-Authored-By: Claude Opus 5.5 --- .../M02_MasterTemplete_Router_Items.py | 13 +++++++++++-- M02_MasterTemplete/M02_MyMachine.py | 12 ++++++------ M02_MasterTemplete/M02_MyMachine_Router.py | 6 ++---- 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/M02_MasterTemplete/M02_MasterTemplete_Router_Items.py b/M02_MasterTemplete/M02_MasterTemplete_Router_Items.py index 4afb42205..2580f8717 100644 --- a/M02_MasterTemplete/M02_MasterTemplete_Router_Items.py +++ b/M02_MasterTemplete/M02_MasterTemplete_Router_Items.py @@ -142,9 +142,18 @@ async def others_write(session: Session, got: access.Grant, folder: Path) -> Non pending.append((session, got)) -def _root(session: Session, layer: str, owner: str | None = None, write: bool = False) -> Path: +def _root( + session: Session, + layer: str, + owner: str | None = None, + write: bool = False, + personal: str | None = None, +) -> Path: """층 폴더(권한까지 · `M02_Layer_Access`) — 자기 회사 · 개인 층은 없으면 빈 뼈대를 만듦 · - 남의 층 쓰기(맡은 회사 · 39-6)는 `others_write`.""" + 남의 층 쓰기(맡은 회사 · 39-6)는 `others_write` · `personal` = 개인 층만 받는 종류(내 기계 + 등)의 그 밖 층 404 글(858 5-2 — 층 폴더 찾기 한 벌).""" + if personal and layer != "personal": + raise HTTPException(status_code=404, detail=personal) got = access.require(session, layer, owner, write=write) if layer == "system": return store.FOLDER diff --git a/M02_MasterTemplete/M02_MyMachine.py b/M02_MasterTemplete/M02_MyMachine.py index 2ceab589c..9a5f2b25f 100644 --- a/M02_MasterTemplete/M02_MyMachine.py +++ b/M02_MasterTemplete/M02_MyMachine.py @@ -410,14 +410,14 @@ def _seed(key: str) -> dict: def _user() -> str: - """개인 층(`storage/{회사}/{사용자}/templates`) 사용자 번호 — 그 밖 층 = 404.""" - from M02_MasterTemplete import M02_Template_Layers as layers + """개인 층(`storage/{회사}/{사용자}/templates`) 사용자 번호 — 그 밖 층 = 404 · 층 판정 = + `Labor_Ref.where` 한 벌(858 5-2).""" + from M02_MasterTemplete import M02_Labor_Ref as refs - here = store.root().resolve() - user, company = here.parent.name, here.parent.parent.name - if not (user.isdigit() and company.isdigit()) or here != layers.personal_dir(company, user): + layer, owner = refs.where(store.root()) + if layer != "personal" or not owner: raise _bad("내 기계는 개인 층만", 404) - return user + return owner.split("/")[1] def not_m01(raw: Any, skip: str = "") -> None: diff --git a/M02_MasterTemplete/M02_MyMachine_Router.py b/M02_MasterTemplete/M02_MyMachine_Router.py index 2637bf04b..725d07f61 100644 --- a/M02_MasterTemplete/M02_MyMachine_Router.py +++ b/M02_MasterTemplete/M02_MyMachine_Router.py @@ -13,7 +13,7 @@ from __future__ import annotations from typing import Any -from fastapi import APIRouter, Depends, HTTPException +from fastapi import APIRouter, Depends from pydantic import BaseModel from common_util.common_util_auth import verify_session @@ -32,9 +32,7 @@ class MachineBody(BaseModel): def _folder(session: Session, layer: str, owner: str | None, write: bool = False): - if layer != "personal": - raise HTTPException(status_code=404, detail="내 기계는 개인 층만") - return _root(session, layer, owner, write=write) + return _root(session, layer, owner, write=write, personal="내 기계는 개인 층만") @router.get(PATH)