refactor(855-2-D): 단가산출 층 저장 꼴 = 남는 칸만 — 값 사본 = 수식 한 벌(사본 안 씀) · 빈 옛 칸 · M01판 안 씀
- 저장 관문 `Copy_Slim.trim`(층 저장만 · 프로젝트 층은 안 탐) — `사본` 값을 `수식` 값 몫에 얹고 `사본` 뺌 · 빈 옛 칸(입력값 · 열린입력 · 고름 · 자재표시 · 켜쌓기율 · 덮개 · 뺀줄 · 뺀더한줄 · 상수덮개 · 표값덮개 · 글줄 · 까닭 · 수식고침 · 변수줄 · 식덮개) 뺌 · 값 든 옛 칸 = 그대로(못 셈 + 까닭) · `더한줄` = 서고 뼈대 표지라 남김 - `Sangeun_Copy.held` = 값 사본 한 곳(셈 중 `사본` › 층 파일 `수식` 값 몫) — `over` · `settle`(저장본 · 받은 문서) · `same_part` 가 씀 · `Copy.logic` = 사본 줄 › M01 › 속 색인이 따로 내주는 줄(굳힌 사본 `_Over`) - `Sangeun_Const.stamp` = `바탕판` 만(화면 「기초가 바뀜」 이 읽음) · `M01판`(읽던 시트 2-C1 에서 걷음) 안 적음 - 층 서고 SK 14 + SC 6 다시 저장(임시 복사본 · `resave.py`): 셈 답 같음 20 / 20 · SK 칸 18 → 12(가져온 식 12 · 그 밖 11) · 크기 408 → 309 KB - 시험: 파일 `사본` 을 읽던 줄 = `skc.held`(795_1 · 821_1 · 821_4 · 826_3 — 826_3 「두 칸 같음」 → `사본` 없음 + 수식 값 몫) · m02_858_shelf_golden 다시 뜸(SK 읽기 답 = 파일 칸 바뀜) Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -20,7 +20,7 @@
|
||||
"sangeun.복사": "40edbd4d0644186f",
|
||||
"sangeun.붙여넣기": "57cfb7bb522a80d3",
|
||||
"sangeun.쓰는곳": "2c9ec1824709481f",
|
||||
"sangeun.읽기": "2b7850af819535c2",
|
||||
"sangeun.읽기": "19662ccd4c5ae0c0",
|
||||
"sangeun.중복": "2c9378c6e9c61251",
|
||||
"sangeun.지우기": "db8b1e8ad9bef9eb",
|
||||
"sangeun.합치기": "b8f7720e8a1e1bbb",
|
||||
|
||||
@@ -91,7 +91,7 @@ def test_copy_stamped_and_logic_change_kept(world, monkeypatch):
|
||||
"""① · ④ 저장 때 사본(로직 · 단가 갈래) · M01 로직 바꿔도 금액 그대로 · 배지만."""
|
||||
me = world["personal"]
|
||||
key = _sk(me, 바탕={"로직": PCT})
|
||||
got = _doc(me, key)["사본"]
|
||||
got = skc.held(_doc(me, key))
|
||||
assert PCT in {r["키"] for r in got["로직"]}
|
||||
assert got["단가"] and all(r["키"][:2] in skc.RES for r in got["단가"])
|
||||
assert not any(r["키"][:2] in skc.RES for r in got["로직"])
|
||||
@@ -111,7 +111,7 @@ def test_price_refresh_only_on_press(world, monkeypatch):
|
||||
me = world["personal"]
|
||||
key = _sk(me, 바탕={"로직": PCT})
|
||||
was = _sum(me, key)
|
||||
lb = next(r["키"] for r in _doc(me, key)["사본"]["단가"] if r["키"].startswith("LB"))
|
||||
lb = next(r["키"] for r in skc.held(_doc(me, key))["단가"] if r["키"].startswith("LB"))
|
||||
row = copy.deepcopy(_live().get(lb))
|
||||
row["값"] = row["값"] * 2
|
||||
_fake(monkeypatch, [row])
|
||||
@@ -126,7 +126,7 @@ def test_price_refresh_only_on_press(world, monkeypatch):
|
||||
_save(me, key, got["문서"]) # [저장] = 서버가 할일 적용
|
||||
saved = _doc(me, key)
|
||||
assert skc.JOB not in saved and _sum(me, key) == fresh
|
||||
assert saved["사본"]["단가시점"] >= saved["사본"]["시점"]
|
||||
assert skc.held(saved)["단가시점"] >= skc.held(saved)["시점"]
|
||||
|
||||
|
||||
def test_deleted_keys_keep_last_value(world, monkeypatch):
|
||||
@@ -134,7 +134,7 @@ def test_deleted_keys_keep_last_value(world, monkeypatch):
|
||||
me = world["personal"]
|
||||
key = _sk(me, 바탕={"로직": PCT})
|
||||
was = _sum(me, key)
|
||||
lb = next(r["키"] for r in _doc(me, key)["사본"]["단가"] if r["키"].startswith("LB"))
|
||||
lb = next(r["키"] for r in skc.held(_doc(me, key))["단가"] if r["키"].startswith("LB"))
|
||||
_fake(monkeypatch, drop=[PCT, lb])
|
||||
with pytest.raises(Exception):
|
||||
m01.loaded()[1].logic(PCT)
|
||||
@@ -186,7 +186,7 @@ def test_imported_same_rule(world, monkeypatch):
|
||||
with store.at(me):
|
||||
key = imp.create(_imported_row(), None, "sub2임시 가져온")["이름"]
|
||||
doc = _doc(me, key)
|
||||
assert MAN in {r["키"] for r in doc["사본"]["단가"]}
|
||||
assert MAN in {r["키"] for r in skc.held(doc)["단가"]}
|
||||
with store.at(me):
|
||||
ours = imp.to_price(doc, "우리")["문서"]
|
||||
_save(me, key, ours)
|
||||
|
||||
@@ -137,7 +137,7 @@ def test_sk_copy_edit_refresh_delete(world):
|
||||
made = _at(me, mym.create, _easy())
|
||||
key, no = made["줄"]["키"], made["줄"]["원문번호"]
|
||||
sk = _sk(me, no)
|
||||
copy = _doc(me, sk)["사본"]
|
||||
copy = skc.held(_doc(me, sk))
|
||||
assert key in {r["키"] for r in copy["단가"]}
|
||||
was = _sum(me, sk)
|
||||
assert float(was) == made["시간당"]["계"]
|
||||
@@ -174,7 +174,7 @@ def test_m01_only_sk_same(world):
|
||||
plain = _at(other, lambda: refs.create("sangeun", base)["이름"])
|
||||
_at(me, mym.create, _easy())
|
||||
mine = _at(me, lambda: refs.create("sangeun", base)["이름"])
|
||||
a, b = _doc(other, plain)["사본"], _doc(me, mine)["사본"]
|
||||
a, b = skc.held(_doc(other, plain)), skc.held(_doc(me, mine))
|
||||
assert json.dumps(a["단가"], sort_keys=True) == json.dumps(b["단가"], sort_keys=True)
|
||||
assert a["판"] == b["판"] and _sum(other, plain) == _sum(me, mine)
|
||||
|
||||
|
||||
@@ -168,7 +168,7 @@ def test_make_flow(world) -> None:
|
||||
ours = imp.to_price(doc, "우리") # [우리 단가로] = 내 기계 값
|
||||
assert ours["후"]["계"] is not None and ours["후"] != ours["전"]
|
||||
assert not [u for u in ours["이음없음"] if "파워트로웰" in u["이름"]]
|
||||
assert one["키"] in {r["키"] for r in (doc.get(skc.KEY) or {}).get("단가") or []} # 사본
|
||||
assert one["키"] in {r["키"] for r in (skc.held(doc) or {}).get("단가") or []} # 사본
|
||||
conv = dim.derive(doc, None, imp._whole())
|
||||
assert f"내 기계 {one['키']}" in json.dumps(
|
||||
conv["변수"], ensure_ascii=False, default=str
|
||||
|
||||
@@ -70,7 +70,7 @@ def test_base_logic_read_rows_only(world):
|
||||
me = world["personal"]
|
||||
key = _sk(me, 바탕={"로직": DIG_BASE}, 단위="㎥")
|
||||
doc = _file(me, key)
|
||||
have = doc[skc.KEY]
|
||||
have = skc.held(doc)
|
||||
assert _closed(doc) >= 3 * len(_keys(have))
|
||||
assert len(_keys(have)) <= 12 and len(have["단가"]) < 10
|
||||
assert _keys(have) == _keys(doc["수식"]) # 두 자리 같은 줄(꼴 그대로)
|
||||
@@ -89,7 +89,7 @@ def test_m01_change_kept_then_price(world, monkeypatch):
|
||||
me = world["personal"]
|
||||
key = _sk(me, 바탕={"로직": DIG_BASE}, 단위="㎥")
|
||||
was = _sum(me, key)
|
||||
read = set(_keys(_file(me, key)[skc.KEY]))
|
||||
read = set(_keys(skc.held(_file(me, key))))
|
||||
moved = [k for k in read if k[:2] in ("EQ", "LB", "MO")]
|
||||
assert moved
|
||||
_move(monkeypatch, *moved)
|
||||
@@ -97,7 +97,7 @@ def test_m01_change_kept_then_price(world, monkeypatch):
|
||||
assert _at(me, path.read, key)["사본"]["단가새값"] is True
|
||||
got = _price(me, key)
|
||||
assert set(got["바뀐"]) == set(moved) and got["후"] > was
|
||||
assert set(_keys(_file(me, key)[skc.KEY])) == read
|
||||
assert set(_keys(skc.held(_file(me, key)))) == read
|
||||
|
||||
|
||||
def test_machine_swap_preview_then_save(world, monkeypatch):
|
||||
@@ -146,11 +146,11 @@ def test_regen_slim(world, monkeypatch):
|
||||
"""[재생성] — 지금 M01 로 다시 찍어도 읽은 줄만 · 그 뒤 M01 바뀌어도 그대로."""
|
||||
me = world["personal"]
|
||||
key = _sk(me, 바탕={"로직": DIG_BASE}, 단위="㎥")
|
||||
read = [k for k in _keys(_file(me, key)[skc.KEY]) if k[:2] in ("EQ", "MO")]
|
||||
read = [k for k in _keys(skc.held(_file(me, key))) if k[:2] in ("EQ", "MO")]
|
||||
_move(monkeypatch, *read)
|
||||
판 = _at(me, path.read, key)["판"]
|
||||
_at(me, path.save, key, {"할일": skc.REGEN, "판": 판})
|
||||
after = _file(me, key)[skc.KEY]
|
||||
after = skc.held(_file(me, key))
|
||||
assert len(_keys(after)) <= 12
|
||||
was = _sum(me, key)
|
||||
_move(monkeypatch, *read)
|
||||
@@ -162,13 +162,13 @@ def test_layer_copy_slim(world, monkeypatch):
|
||||
me, co = world["personal"], world["company"]
|
||||
key = _sk(me, 바탕={"로직": DIG_BASE}, 단위="㎥")
|
||||
was = _sum(me, key)
|
||||
_move(monkeypatch, DIG, *[k for k in _keys(_file(me, key)[skc.KEY]) if k[:2] == "EQ"])
|
||||
_move(monkeypatch, DIG, *[k for k in _keys(skc.held(_file(me, key))) if k[:2] == "EQ"])
|
||||
ref = {"층": "personal", "주인": "7/42", "키": key}
|
||||
with store.at(co):
|
||||
doc = refs.read_ref(ref)
|
||||
new = refs.create("sangeun", refs.carry(refs.origin_mark(doc, ref), ("personal", "7/42")))
|
||||
assert _sum(co, new["이름"]) == was
|
||||
assert _keys(_file(co, new["이름"])[skc.KEY]) == _keys(_file(me, key)[skc.KEY])
|
||||
assert _keys(skc.held(_file(co, new["이름"]))) == _keys(skc.held(_file(me, key)))
|
||||
|
||||
|
||||
def test_labor_and_combo_slim(world, monkeypatch):
|
||||
@@ -206,7 +206,7 @@ def test_old_big_copy_reads_then_slims(world):
|
||||
with store.at(me):
|
||||
got = store.read("sangeun", key)
|
||||
store.write("sangeun", key, got["판"], got["문서"])
|
||||
assert len(_keys(_file(me, key)[skc.KEY])) * 3 <= len(big["로직"]) + len(big["단가"])
|
||||
assert len(_keys(skc.held(_file(me, key)))) * 3 <= len(big["로직"]) + len(big["단가"])
|
||||
assert _sum(me, key) == was
|
||||
|
||||
|
||||
@@ -253,6 +253,6 @@ def test_doc_path_save_keeps_both_slots(world):
|
||||
assert look["사본"]["사본없음"] > 0
|
||||
_at(me, path.save, key, {"문서": doc, "판": got["판"]})
|
||||
after = _file(me, key)
|
||||
assert set(_keys(after[skc.KEY])) == set(_keys(after["수식"]))
|
||||
assert len(_keys(after[skc.KEY])) >= 6
|
||||
assert skc.KEY not in after # 층 파일 값 사본 = `수식` 한 벌(855 2-D)
|
||||
assert len(_keys(skc.held(after))) >= 6
|
||||
assert _sum(me, key) == look["셈"]["계"] != got["셈"]["계"]
|
||||
|
||||
Reference in New Issue
Block a user