feat(project): add meeting cell editing

Apply project_db migration 019 to enable vertical cell merges. Other cell editing remains available before migration.
This commit is contained in:
2026-10-03 15:11:41 +09:00
parent 193da56edf
commit 090e508bf3
18 changed files with 1054 additions and 78 deletions
+5
View File
@@ -18,6 +18,7 @@ node tests/js/box_calc_ui.test.js
`goals.html`·`goal_meeting.html` + `static/project.js` — 칸 저장 직렬화·늦은 응답·503·초안 보호·구조 변경 중단·이번주 실적 %·
실적 미확인 표시·⋮ 메뉴(키보드·터치 클릭)·매출 갱신 안내를 가짜 서버(지연·실패를 직접 만듦)로 검증한다.
회의록 글 서식·범위 지우기/되돌리기·셀 이동·병합 요청·019 미적용·열 경계 조절·열 순서 변경·보기 전용 권한도 확인한다.
```bash
python tests/js/render_goals.py # → tests/js/.out/goals_*.html · meeting_*.html
@@ -32,6 +33,7 @@ node tests/js/goals_meeting_ui.test.js # jsdom 필요(npm install jsdom
회의록도 3줄/2줄 셀·한 줄 행·빈 실적 영역·75% 배율·보기 전용 화면을 확인하고,
항목명 오른쪽의 `자동입력`·`실적 미사용` 표시가 같은 줄에 들어가는지 검증한다.
실제 마우스로 셀 테두리를 끌어 내용·부분 서식을 이동하고, 지연 응답 동안 원본을 유지하는지 확인한다.
회의록에서는 실제 contenteditable 선택·서식 도구·초안 저장 후 이동·이번주/지난주 열 순서·75% 배율의 너비 맞춤도 확인한다.
우클릭 현재/전체 열 자동 맞춤은 접힌 월 열의 측정·너비 저장도 검증한다. jsdom에서는 저장 실패·409 충돌·덮어쓰기 취소·Esc 취소를 추가로 확인한다.
```powershell
@@ -47,7 +49,10 @@ node tests/js/goals_autofit.browser.test.js
```bash
python -m unittest discover -s tests -p test_project_goal_move.py
python -m unittest discover -s tests -p test_project_meeting_cells.py
```
실제 PostgreSQL 이동·동시 요청 검증은 `python tests/test_project_module.py`에 포함된다.
`PROJECT_TEST_DB_URL`에 기존 로컬 테스트 DB를 지정해야 하며, 미설정 또는 로컬 주소가 아니면 건너뛴다.
회의록 셀 테스트는 DB 연결을 대신하는 트랜잭션 모형으로 실제 저장소 메서드·API 권한/충돌·이동/병합 롤백·
019 미적용·병합 행 작업 보호·서식 보존·안전한 템플릿 출력을 검증한다. 실제 PostgreSQL 잠금 동작 검증은 별도다.
+87 -3
View File
@@ -19,7 +19,7 @@ const server = http.createServer(function (req, res) {
res.setHeader("Content-Type", "text/html; charset=utf-8"); res.end(html); return;
}
if (url.pathname === "/project/goals/2026/meetings/9") {
const fixture = url.searchParams.has("readonly") ? "meeting_layout_ro.html" : "meeting_layout_admin.html";
const fixture = url.searchParams.has("merged") ? "meeting_merged.html" : url.searchParams.has("readonly") ? "meeting_layout_ro.html" : "meeting_layout_admin.html";
const html = fs.readFileSync(path.join(__dirname, ".out", fixture), "utf8")
.replace('<link rel="stylesheet"', '<link rel="stylesheet" href="/static/erp.css"><link rel="stylesheet" href="/static/erp-shell.css"><link rel="stylesheet"')
.replace("<body>", '<body style="font-family:var(--pj-font)"><div class="erp-app">')
@@ -249,12 +249,12 @@ const server = http.createServer(function (req, res) {
checkMeeting(initial, 3);
assert(Math.abs(initial.short - initial.line * 2 - initial.top - initial.bottom) <= 1, JSON.stringify(initial));
if (!readonly) {
await meetingPage.locator('tr[data-item="2"] textarea').fill("한 줄");
await meetingPage.locator('tr[data-item="2"] .pj-meet-text').fill("한 줄");
await meetingPage.locator('tr[data-item="2"] .is-prev .pj-meet-ro').evaluate(e => { e.textContent = "한 줄"; });
const smaller = await meetingMetrics();
checkMeeting(smaller, 1);
assert(smaller.row < initial.row);
await meetingPage.locator('tr[data-item="2"] textarea').fill("첫 번째 줄\n두 번째 줄\n세 번째 줄");
await meetingPage.locator('tr[data-item="2"] .pj-meet-text').fill("첫 번째 줄\n두 번째 줄\n세 번째 줄");
}
await meetingPage.evaluate(function () {
document.documentElement.classList.add("pj-ui-scale");
@@ -266,6 +266,90 @@ const server = http.createServer(function (req, res) {
console.log("PASS meeting row height, equal padding, top alignment, inline automatic/unused labels, shrink and 75% zoom" + (readonly ? " (read-only)" : ""));
}
const meetingEditing = await browser.newPage({ viewport: { width: 1600, height: 1000 } });
let releaseMeetingMove, meetingMoveStarted;
const meetingMoveGate = new Promise(resolve => { releaseMeetingMove = resolve; });
const meetingMoveStart = new Promise(resolve => { meetingMoveStarted = resolve; });
const meetingWrites = [], meetingErrors = [];
meetingEditing.on("pageerror", e => meetingErrors.push(e.message));
await meetingEditing.route("**/project/api/**", async function (route) {
const req = route.request();
if (req.method() !== "GET") meetingWrites.push({ url: req.url(), body: req.postDataJSON() });
if (req.url().endsWith("/meeting-cells/move")) {
meetingMoveStarted(); await meetingMoveGate;
await route.fulfill({ json: { ok: true, body: req.postDataJSON().source_body } });
} else await route.fulfill({ json: { ok: true } });
});
await meetingEditing.goto("http://127.0.0.1:" + server.address().port + "/project/goals/2026/meetings/9");
const meetingSource = meetingEditing.locator('tr[data-item="2"] .pj-meet-text');
const meetingTarget = meetingEditing.locator('tr[data-item="3"] .pj-meet-text');
await meetingSource.fill("앞 선택 뒤");
await meetingSource.evaluate(function (e) {
const r = document.createRange(); r.setStart(e.firstChild, 2); r.setEnd(e.firstChild, 4);
window.getSelection().removeAllRanges(); window.getSelection().addRange(r);
e.dispatchEvent(new MouseEvent("mouseup", { bubbles: true }));
});
for (const name of ["굵게", "기울임", "밑줄", "글자 크기 2px 키우기"]) await meetingEditing.getByRole("button", { name: name, exact: true }).click();
await meetingEditing.getByRole("button", { name: "글자 색상", exact: true }).click();
await meetingEditing.getByRole("button", { name: "#DC2626", exact: true }).click();
const meetingRich = await meetingSource.evaluate(e => e.value);
const selectedRun = JSON.parse(meetingRich.slice(11))[1];
assert(selectedRun.bold && selectedRun.italic && selectedRun.underline && selectedRun.color === "#dc2626" && selectedRun.size === 16);
await meetingSource.click();
const meetingEdge = await meetingSource.locator("..").locator('.pj-goal-move-edge[data-edge="bottom"]').boundingBox();
const meetingDest = await meetingTarget.locator("..").boundingBox();
await meetingEditing.mouse.move(meetingEdge.x + meetingEdge.width / 2, meetingEdge.y + meetingEdge.height / 2);
await meetingEditing.mouse.down();
await meetingEditing.mouse.move(meetingDest.x + meetingDest.width / 2, meetingDest.y + meetingDest.height / 2, { steps: 5 });
assert(await meetingTarget.locator("..").evaluate(td => td.classList.contains("is-goal-move-target")));
await meetingEditing.mouse.up();
await Promise.race([meetingMoveStart, new Promise((resolve, reject) => setTimeout(() => reject(new Error("meeting move request did not start")), 3000))]);
assert.equal(await meetingSource.evaluate(e => e.value), meetingRich);
releaseMeetingMove();
await meetingEditing.waitForFunction(() => document.querySelector('tr[data-item="2"] .pj-meet-text').value === "");
assert.equal(await meetingTarget.evaluate(e => e.value), meetingRich);
assert(meetingWrites.findIndex(r => r.url.endsWith("/meeting-items/2")) < meetingWrites.findIndex(r => r.url.endsWith("/meeting-cells/move")));
await meetingTarget.evaluate(e => { e.value = "명시적 줄바꿈\n너비 자동 맞춤은 이 문단 전체에 맞춥니다"; e.dispatchEvent(new Event("input", { bubbles: true })); });
await meetingTarget.locator("..").locator(".pj-meet-colresize").dblclick();
const fittedMeeting = await meetingEditing.locator('col[data-meet-col="content"]').evaluate(c => parseFloat(c.style.width));
assert(fittedMeeting > 200);
await meetingEditing.locator("#pj-meet-order").click();
await meetingEditing.waitForFunction(() => document.getElementById("pj-meet-table").classList.contains("is-prev-first"));
assert.equal(await meetingTarget.locator("..").getAttribute("data-meet-cols"), "content");
await meetingEditing.evaluate(() => { document.documentElement.classList.add("pj-ui-scale"); window.dispatchEvent(new Event("resize")); });
await meetingTarget.locator("..").locator(".pj-meet-colresize").dblclick();
const zoomedMeeting = await meetingEditing.locator('col[data-meet-col="content"]').evaluate(c => parseFloat(c.style.width));
assert(Math.abs(fittedMeeting - zoomedMeeting) <= 1, JSON.stringify({ fittedMeeting, zoomedMeeting }));
await meetingTarget.click({ button: "right" });
await meetingEditing.getByRole("menuitem", { name: "전체 열 너비 자동 맞춤" }).click();
assert(await meetingEditing.evaluate(() => Object.keys(JSON.parse(localStorage.getItem("pj_meet_col_w"))).length === 9));
assert.deepEqual(meetingErrors, []);
await meetingEditing.locator("#pj-meet-table").screenshot({ path: path.join(__dirname, ".out", "meeting-cell-editing.png") });
await meetingEditing.close();
console.log("PASS actual meeting formatting, border move, draft save ordering, width fitting, review order and 75% zoom");
const mergedMeeting = await browser.newPage({ viewport: { width: 1600, height: 1000 } });
const mergedErrors = []; mergedMeeting.on("pageerror", e => mergedErrors.push(e.message));
await mergedMeeting.goto("http://127.0.0.1:" + server.address().port + "/project/goals/2026/meetings/9?merged");
const mergedCell = mergedMeeting.locator('td[data-meet-item="2"]');
assert.equal(await mergedCell.getAttribute("rowspan"), "2");
assert.equal(await mergedMeeting.locator('td[data-meet-item="3"]').count(), 0);
for (const order of [false, true]) {
if (order) await mergedMeeting.locator("#pj-meet-order").click();
await mergedMeeting.waitForFunction(() => document.querySelector('tr[data-item="3"] td.pj-meet-c-amt').dataset.meetCols === "target");
const geometry = await mergedMeeting.evaluate(() => {
const rect = el => el.getBoundingClientRect();
const a = rect(document.querySelector('td[data-meet-item="2"]'));
const b = rect(document.querySelector('tr[data-item="3"] td.pj-meet-c-amt'));
const t = rect(document.querySelector('tr[data-item="2"] td.pj-meet-c-amt'));
return { sameColumn: Math.abs(b.left - t.left) < 1, sameBottom: Math.abs(a.bottom - b.bottom) < 1, disjoint: a.right <= b.left + 1 };
});
assert(geometry.sameColumn && geometry.sameBottom && geometry.disjoint, JSON.stringify(geometry));
await mergedCell.locator(".pj-meet-colresize").dblclick();
}
assert.deepEqual(mergedErrors, []); await mergedMeeting.close();
console.log("PASS merged meeting rowspan, independent numeric cells and both column orders");
const interactive = await browser.newPage({ viewport: { width: 1600, height: 1000 } });
let releaseMove, startedMove;
const moveGate = new Promise(function (resolve) { releaseMove = resolve; });
+102 -10
View File
@@ -89,6 +89,7 @@ function makeEnv(html, url, opts) {
async function boot(env) {
if (env.d.readyState === "loading") await new Promise(function (r) { env.d.addEventListener("DOMContentLoaded", r); });
env.w.eval(fs.readFileSync(path.join(ROOT, "app", "static", "project-goal-text.js"), "utf8"));
env.w.eval(fs.readFileSync(path.join(ROOT, "app", "static", "project-meeting-cells.js"), "utf8"));
env.w.eval(JS);
env.d.dispatchEvent(new env.w.Event("DOMContentLoaded"));
await settle();
@@ -252,7 +253,7 @@ function meetServer(env, st) {
const gate = deferred();
const st = meetServer(env, { itemHook: async function (id, body, call) { if (body.content === "draft A") await gate.promise; } });
await boot(env);
const ta = env.d.querySelector('tr[data-item="1"] textarea.pj-meet-text');
const ta = env.d.querySelector('tr[data-item="1"] .pj-meet-text');
ta.focus(); type(env, ta, "draft A"); ta.blur();
await settle();
ta.focus(); type(env, ta, "draft B");
@@ -274,7 +275,7 @@ function meetServer(env, st) {
const gates = [];
const st = meetServer(env, { itemHook: async function () { const g = deferred(); gates.push(g); await g.promise; } });
await boot(env);
const ta = env.d.querySelector('tr[data-item="1"] textarea.pj-meet-text');
const ta = env.d.querySelector('tr[data-item="1"] .pj-meet-text');
ta.focus(); type(env, ta, "x1"); ta.blur(); fire(env, ta, "blur"); fire(env, ta, "blur");
ta.focus(); type(env, ta, "x12"); type(env, ta, "x123"); ta.blur();
await settle();
@@ -292,7 +293,7 @@ function meetServer(env, st) {
let fail = true;
const st = meetServer(env, { itemHook: function () { if (fail) return { status: 503, body: { detail: "temporary" } }; } });
await boot(env);
const ta = env.d.querySelector('tr[data-item="1"] textarea.pj-meet-text');
const ta = env.d.querySelector('tr[data-item="1"] .pj-meet-text');
ta.focus(); type(env, ta, "important"); ta.blur();
await settle();
check("[1c] 실패해도 글 그대로", ta.value === "important");
@@ -311,7 +312,7 @@ function meetServer(env, st) {
const env2 = makeEnv(PAGE.meeting_admin, MEET_URL, { storage: { "pj_draft:meet:item:1:content": JSON.stringify(draft) } });
const st2 = meetServer(env2);
await boot(env2);
const ta2 = env2.d.querySelector('tr[data-item="1"] textarea.pj-meet-text');
const ta2 = env2.d.querySelector('tr[data-item="1"] .pj-meet-text');
check("[1c] 다시 열면 초안 되살림", ta2.value === "important");
await wait(900); await settle();
check("[1c] 되살린 초안 자동 저장", st2.items[1] && st2.items[1].content === "important", st2.items[1]);
@@ -321,7 +322,7 @@ function meetServer(env, st) {
const env3 = makeEnv(PAGE.meeting_admin, MEET_URL, { storage: { "pj_draft:meet:item:1:content": stale } });
meetServer(env3);
await boot(env3);
check("[1c] 서버 값이 바뀐 칸은 초안을 덮어쓰지 않음", env3.d.querySelector('tr[data-item="1"] textarea.pj-meet-text').value === "original");
check("[1c] 서버 값이 바뀐 칸은 초안을 덮어쓰지 않음", env3.d.querySelector('tr[data-item="1"] .pj-meet-text').value === "original");
fail = false; void st;
});
// 진행 중 저장이 있으면 줄 작업(위로)은 그 저장이 끝난 뒤에, 저장 실패면 줄 작업을 하지 않는다
@@ -331,7 +332,7 @@ function meetServer(env, st) {
let fail = false;
meetServer(env, { itemHook: async function (id, body) { if ("content" in body) { await gate.promise; if (fail) return { status: 503, body: { detail: "x" } }; } } });
await boot(env);
const ta = env.d.querySelector('tr[data-item="1"] textarea.pj-meet-text');
const ta = env.d.querySelector('tr[data-item="1"] .pj-meet-text');
ta.focus(); type(env, ta, "pending text"); ta.blur();
await settle();
fail = true;
@@ -408,7 +409,7 @@ function meetServer(env, st) {
const st = meetServer(env, { itemHook: function (id, body) { if ("content" in body) return { status: 503, body: { detail: "x" } }; } });
await boot(env);
const gets0 = st.gets || 0;
const ta = env.d.querySelector('tr[data-item="1"] textarea.pj-meet-text');
const ta = env.d.querySelector('tr[data-item="1"] .pj-meet-text');
ta.focus(); type(env, ta, "unsaved note");
const tgt = env.d.getElementById("pj-meet-target");
tgt.focus(); tgt.value = "2,000"; tgt.blur();
@@ -525,7 +526,7 @@ function meetServer(env, st) {
const row = env.d.querySelector('tr[data-item="1"]');
check("[6] 쇼핑몰 연결 줄 결과 = 미확인, 직접 입력 칸으로 바뀌지 않음", /미확인/.test(row.querySelector(".pj-meet-c-result").textContent) && !row.querySelector(".pj-meet-c-result input"));
check("[6] 이번주 실적 미확인 · 달성률 비움", /미확인/.test(row.querySelector(".pj-meet-week-slot").textContent) && row.querySelector("[data-rate]").textContent.trim() === "");
check("[6] 회의록 입력은 그대로 가능", !!row.querySelector("textarea.pj-meet-text") && !!env.d.getElementById("pj-meet-target"));
check("[6] 회의록 입력은 그대로 가능", !!row.querySelector(".pj-meet-text") && !!env.d.getElementById("pj-meet-target"));
check("[6] 조회 실패 안내 문구", /미확인/.test(env.d.querySelector(".pj-meet-perf-warn").textContent));
});
await section(async function () { // 지난주 리뷰 머리 = 지난주(9/21~) — 지난주 회의록에 없는 줄 안내
@@ -774,7 +775,7 @@ function meetServer(env, st) {
shops: [{ name: "쿠팡", state: "done", active: true }, { name: "네이버", state: "error", label: "인증 오류", active: true }], overall: {} } } };
} });
await boot(env);
const ta = env.d.querySelector('tr[data-item="1"] textarea.pj-meet-text');
const ta = env.d.querySelector('tr[data-item="1"] .pj-meet-text');
ta.focus(); type(env, ta, "editing while sync");
await wait(20); await settle();
const box = env.d.getElementById("pj-meet-sync"), btn = env.d.getElementById("pj-meet-sync-btn");
@@ -815,7 +816,7 @@ function meetServer(env, st) {
await wait(20); await settle();
check("[9] 실적 권한 없음 → sync API 호출 0", !st.syncCalls && !env.calls.some(function (c) { return /performance/.test(c.url); }));
check("[9] 권한 없음 설명(저장된 실적·마지막 갱신 시각)", /권한이 없어/.test(env.d.getElementById("pj-meet-sync").textContent) && /10\/01 14:20/.test(env.d.getElementById("pj-meet-sync").textContent));
check("[9] 보기 전용: 입력칸 없음", !env.d.querySelector("textarea.pj-meet-text") && !env.d.getElementById("pj-meet-target"));
check("[9] 보기 전용: 입력칸 없음", !env.d.querySelector(".pj-meet-text") && !env.d.getElementById("pj-meet-target"));
});
await section(async function () { // 10분 제한 — 최근 기록이 있으면 다시 부르지 않고 그 상태만(일부 실패면 안내 유지)
const env = makeEnv(PAGE.meeting_admin, MEET_URL, { session: { "pj_meet_sync:2026-09-28": JSON.stringify({ at: Date.now(), state: "partial", bad: ["네이버"] }) } });
@@ -848,6 +849,97 @@ function meetServer(env, st) {
check("[회귀] 참석자 고르기 → 칩 + 저장", !!env.d.querySelector('.pj-meet-chip[data-key="a@test.local"]') && st.head.attendees === "a@test.local", st.head);
});
await section(async function () { // 회의록에서도 같은 글자 서식·저장·초안 형식
const env = makeEnv(PAGE.meeting_admin, MEET_URL), st = meetServer(env); await boot(env);
const d = env.d, w = env.w, editor = d.querySelector('tr[data-item="1"] .pj-meet-text');
type(env, editor, "앞 선택 뒤"); editor.focus();
const range = d.createRange(); range.setStart(editor.firstChild, 2); range.setEnd(editor.firstChild, 4);
w.getSelection().removeAllRanges(); w.getSelection().addRange(range); fire(env, editor, "mouseup");
check("[회의록 서식] 같은 선택 글자 도구 표시", !d.getElementById("pj-goal-format").hidden);
["bold", "italic", "underline", "size-up"].forEach(k => d.querySelector('[data-goal-format="' + k + '"]').click());
d.querySelector('[data-goal-color="#DC2626"]').click();
fire(env, editor, "blur"); await settle();
const runs = JSON.parse(st.items[1].content.slice(11));
check("[회의록 서식] 선택 부분의 색·크기·굵게·기울임·밑줄 저장", runs[1].text === "선택" && runs[1].bold && runs[1].italic && runs[1].underline && runs[1].size === 16 && runs[1].color === "#dc2626" && !runs[0].bold, runs);
d.querySelector('[data-goal-format="reset"]').click(); fire(env, editor, "blur"); await settle();
check("[회의록 서식] 초기화는 내용 보존·평문으로 저장", st.items[1].content === "앞 선택 뒤");
});
await section(async function () { // 회의록 셀 이동 — 지연 응답·저장 순서·후속 blur
const env = makeEnv(PAGE.meeting_admin, MEET_URL), st = meetServer(env); const gate = deferred(); await boot(env);
env.route("POST", /\/meeting-cells\/move$/, async function (u, body) { await gate.promise; return { body: { ok: true, body: body.source_body } }; });
const source = env.d.querySelector('tr[data-item="2"] .pj-meet-text'), target = env.d.querySelector('tr[data-item="3"] .pj-meet-text');
const rich = 'pj-rich:v1:' + JSON.stringify([{ text: "이동", bold: true, italic: true, underline: true, size: 24, color: "#dc2626" }]);
type(env, source, rich); const end = beginGoalMove(env, source, target);
check("[회의록 이동] 대상 미리보기", target.closest("td").classList.contains("is-goal-move-target"));
end(); await settle();
const call = env.calls.find(c => /\/meeting-cells\/move$/.test(c.url));
check("[회의록 이동] 초안 저장 후 이동, 응답 전 원본 유지", st.items[2].content === rich && call && source.value === rich && target.value === "" && source.getAttribute("contenteditable") === "false");
gate.resolve(); await settle();
check("[회의록 이동] 내용과 모든 서식 함께 반영", source.value === "" && target.value === rich && source.getAttribute("contenteditable") === "true");
const before = env.calls.length; fire(env, source, "blur"); fire(env, target, "blur"); await settle();
check("[회의록 이동] 후속 blur 중복 저장 없음", env.calls.length === before);
});
for (const failure of ["network", "conflict", "save"]) await section(async function () {
const env = makeEnv(PAGE.meeting_admin, MEET_URL); meetServer(env, { itemHook: failure === "save" ? () => ({ status: 503 }) : null }); await boot(env);
env.route("POST", /\/meeting-cells\/move$/, () => failure === "network" ? "NETWORK" : { status: 409 });
const source = env.d.querySelector('tr[data-item="1"] .pj-meet-text'), target = env.d.querySelector('tr[data-item="2"] .pj-meet-text');
if (failure === "save") type(env, source, "미저장 글");
const before = source.value; beginGoalMove(env, source, target)(); await settle();
check("[회의록 이동 " + failure + "] 실패 후 원본·대상·편집 가능 상태 유지", source.value === before && target.value === "" && source.getAttribute("contenteditable") === "true");
check("[회의록 이동 " + failure + "] 저장 실패면 이동 요청 없음", failure !== "save" || !env.calls.some(c => /\/meeting-cells\/move$/.test(c.url)));
});
await section(async function () { // 회의록 범위 지우기·Ctrl+Z, 병합 실패시 입력 유지
const env = makeEnv(PAGE.meeting_admin, MEET_URL), st = meetServer(env); await boot(env);
const a = env.d.querySelector('tr[data-item="2"] .pj-meet-text'), b = env.d.querySelector('tr[data-item="3"] .pj-meet-text');
type(env, a, "첫 줄"); type(env, b, "둘째 줄"); fire(env, a, "blur"); fire(env, b, "blur"); await settle();
a.closest("td").dispatchEvent(new env.w.MouseEvent("mousedown", { bubbles: true, cancelable: true, button: 0 }));
env.d.dispatchEvent(new env.w.MouseEvent("mouseup", { bubbles: true }));
b.closest("td").dispatchEvent(new env.w.MouseEvent("mousedown", { bubbles: true, cancelable: true, button: 0, shiftKey: true }));
key(env, env.d.body, "Delete"); await settle();
check("[회의록 범위] 선택한 두 셀만 지우고 저장", a.value === "" && b.value === "" && st.items[2].content === "" && st.items[3].content === "");
key(env, env.d.body, "z", { ctrlKey: true }); await settle();
check("[회의록 범위] Ctrl+Z는 내용과 저장 복원", a.value === "첫 줄" && b.value === "둘째 줄" && st.items[2].content === "첫 줄");
env.route("POST", /\/meeting-cells\/merge$/, () => ({ status: 503 }));
b.dispatchEvent(new env.w.MouseEvent("contextmenu", { bubbles: true, cancelable: true }));
const merge = Array.from(env.d.querySelectorAll(".pj-ctxmenu-item")).find(n => itemLabel(n).startsWith("셀 병합"));
check("[회의록 병합] 같은 구역 범위에 병합 메뉴", !!merge); merge.click(); await settle();
check("[회의록 병합] 실패 후 모든 글·편집 상태 유지", a.value === "첫 줄" && b.value === "둘째 줄" && a.getAttribute("contenteditable") === "true" && !env.navigations);
const request = env.calls.find(c => /\/meeting-cells\/merge$/.test(c.url));
check("[회의록 병합] 선택한 주의 줄 ID로 요청", request.body.item_from === "2" && request.body.item_to === "3");
env.route("POST", /\/meeting-cells\/merge$/, () => ({ body: { ok: true } }));
b.dispatchEvent(new env.w.MouseEvent("contextmenu", { bubbles: true, cancelable: true }));
Array.from(env.d.querySelectorAll(".pj-ctxmenu-item")).find(n => itemLabel(n).startsWith("셀 병합")).click(); await settle();
check("[회의록 병합] 저장 성공 뒤 화면을 다시 받음", env.navigations === 1);
});
await section(async function () {
const env = makeEnv(fs.readFileSync(path.join(OUT, "meeting_merged.html"), "utf8"), MEET_URL); meetServer(env); await boot(env);
const a = env.d.querySelector('td[data-meet-item="2"]');
check("[회의록 병합 화면] 첫 셀만 표시하고 숫자 칸 유지", a.rowSpan === 2 && !env.d.querySelector('td[data-meet-item="3"]') && env.d.querySelectorAll('.pj-meet-amount[data-field="target_amount"]').length === 3);
a.dispatchEvent(new env.w.MouseEvent("contextmenu", { bubbles: true, cancelable: true }));
Array.from(env.d.querySelectorAll(".pj-ctxmenu-item")).find(n => itemLabel(n) === "병합 해제").click(); await settle();
check("[회의록 병합 해제] 첫 셀 ID로 요청하고 화면 갱신", env.calls.some(c => c.method === "DELETE" && /\/meeting-items\/2\/cell-merge$/.test(c.url)) && env.navigations === 1);
check("[회의록 병합 해제] 요청 중 합쳐진 글 보존", a.textContent.includes("병합한 계획"));
});
await section(async function () {
const env = makeEnv(PAGE.meeting_admin, MEET_URL); meetServer(env); await boot(env);
const field = env.d.querySelector('tr[data-item="2"] .pj-meet-text'), handle = field.closest("td").querySelector(".pj-meet-colresize");
handle.dispatchEvent(new env.w.MouseEvent("mousedown", { bubbles: true, cancelable: true, button: 0, clientX: 100 }));
env.d.dispatchEvent(new env.w.MouseEvent("mousemove", { bubbles: true, clientX: 200 }));
env.d.dispatchEvent(new env.w.MouseEvent("mouseup", { bubbles: true }));
check("[회의록 너비] 드래그 너비 저장", JSON.parse(env.w.localStorage.getItem("pj_meet_col_w")).content === 260);
env.d.getElementById("pj-meet-order").click(); await settle();
check("[회의록 너비] 순서 변경 후 논리 열 유지", field.closest("td").dataset.meetCols === "content");
const ro = makeEnv(PAGE.meeting_ro, MEET_URL); meetServer(ro); await boot(ro);
ro.d.querySelector("td.pj-meet-c-text").dispatchEvent(new ro.w.MouseEvent("contextmenu", { bubbles: true, cancelable: true }));
const labels = Array.from(ro.d.querySelectorAll(".pj-ctxmenu-item")).map(itemLabel);
check("[회의록 보기 전용] 너비 맞춤 제공·쓰기 도구 없음", labels.join("|") === "현재 열 너비 자동 맞춤|전체 열 너비 자동 맞춤" && !ro.d.querySelector(".pj-goal-move-edge,[contenteditable='true'],#pj-goal-format"));
});
await section(async function () { // 선택한 글자만 서식·서식 초기화·저장·다시 그리기
const env = makeEnv(PAGE.goals_admin, "http://localhost/project/goals/2026"); const st = goalsServer(env); await boot(env);
const d = env.d, w = env.w, editor = d.querySelector('.pj-goal-text[data-row="10"][data-month="1"]');
+11 -1
View File
@@ -74,7 +74,7 @@ def meeting_view(err: bool) -> dict:
it_new = {"id": 3, "section": "상품", "section_color": "#fde2e4", "label": "새 줄", "content": "",
"target_amount": None, "marketplace_code": "", "market_name": "", "market_off": False,
"market_unknown": False, "week_auto": None, "week_error": False, "prev": None, "rate": None}
meeting = {"week_start": "2026-09-28", "week_target": 1000, "attendees": "", "notes": "메모 원본",
meeting = {"week_start": "2026-09-28", "week_target": 1000, "attendees": "", "notes": "메모 원본", "cell_merges": True,
"items": [it_p1, it_new, it_cou],
"sections": [{"name": "상품", "color": "#fde2e4", "rows": [it_p1, it_new]},
{"name": "유통", "color": "", "rows": [it_cou]}]}
@@ -120,6 +120,15 @@ def meeting_layout_ctx(admin: bool) -> dict:
return ctx
def meeting_merged_ctx() -> dict:
ctx = meeting_ctx(True, False, can_sync=False)
a, b = ctx["meeting"]["sections"][0]["rows"]
a.update(content_span=2, content_hidden=False,
content_html=store.goal_text_html(store.GOAL_RICH_PREFIX + '[{"text":"병합한 계획\\n두 번째 줄","bold":true,"size":24}]'))
b["content_hidden"] = True
return ctx
def main() -> None:
env = jinja2.Environment(loader=jinja2.ChoiceLoader([
jinja2.DictLoader({"erp_base.html": BASE_STUB}),
@@ -135,6 +144,7 @@ def main() -> None:
"meeting_ro.html": ("project/goal_meeting.html", meeting_ctx(False, False, can_sync=False)),
"meeting_layout_admin.html": ("project/goal_meeting.html", meeting_layout_ctx(True)),
"meeting_layout_ro.html": ("project/goal_meeting.html", meeting_layout_ctx(False)),
"meeting_merged.html": ("project/goal_meeting.html", meeting_merged_ctx()),
}
for name, (tpl, ctx) in pages.items():
html = env.get_template(tpl).render(**ctx)
+246
View File
@@ -0,0 +1,246 @@
"""회의록 실제 저장소/API의 권한·충돌·롤백·병합 글 보존을 DB 연결 없이 검증한다."""
import copy
import importlib
import json
import unittest
from contextlib import contextmanager
from datetime import date
from types import SimpleNamespace
from unittest.mock import patch
from fastapi import FastAPI
from fastapi.testclient import TestClient
from app.modules.project import store
from app.modules.project.db import ProjectStore
api = importlib.import_module("app.modules.project.router")
class Result:
def __init__(self, rows=()):
self.rows = list(rows)
def fetchone(self):
return self.rows[0] if self.rows else None
def fetchall(self):
return self.rows
class Connection:
def __init__(self):
self.rows = {}
for n in range(1, 5):
self.rows[n] = dict(id=n, week_start=date(2026, 9, 28), section="상품" if n < 4 else "유통",
section_color="", label=f"줄{n}", content="원본" if n == 1 else "대상" if n == 2 else "",
content_row_span=1, target_amount=100 * n, result_amount=None, status="",
marketplace_code="", carry_from=None, sort_order=n)
self.calls, self.depth, self.locked = [], 0, False
self.writes, self.fail_write, self.rollbacks = 0, None, 0
@contextmanager
def transaction(self):
before = copy.deepcopy(self.rows)
self.depth += 1
try:
yield
except Exception:
self.rows = before
self.rollbacks += 1
raise
finally:
self.depth -= 1
self.locked = False
def execute(self, sql, params):
self.calls.append((sql, params))
if sql == "SELECT week_start FROM goal_meeting_items WHERE id = %s":
return Result([copy.deepcopy(self.rows[params[0]])] if params[0] in self.rows else [])
if sql.startswith("SELECT week_start FROM goal_meetings"):
assert self.depth > 0
self.locked = True
return Result([{"week_start": params[0]}])
if sql.startswith("SELECT id, week_start") and "FROM goal_meeting_items" in sql:
return Result(copy.deepcopy(r) for r in self.rows.values() if r["week_start"] == params[0])
if sql.startswith("UPDATE goal_meeting_items SET"):
assert self.locked and self.depth > 0, "Every cell write must hold the meeting lock until commit"
self.writes += 1
if self.writes == self.fail_write:
raise RuntimeError("second write failed")
item = self.rows[params[-1]]
if "content_row_span = 1," in sql:
item["content_row_span"] = 1
keys = [s.strip().split(" = ")[0] for s in sql.split(" SET ")[1].split(" WHERE ")[0].split(",") if "%s" in s]
item.update(zip(keys, params[:-1]))
return Result([copy.deepcopy(item)])
raise AssertionError(sql)
class MeetingCellTests(unittest.TestCase):
def setUp(self):
self.conn = Connection()
@contextmanager
def connection():
yield self.conn
self.st = ProjectStore.__new__(ProjectStore)
self.st._pool = SimpleNamespace(connection=connection)
self.st._table_exists = lambda conn, name: True
self.st._column_exists = lambda conn, table, col: col == "content_row_span"
self.payload = dict(source_item=1, target_item=2, source_body="원본", target_body="대상", updated_by="ADMIN@TEST.LOCAL")
def test_atomic_move_preserves_rich_text_and_numeric_values(self):
rich = store.validate_goal_text(store.GOAL_RICH_PREFIX + json.dumps([
dict(text="서식", bold=True, italic=True, underline=True, color="#dc2626", size=24)]))
self.conn.rows[1]["content"] = rich
self.assertEqual(self.st.move_meeting_cell(**(self.payload | {"source_body": rich})), rich)
self.assertEqual(self.conn.rows[1]["content"], "")
self.assertEqual(self.conn.rows[2]["content"], rich)
self.assertEqual(self.conn.rows[2]["target_amount"], 200)
self.assertEqual(self.conn.rows[2]["updated_by"], "admin@test.local")
self.assertEqual(self.st.move_meeting_cell(**(self.payload | {"source_body": rich})), rich)
self.assertEqual(self.conn.writes, 2, "Lost-response retry must not rewrite cells")
def test_second_write_failure_rolls_back_both_cells(self):
before = copy.deepcopy(self.conn.rows)
self.conn.fail_write = 2
with self.assertRaises(RuntimeError):
self.st.move_meeting_cell(**self.payload)
self.assertEqual(self.conn.rows, before)
self.assertEqual(self.conn.rollbacks, 1)
def test_equivalent_rich_runs_match_editor_and_empty_move_is_rejected(self):
rich = store.GOAL_RICH_PREFIX + json.dumps([dict(text="원", bold=True), dict(text="본", bold=True)])
expected = store.validate_meeting_content(rich)
self.conn.rows[1]["content"] = rich
self.assertEqual(self.st.move_meeting_cell(**(self.payload | {"source_body": expected})), expected)
self.assertEqual(self.conn.rows[2]["content"], expected)
before = copy.deepcopy(self.conn.rows)
with self.assertRaises(ValueError):
self.st.move_meeting_cell(**(self.payload | {"source_body": ""}))
self.assertEqual(self.conn.rows, before)
def test_stale_source_or_target_never_overwrites(self):
for item in (1, 2):
with self.subTest(item=item):
self.setUp()
self.conn.rows[item]["content"] = "다른 창에서 변경"
before = copy.deepcopy(self.conn.rows)
with self.assertRaises(store.GoalCellConflict):
self.st.move_meeting_cell(**self.payload)
self.assertEqual(self.conn.rows, before)
def test_different_week_and_hidden_cells_cannot_be_written(self):
self.conn.rows[2]["week_start"] = date(2026, 9, 21)
with self.assertRaises(KeyError):
self.st.move_meeting_cell(**self.payload)
self.conn.rows[2]["week_start"] = date(2026, 9, 28)
self.conn.rows[1]["content_row_span"] = 2
with self.assertRaises(store.GoalCellConflict):
self.st.move_meeting_cell(**self.payload)
with self.assertRaises(store.GoalCellConflict):
self.st.update_meeting_item(item_id=2, fields={"content": "hidden"})
def test_merge_unmerge_preserves_all_text_and_formats(self):
self.conn.rows[1]["content"] = store.validate_goal_text(store.GOAL_RICH_PREFIX + json.dumps([dict(text="원본", bold=True)]))
out = self.st.merge_meeting_cells(item_from=1, item_to=3)
self.assertEqual(out["row_span"], 3)
self.assertEqual(store.goal_text_plain(out["body"]), "원본\n대상")
self.assertTrue(store.goal_text_runs(out["body"])[0]["bold"])
self.assertEqual([self.conn.rows[n]["content"] for n in (2, 3)], ["", ""])
self.st.unmerge_meeting_cell(item_id=1)
self.assertEqual(self.conn.rows[1]["content_row_span"], 1)
self.assertEqual(self.conn.rows[1]["content"], out["body"])
def test_merge_validation_and_rollback(self):
for endpoint in (1, 4):
with self.subTest(endpoint=endpoint), self.assertRaises(ValueError):
self.st.merge_meeting_cells(item_from=1, item_to=endpoint)
before = copy.deepcopy(self.conn.rows)
self.conn.fail_write = 2
with self.assertRaises(RuntimeError):
self.st.merge_meeting_cells(item_from=1, item_to=3)
self.assertEqual(self.conn.rows, before)
def test_existing_merge_must_be_selected_whole(self):
self.st.merge_meeting_cells(item_from=1, item_to=2)
with self.assertRaises(store.GoalCellConflict):
self.st.merge_meeting_cells(item_from=2, item_to=3)
self.assertEqual(self.st.merge_meeting_cells(item_from=1, item_to=3)["row_span"], 3)
def test_merged_rows_require_unmerge_before_delete_or_reorder(self):
self.st.merge_meeting_cells(item_from=1, item_to=2)
with self.assertRaises(ValueError):
self.st.delete_meeting_item(item_id=1)
with self.assertRaises(ValueError):
self.st.move_meeting_item(item_id=3, direction=-1)
def test_plain_and_rich_saves_share_move_lock_and_visible_length_limit(self):
rich = store.GOAL_RICH_PREFIX + json.dumps([dict(text="가", bold=True)] * 4000)
out = self.st.update_meeting_item(item_id=1, fields={"content": rich})
self.assertEqual(len(store.goal_text_plain(out["content"])), 4000)
with self.assertRaises(ValueError):
self.st.update_meeting_item(item_id=1, fields={"content": "가" * 4001})
safe = store.goal_text_html(store.validate_goal_text(store.GOAL_RICH_PREFIX + json.dumps([
dict(text="<script>alert(1)</script>", color="red;display:none", size=200)])))
self.assertNotIn("<script>", safe)
self.assertNotIn("display:none", safe)
def test_http_permissions_conflict_validation_and_migration(self):
app = FastAPI()
app.include_router(api.router)
app.state.project_store = self.st
client = TestClient(app)
endpoints = [("POST", "/meeting-cells/move", self.payload),
("POST", "/meeting-cells/merge", dict(item_from=1, item_to=2)),
("DELETE", "/meeting-items/1/cell-merge", None)]
with patch.object(api, "_require_user", return_value=dict(role="user", email="user@test.local")):
for method, endpoint, body in endpoints:
self.assertEqual(client.request(method, "/project/api/goals" + endpoint, json=body).status_code, 403)
with patch.object(api, "_require_user", return_value=dict(role="admin", email="admin@test.local")):
url = "/project/api/goals/meeting-cells/move"
self.assertEqual(client.post(url, json={}).status_code, 400)
self.assertEqual(client.post(url, json=self.payload | {"source_body": None}).status_code, 400)
self.assertEqual(client.post(url, json=self.payload | {"target_body": "changed"}).status_code, 409)
self.st._meeting_cells = lambda conn: False
self.assertEqual(client.post("/project/api/goals/meeting-cells/merge", json=dict(item_from=1, item_to=2)).status_code, 503)
self.assertEqual(client.post(url, json=self.payload).status_code, 200, "Move/formatting work without 019")
def test_rendered_meeting_keeps_merge_geometry_and_escapes_rich_text(self):
from pathlib import Path
from jinja2 import ChoiceLoader, DictLoader, Environment, FileSystemLoader
root = Path(__file__).resolve().parents[1]
rich = store.validate_goal_text(store.GOAL_RICH_PREFIX + json.dumps([
dict(text="<img onerror=alert(1)>\n계획", bold=True, size=24, color="#dc2626")]))
self.conn.rows[1]["content"] = rich
self.st.merge_meeting_cells(item_from=1, item_to=2)
items = [self.st._meeting_item(copy.deepcopy(r)) | {"prev": None} for r in self.conn.rows.values()]
head = dict(week_start="2026-09-28", notes="", attendees="", week_target=None,
items=items, prev_meeting=None, cell_merges=True)
fake = SimpleNamespace(get_meeting=lambda **kw: copy.deepcopy(head),
goal_month_targets=lambda **kw: dict(sales_unit="원", sales_target=None, roas_target=None))
request = SimpleNamespace(app=SimpleNamespace(state=SimpleNamespace(performance_store=None)))
view = api._meeting_view(request, fake, year=2026, month=9, week=date(2026, 9, 28))
rows = view["meeting"]["sections"][0]["rows"]
self.assertEqual(rows[0]["content_span"], 2)
self.assertTrue(rows[1]["content_hidden"])
env = Environment(loader=ChoiceLoader([
DictLoader({"erp_base.html": "{% block head_extra %}{% endblock %}{% block content %}{% endblock %}"}),
FileSystemLoader(root / "app/modules/project/templates")]), autoescape=True)
html = env.get_template("project/goal_meeting.html").render(
user=dict(email="test@local"), is_admin=True, goal_year=2026, goal_month=9,
meetings_enabled=True, week="2026-09-28", week_end="2026-10-04", prev_week="2026-09-21",
prev_week_end="2026-09-27", meeting_status=store.MEETING_STATUS, pj_kr_holidays={},
nav_projects=[], goal_years=[2026], color_palette=[], project_icons=[], meet_members=[], month_plan=None, **view)
self.assertIn('rowspan="2" data-meet-item="1"', html)
self.assertNotIn('data-meet-item="2"', html)
self.assertIn("&lt;img onerror=alert(1)&gt;", html)
self.assertNotIn("<img onerror=", html)
self.assertIn("font-weight:700", html)
if __name__ == "__main__":
unittest.main()