fix(wordsearch): json.dumps для JSONB + usage_count reflect current levels
This commit is contained in:
+47
-21
@@ -334,9 +334,8 @@ async def create_level(request: Request):
|
|||||||
f"Level {level_code} #{level_number} already exists (id={existing})"
|
f"Level {level_code} #{level_number} already exists (id={existing})"
|
||||||
)
|
)
|
||||||
|
|
||||||
# 🔧 ФИКС (30.09.2026): jsonb_double_encoding —
|
# 🔧 ФИКС (30.09.2026): asyncpg_jsonb_str —
|
||||||
# asyncpg сам сериализует dict/list в JSONB.
|
# asyncpg требует json.dumps() для JSONB. Без него — DataError.
|
||||||
# json.dumps() приводил к двойному кодированию (JSONB-строка вместо объекта).
|
|
||||||
row = await conn.fetchrow("""
|
row = await conn.fetchrow("""
|
||||||
INSERT INTO levels
|
INSERT INTO levels
|
||||||
(level_number, grid_size, game_type, level, grid_letters, word_paths,
|
(level_number, grid_size, game_type, level, grid_letters, word_paths,
|
||||||
@@ -345,8 +344,8 @@ async def create_level(request: Request):
|
|||||||
RETURNING id
|
RETURNING id
|
||||||
""",
|
""",
|
||||||
level_number, grid_size, level_code,
|
level_number, grid_size, level_code,
|
||||||
grid_letters, # ← передаём как есть, asyncpg сам сериализует в JSONB
|
json.dumps(grid_letters), # 🔧 ФИКС (30.09.2026): asyncpg требует str для JSONB
|
||||||
word_paths, # ← то же
|
json.dumps(word_paths), # 🔧 ФИКС (30.09.2026): то же
|
||||||
is_active, telegram_id,
|
is_active, telegram_id,
|
||||||
)
|
)
|
||||||
level_id = row["id"]
|
level_id = row["id"]
|
||||||
@@ -385,7 +384,7 @@ async def update_level(request: Request, level_id: int):
|
|||||||
pool = await get_pool()
|
pool = await get_pool()
|
||||||
async with pool.acquire() as conn:
|
async with pool.acquire() as conn:
|
||||||
existing = await conn.fetchrow("""
|
existing = await conn.fetchrow("""
|
||||||
SELECT id, level, level_number FROM levels
|
SELECT id, level, level_number, word_paths FROM levels
|
||||||
WHERE id = $1 AND created_by IS NOT NULL
|
WHERE id = $1 AND created_by IS NOT NULL
|
||||||
""", level_id)
|
""", level_id)
|
||||||
if not existing:
|
if not existing:
|
||||||
@@ -393,13 +392,19 @@ async def update_level(request: Request, level_id: int):
|
|||||||
|
|
||||||
level_code = existing["level"]
|
level_code = existing["level"]
|
||||||
|
|
||||||
|
# 🔧 ФИКС (30.09.2026): usage_count_reflects_current —
|
||||||
|
# читаем старые слова, чтобы откатить их счётчики при замене.
|
||||||
|
old_word_paths_raw = existing["word_paths"]
|
||||||
|
old_word_paths = json.loads(old_word_paths_raw) if isinstance(old_word_paths_raw, str) else old_word_paths_raw
|
||||||
|
old_words = set(old_word_paths.keys())
|
||||||
|
|
||||||
grid_size, grid_letters, word_paths = _validate_payload(body)
|
grid_size, grid_letters, word_paths = _validate_payload(body)
|
||||||
|
|
||||||
is_active = bool(body.get("is_active", False))
|
is_active = bool(body.get("is_active", False))
|
||||||
|
|
||||||
async with conn.transaction():
|
async with conn.transaction():
|
||||||
# 🔧 ФИКС (30.09.2026): jsonb_double_encoding —
|
# 🔧 ФИКС (30.09.2026): asyncpg_jsonb_str —
|
||||||
# убран json.dumps, asyncpg сам сериализует в JSONB.
|
# asyncpg требует json.dumps() для JSONB. Без него — DataError.
|
||||||
await conn.execute("""
|
await conn.execute("""
|
||||||
UPDATE levels
|
UPDATE levels
|
||||||
SET grid_size = $1,
|
SET grid_size = $1,
|
||||||
@@ -409,34 +414,55 @@ async def update_level(request: Request, level_id: int):
|
|||||||
WHERE id = $5
|
WHERE id = $5
|
||||||
""",
|
""",
|
||||||
grid_size,
|
grid_size,
|
||||||
grid_letters, # ← передаём как есть
|
json.dumps(grid_letters), # 🔧 ФИКС (30.09.2026): asyncpg требует str для JSONB
|
||||||
word_paths, # ← то же
|
json.dumps(word_paths), # 🔧 ФИКС (30.09.2026): то же
|
||||||
is_active,
|
is_active,
|
||||||
level_id,
|
level_id,
|
||||||
)
|
)
|
||||||
|
|
||||||
await _upsert_level_words(conn, level_id, level_code, word_paths)
|
await _upsert_level_words(conn, level_id, level_code, word_paths)
|
||||||
|
|
||||||
# 🔧 ФИКС (30.09.2026): update_double_count —
|
# 🔧 ФИКС (30.09.2026): usage_count_reflects_current —
|
||||||
# при UPDATE не инкрементим счётчики. Слова, которые уже были —
|
# 1) Откатываем счётчики для слов, которых НЕТ в новом уровне.
|
||||||
# считаем как «те же», новые — добавляем.
|
# 2) Добавляем/инкрементим для новых слов.
|
||||||
# Сначала откатываем старые (убираем из word_usage, если их нет в новом)
|
# 3) Пересечение — не трогаем (last_used_at обновляем).
|
||||||
old_words_rows = await conn.fetch("""
|
new_words = set(word_paths.keys())
|
||||||
SELECT word_pl FROM level_words
|
words_added = new_words - old_words # новые слова
|
||||||
WHERE level_id = $1
|
words_removed = old_words - new_words # убранные слова
|
||||||
""", level_id)
|
|
||||||
# (старые words уже удалены в _upsert_level_words выше)
|
|
||||||
|
|
||||||
# Добавляем только те слова, которых ещё НЕ было в word_usage
|
# Откатываем счётчики для убранных
|
||||||
for word in word_paths.keys():
|
for word in words_removed:
|
||||||
|
await conn.execute("""
|
||||||
|
UPDATE word_usage
|
||||||
|
SET usage_count = GREATEST(0, usage_count - 1)
|
||||||
|
WHERE level_code = $1 AND word_pl = $2
|
||||||
|
""", level_code, word)
|
||||||
|
|
||||||
|
# Если счётчик = 0 — удаляем строку (чтобы не мусорить)
|
||||||
|
await conn.execute("""
|
||||||
|
DELETE FROM word_usage
|
||||||
|
WHERE level_code = $1 AND word_pl = $2 AND usage_count <= 0
|
||||||
|
""", level_code, word)
|
||||||
|
|
||||||
|
# Инкрементим для новых
|
||||||
|
for word in words_added:
|
||||||
await conn.execute("""
|
await conn.execute("""
|
||||||
INSERT INTO word_usage (level_code, word_pl, usage_count, last_used_at)
|
INSERT INTO word_usage (level_code, word_pl, usage_count, last_used_at)
|
||||||
VALUES ($1, $2, 1, NOW())
|
VALUES ($1, $2, 1, NOW())
|
||||||
ON CONFLICT (level_code, word_pl)
|
ON CONFLICT (level_code, word_pl)
|
||||||
DO UPDATE SET
|
DO UPDATE SET
|
||||||
|
usage_count = word_usage.usage_count + 1,
|
||||||
last_used_at = NOW()
|
last_used_at = NOW()
|
||||||
""", level_code, word)
|
""", level_code, word)
|
||||||
|
|
||||||
|
# Для пересечения — обновляем только last_used_at
|
||||||
|
for word in new_words & old_words:
|
||||||
|
await conn.execute("""
|
||||||
|
UPDATE word_usage
|
||||||
|
SET last_used_at = NOW()
|
||||||
|
WHERE level_code = $1 AND word_pl = $2
|
||||||
|
""", level_code, word)
|
||||||
|
|
||||||
logger.info(
|
logger.info(
|
||||||
f"[admin_wordsearch] level updated: id={level_id} "
|
f"[admin_wordsearch] level updated: id={level_id} "
|
||||||
f"({len(word_paths)} words, active={is_active}) "
|
f"({len(word_paths)} words, active={is_active}) "
|
||||||
|
|||||||
Reference in New Issue
Block a user