Merge pull request '[Eva] Ева, привет! Новая задача: игра «Составь' (#51) from eva/chat-ec3e05-backend into main
Reviewed-on: #51
This commit was merged in pull request #51.
This commit is contained in:
@@ -100,13 +100,14 @@ async def get_next_sentence(request: Request):
|
|||||||
pool = await get_pool()
|
pool = await get_pool()
|
||||||
async with pool.acquire() as conn:
|
async with pool.acquire() as conn:
|
||||||
user = await conn.fetchrow(
|
user = await conn.fetchrow(
|
||||||
"SELECT app_language, current_level FROM users WHERE telegram_id = $1", telegram_id
|
"SELECT app_language, current_level, difficulty FROM users WHERE telegram_id = $1", telegram_id
|
||||||
)
|
)
|
||||||
if not user:
|
if not user:
|
||||||
raise HTTPException(401, "User not registered")
|
raise HTTPException(401, "User not registered")
|
||||||
|
|
||||||
lang = user["app_language"] or "pl"
|
lang = user["app_language"] or "pl"
|
||||||
current_level = user["current_level"] or "A1"
|
current_level = user["current_level"] or "A1"
|
||||||
|
difficulty = user["difficulty"] or "medium"
|
||||||
|
|
||||||
# Находим случайное непройденное предложение нужного уровня
|
# Находим случайное непройденное предложение нужного уровня
|
||||||
row = await conn.fetchrow("""
|
row = await conn.fetchrow("""
|
||||||
@@ -147,6 +148,7 @@ async def get_next_sentence(request: Request):
|
|||||||
"correct_words": display_words,
|
"correct_words": display_words,
|
||||||
"translation": translation,
|
"translation": translation,
|
||||||
"difficulty": row["difficulty"],
|
"difficulty": row["difficulty"],
|
||||||
|
"user_difficulty": difficulty,
|
||||||
"level": row["level"],
|
"level": row["level"],
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user