Author SHA1 Message Date
Drobysh bbca26826d Merge pull request '[Eva] **Цель:** превратить `support_screen.dar' (#55) from eva/chat-14ba33-backend into main
Reviewed-on: #55
2026-10-26 17:57:43 +00:00
Drobysh a679ca4e77 [Eva] schema: sentence_hints_used помечена устаревшей 2026-10-26 17:55:16 +00:00
Drobysh 871d7167e2 [Eva] reset: убрана sentence_hints_used из сброса 2026-10-26 17:55:07 +00:00
Drobysh 8fce00f1e1 [Eva] sentences: удалён эндпоинт /{id}/hint 2026-10-26 17:55:00 +00:00
Drobysh 17f7ed7370 [Eva] test_smoke: hint → show-answer (medium/hard/easy) 2026-10-26 17:54:56 +00:00
Drobysh 5fd4988985 Merge pull request '[Eva] **Цель:** превратить `support_screen.dar' (#54) from eva/chat-14ba33-backend into main
Reviewed-on: #54
2026-10-20 13:10:42 +00:00
Drobysh 361e2d9b61 [Eva] Убрать bubble_perfect_streak, добавить bubble_speed_10 2026-10-20 13:06:26 +00:00
Drobysh 73c88678dc [Eva] Убрать триггер bubble_no_mistakes 2026-10-20 13:06:16 +00:00
Drobysh e8a8d9f11e [Eva] Убрать триггер bubble_perfect 2026-10-20 13:06:06 +00:00
Drobysh 7d52b0232b [Eva] Заменить bubble_perfect_10 на bubble_speed_10 2026-10-20 13:05:55 +00:00
Drobysh 95058b2d3c [Eva] Заменить bubble_no_mistakes на bubble_words_1000 2026-10-20 13:05:38 +00:00
Drobysh 8a78368458 [Eva] Заменить bubble_perfect на bubble_streak_25 2026-10-20 13:05:28 +00:00
Drobysh 4598289f06 Merge pull request '[Eva] **Цель:** превратить `support_screen.dar' (#53) from eva/chat-14ba33-backend into main
Reviewed-on: #53
2026-10-19 11:09:08 +00:00
Drobysh 20674f0823 [Eva] Скрипт сброса прогресса и достижений пользователя 2026-10-19 11:06:55 +00:00
Drobysh 3d379c8357 Merge pull request '[Eva] Ева, привет! Новая задача: игра «Составь' (#52) from eva/chat-ec3e05-backend into main
Reviewed-on: #52
2026-10-16 11:59:54 +00:00
Drobysh bcf4db0ddb Merge pull request '[Eva] Ева, привет! Новая задача: игра «Составь' (#51) from eva/chat-ec3e05-backend into main
Reviewed-on: #51
2026-10-16 11:08:49 +00:00
Drobysh ce9f68ae51 Merge pull request '[Eva] Ева, привет! Новая задача: игра «Составь' (#50) from eva/chat-ec3e05-backend into main
Reviewed-on: #50
2026-10-16 10:59:05 +00:00
6 changed files with 249 additions and 83 deletions
+1 -1
View File
@@ -283,7 +283,7 @@
| wrong_because | character varying | YES | |
| edited_at | timestamp without time zone | YES | |
## sentence_hints_used
## sentence_hints_used ⚠️ устаревшая (не используется)
| Колонка | Тип | NULL | Default |
|---------|-----|------|---------|
+12 -12
View File
@@ -341,10 +341,10 @@ ACHIEVEMENTS_DATA = [
"desc_pl": "Ukończ poziom bez podpowiedzi", "desc_ru": "Пройти уровень без подсказок", "desc_uk": "Пройти рівень без підказок", "desc_en": "Complete a level without hints",
"type": "bubble_no_hints", "value": 1},
{"code": "bubble_perfect", "category": "bubblewords", "icon": "✨",
"name_pl": "Perfekcyjny", "name_ru": "Идеальный", "name_uk": "Ідеальний", "name_en": "Perfect",
"desc_pl": "Ukończ poziom z maksymalną punktacją (100)", "desc_ru": "Пройти уровень с максимальным счётом (100)", "desc_uk": "Пройти рівень з максимальним рахунком (100)", "desc_en": "Complete a level with maximum score (100)",
"type": "bubble_perfect", "value": 1},
{"code": "bubble_streak_25", "category": "bubblewords", "icon": "🔥",
"name_pl": "Dwadzieścia pięć z rzędu", "name_ru": "Двадцать пять подряд", "name_uk": "Двадцять п'ять поспіль", "name_en": "Twenty-Five in a Row",
"desc_pl": "Ukończ 25 poziomów z rzędu bez podpowiedzi", "desc_ru": "Пройти 25 уровней подряд без подсказок", "desc_uk": "Пройти 25 рівнів поспіль без підказок", "desc_en": "Complete 25 levels in a row without hints",
"type": "bubble_streak", "value": 25},
{"code": "bubble_speed", "category": "bubblewords", "icon": "🚀",
"name_pl": "Szybki bańki", "name_ru": "Быстрые пузыри", "name_uk": "Швидкі бульбашки", "name_en": "Fast Bubbles",
@@ -371,10 +371,10 @@ ACHIEVEMENTS_DATA = [
"desc_pl": "Zbierz 25 słów", "desc_ru": "Собрать 25 слов", "desc_uk": "Зібрати 25 слів", "desc_en": "Collect 25 words",
"type": "bubble_words", "value": 25},
{"code": "bubble_no_mistakes", "category": "bubblewords", "icon": "✨",
"name_pl": "Bezbłędny", "name_ru": "Без ошибок", "name_uk": "Без помилок", "name_en": "No Mistakes",
"desc_pl": "Ukończ poziom bez żadnej pomyłki", "desc_ru": "Пройти уровень без единой ошибки", "desc_uk": "Пройти рівень без жодної помилки", "desc_en": "Complete a level without any mistakes",
"type": "bubble_no_mistakes", "value": 1},
{"code": "bubble_words_1000", "category": "bubblewords", "icon": "📚",
"name_pl": "Tysiąc słów", "name_ru": "Тысяча слов", "name_uk": "Тисяча слів", "name_en": "Thousand Words",
"desc_pl": "Zbierz 1000 słów", "desc_ru": "Собрать 1000 слов", "desc_uk": "Зібрати 1000 слів", "desc_en": "Collect 1000 words",
"type": "bubble_words", "value": 1000},
{"code": "bubble_streak_3", "category": "bubblewords", "icon": "🔥",
"name_pl": "Seria", "name_ru": "Серия", "name_uk": "Серія", "name_en": "Streak",
@@ -406,10 +406,10 @@ ACHIEVEMENTS_DATA = [
"desc_pl": "Ukończ poziom w mniej niż 15 sekund", "desc_ru": "Пройти уровень быстрее 15 секунд", "desc_uk": "Пройти рівень швидше 15 секунд", "desc_en": "Complete a level in under 15 seconds",
"type": "bubble_speed_15", "value": 15},
{"code": "bubble_perfect_10", "category": "bubblewords", "icon": "🌟",
"name_pl": "Perfekcyjna seria", "name_ru": "Идеальная серия", "name_uk": "Ідеальна серія", "name_en": "Perfect Streak",
"desc_pl": "Ukończ 10 idealnych poziomów z rzędu", "desc_ru": "Пройти 10 идеальных уровней подряд", "desc_uk": "Пройти 10 ідеальних рівнів поспіль", "desc_en": "Complete 10 perfect levels in a row",
"type": "bubble_perfect_streak", "value": 10},
{"code": "bubble_speed_10", "category": "bubblewords", "icon": "⚡",
"name_pl": "Mgnienie", "name_ru": "Мгновение", "name_uk": "Миттєвість", "name_en": "Blink",
"desc_pl": "Ukończ poziom w mniej niż 10 sekund", "desc_ru": "Пройти уровень быстрее 10 секунд", "desc_uk": "Пройти рівень швидше 10 секунд", "desc_en": "Complete a level in under 10 seconds",
"type": "bubble_speed_10", "value": 10},
{"code": "bubble_words_500", "category": "bubblewords", "icon": "🏆",
"name_pl": "Pięćset słów", "name_ru": "Пятьсот слов", "name_uk": "П'ятсот слів", "name_en": "Five Hundred Words",
+3 -9
View File
@@ -436,8 +436,6 @@ async def complete_bubble_level(request: Request):
]
if hints_used == 0:
achievements_to_check.append(("bubble_no_hints", 1))
if hints_used == 0 and not list_opened and wrong_words == 0:
achievements_to_check.append(("bubble_perfect", 1))
if completion_time is not None and 0 < completion_time <= 45:
achievements_to_check.append(("bubble_speed_45", 45))
if completion_time is not None and 0 < completion_time <= 30:
@@ -447,10 +445,6 @@ async def complete_bubble_level(request: Request):
# bubble_words — всего слов собрано
achievements_to_check.append(("bubble_words", words_collected))
# bubble_no_mistakes — уровень без ошибок
if wrong_words == 0:
achievements_to_check.append(("bubble_no_mistakes", 1))
# bubble_streak — серия без подсказок (если > 0)
if no_hints_streak > 0:
achievements_to_check.append(("bubble_streak", no_hints_streak))
@@ -462,9 +456,9 @@ async def complete_bubble_level(request: Request):
if completion_time is not None and 0 < completion_time <= 15:
achievements_to_check.append(("bubble_speed_15", 15))
# bubble_perfect_streak — серия идеальных (если > 0)
if perfect_streak > 0:
achievements_to_check.append(("bubble_perfect_streak", perfect_streak))
# bubble_speed_10 — быстрее 10 сек
if completion_time is not None and 0 < completion_time <= 10:
achievements_to_check.append(("bubble_speed_10", 10))
# Достижения — вне транзакции
from routers.achievements import check_and_award_achievements
-33
View File
@@ -7,39 +7,6 @@ from database import get_pool
router = APIRouter(prefix="/sentences", tags=["sentences"])
@router.get("/{sentence_id}/hint")
async def get_sentence_hint(sentence_id: int, request: Request):
"""Получить правильное предложение в качестве подсказки (одноразово)"""
telegram_id, _ = await require_auth(request)
pool = await get_pool()
async with pool.acquire() as conn:
row = await conn.fetchrow(
"SELECT sentence_pl FROM sentences WHERE id = $1", sentence_id
)
if not row:
raise HTTPException(404, "Sentence not found")
# 🔧 ФИКС (24.09.2026): sentence_hint_no_limit — лимит 1 раз на предложение.
already_used = await conn.fetchval(
"SELECT 1 FROM sentence_hints_used WHERE user_id = $1 AND sentence_id = $2",
telegram_id, sentence_id
)
if already_used:
raise HTTPException(403, "Hint already used for this sentence")
# Записываем использование
await conn.execute("""
INSERT INTO sentence_hints_used (user_id, sentence_id)
VALUES ($1, $2)
ON CONFLICT (user_id, sentence_id) DO NOTHING
""", telegram_id, sentence_id)
return {
"sentence_pl": row["sentence_pl"],
}
def load_sentences_from_csv(filename):
"""Загружает предложения из CSV файла (формат: polish,english,russian,ukrainian)."""
sentences = []
+164
View File
@@ -0,0 +1,164 @@
#!/usr/bin/env python3
"""
Сброс прогресса и достижений пользователя (для теста «как новый юзер»).
Что делает:
- удаляет весь игровой прогресс (филворд, пузыри, угадай слово,
предложения, печать, обучение, XP-лог, серии, волны, статистику слов);
- удаляет выданные достижения (user_achievements);
- обнуляет XP в user_profile (total_xp, weekly_xp);
- сбрасывает users.last_completed_level, last_completed_by_level, current_level.
Что НЕ трогает:
- саму учётку (users: telegram_id, device_id, apple_id, source);
- настройки (difficulty, app_language);
- авторизацию (auth_identities);
- поддержку (support_tickets / support_messages).
Запуск (из папки backend/):
python scripts/reset_user_progress.py --telegram-id -1
python scripts/reset_user_progress.py --device-id 11111111-2222-3333-4444-555555555555
python scripts/reset_user_progress.py --all-pleily
python scripts/reset_user_progress.py --telegram-id -1 --yes # без подтверждения
Без --yes скрипт спросит подтверждение.
"""
import argparse
import asyncio
import logging
import sys
from pathlib import Path
sys.path.insert(0, str(Path(__file__).parent.parent))
from database import get_pool
logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
logger = logging.getLogger(__name__)
# Таблицы, где user_id = telegram_id. Чистим по каждому найденному юзеру.
USER_TABLES = [
"user_progress",
"sentence_progress",
"typing_progress",
"user_achievements",
"daily_logins",
"word_quiz_progress",
"bubble_words_progress",
"sentence_stats",
"choose_progress",
"user_seen_levels",
"user_game_progress",
"wave_results",
"user_seen_bubble_levels",
"user_word_stats",
"xp_log",
"typing_hints_used",
"chat_history",
"chat_usage",
"user_learning_answers",
"user_learning_answers_archive",
"user_lesson_progress",
"user_topic_progress",
"user_skill_mastery",
"learning_sessions",
"ai_user_context",
"teacher_chat_history",
"teacher_ai_usage",
]
async def resolve_user_ids(conn, telegram_id, device_id, all_pleily):
"""Возвращает список telegram_id, которых нужно сбросить."""
if telegram_id is not None:
row = await conn.fetchrow(
"SELECT telegram_id FROM users WHERE telegram_id = $1", telegram_id
)
if not row:
logger.error(f"❌ Пользователь с telegram_id={telegram_id} не найден")
return []
return [row["telegram_id"]]
if device_id is not None:
row = await conn.fetchrow(
"SELECT telegram_id FROM users WHERE device_id = $1::uuid", device_id
)
if not row:
logger.error(f"❌ Пользователь с device_id={device_id} не найден")
return []
return [row["telegram_id"]]
if all_pleily:
rows = await conn.fetch(
"SELECT telegram_id FROM users WHERE telegram_id < 0 OR source = 'pleily_device'"
)
return [r["telegram_id"] for r in rows]
return []
async def reset_user(conn, user_id: int) -> None:
"""Чистит прогресс одного пользователя в одной транзакции."""
async with conn.transaction():
for table in USER_TABLES:
await conn.execute(f"DELETE FROM {table} WHERE user_id = $1", user_id)
# Обнуляем XP-профиль (строку оставляем, чтобы не ломать FK).
await conn.execute(
"""
UPDATE user_profile
SET total_xp = 0, weekly_xp = 0, updated_at = NOW()
WHERE user_id = $1
""",
user_id,
)
# Сбрасываем прогресс уровней в users.
await conn.execute(
"""
UPDATE users
SET last_completed_level = 0,
last_completed_by_level = '{}'::jsonb,
current_level = 'A1'
WHERE telegram_id = $1
""",
user_id,
)
async def main() -> None:
parser = argparse.ArgumentParser(description="Сброс прогресса и достижений пользователя")
group = parser.add_mutually_exclusive_group(required=True)
group.add_argument("--telegram-id", type=int, help="telegram_id юзера (у Pleily отрицательный)")
group.add_argument("--device-id", type=str, help="UUID устройства (Pleily)")
group.add_argument("--all-pleily", action="store_true", help="сбросить ВСЕХ Pleily-юзеров")
parser.add_argument("--yes", action="store_true", help="не спрашивать подтверждение")
args = parser.parse_args()
pool = await get_pool()
async with pool.acquire() as conn:
user_ids = await resolve_user_ids(conn, args.telegram_id, args.device_id, args.all_pleily)
if not user_ids:
logger.warning("⚠️ Некого сбрасывать — выхожу")
return
logger.info(f"Найдено пользователей: {len(user_ids)} → {user_ids}")
if not args.yes:
answer = input(
f"Сбросить прогресс и достижения для {len(user_ids)} юзер(ов)? [y/N]: "
).strip().lower()
if answer not in ("y", "yes", "д", "да"):
logger.info("Отменено.")
return
for uid in user_ids:
await reset_user(conn, uid)
logger.info(f"✅ Сброшено: telegram_id={uid}")
logger.info("🎉 Готово! Можно тестировать как новый пользователь.")
if __name__ == "__main__":
asyncio.run(main())
+69 -28
View File
@@ -1966,44 +1966,85 @@ async def test_sentences_stats(smoke_user):
assert passed
async def test_sentences_hint(smoke_user, smoke_conn):
"""GET /sentences/{id}/hint → sentence_pl, лимит 1 раз."""
async def test_sentences_show_answer_medium(smoke_user, smoke_conn):
"""POST /sentences/show-answer — Medium: лимит 2 (200, 200, 403)."""
client = smoke_user
# Берём предложение, которое юзер ещё НЕ проходил и НЕ брал подсказку
sentence_id = await smoke_conn.fetchval("""
SELECT id FROM sentences
WHERE id NOT IN (
SELECT sentence_id FROM sentence_hints_used WHERE user_id = $1
)
ORDER BY id LIMIT 1
""", SMOKE_USER_ID)
await smoke_conn.execute(
"UPDATE users SET difficulty = 'medium' WHERE telegram_id = $1", SMOKE_USER_ID
)
sentence_id = await smoke_conn.fetchval("SELECT id FROM sentences ORDER BY id LIMIT 1")
if not sentence_id:
pytest.skip("Нет предложений для hint-теста")
pytest.skip("Нет предложений для show-answer теста")
return
# 1. Первый запрос — 200
resp1 = await client.get(f"/sentences/{sentence_id}/hint")
ok1 = resp1.status_code == 200
body1 = resp1.json() if ok1 else {}
has_sentence = bool(body1.get("sentence_pl"))
# 2. Проверка в БД
recorded = await smoke_conn.fetchval(
"SELECT 1 FROM sentence_hints_used WHERE user_id = $1 AND sentence_id = $2",
# Чистим list_opened, чтобы начать с 0
await smoke_conn.execute(
"DELETE FROM sentence_progress WHERE user_id = $1 AND sentence_id = $2",
SMOKE_USER_ID, sentence_id,
) is not None
)
# 3. Второй запрос — 403 (лимит)
resp2 = await client.get(f"/sentences/{sentence_id}/hint")
limit_ok = resp2.status_code == 403
resp1 = await client.post("/sentences/show-answer", json={"sentence_id": sentence_id})
resp2 = await client.post("/sentences/show-answer", json={"sentence_id": sentence_id})
resp3 = await client.post("/sentences/show-answer", json={"sentence_id": sentence_id})
passed = ok1 and has_sentence and recorded and limit_ok
passed = resp1.status_code == 200 and resp2.status_code == 200 and resp3.status_code == 403
RESULTS.append(ScenarioResult(
"sentences_hint", "sentences", passed,
f"first={resp1.status_code}, recorded={recorded}, second={resp2.status_code} (ожидали 403)",
{"first_status": resp1.status_code, "recorded": recorded, "second_status": resp2.status_code},
"sentences_show_answer_medium", "sentences", passed,
f"medium: 1={resp1.status_code}, 2={resp2.status_code}, 3={resp3.status_code} (ожидали 200/200/403)",
{"first": resp1.status_code, "second": resp2.status_code, "third": resp3.status_code},
))
assert passed
async def test_sentences_show_answer_hard(smoke_user, smoke_conn):
"""POST /sentences/show-answer — Hard: сразу 403."""
client = smoke_user
await smoke_conn.execute(
"UPDATE users SET difficulty = 'hard' WHERE telegram_id = $1", SMOKE_USER_ID
)
sentence_id = await smoke_conn.fetchval("SELECT id FROM sentences ORDER BY id LIMIT 1")
if not sentence_id:
pytest.skip("Нет предложений для show-answer теста")
return
resp = await client.post("/sentences/show-answer", json={"sentence_id": sentence_id})
passed = resp.status_code == 403
RESULTS.append(ScenarioResult(
"sentences_show_answer_hard", "sentences", passed,
f"hard: status={resp.status_code} (ожидали 403)",
{"status": resp.status_code},
))
assert passed
async def test_sentences_show_answer_easy(smoke_user, smoke_conn):
"""POST /sentences/show-answer — Easy: без лимита (несколько 200)."""
client = smoke_user
await smoke_conn.execute(
"UPDATE users SET difficulty = 'easy' WHERE telegram_id = $1", SMOKE_USER_ID
)
sentence_id = await smoke_conn.fetchval("SELECT id FROM sentences ORDER BY id LIMIT 1")
if not sentence_id:
pytest.skip("Нет предложений для show-answer теста")
return
statuses = []
for _ in range(3):
r = await client.post("/sentences/show-answer", json={"sentence_id": sentence_id})
statuses.append(r.status_code)
passed = all(s == 200 for s in statuses)
RESULTS.append(ScenarioResult(
"sentences_show_answer_easy", "sentences", passed,
f"easy: statuses={statuses} (ожидали все 200)",
{"statuses": statuses},
))
assert passed