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:
+148
-26
@@ -2534,7 +2534,50 @@ class ProjectStore:
|
||||
return ok
|
||||
|
||||
def _meeting_cols(self, conn: Any) -> str:
|
||||
return self._MEETING_ITEM_COLS + (", line_key" if self._meeting_keys(conn) else "")
|
||||
return (self._MEETING_ITEM_COLS + (", line_key" if self._meeting_keys(conn) else "")
|
||||
+ (", content_row_span" if self._meeting_cells(conn) else ""))
|
||||
|
||||
def _meeting_cells(self, conn: Any) -> bool:
|
||||
if getattr(self, "_meeting_cells_ok", False):
|
||||
return True
|
||||
ok = self._column_exists(conn, "goal_meeting_items", "content_row_span")
|
||||
if ok:
|
||||
self._meeting_cells_ok = True
|
||||
return ok
|
||||
|
||||
def _locked_meeting_items(self, conn: Any, item_id: int) -> list[dict[str, Any]]:
|
||||
"""글 저장·이동·병합·줄 변경이 같은 주 잠금을 공유한다."""
|
||||
me = conn.execute("SELECT week_start FROM goal_meeting_items WHERE id = %s", (item_id,)).fetchone()
|
||||
if me is None:
|
||||
raise KeyError(item_id)
|
||||
if not conn.execute("SELECT week_start FROM goal_meetings WHERE week_start = %s FOR UPDATE",
|
||||
(me["week_start"],)).fetchone():
|
||||
raise KeyError(item_id)
|
||||
rows = conn.execute(f"SELECT {self._meeting_cols(conn)} FROM goal_meeting_items "
|
||||
"WHERE week_start = %s ORDER BY sort_order, id FOR UPDATE", (me["week_start"],)).fetchall()
|
||||
if not any(int(r["id"]) == item_id for r in rows):
|
||||
raise KeyError(item_id)
|
||||
return rows
|
||||
|
||||
@staticmethod
|
||||
def _meeting_merge_ranges(rows: list[dict[str, Any]]) -> list[tuple[int, int]]:
|
||||
ranges = []
|
||||
for i, row in enumerate(rows):
|
||||
span = int(row.get("content_row_span") or 1)
|
||||
if span > 1:
|
||||
end = i + span - 1
|
||||
if end >= len(rows) or any(r["section"] != row["section"] for r in rows[i:end + 1]):
|
||||
raise store.GoalCellConflict("병합 범위가 바뀌었습니다. 새로고침해 주세요.")
|
||||
ranges.append((i, end))
|
||||
return ranges
|
||||
|
||||
def _require_meeting_cell_visible(self, rows: list[dict[str, Any]], item_id: int) -> int:
|
||||
i = next((n for n, r in enumerate(rows) if int(r["id"]) == item_id), -1)
|
||||
if i < 0:
|
||||
raise KeyError(item_id)
|
||||
if any(a < i <= b for a, b in self._meeting_merge_ranges(rows)):
|
||||
raise store.GoalCellConflict("병합에 가려진 셀입니다. 새로고침해 주세요.")
|
||||
return i
|
||||
|
||||
@staticmethod
|
||||
def _meeting_item(r: dict[str, Any]) -> dict[str, Any]:
|
||||
@@ -2570,6 +2613,7 @@ class ProjectStore:
|
||||
self._require_meetings(conn)
|
||||
cols = self._meeting_cols(conn)
|
||||
keyed = self._meeting_keys(conn)
|
||||
cell_merges = self._meeting_cells(conn)
|
||||
head = conn.execute(
|
||||
"SELECT week_start, week_target, attendees, notes, updated_by, updated_at "
|
||||
"FROM goal_meetings WHERE week_start = %s", (week_start,),
|
||||
@@ -2608,6 +2652,7 @@ class ProjectStore:
|
||||
"week_target": int(prev_head["week_target"]) if prev_head["week_target"] is not None
|
||||
else None} if prev_head else None,
|
||||
"line_keys": keyed,
|
||||
"cell_merges": cell_merges,
|
||||
}
|
||||
|
||||
def create_meeting(self, *, week_start: date, sections: list[tuple[str, str]], created_by: str = "") -> bool:
|
||||
@@ -2742,7 +2787,7 @@ class ProjectStore:
|
||||
).fetchone():
|
||||
raise KeyError(str(week_start))
|
||||
rows = conn.execute(
|
||||
"SELECT id, section, section_color FROM goal_meeting_items WHERE week_start = %s "
|
||||
f"SELECT {self._meeting_cols(conn)} FROM goal_meeting_items WHERE week_start = %s "
|
||||
"ORDER BY sort_order, id", (week_start,),
|
||||
).fetchall()
|
||||
ids = [int(r["id"]) for r in rows]
|
||||
@@ -2755,6 +2800,8 @@ class ProjectStore:
|
||||
else:
|
||||
same = [n for n, r in enumerate(rows) if r["section"] == sec]
|
||||
i = same[-1] + 1 if same else len(ids)
|
||||
if any(a < i <= b for a, b in self._meeting_merge_ranges(rows)):
|
||||
raise ValueError("병합된 셀 안에 줄을 추가하려면 먼저 병합을 해제해 주세요.")
|
||||
# 새 줄 = 새 연결키(018) — 이름이 같은 다른 줄과 섞이지 않는다
|
||||
keyed = self._meeting_keys(conn)
|
||||
new_id = int(conn.execute(
|
||||
@@ -2779,7 +2826,7 @@ class ProjectStore:
|
||||
params.append(store.validate_meeting_text(fields["label"], limit=store.MEETING_LABEL_MAX, what="줄 이름"))
|
||||
if "content" in fields:
|
||||
sets.append("content = %s")
|
||||
params.append(store.validate_meeting_text(fields["content"]))
|
||||
params.append(store.validate_meeting_content(fields["content"]))
|
||||
for k in ("target_amount", "result_amount"):
|
||||
if k in fields:
|
||||
v = store.validate_meeting_amount(fields[k])
|
||||
@@ -2797,25 +2844,106 @@ class ProjectStore:
|
||||
sets.append("marketplace_code = %s")
|
||||
params.append(code)
|
||||
with self._pool.connection() as conn:
|
||||
self._require_meetings(conn)
|
||||
if sets:
|
||||
row = conn.execute(
|
||||
f"UPDATE goal_meeting_items SET {', '.join(sets)}, updated_by = %s, updated_at = now() "
|
||||
f"WHERE id = %s RETURNING {self._MEETING_ITEM_COLS}",
|
||||
(*params, store.norm_str(updated_by, lower=True), item_id),
|
||||
).fetchone()
|
||||
else:
|
||||
row = conn.execute(
|
||||
f"SELECT {self._MEETING_ITEM_COLS} FROM goal_meeting_items WHERE id = %s", (item_id,),
|
||||
).fetchone()
|
||||
with conn.transaction():
|
||||
self._require_meetings(conn)
|
||||
rows = self._locked_meeting_items(conn, item_id)
|
||||
if "content" in fields:
|
||||
self._require_meeting_cell_visible(rows, item_id)
|
||||
if sets:
|
||||
row = conn.execute(
|
||||
f"UPDATE goal_meeting_items SET {', '.join(sets)}, updated_by = %s, updated_at = now() "
|
||||
f"WHERE id = %s RETURNING {self._meeting_cols(conn)}",
|
||||
(*params, store.norm_str(updated_by, lower=True), item_id),
|
||||
).fetchone()
|
||||
else:
|
||||
row = next((r for r in rows if int(r["id"]) == item_id), None)
|
||||
if row is None:
|
||||
raise KeyError(item_id)
|
||||
return self._meeting_item(row)
|
||||
|
||||
def move_meeting_cell(self, *, source_item: Any, target_item: Any, source_body: Any,
|
||||
target_body: Any, updated_by: str = "") -> str:
|
||||
if not isinstance(source_body, str) or not isinstance(target_body, str):
|
||||
raise ValueError("원본·대상 셀의 예상 내용을 문자열로 보내 주세요.")
|
||||
try:
|
||||
source, target = int(source_item), int(target_item)
|
||||
except (TypeError, ValueError):
|
||||
raise ValueError("옮길 셀이 올바르지 않습니다.")
|
||||
if source <= 0 or target <= 0:
|
||||
raise ValueError("옮길 셀이 올바르지 않습니다.")
|
||||
expected_source = store.validate_meeting_content(source_body)
|
||||
expected_target = store.validate_meeting_content(target_body)
|
||||
if not expected_source:
|
||||
raise ValueError("비어 있는 셀은 옮길 수 없습니다.")
|
||||
with self._pool.connection() as conn:
|
||||
with conn.transaction():
|
||||
self._require_meetings(conn)
|
||||
rows = self._locked_meeting_items(conn, source)
|
||||
a = self._require_meeting_cell_visible(rows, source)
|
||||
b = self._require_meeting_cell_visible(rows, target)
|
||||
body = store.validate_meeting_content(rows[a]["content"])
|
||||
old_target = store.validate_meeting_content(rows[b]["content"])
|
||||
if source == target:
|
||||
return body
|
||||
# 응답 유실 후 같은 요청 재전송은 이미 저장된 이동으로 처리한다.
|
||||
if body == "" and old_target == expected_source:
|
||||
return old_target
|
||||
if body != expected_source or old_target != expected_target:
|
||||
raise store.GoalCellConflict("다른 곳에서 셀 내용이 바뀌었습니다. 새로고침 후 다시 옮겨 주세요.")
|
||||
for item, text in ((target, body), (source, "")):
|
||||
conn.execute("UPDATE goal_meeting_items SET content = %s, updated_by = %s, updated_at = now() "
|
||||
"WHERE id = %s", (text, store.norm_str(updated_by, lower=True), item))
|
||||
return body
|
||||
|
||||
def merge_meeting_cells(self, *, item_from: Any, item_to: Any, updated_by: str = "") -> dict[str, Any]:
|
||||
try:
|
||||
first, last = int(item_from), int(item_to)
|
||||
except (TypeError, ValueError):
|
||||
raise ValueError("병합할 셀이 올바르지 않습니다.")
|
||||
with self._pool.connection() as conn:
|
||||
with conn.transaction():
|
||||
self._require_meetings(conn)
|
||||
if not self._meeting_cells(conn):
|
||||
raise store.MeetingCellMigrationNeeded()
|
||||
rows = self._locked_meeting_items(conn, first)
|
||||
indices = {int(r["id"]): n for n, r in enumerate(rows)}
|
||||
if last not in indices:
|
||||
raise KeyError(last)
|
||||
a, b = sorted((indices[first], indices[last]))
|
||||
# 마지막 셀이 이미 병합된 경우 그 아래까지 선택 범위를 넓힌다.
|
||||
b += int(rows[b].get("content_row_span") or 1) - 1
|
||||
if a == b or b - a + 1 > 500 or any(r["section"] != rows[a]["section"] for r in rows[a:b + 1]):
|
||||
raise ValueError("같은 구역의 이번주 할 일 셀을 2줄 이상 선택해 주세요.")
|
||||
if any(x < a <= y or x <= b < y for x, y in self._meeting_merge_ranges(rows)):
|
||||
raise store.GoalCellConflict("병합된 셀 전체를 선택해 주세요.")
|
||||
body = store.validate_meeting_content(store.merge_goal_texts([r["content"] for r in rows[a:b + 1]]))
|
||||
who = store.norm_str(updated_by, lower=True)
|
||||
for n in range(a, b + 1):
|
||||
conn.execute("UPDATE goal_meeting_items SET content = %s, content_row_span = %s, "
|
||||
"updated_by = %s, updated_at = now() WHERE id = %s",
|
||||
(body if n == a else "", b - a + 1 if n == a else 1, who, rows[n]["id"]))
|
||||
return {"item_id": int(rows[a]["id"]), "row_span": b - a + 1, "body": body}
|
||||
|
||||
def unmerge_meeting_cell(self, *, item_id: int, updated_by: str = "") -> None:
|
||||
with self._pool.connection() as conn:
|
||||
with conn.transaction():
|
||||
self._require_meetings(conn)
|
||||
if not self._meeting_cells(conn):
|
||||
raise store.MeetingCellMigrationNeeded()
|
||||
rows = self._locked_meeting_items(conn, item_id)
|
||||
self._require_meeting_cell_visible(rows, item_id)
|
||||
conn.execute("UPDATE goal_meeting_items SET content_row_span = 1, updated_by = %s, "
|
||||
"updated_at = now() WHERE id = %s", (store.norm_str(updated_by, lower=True), item_id))
|
||||
|
||||
def delete_meeting_item(self, *, item_id: int) -> None:
|
||||
with self._pool.connection() as conn:
|
||||
self._require_meetings(conn)
|
||||
row = conn.execute("DELETE FROM goal_meeting_items WHERE id = %s RETURNING id", (item_id,)).fetchone()
|
||||
with conn.transaction():
|
||||
self._require_meetings(conn)
|
||||
rows = self._locked_meeting_items(conn, item_id)
|
||||
i = next(n for n, r in enumerate(rows) if int(r["id"]) == item_id)
|
||||
if any(a <= i <= b for a, b in self._meeting_merge_ranges(rows)):
|
||||
raise ValueError("병합된 셀의 줄을 삭제하려면 먼저 병합을 해제해 주세요.")
|
||||
row = conn.execute("DELETE FROM goal_meeting_items WHERE id = %s RETURNING id", (item_id,)).fetchone()
|
||||
if row is None:
|
||||
raise KeyError(item_id)
|
||||
|
||||
@@ -2824,20 +2952,14 @@ class ProjectStore:
|
||||
with self._pool.connection() as conn:
|
||||
with conn.transaction():
|
||||
self._require_meetings(conn)
|
||||
me = conn.execute(
|
||||
"SELECT week_start, section FROM goal_meeting_items WHERE id = %s", (item_id,)
|
||||
).fetchone()
|
||||
if me is None:
|
||||
raise KeyError(item_id)
|
||||
rows = conn.execute(
|
||||
"SELECT id, section FROM goal_meeting_items WHERE week_start = %s ORDER BY sort_order, id "
|
||||
"FOR UPDATE", (me["week_start"],),
|
||||
).fetchall()
|
||||
rows = self._locked_meeting_items(conn, item_id)
|
||||
ids = [int(r["id"]) for r in rows]
|
||||
i = ids.index(item_id)
|
||||
j = i + (1 if direction > 0 else -1)
|
||||
if not 0 <= j < len(ids) or rows[j]["section"] != me["section"]:
|
||||
if not 0 <= j < len(ids) or rows[j]["section"] != rows[i]["section"]:
|
||||
return
|
||||
if any(a <= i <= b or a <= j <= b for a, b in self._meeting_merge_ranges(rows)):
|
||||
raise ValueError("병합된 셀의 줄을 이동하려면 먼저 병합을 해제해 주세요.")
|
||||
ids[i], ids[j] = ids[j], ids[i]
|
||||
for n, x in enumerate(ids):
|
||||
conn.execute("UPDATE goal_meeting_items SET sort_order = %s WHERE id = %s", (n, x))
|
||||
|
||||
Reference in New Issue
Block a user