feat(wordsearch): конструктор уровней + csv_words + word_usage + приоритет ручных в игре
This commit is contained in:
+19
-5
@@ -80,11 +80,25 @@ async def get_level(request: Request, level_number: int):
|
||||
if level_number > 1 and level_number > last_completed + 1:
|
||||
raise HTTPException(403, "Level not available yet. Complete previous level first.")
|
||||
|
||||
# Получаем уровень по его номеру ВНУТРИ выбранного уровня
|
||||
level = await conn.fetchrow(
|
||||
"SELECT * FROM levels WHERE level = $1 AND level_number = $2", current_level, level_number
|
||||
)
|
||||
|
||||
# 🔧 ФИКС (29.09.2026): приоритет ручным уровням.
|
||||
# Если есть уровень, созданный вручную (created_by IS NOT NULL) —
|
||||
# показываем его. Иначе — fallback на авто (created_by IS NULL).
|
||||
level = await conn.fetchrow("""
|
||||
SELECT * FROM levels
|
||||
WHERE level = $1 AND level_number = $2
|
||||
AND created_by IS NOT NULL
|
||||
LIMIT 1
|
||||
""", current_level, level_number)
|
||||
|
||||
# Fallback на авто, если ручного нет
|
||||
if not level:
|
||||
level = await conn.fetchrow("""
|
||||
SELECT * FROM levels
|
||||
WHERE level = $1 AND level_number = $2
|
||||
AND created_by IS NULL
|
||||
LIMIT 1
|
||||
""", current_level, level_number)
|
||||
|
||||
if not level:
|
||||
raise HTTPException(404, "Level not found")
|
||||
|
||||
|
||||
Reference in New Issue
Block a user