From 2a4d1ecc36c342558173427550ebb084192e493d Mon Sep 17 00:00:00 2001 From: umsangdon Date: Wed, 18 Nov 2026 03:26:45 +0900 Subject: [PATCH] =?UTF-8?q?refactor(855-2-D):=20=EC=9D=BC=EC=9C=84?= =?UTF-8?q?=EB=8C=80=EA=B0=80=20=C2=B7=20=EC=82=AC=EC=A0=84=EC=A1=B0?= =?UTF-8?q?=ED=95=A9=20=EC=B8=B5=20=EC=A0=80=EC=9E=A5=20=EA=BC=B4=20?= =?UTF-8?q?=E2=80=94=20=EC=82=AC=EB=B3=B8=20=EC=95=88=20=EC=94=80(?= =?UTF-8?q?=EA=B0=92=20=EC=82=AC=EB=B3=B8=20=3D=20=EC=88=98=EC=8B=9D=20?= =?UTF-8?q?=ED=95=9C=20=EB=B2=8C)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 저장 관문 `Copy_Slim.trim` 을 일위대가(labor) · 사전조합(precombo)에도 — `사본` 값을 `수식` 값 몫에 얹고 `사본` 뺌(층만 · 프로젝트 층 그대로) - `Labor_Copy._stored` · `settle` · `combo` = `skc.held`(셈 중 사본 › 층 파일 수식 값 몫) - 층 서고 SK 14 + SC 6 다시 저장: 셈 답 같음 20 / 20 · SC 사본 든 파일 2 → 0 · 크기 합 408 → 306 KB - 시험: 파일 사본을 읽던 줄 = `skc.held`(795_2 · 823_1 · 826_3) · 795_2 ⑥ 「사본 없는 옛 문서」 = 사본 · 수식 둘 다 뗌 - 이음(sub1 B9-5): `M02_Item_Source.copy_rows` 가 층 문서 · SK 원본의 `사본` 을 읽음 → `skc.held(one)` 로 한 줄 바꿔야 사본 묶음(만든 때 값 · 지운 키 마지막 값) 유지 — 그 전까지 test_795_4_b09_copy 둘 실패(브레인 확인 · 둘을 합친 뒤 통과) Co-Authored-By: Claude Opus 5.5 --- M02_MasterTemplete/M02_Copy_Slim.py | 10 ++++++---- M02_MasterTemplete/M02_Labor_Copy.py | 8 ++++---- resources/tester/test_795_2_sc_copy.py | 17 +++++++++-------- resources/tester/test_823_1_imported_swap.py | 5 +++-- resources/tester/test_826_3_copy_slim.py | 6 +++--- 5 files changed, 25 insertions(+), 21 deletions(-) diff --git a/M02_MasterTemplete/M02_Copy_Slim.py b/M02_MasterTemplete/M02_Copy_Slim.py index 2297a5826..482265429 100644 --- a/M02_MasterTemplete/M02_Copy_Slim.py +++ b/M02_MasterTemplete/M02_Copy_Slim.py @@ -120,11 +120,13 @@ EMPTY_GONE = ( def trim(kind: str, doc: Any) -> Any: """층 저장 꼴 = 남는 칸만(855 2-D) — 값 사본 = `수식` 값 몫 한 벌(`사본` 은 셈 중 칸 · 파일엔 안 씀) · 단가산출 빈 옛 칸 · `M01판`(읽는 곳 없음) 뺌 · 프로젝트 층은 이 길을 안 탐(`saved`).""" - if kind != "sangeun" or not isinstance(doc, dict): + if not isinstance(doc, dict): return doc - out = {k: v for k, v in doc.items() if not (k in EMPTY_GONE and v in (None, {}, [], ""))} - out.pop("M01판", None) - form = out.get(dc.KEY) + out = dict(doc) + if kind == "sangeun": + out = {k: v for k, v in out.items() if not (k in EMPTY_GONE and v in (None, {}, [], ""))} + out.pop("M01판", None) + form = out.get(dc.KEY) # 단가산출 · 일위대가 · 사전조합 같은 꼴(SC `수식` = 값 몫 + 부름) if skc.has(out) and isinstance(form, dict) and isinstance(form.get("로직"), list): out[dc.KEY] = {**form, **dc.values_of(out.pop(skc.KEY))} return out diff --git a/M02_MasterTemplete/M02_Labor_Copy.py b/M02_MasterTemplete/M02_Labor_Copy.py index a13b9918c..8dbedbf8f 100644 --- a/M02_MasterTemplete/M02_Labor_Copy.py +++ b/M02_MasterTemplete/M02_Labor_Copy.py @@ -1,6 +1,6 @@ """M02 일위대가 · 사전조합(SC) 로직 사본(PLAN 795-2 · 요구 655 · 656 · 요구서_655) — 서버 단독. -SK 사본(`M02_Sangeun_Copy` · 795-1) 한 벌 — 문서 칸 `사본` 꼴 · 판 · 단가 · 할일 칸 `사본할일` +SK 사본(`M02_Sangeun_Copy` · 795-1) 한 벌 — 셈 중 문서 칸 `사본` 꼴(층 파일 = `수식` 값 몫 한 벌 · 855 2-D) · 판 · 단가 · 할일 칸 `사본할일` (단가갱신 | 재생성) · [단가 갱신] = 자원 단가 줄만 · 자동 갱신 없음 · 지워진 M01 키 = 마지막 값. 사본에 담는 것 = 담은로직 로직 줄 · 줄 덮개(`M02_Labor_Patch`) 더한줄(로직 · 요소 · 고정 이음) · 고정 줄 이음 · 사용자 자재(MT) 가 닿는 M01 닫힌 묶음(참조 줄 = 그 문서 제 사본). @@ -66,7 +66,7 @@ def _file(doc: dict) -> dict: def _stored(doc: dict) -> dict | None: got = _file(doc) - return got[KEY] if skc.has(got) else None + return skc.held(got) # 셈 중 사본 › 층 파일 `수식` 값 몫(855 2-D) def _keys(doc: dict) -> list[str]: @@ -93,7 +93,7 @@ def settle(doc: Any, save: bool = False) -> Any: job = doc.get(JOB) # 모르는 할일 = 없음 out = {k: v for k, v in doc.items() if k not in (KEY, JOB, dc.KEY)} file = _file(doc) - copy = skc.taken(doc.get(KEY)) or (file[KEY] if skc.has(file) else None) + copy = skc.taken(skc.held(doc)) or skc.held(file) # 값 사본 = 층 파일 `수식` 값 몫(855 2-D) if job == REGEN or (copy is None and save): copy = stamp(out) elif job == PRICE and copy: @@ -210,7 +210,7 @@ def combo(expand: Any, doc: dict, trail: tuple[str, ...]) -> dict[str, Any]: from M02_MasterTemplete import M02_Labor_Ref as refs was = expand.whole - if expand.read is refs.read_ref and skc.has(doc): + if expand.read is refs.read_ref and skc.held(doc) is not None: expand.whole = skc.over(doc, was) try: return expand._combo(doc, trail) diff --git a/resources/tester/test_795_2_sc_copy.py b/resources/tester/test_795_2_sc_copy.py index f2fce6882..988417d63 100644 --- a/resources/tester/test_795_2_sc_copy.py +++ b/resources/tester/test_795_2_sc_copy.py @@ -82,8 +82,8 @@ def test_copy_stamped_logic_change_kept(world, monkeypatch): sc = _sc(me, [{"로직": PCT, "수량": {"손": 1}}]) doc = _labor(me, [{"로직": PCT, "수량": {"손": 2}}]) for got in (doc, _read(me, "precombo", sc)): - assert PCT in {r["키"] for r in got["사본"]["로직"]} - assert LB in {r["키"] for r in got["사본"]["단가"]} + assert PCT in {r["키"] for r in skc.held(got)["로직"]} + assert LB in {r["키"] for r in skc.held(got)["단가"]} was = (_calc(me, COL)["반영합"]["계"], _calc(me, sc)["기준합"]["계"], _unit(me, sc)) assert _calc(me, COL)["사본"]["M01새판"] is False _fake(monkeypatch, [_changed(_live().logic(PCT))]) @@ -113,22 +113,22 @@ def test_layer_and_column_copy_keep_copy(world, monkeypatch): """④ 층 사이 복사(회사 → 개인) · 열 복사 = 원본 사본 그대로(지금 M01 로 다시 안 찍음).""" co, me = world["company"], world["personal"] src = _sc(co, [{"로직": PCT, "수량": {"손": 1}, "패치": COVER}]) - first = _read(co, "precombo", src)["사본"] - old = _labor(me, [{"로직": PCT, "수량": {"손": 2}}])["사본"] # 받는 열 = 옛 M01 사본 + first = skc.held(_read(co, "precombo", src)) + old = skc.held(_labor(me, [{"로직": PCT, "수량": {"손": 2}}])) # 받는 열 = 옛 M01 사본 _fake(monkeypatch, [_double(LB), _changed(_live().logic(PCT))]) ref = {"층": "company", "주인": "7", "키": src} with store.at(me): got = refs.create( "precombo", refs.carry(refs.origin_mark(refs.read_ref(ref), ref), ("company", "7")) ) - mine = _read(me, "precombo", got["이름"])["사본"] + mine = skc.held(_read(me, "precombo", got["이름"])) assert (mine["판"], mine["단가판"]) == (first["판"], first["단가판"]) _write(me, "labor", "sub2임시2", {"열": "sub2임시2", "담은로직": [{"로직": PCT}], "자재": []}) - other = _read(me, "labor", "sub2임시2")["사본"] # 원본 열 = 바뀐 M01 사본 + other = skc.held(_read(me, "labor", "sub2임시2")) # 원본 열 = 바뀐 M01 사본 assert other["판"] != old["판"] with store.at(me): # 열 복사(copy_from) = 받은 사본 먼저 store.copy_from("labor", COL, "sub2임시2") - assert _read(me, "labor", COL)["사본"]["판"] == other["판"] + assert skc.held(_read(me, "labor", COL))["판"] == other["판"] def test_ts_mirror_same_amount(world, monkeypatch): @@ -152,7 +152,8 @@ def test_old_doc_without_copy_old_path(world, monkeypatch): me = world["personal"] _labor(me, [{"로직": PCT, "수량": {"손": 1}}]) path = me / "labor" / f"{COL}.json" - raw = {k: v for k, v in json.loads(path.read_bytes()).items() if k != "사본"} + gone = ("사본", "수식") # 값 사본 = `수식` 값 몫(855 2-D) — 둘 다 없는 옛 문서 + raw = {k: v for k, v in json.loads(path.read_bytes()).items() if k not in gone} path.write_text(json.dumps(raw, ensure_ascii=False), encoding="utf-8") assert "사본" not in _calc(me, COL) _fake(monkeypatch, [_double(LB)]) diff --git a/resources/tester/test_823_1_imported_swap.py b/resources/tester/test_823_1_imported_swap.py index 5d79d1d7d..beb5aa96a 100644 --- a/resources/tester/test_823_1_imported_swap.py +++ b/resources/tester/test_823_1_imported_swap.py @@ -22,6 +22,7 @@ from M02_MasterTemplete import M02_Doc_Sk as dsk from M02_MasterTemplete import M02_Doc_Sk_Path as path from M02_MasterTemplete import M02_MasterTemplete_Store as store from M02_MasterTemplete import M02_MyMachine as mym +from M02_MasterTemplete import M02_Sangeun_Copy as skc from M02_MasterTemplete import M02_Sangeun_Imported as imp from resources.tester.test_822_1_copy_gap import _move from resources.tester.test_m02_labor_ref import world # noqa: F401 — 같은 임시 층 @@ -138,7 +139,7 @@ def test_swap_machine_excel_basis(world, monkeypatch): _at(me, path.save, key, {"문서": swapped, "판": 판}) again = _at(me, path.read, key) assert again["셈"]["계"] == look["계"] and dim.swapped(again["문서"]) == 1 - kept = _at(me, lambda: store.read("sangeun", key)["문서"]["사본"]) + kept = _at(me, lambda: skc.held(store.read("sangeun", key)["문서"])) assert NEW_EQ in {r["키"] for r in [*kept["로직"], *kept["단가"]]} _move(monkeypatch, NEW_EQ) assert _at(me, path.read, key)["셈"]["계"] == look["계"] @@ -162,7 +163,7 @@ def test_swap_to_my_machine(world): assert abs(_lines(look)[i] - hour * 0.1) < 1 # 수량 0.1 × 시간당 판 = _at(me, path.read, key)["판"] _at(me, path.save, key, {"문서": swapped, "판": 판}) - kept = _at(me, lambda: store.read("sangeun", key)["문서"]["사본"]) + kept = _at(me, lambda: skc.held(store.read("sangeun", key)["문서"])) assert row["키"] in {r["키"] for r in [*kept["로직"], *kept["단가"]]} diff --git a/resources/tester/test_826_3_copy_slim.py b/resources/tester/test_826_3_copy_slim.py index 36e7f1c5b..141557db0 100644 --- a/resources/tester/test_826_3_copy_slim.py +++ b/resources/tester/test_826_3_copy_slim.py @@ -180,11 +180,11 @@ def test_labor_and_combo_slim(world, monkeypatch): full = prices.collect([DIG_BASE]) closed = sum(len(d[m01.items_key(d)]) for k, d in full.items() if not k.startswith("_")) for doc in (lab, _read(me, "precombo", sc)): - assert len(_keys(doc[skc.KEY])) * 3 <= closed - assert _keys(doc[skc.KEY]) == _keys(doc["수식"]) + assert len(_keys(skc.held(doc))) * 3 <= closed + assert skc.KEY not in doc # 값 사본 = `수식` 값 몫 한 벌(855 2-D) unit = _unit(me, sc) assert unit > 0 - _move(monkeypatch, *[k for k in _keys(lab[skc.KEY]) if k[:2] in ("EQ", "LB", "MO")]) + _move(monkeypatch, *[k for k in _keys(skc.held(lab)) if k[:2] in ("EQ", "LB", "MO")]) assert _unit(me, sc) == unit