Merge remote-tracking branch 'origin/sub_laptop_7' into sub_laptop_3

2026-10-05 20:49:53 +09:00
parent 0793543803 0b11333942
commit 25dda4d851
3 changed files with 61 additions and 3 deletions
@@ -407,3 +407,30 @@ def test_사전조합이_자기_자신을_담으면_422_수량_기본_1(world):
                },
            )
    assert e.value.status == 422 and "자기 자신" in e.value.detail
+
+
+def test_서고_구분_상세구분_연결_승격은_원_로직_사전조합은_고른_값_옛_문서는_읽을_때(world):
+    import M01_MasterData.M01_MasterData_Store as m01
+
+    row = m01.loaded()[1].logic(TEN)
+    sp = _promote(world["system"], 구분="틀림", 상세구분="틀림", 연결={"로직": "x"})
+    doc = _read(world["system"], "promote", sp)
+    assert row["구분"] and row["상세구분"]
+    assert (doc["구분"], doc["상세구분"]) == (row["구분"], row["상세구분"])  # 화면 값 안 받음
+    assert doc["연결"] == {"로직": TEN, "출처": row.get("출처") or ""}
+    sc = _combo(world["system"], [{"참조": {**SYS, "키": sp}}])
+    assert (_read(world["system"], "precombo", sc)["구분"], "") == ("", "")
+    with store.at(world["system"]):
+        have = store.read("precombo", sc)
+        store.write("precombo", sc, have["판"], {**have["문서"], "구분": " 가 ", "상세구분": "나"})
+    got = _read(world["system"], "precombo", sc)
+    assert (got["구분"], got["상세구분"]) == ("가", "나")
+    # 옛 문서(칸 없음) — 승격은 원 로직 것 · 사전조합은 빈 글
+    old = {k: v for k, v in doc.items() if k not in ("구분", "상세구분", "연결")}
+    (world["system"] / "promote" / f"{sp}.json").write_text(json.dumps(old), encoding="utf-8")
+    assert refs.filled("promote", old)["연결"] == doc["연결"]
+    assert refs.filled("precombo", {"담은로직": []})["구분"] == ""
+    rows = [{"종류": "promote", "이름": sp}, {"종류": "precombo", "이름": sc}]
+    refs.summaries(world["system"], rows)
+    assert (rows[0]["구분"], rows[0]["상세구분"]) == (row["구분"], row["상세구분"])
+    assert (rows[1]["구분"], rows[1]["상세구분"], rows[1]["연결"]) == ("가", "나", None)