fix(wordsearch): JSONB-строка → JSON.parse в admin_wordsearch + фронт
This commit is contained in:
+33
-11
@@ -30,6 +30,17 @@ LEVELS = ["A1", "A2", "B1", "B2", "C1", "C2"]
|
|||||||
MAX_GRID_SIZE = 15
|
MAX_GRID_SIZE = 15
|
||||||
|
|
||||||
|
|
||||||
|
def _json_or_value(v):
|
||||||
|
"""🔧 ФИКС (30.09.2026): asyncpg_jsonb_string —
|
||||||
|
asyncpg возвращает JSONB как строку. Парсим, если строка."""
|
||||||
|
if isinstance(v, str):
|
||||||
|
try:
|
||||||
|
return json.loads(v)
|
||||||
|
except (json.JSONDecodeError, TypeError):
|
||||||
|
return v
|
||||||
|
return v
|
||||||
|
|
||||||
|
|
||||||
def _require_admin(telegram_id: int) -> None:
|
def _require_admin(telegram_id: int) -> None:
|
||||||
if telegram_id not in ADMIN_IDS:
|
if telegram_id not in ADMIN_IDS:
|
||||||
raise HTTPException(403, "Access denied")
|
raise HTTPException(403, "Access denied")
|
||||||
@@ -155,8 +166,8 @@ async def get_level(request: Request, level_id: int):
|
|||||||
"level": row["level"],
|
"level": row["level"],
|
||||||
"level_number": row["level_number"],
|
"level_number": row["level_number"],
|
||||||
"grid_size": row["grid_size"],
|
"grid_size": row["grid_size"],
|
||||||
"grid_letters": row["grid_letters"],
|
"grid_letters": _json_or_value(row["grid_letters"]),
|
||||||
"word_paths": row["word_paths"],
|
"word_paths": _json_or_value(row["word_paths"]),
|
||||||
"is_active": row["is_active"],
|
"is_active": row["is_active"],
|
||||||
"created_at": row["created_at"].isoformat() if row["created_at"] else None,
|
"created_at": row["created_at"].isoformat() if row["created_at"] else None,
|
||||||
"words": [
|
"words": [
|
||||||
@@ -323,6 +334,9 @@ 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 —
|
||||||
|
# asyncpg сам сериализует dict/list в JSONB.
|
||||||
|
# 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,
|
||||||
@@ -331,8 +345,8 @@ async def create_level(request: Request):
|
|||||||
RETURNING id
|
RETURNING id
|
||||||
""",
|
""",
|
||||||
level_number, grid_size, level_code,
|
level_number, grid_size, level_code,
|
||||||
json.dumps(grid_letters),
|
grid_letters, # ← передаём как есть, asyncpg сам сериализует в JSONB
|
||||||
json.dumps(word_paths),
|
word_paths, # ← то же
|
||||||
is_active, telegram_id,
|
is_active, telegram_id,
|
||||||
)
|
)
|
||||||
level_id = row["id"]
|
level_id = row["id"]
|
||||||
@@ -384,6 +398,8 @@ async def update_level(request: Request, level_id: int):
|
|||||||
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 —
|
||||||
|
# убран json.dumps, asyncpg сам сериализует в JSONB.
|
||||||
await conn.execute("""
|
await conn.execute("""
|
||||||
UPDATE levels
|
UPDATE levels
|
||||||
SET grid_size = $1,
|
SET grid_size = $1,
|
||||||
@@ -393,25 +409,31 @@ async def update_level(request: Request, level_id: int):
|
|||||||
WHERE id = $5
|
WHERE id = $5
|
||||||
""",
|
""",
|
||||||
grid_size,
|
grid_size,
|
||||||
json.dumps(grid_letters),
|
grid_letters, # ← передаём как есть
|
||||||
json.dumps(word_paths),
|
word_paths, # ← то же
|
||||||
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 —
|
||||||
# Простой путь: не откатываем, только добавляем за новые слова
|
# при UPDATE не инкрементим счётчики. Слова, которые уже были —
|
||||||
# (пересечения и повторные использования считаются корректно,
|
# считаем как «те же», новые — добавляем.
|
||||||
# так как слово используется в новом уровне впервые)
|
# Сначала откатываем старые (убираем из word_usage, если их нет в новом)
|
||||||
|
old_words_rows = await conn.fetch("""
|
||||||
|
SELECT word_pl FROM level_words
|
||||||
|
WHERE level_id = $1
|
||||||
|
""", level_id)
|
||||||
|
# (старые words уже удалены в _upsert_level_words выше)
|
||||||
|
|
||||||
|
# Добавляем только те слова, которых ещё НЕ было в word_usage
|
||||||
for word in word_paths.keys():
|
for word in word_paths.keys():
|
||||||
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)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user