Author SHA1 Message Date
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 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 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 ba9a43dcfa [Eva] B5.4: /stats — убрать фильтр по уровню и поле level 2026-10-16 11:59:03 +00:00
Drobysh 3c9548540c [Eva] B5.3: database.py — UNIQUE(sentence_number) + перенумерация 2026-10-16 11:58:59 +00:00
Drobysh 5810eccde1 [Eva] B5.2: init_sentences — единый пул, сквозная нумерация 1..400 2026-10-16 11:58:53 +00:00
Drobysh 1df1119d11 [Eva] B5.1: /next — убрать фильтр по уровню (единый пул) 2026-10-16 11:58:50 +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 965d5d2503 [Eva] B4: добавляем user_difficulty в ответ /sentences/next 2026-10-16 11:08:03 +00:00
Drobysh a313c08b95 [Eva] B4: читаем difficulty юзера в /sentences/next 2026-10-16 11:08:00 +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
Drobysh 400cf375be [Eva] Добавляю идеальные серии и XP-достижения 2026-10-16 10:58:06 +00:00
Drobysh 11ef94a9bf [Eva] Добавляю sentence_speed_3 и серии без ошибок 2026-10-16 10:57:53 +00:00
Drobysh ed60a54e0c [Eva] Добавляю sentence_500 и sentence_1000 2026-10-16 10:57:42 +00:00
Drobysh 2d687904b0 [Eva] Удаляю 3 мёртвых достижения предложений 2026-10-16 10:57:12 +00:00
Drobysh c7ca0c97c2 [Eva] Sentence Builder: заголовок 10 → 20 2026-10-16 10:57:09 +00:00
Drobysh 3dfe34f18a [Eva] Добавляем 3 новых типа достижений в /check 2026-10-16 10:56:48 +00:00
Drobysh 61fbbe55e8 [Eva] Читаем sentence_stats для достижений 2026-10-16 10:56:45 +00:00
Drobysh 7cbde183ff [Eva] B2.3: убрать stars из ответа (KeyError) 2026-10-16 10:49:07 +00:00
Drobysh da3f1567a8 [Eva] B2.3: формула очков по сложности + серии в sentence_stats 2026-10-16 10:49:00 +00:00
Drobysh 82eb9208d8 [Eva] B2.3: already_completed по completed_at IS NOT NULL 2026-10-16 10:48:50 +00:00
Drobysh 5b2dbc0d42 [Eva] B2.2: новый эндпоинт POST /sentences/show-answer 2026-10-16 10:48:37 +00:00
Drobysh 3548654d6a [Eva] B2.1: /next создаёт строку прогресса (in-progress) 2026-10-16 10:48:26 +00:00
Drobysh 4e78c32c18 [Eva] B2.1: /next исключает только завершённые предложения 2026-10-16 10:48:17 +00:00
Drobysh 5be242aafd [Eva] Добавлена таблица sentence_stats + идемпотентные миграции 2026-10-16 10:46:30 +00:00
Drobysh 10242f89b3 [Eva] B1: миграции sentence_progress (list_opened, no_mistakes_streak, perfect_streak, completion_time) 2026-10-16 10:37:29 +00:00
Drobysh 299c4e2fd5 Merge pull request '[Eva] Ева, критичный фикс в wordquiz.py — 500' (#49) from eva/chat-55df46-backend into main
Reviewed-on: #49
2026-10-15 17:46:02 +00:00
7 changed files with 577 additions and 144 deletions
+134 -5
View File
@@ -258,20 +258,31 @@ async def init_db():
) )
""") """)
# ============ Убираем старый UNIQUE constraint с sentences.sentence_number ============ # ============ Убираем составной UNIQUE (level, sentence_number) ============
await conn.execute(""" await conn.execute("""
ALTER TABLE sentences DROP CONSTRAINT IF EXISTS sentences_sentence_number_key ALTER TABLE sentences DROP CONSTRAINT IF EXISTS sentences_sentence_number_unique
""") """)
# ============ Добавляем составной UNIQUE (level, sentence_number) ============ # ============ Пересчёт номеров: единый пул 1..N ============
await conn.execute("""
UPDATE sentences s
SET sentence_number = sub.rn
FROM (
SELECT id, ROW_NUMBER() OVER (ORDER BY id) AS rn
FROM sentences
) sub
WHERE s.id = sub.id
""")
# ============ Добавляем UNIQUE (sentence_number) ============
await conn.execute(""" await conn.execute("""
DO $$ DO $$
BEGIN BEGIN
IF NOT EXISTS ( IF NOT EXISTS (
SELECT 1 FROM pg_constraint SELECT 1 FROM pg_constraint
WHERE conname = 'sentences_sentence_number_unique' WHERE conname = 'sentences_sentence_number_key'
) THEN ) THEN
ALTER TABLE sentences ADD CONSTRAINT sentences_sentence_number_unique UNIQUE (level, sentence_number); ALTER TABLE sentences ADD CONSTRAINT sentences_sentence_number_key UNIQUE (sentence_number);
END IF; END IF;
END $$; END $$;
""") """)
@@ -300,6 +311,60 @@ async def init_db():
""") """)
logger.info("Added level column to sentence_progress") logger.info("Added level column to sentence_progress")
# 🔧 НОВОЕ (16.10.2026): list_opened — счётчик «показать предложение»
# для текущего предложения. Medium — лимит 2, Easy — ∞, Hard — 0.
col_exists = await conn.fetchval("""
SELECT 1 FROM information_schema.columns
WHERE table_name = 'sentence_progress' AND column_name = 'list_opened'
""")
if not col_exists:
await conn.execute("""
ALTER TABLE sentence_progress
ADD COLUMN list_opened INTEGER DEFAULT 0
""")
logger.info("Added list_opened column to sentence_progress")
# 🔧 НОВОЕ (16.10.2026): no_mistakes_streak — серия предложений без ошибок.
# +1 если предложение собрано без ошибок, иначе сброс в 0.
# Нужен для достижения sentence_no_mistakes.
col_exists = await conn.fetchval("""
SELECT 1 FROM information_schema.columns
WHERE table_name = 'sentence_progress' AND column_name = 'no_mistakes_streak'
""")
if not col_exists:
await conn.execute("""
ALTER TABLE sentence_progress
ADD COLUMN no_mistakes_streak INTEGER DEFAULT 0
""")
logger.info("Added no_mistakes_streak column to sentence_progress")
# 🔧 НОВОЕ (16.10.2026): perfect_streak — серия идеальных предложений
# (без ошибок + без показов). +1 если всё чисто, иначе сброс в 0.
# Нужен для достижения sentence_perfect_streak.
col_exists = await conn.fetchval("""
SELECT 1 FROM information_schema.columns
WHERE table_name = 'sentence_progress' AND column_name = 'perfect_streak'
""")
if not col_exists:
await conn.execute("""
ALTER TABLE sentence_progress
ADD COLUMN perfect_streak INTEGER DEFAULT 0
""")
logger.info("Added perfect_streak column to sentence_progress")
# 🔧 НОВОЕ (16.10.2026): completion_time — время прохождения последнего
# предложения (сек). Для статистики и бонуса Hard (≤15 сек).
col_exists = await conn.fetchval("""
SELECT 1 FROM information_schema.columns
WHERE table_name = 'sentence_progress' AND column_name = 'completion_time'
""")
if not col_exists:
await conn.execute("""
ALTER TABLE sentence_progress
ADD COLUMN completion_time INTEGER DEFAULT 0
""")
logger.info("Added completion_time column to sentence_progress")
# ============ typing_progress ============ # ============ typing_progress ============
await conn.execute(""" await conn.execute("""
CREATE TABLE IF NOT EXISTS typing_progress ( CREATE TABLE IF NOT EXISTS typing_progress (
@@ -993,6 +1058,70 @@ async def init_db():
""") """)
logger.info("Added perfect_streak column to bubble_words_progress") logger.info("Added perfect_streak column to bubble_words_progress")
# ============ sentence_stats ============
# 🔧 НОВОЕ (16.10.2026): глобальная статистика игры «Составь предложение».
# PK = user_id (одна строка на юзера), по образцу word_quiz_progress.
# total_score — суммарные очки; no_mistakes_streak / perfect_streak —
# серии для достижений sentence_no_mistakes / sentence_perfect_streak.
await conn.execute("""
CREATE TABLE IF NOT EXISTS sentence_stats (
user_id BIGINT PRIMARY KEY
REFERENCES users(telegram_id) ON DELETE CASCADE,
total_score INTEGER DEFAULT 0,
no_mistakes_streak INTEGER DEFAULT 0,
perfect_streak INTEGER DEFAULT 0,
updated_at TIMESTAMP DEFAULT NOW()
)
""")
# ============ Авто-миграция: total_score ============
col_exists = await conn.fetchval("""
SELECT 1 FROM information_schema.columns
WHERE table_name = 'sentence_stats' AND column_name = 'total_score'
""")
if not col_exists:
await conn.execute("""
ALTER TABLE sentence_stats
ADD COLUMN total_score INTEGER DEFAULT 0
""")
logger.info("Added total_score column to sentence_stats")
# ============ Авто-миграция: no_mistakes_streak ============
col_exists = await conn.fetchval("""
SELECT 1 FROM information_schema.columns
WHERE table_name = 'sentence_stats' AND column_name = 'no_mistakes_streak'
""")
if not col_exists:
await conn.execute("""
ALTER TABLE sentence_stats
ADD COLUMN no_mistakes_streak INTEGER DEFAULT 0
""")
logger.info("Added no_mistakes_streak column to sentence_stats")
# ============ Авто-миграция: perfect_streak ============
col_exists = await conn.fetchval("""
SELECT 1 FROM information_schema.columns
WHERE table_name = 'sentence_stats' AND column_name = 'perfect_streak'
""")
if not col_exists:
await conn.execute("""
ALTER TABLE sentence_stats
ADD COLUMN perfect_streak INTEGER DEFAULT 0
""")
logger.info("Added perfect_streak column to sentence_stats")
# ============ Авто-миграция: updated_at ============
col_exists = await conn.fetchval("""
SELECT 1 FROM information_schema.columns
WHERE table_name = 'sentence_stats' AND column_name = 'updated_at'
""")
if not col_exists:
await conn.execute("""
ALTER TABLE sentence_stats
ADD COLUMN updated_at TIMESTAMP DEFAULT NOW()
""")
logger.info("Added updated_at column to sentence_stats")
# ============ wrong_because_explanations ============ # ============ wrong_because_explanations ============
await conn.execute(""" await conn.execute("""
CREATE TABLE IF NOT EXISTS wrong_because_explanations ( CREATE TABLE IF NOT EXISTS wrong_because_explanations (
+1 -1
View File
@@ -283,7 +283,7 @@
| wrong_because | character varying | YES | | | wrong_because | character varying | YES | |
| edited_at | timestamp without time zone | YES | | | edited_at | timestamp without time zone | YES | |
## sentence_hints_used ## sentence_hints_used ⚠️ устаревшая (не используется)
| Колонка | Тип | NULL | Default | | Колонка | Тип | NULL | Default |
|---------|-----|------|---------| |---------|-----|------|---------|
+76 -25
View File
@@ -112,7 +112,7 @@ ACHIEVEMENTS_DATA = [
"desc_pl": "Zdobądź 10 000 XP w filwordach", "desc_ru": "Набрать 10 000 XP в филвордах", "desc_uk": "Набрати 10 000 XP у філвордах", "desc_en": "Earn 10,000 XP in word searches", "desc_pl": "Zdobądź 10 000 XP w filwordach", "desc_ru": "Набрать 10 000 XP в филвордах", "desc_uk": "Набрати 10 000 XP у філвордах", "desc_en": "Earn 10,000 XP in word searches",
"type": "wordsearch_xp", "value": 10000}, "type": "wordsearch_xp", "value": 10000},
# ===== Sentence Builder (10) ===== # ===== Sentence Builder (20) =====
{"code": "first_sentence", "category": "sentence", "icon": "📝", {"code": "first_sentence", "category": "sentence", "icon": "📝",
"name_pl": "Debiutant", "name_ru": "Дебютант", "name_uk": "Дебютант", "name_en": "Debutant", "name_pl": "Debiutant", "name_ru": "Дебютант", "name_uk": "Дебютант", "name_en": "Debutant",
"desc_pl": "Ułóż 1 zdanie", "desc_ru": "Составить 1 предложение", "desc_uk": "Скласти 1 речення", "desc_en": "Build 1 sentence", "desc_pl": "Ułóż 1 zdanie", "desc_ru": "Составить 1 предложение", "desc_uk": "Скласти 1 речення", "desc_en": "Build 1 sentence",
@@ -138,20 +138,16 @@ ACHIEVEMENTS_DATA = [
"desc_pl": "Ułóż 200 zdań", "desc_ru": "Составить 200 предложений", "desc_uk": "Скласти 200 речень", "desc_en": "Build 200 sentences", "desc_pl": "Ułóż 200 zdań", "desc_ru": "Составить 200 предложений", "desc_uk": "Скласти 200 речень", "desc_en": "Build 200 sentences",
"type": "sentences_completed", "value": 200}, "type": "sentences_completed", "value": 200},
{"code": "perfect_sentence_5", "category": "sentence", "icon": "✨", {"code": "sentence_500", "category": "sentence", "icon": "🌟",
"name_pl": "Perfekcjonista", "name_ru": "Перфекционист", "name_uk": "Перфекціоніст", "name_en": "Perfectionist", "name_pl": "Legenda zdań", "name_ru": "Легенда предложений", "name_uk": "Легенда речень", "name_en": "Sentence Legend",
"desc_pl": "Ułóż 5 zdań bez błędu", "desc_ru": "Составить 5 предложений без единой ошибки", "desc_uk": "Скласти 5 речень без жодної помилки", "desc_en": "Build 5 sentences without mistakes", "desc_pl": "Ułóż 500 zdań", "desc_ru": "Составить 500 предложений", "desc_uk": "Скласти 500 речень", "desc_en": "Build 500 sentences",
"type": "perfect_sentences", "value": 5}, "type": "sentences_completed", "value": 500},
{"code": "sentence_perfect_10", "category": "sentence", "icon": "💎", {"code": "sentence_1000", "category": "sentence", "icon": "👑",
"name_pl": "Mistrz zdań", "name_ru": "Мастер предложений", "name_uk": "Майстер речень", "name_en": "Sentence Master", "name_pl": "Guru zdań", "name_ru": "Гуру предложений", "name_uk": "Гуру речень", "name_en": "Sentence Guru",
"desc_pl": "Ułóż 10 zdań bez błędu", "desc_ru": "Составить 10 предложений без ошибок", "desc_uk": "Скласти 10 речень без помилок", "desc_en": "Build 10 sentences without mistakes", "desc_pl": "Ułóż 1000 zdań", "desc_ru": "Составить 1000 предложений", "desc_uk": "Скласти 1000 речень", "desc_en": "Build 1000 sentences",
"type": "perfect_sentences", "value": 10}, "type": "sentences_completed", "value": 1000},
{"code": "sentence_streak_10", "category": "sentence", "icon": "💪",
"name_pl": "Nieomylny", "name_ru": "Безошибочный", "name_uk": "Безпомилковий", "name_en": "Flawless",
"desc_pl": "Ułóż 10 zdań z rzędu bez błędu", "desc_ru": "Составить 10 предложений подряд без ошибок", "desc_uk": "Скласти 10 речень поспіль без помилок", "desc_en": "Build 10 sentences in a row without mistakes",
"type": "sentence_streak", "value": 10},
{"code": "speed_10", "category": "sentence", "icon": "🚀", {"code": "speed_10", "category": "sentence", "icon": "🚀",
"name_pl": "Turbo", "name_ru": "Турбо", "name_uk": "Турбо", "name_en": "Turbo", "name_pl": "Turbo", "name_ru": "Турбо", "name_uk": "Турбо", "name_en": "Turbo",
@@ -163,6 +159,61 @@ ACHIEVEMENTS_DATA = [
"desc_pl": "Ułóż zdanie w mniej niż 5 sekund", "desc_ru": "Составить предложение быстрее 5 секунд", "desc_uk": "Скласти речення швидше 5 секунд", "desc_en": "Build a sentence in under 5 seconds", "desc_pl": "Ułóż zdanie w mniej niż 5 sekund", "desc_ru": "Составить предложение быстрее 5 секунд", "desc_uk": "Скласти речення швидше 5 секунд", "desc_en": "Build a sentence in under 5 seconds",
"type": "speed_sentence", "value": 5}, "type": "speed_sentence", "value": 5},
{"code": "sentence_speed_3", "category": "sentence", "icon": "⚡",
"name_pl": "Błyskawica", "name_ru": "Молния", "name_uk": "Блискавка", "name_en": "Lightning",
"desc_pl": "Ułóż zdanie w mniej niż 3 sekundy", "desc_ru": "Составить предложение быстрее 3 секунд", "desc_uk": "Скласти речення швидше 3 секунд", "desc_en": "Build a sentence in under 3 seconds",
"type": "speed_sentence", "value": 3},
{"code": "sentence_no_mistakes_5", "category": "sentence", "icon": "✨",
"name_pl": "Bezbłędny", "name_ru": "Безошибочный", "name_uk": "Безпомилковий", "name_en": "Flawless",
"desc_pl": "Ułóż 5 zdań bez błędu z rzędu", "desc_ru": "Составить 5 предложений без ошибок подряд", "desc_uk": "Скласти 5 речень без помилок поспіль", "desc_en": "Build 5 sentences without mistakes in a row",
"type": "sentence_no_mistakes", "value": 5},
{"code": "sentence_no_mistakes_10", "category": "sentence", "icon": "💎",
"name_pl": "Nieomylny", "name_ru": "Безошибочный", "name_uk": "Безпомилковий", "name_en": "Infallible",
"desc_pl": "Ułóż 10 zdań bez błędu z rzędu", "desc_ru": "Составить 10 предложений без ошибок подряд", "desc_uk": "Скласти 10 речень без помилок поспіль", "desc_en": "Build 10 sentences without mistakes in a row",
"type": "sentence_no_mistakes", "value": 10},
{"code": "sentence_no_mistakes_25", "category": "sentence", "icon": "🏆",
"name_pl": "Mistrz czystości", "name_ru": "Мастер чистоты", "name_uk": "Майстер чистоти", "name_en": "Pure Master",
"desc_pl": "Ułóż 25 zdań bez błędu z rzędu", "desc_ru": "Составить 25 предложений без ошибок подряд", "desc_uk": "Скласти 25 речень без помилок поспіль", "desc_en": "Build 25 sentences without mistakes in a row",
"type": "sentence_no_mistakes", "value": 25},
{"code": "sentence_no_mistakes_50", "category": "sentence", "icon": "👑",
"name_pl": "Król czystości", "name_ru": "Король чистоты", "name_uk": "Король чистоти", "name_en": "Pure King",
"desc_pl": "Ułóż 50 zdań bez błędu z rzędu", "desc_ru": "Составить 50 предложений без ошибок подряд", "desc_uk": "Скласти 50 речень без помилок поспіль", "desc_en": "Build 50 sentences without mistakes in a row",
"type": "sentence_no_mistakes", "value": 50},
{"code": "sentence_perfect_streak_5", "category": "sentence", "icon": "✨",
"name_pl": "Perfekcyjna seria", "name_ru": "Идеальная серия", "name_uk": "Ідеальна серія", "name_en": "Perfect Streak",
"desc_pl": "Ułóż 5 idealnych zdań z rzędu", "desc_ru": "Составить 5 идеальных предложений подряд", "desc_uk": "Скласти 5 ідеальних речень поспіль", "desc_en": "Build 5 perfect sentences in a row",
"type": "sentence_perfect_streak", "value": 5},
{"code": "sentence_perfect_streak_10", "category": "sentence", "icon": "💎",
"name_pl": "Mistrz perfekcji", "name_ru": "Мастер идеала", "name_uk": "Майстер ідеалу", "name_en": "Perfection Master",
"desc_pl": "Ułóż 10 idealnych zdań z rzędu", "desc_ru": "Составить 10 идеальных предложений подряд", "desc_uk": "Скласти 10 ідеальних речень поспіль", "desc_en": "Build 10 perfect sentences in a row",
"type": "sentence_perfect_streak", "value": 10},
{"code": "sentence_perfect_streak_25", "category": "sentence", "icon": "🏆",
"name_pl": "Perfekcjonista", "name_ru": "Перфекционист", "name_uk": "Перфекціоніст", "name_en": "Perfectionist",
"desc_pl": "Ułóż 25 idealnych zdań z rzędu", "desc_ru": "Составить 25 идеальных предложений подряд", "desc_uk": "Скласти 25 ідеальних речень поспіль", "desc_en": "Build 25 perfect sentences in a row",
"type": "sentence_perfect_streak", "value": 25},
{"code": "sentence_perfect_streak_50", "category": "sentence", "icon": "👑",
"name_pl": "Idealny król", "name_ru": "Идеальный король", "name_uk": "Ідеальний король", "name_en": "Perfect King",
"desc_pl": "Ułóż 50 idealnych zdań z rzędu", "desc_ru": "Составить 50 идеальных предложений подряд", "desc_uk": "Скласти 50 ідеальних речень поспіль", "desc_en": "Build 50 perfect sentences in a row",
"type": "sentence_perfect_streak", "value": 50},
{"code": "sentence_xp_1000", "category": "sentence", "icon": "💎",
"name_pl": "Zdaniowy XP", "name_ru": "XP предложений", "name_uk": "XP речень", "name_en": "Sentence XP",
"desc_pl": "Zdobądź 1000 punktów w zdaniach", "desc_ru": "Набрать 1000 очков в предложениях", "desc_uk": "Набрати 1000 балів у реченнях", "desc_en": "Earn 1000 points in sentences",
"type": "sentence_xp", "value": 1000},
{"code": "sentence_xp_5000", "category": "sentence", "icon": "👑",
"name_pl": "Zdaniowy diament", "name_ru": "Бриллиант предложений", "name_uk": "Діамант речень", "name_en": "Sentence Diamond",
"desc_pl": "Zdobądź 5000 punktów w zdaniach", "desc_ru": "Набрать 5000 очков в предложениях", "desc_uk": "Набрати 5000 балів у реченнях", "desc_en": "Earn 5000 points in sentences",
"type": "sentence_xp", "value": 5000},
# ===== Word Quiz (20) ===== # ===== Word Quiz (20) =====
{"code": "quiz_10", "category": "wordquiz", "icon": "🧠", {"code": "quiz_10", "category": "wordquiz", "icon": "🧠",
"name_pl": "Myśliciel", "name_ru": "Мыслитель", "name_uk": "Мислитель", "name_en": "Thinker", "name_pl": "Myśliciel", "name_ru": "Мыслитель", "name_uk": "Мислитель", "name_en": "Thinker",
@@ -290,10 +341,10 @@ ACHIEVEMENTS_DATA = [
"desc_pl": "Ukończ poziom bez podpowiedzi", "desc_ru": "Пройти уровень без подсказок", "desc_uk": "Пройти рівень без підказок", "desc_en": "Complete a level without hints", "desc_pl": "Ukończ poziom bez podpowiedzi", "desc_ru": "Пройти уровень без подсказок", "desc_uk": "Пройти рівень без підказок", "desc_en": "Complete a level without hints",
"type": "bubble_no_hints", "value": 1}, "type": "bubble_no_hints", "value": 1},
{"code": "bubble_perfect", "category": "bubblewords", "icon": "✨", {"code": "bubble_streak_25", "category": "bubblewords", "icon": "🔥",
"name_pl": "Perfekcyjny", "name_ru": "Идеальный", "name_uk": "Ідеальний", "name_en": "Perfect", "name_pl": "Dwadzieścia pięć z rzędu", "name_ru": "Двадцать пять подряд", "name_uk": "Двадцять п'ять поспіль", "name_en": "Twenty-Five in a Row",
"desc_pl": "Ukończ poziom z maksymalną punktacją (100)", "desc_ru": "Пройти уровень с максимальным счётом (100)", "desc_uk": "Пройти рівень з максимальним рахунком (100)", "desc_en": "Complete a level with maximum score (100)", "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_perfect", "value": 1}, "type": "bubble_streak", "value": 25},
{"code": "bubble_speed", "category": "bubblewords", "icon": "🚀", {"code": "bubble_speed", "category": "bubblewords", "icon": "🚀",
"name_pl": "Szybki bańki", "name_ru": "Быстрые пузыри", "name_uk": "Швидкі бульбашки", "name_en": "Fast Bubbles", "name_pl": "Szybki bańki", "name_ru": "Быстрые пузыри", "name_uk": "Швидкі бульбашки", "name_en": "Fast Bubbles",
@@ -320,10 +371,10 @@ ACHIEVEMENTS_DATA = [
"desc_pl": "Zbierz 25 słów", "desc_ru": "Собрать 25 слов", "desc_uk": "Зібрати 25 слів", "desc_en": "Collect 25 words", "desc_pl": "Zbierz 25 słów", "desc_ru": "Собрать 25 слов", "desc_uk": "Зібрати 25 слів", "desc_en": "Collect 25 words",
"type": "bubble_words", "value": 25}, "type": "bubble_words", "value": 25},
{"code": "bubble_no_mistakes", "category": "bubblewords", "icon": "✨", {"code": "bubble_words_1000", "category": "bubblewords", "icon": "📚",
"name_pl": "Bezbłędny", "name_ru": "Без ошибок", "name_uk": "Без помилок", "name_en": "No Mistakes", "name_pl": "Tysiąc słów", "name_ru": "Тысяча слов", "name_uk": "Тисяча слів", "name_en": "Thousand Words",
"desc_pl": "Ukończ poziom bez żadnej pomyłki", "desc_ru": "Пройти уровень без единой ошибки", "desc_uk": "Пройти рівень без жодної помилки", "desc_en": "Complete a level without any mistakes", "desc_pl": "Zbierz 1000 słów", "desc_ru": "Собрать 1000 слов", "desc_uk": "Зібрати 1000 слів", "desc_en": "Collect 1000 words",
"type": "bubble_no_mistakes", "value": 1}, "type": "bubble_words", "value": 1000},
{"code": "bubble_streak_3", "category": "bubblewords", "icon": "🔥", {"code": "bubble_streak_3", "category": "bubblewords", "icon": "🔥",
"name_pl": "Seria", "name_ru": "Серия", "name_uk": "Серія", "name_en": "Streak", "name_pl": "Seria", "name_ru": "Серия", "name_uk": "Серія", "name_en": "Streak",
@@ -355,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", "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}, "type": "bubble_speed_15", "value": 15},
{"code": "bubble_perfect_10", "category": "bubblewords", "icon": "🌟", {"code": "bubble_speed_10", "category": "bubblewords", "icon": "⚡",
"name_pl": "Perfekcyjna seria", "name_ru": "Идеальная серия", "name_uk": "Ідеальна серія", "name_en": "Perfect Streak", "name_pl": "Mgnienie", "name_ru": "Мгновение", "name_uk": "Миттєвість", "name_en": "Blink",
"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", "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_perfect_streak", "value": 10}, "type": "bubble_speed_10", "value": 10},
{"code": "bubble_words_500", "category": "bubblewords", "icon": "🏆", {"code": "bubble_words_500", "category": "bubblewords", "icon": "🏆",
"name_pl": "Pięćset słów", "name_ru": "Пятьсот слов", "name_uk": "П'ятсот слів", "name_en": "Five Hundred Words", "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: if hints_used == 0:
achievements_to_check.append(("bubble_no_hints", 1)) 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: if completion_time is not None and 0 < completion_time <= 45:
achievements_to_check.append(("bubble_speed_45", 45)) achievements_to_check.append(("bubble_speed_45", 45))
if completion_time is not None and 0 < completion_time <= 30: if completion_time is not None and 0 < completion_time <= 30:
@@ -447,10 +445,6 @@ async def complete_bubble_level(request: Request):
# bubble_words — всего слов собрано # bubble_words — всего слов собрано
achievements_to_check.append(("bubble_words", words_collected)) 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) # bubble_streak — серия без подсказок (если > 0)
if no_hints_streak > 0: if no_hints_streak > 0:
achievements_to_check.append(("bubble_streak", no_hints_streak)) 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: if completion_time is not None and 0 < completion_time <= 15:
achievements_to_check.append(("bubble_speed_15", 15)) achievements_to_check.append(("bubble_speed_15", 15))
# bubble_perfect_streak — серия идеальных (если > 0) # bubble_speed_10 — быстрее 10 сек
if perfect_streak > 0: if completion_time is not None and 0 < completion_time <= 10:
achievements_to_check.append(("bubble_perfect_streak", perfect_streak)) achievements_to_check.append(("bubble_speed_10", 10))
# Достижения — вне транзакции # Достижения — вне транзакции
from routers.achievements import check_and_award_achievements from routers.achievements import check_and_award_achievements
+130 -76
View File
@@ -7,39 +7,6 @@ from database import get_pool
router = APIRouter(prefix="/sentences", tags=["sentences"]) 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): def load_sentences_from_csv(filename):
"""Загружает предложения из CSV файла (формат: polish,english,russian,ukrainian).""" """Загружает предложения из CSV файла (формат: polish,english,russian,ukrainian)."""
sentences = [] sentences = []
@@ -65,6 +32,7 @@ async def init_sentences():
("B1", "sentences_b1.csv"), ("B1", "sentences_b1.csv"),
] ]
offset = 0
for level, filename in level_files: for level, filename in level_files:
sentences = load_sentences_from_csv(filename) sentences = load_sentences_from_csv(filename)
for i, s in enumerate(sentences): for i, s in enumerate(sentences):
@@ -74,11 +42,12 @@ async def init_sentences():
await conn.execute( await conn.execute(
"""INSERT INTO sentences (sentence_number, sentence_pl, translation_ru, translation_uk, translation_en, difficulty, level) """INSERT INTO sentences (sentence_number, sentence_pl, translation_ru, translation_uk, translation_en, difficulty, level)
VALUES ($1, $2, $3, $4, $5, $6, $7) VALUES ($1, $2, $3, $4, $5, $6, $7)
ON CONFLICT (level, sentence_number) DO NOTHING""", ON CONFLICT (sentence_number) DO NOTHING""",
i + 1, s["sentence_pl"], offset + i + 1, s["sentence_pl"],
s["translation_ru"], s["translation_uk"], s["translation_en"], s["translation_ru"], s["translation_uk"], s["translation_en"],
difficulty, level difficulty, level
) )
offset += len(sentences)
def normalize_word_for_display(word: str) -> str: def normalize_word_for_display(word: str) -> str:
@@ -100,28 +69,34 @@ 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, 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" difficulty = user["difficulty"] or "medium"
# Находим случайное непройденное предложение нужного уровня # Находим случайное непройденное предложение (единый пул)
row = await conn.fetchrow(""" row = await conn.fetchrow("""
SELECT s.* FROM sentences s SELECT s.* FROM sentences s
WHERE s.level = $1 WHERE s.id NOT IN (
AND s.id NOT IN ( SELECT sentence_id FROM sentence_progress WHERE user_id = $1 AND completed_at IS NOT NULL
SELECT sentence_id FROM sentence_progress WHERE user_id = $2
) )
ORDER BY RANDOM() ORDER BY RANDOM()
LIMIT 1 LIMIT 1
""", current_level, telegram_id) """, telegram_id)
if not row: if not row:
return {"completed": True, "message": "All sentences completed!"} return {"completed": True, "message": "All sentences completed!"}
# 🔧 НОВОЕ (16.10.2026): строка прогресса (in-progress) для счётчика list_opened.
await conn.execute("""
INSERT INTO sentence_progress (user_id, sentence_id, list_opened, completion_time)
VALUES ($1, $2, 0, 0)
ON CONFLICT (user_id, sentence_id) DO NOTHING
""", telegram_id, row["id"])
# Оригинальные слова (для проверки) # Оригинальные слова (для проверки)
correct_words = row["sentence_pl"].split() correct_words = row["sentence_pl"].split()
@@ -140,10 +115,64 @@ 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"],
} }
@router.post("/show-answer")
async def show_answer(request: Request):
"""Подсказка «показать предложение». Easy — ∞ бесплатно, Medium — 2 раза × −20, Hard — 403."""
telegram_id, _ = await require_auth(request)
body = await request.json()
sentence_id = body.get("sentence_id")
if not sentence_id:
raise HTTPException(400, "sentence_id required")
pool = await get_pool()
async with pool.acquire() as conn:
user = await conn.fetchrow(
"SELECT difficulty FROM users WHERE telegram_id = $1", telegram_id
)
if not user:
raise HTTPException(401, "User not registered")
difficulty = user["difficulty"] or "medium"
row = await conn.fetchrow(
"SELECT sentence_pl FROM sentences WHERE id = $1", sentence_id
)
if not row:
raise HTTPException(404, "Sentence not found")
if difficulty == "hard":
raise HTTPException(403, "Hints are disabled on Hard difficulty")
progress = await conn.fetchrow(
"SELECT list_opened FROM sentence_progress WHERE user_id = $1 AND sentence_id = $2",
telegram_id, sentence_id
)
list_opened = (progress["list_opened"] if progress else 0) or 0
if difficulty == "medium":
if list_opened >= 2:
raise HTTPException(403, "Show answer limit reached on Medium difficulty")
await conn.execute("""
INSERT INTO sentence_progress (user_id, sentence_id, list_opened)
VALUES ($1, $2, 1)
ON CONFLICT (user_id, sentence_id) DO UPDATE
SET list_opened = sentence_progress.list_opened + 1
""", telegram_id, sentence_id)
new_list_opened = list_opened + 1
else:
new_list_opened = list_opened # Easy — не инкрементим
return {
"sentence_pl": row["sentence_pl"],
"list_opened": new_list_opened,
"max_list_opened": None if difficulty == "easy" else 2,
}
@router.post("/check") @router.post("/check")
async def check_sentence(request: Request): async def check_sentence(request: Request):
"""Проверка предложения с защитой от повторного прохождения и выдачей достижений""" """Проверка предложения с защитой от повторного прохождения и выдачей достижений"""
@@ -176,7 +205,7 @@ async def check_sentence(request: Request):
raise HTTPException(404, "Sentence not found") raise HTTPException(404, "Sentence not found")
existing_progress = await conn.fetchrow( existing_progress = await conn.fetchrow(
"SELECT score, completed_at FROM sentence_progress WHERE user_id = $1 AND sentence_id = $2", "SELECT score, completed_at FROM sentence_progress WHERE user_id = $1 AND sentence_id = $2 AND completed_at IS NOT NULL",
telegram_id, sentence_id telegram_id, sentence_id
) )
@@ -208,36 +237,67 @@ async def check_sentence(request: Request):
is_correct = user_words_normalized == correct_words_normalized is_correct = user_words_normalized == correct_words_normalized
if is_correct: if is_correct:
word_count = len(correct_words_original) # 🔧 НОВОЕ (16.10.2026): очки по формуле сложностей.
# Easy — фикс 20. Medium — 60 − 20×list_opened (мин 20).
# 🆕 Расчёт звёзд для "Составь предложение" # Hard — 100, +50 бонус если completion_time <= 15 сек.
# Старт 5. Штрафы:
# -1 за каждую неверную проверку (клиент шлёт wrong_checks)
# -1 если time > лимита (по длине: 3-4 → 30с, 5-6 → 45с, 7-8 → 60с)
wrong_checks = int(body.get("wrong_checks", 0) or 0) wrong_checks = int(body.get("wrong_checks", 0) or 0)
if word_count <= 4: user_row = await conn.fetchrow(
time_limit = 30 "SELECT difficulty FROM users WHERE telegram_id = $1", telegram_id
elif word_count <= 6: )
time_limit = 45 difficulty = (user_row["difficulty"] if user_row else None) or "medium"
else:
time_limit = 60
time_penalty = 1 if (completion_time and completion_time > time_limit) else 0 progress_row = await conn.fetchrow(
wrong_penalty = min(max(0, wrong_checks), 3) "SELECT list_opened FROM sentence_progress WHERE user_id = $1 AND sentence_id = $2",
stars = max(1, 5 - wrong_penalty - time_penalty) telegram_id, sentence_id
)
list_opened = (progress_row["list_opened"] if progress_row else 0) or 0
if difficulty == "easy":
points = 20
elif difficulty == "medium":
points = max(20, 60 - 20 * list_opened)
else: # hard
points = 100
if completion_time is not None and completion_time <= 15:
points = 150
# Начисляем XP # Начисляем XP
from services.xp import award_xp from services.xp import award_xp
xp_result = await award_xp(conn, telegram_id, "sentence", stars) xp_result = await award_xp(conn, telegram_id, "sentence", points)
score = xp_result["points"] score = xp_result["points"]
await conn.execute( await conn.execute(
"""INSERT INTO sentence_progress (user_id, sentence_id, completed_at, score, level) """INSERT INTO sentence_progress (user_id, sentence_id, completed_at, score, level, completion_time)
VALUES ($1, $2, NOW(), $3, $4)""", VALUES ($1, $2, NOW(), $3, $4, $5)
telegram_id, sentence_id, score, row["level"], ON CONFLICT (user_id, sentence_id) DO UPDATE
SET completed_at = NOW(), score = $3, level = $4, completion_time = $5""",
telegram_id, sentence_id, score, row["level"], completion_time or 0,
) )
# 🔧 НОВОЕ (16.10.2026): серии в sentence_stats (PK user_id).
await conn.execute("""
INSERT INTO sentence_stats (user_id, total_score, no_mistakes_streak, perfect_streak, updated_at)
VALUES ($1, $2,
CASE WHEN $3 = 0 THEN 1 ELSE 0 END,
CASE WHEN $3 = 0 AND $4 = 0 THEN 1 ELSE 0 END,
NOW())
ON CONFLICT (user_id) DO UPDATE
SET total_score = sentence_stats.total_score + $2,
no_mistakes_streak = CASE WHEN $3 = 0 THEN sentence_stats.no_mistakes_streak + 1 ELSE 0 END,
perfect_streak = CASE WHEN $3 = 0 AND $4 = 0 THEN sentence_stats.perfect_streak + 1 ELSE 0 END,
updated_at = NOW()
""", telegram_id, score, wrong_checks, list_opened)
# 🔧 НОВОЕ (16.10.2026): читаем серии/очки для достижений.
stats_row = await conn.fetchrow(
"SELECT total_score, no_mistakes_streak, perfect_streak FROM sentence_stats WHERE user_id = $1",
telegram_id
)
sentence_total_score = stats_row["total_score"] if stats_row else 0
sentence_no_mistakes = stats_row["no_mistakes_streak"] if stats_row else 0
sentence_perfect_streak = stats_row["perfect_streak"] if stats_row else 0
# 🔧 ФИКС (23.09.2026): achievements_nested_pool_acquire_sentences — # 🔧 ФИКС (23.09.2026): achievements_nested_pool_acquire_sentences —
# раньше check_and_award_achievements вызывался ВНУТРИ async with pool.acquire(), # раньше check_and_award_achievements вызывался ВНУТРИ async with pool.acquire(),
# что могло привести к дедлоку пула. Теперь собираем данные внутри блока, # что могло привести к дедлоку пула. Теперь собираем данные внутри блока,
@@ -268,6 +328,9 @@ async def check_sentence(request: Request):
achievements_to_check = [ achievements_to_check = [
("sentences_completed", sentences_completed), ("sentences_completed", sentences_completed),
("total_score", grand_total), ("total_score", grand_total),
("sentence_no_mistakes", sentence_no_mistakes),
("sentence_perfect_streak", sentence_perfect_streak),
("sentence_xp", sentence_total_score),
] ]
if completion_time is not None and completion_time > 0: if completion_time is not None and completion_time > 0:
achievements_to_check.append(("speed_sentence", int(completion_time))) achievements_to_check.append(("speed_sentence", int(completion_time)))
@@ -287,7 +350,6 @@ async def check_sentence(request: Request):
"score": score, "score": score,
"new_achievements": new_achievements, "new_achievements": new_achievements,
# 🆕 XP # 🆕 XP
"stars": xp_result["stars"],
"base_points": xp_result["base_points"], "base_points": xp_result["base_points"],
"multiplier": xp_result["multiplier"], "multiplier": xp_result["multiplier"],
"points": xp_result["points"], "points": xp_result["points"],
@@ -315,21 +377,14 @@ async def get_sentence_stats(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( total = await conn.fetchval("SELECT COUNT(*) FROM sentences")
"SELECT current_level FROM users WHERE telegram_id = $1", telegram_id
)
current_level = user["current_level"] if user else "A1"
total = await conn.fetchval(
"SELECT COUNT(*) FROM sentences WHERE level = $1", current_level
)
completed = await conn.fetchval( completed = await conn.fetchval(
"SELECT COUNT(*) FROM sentence_progress WHERE user_id = $1 AND level = $2", "SELECT COUNT(*) FROM sentence_progress WHERE user_id = $1 AND completed_at IS NOT NULL",
telegram_id, current_level telegram_id
) )
total_score = await conn.fetchval( total_score = await conn.fetchval(
"SELECT COALESCE(SUM(score), 0) FROM sentence_progress WHERE user_id = $1 AND level = $2", "SELECT COALESCE(SUM(score), 0) FROM sentence_progress WHERE user_id = $1 AND completed_at IS NOT NULL",
telegram_id, current_level telegram_id
) )
return { return {
@@ -338,5 +393,4 @@ async def get_sentence_stats(request: Request):
"remaining": total - (completed or 0), "remaining": total - (completed or 0),
"total_score": total_score or 0, "total_score": total_score or 0,
"progress_percent": round(((completed or 0) / total * 100), 1) if total > 0 else 0, "progress_percent": round(((completed or 0) / total * 100), 1) if total > 0 else 0,
"level": current_level,
} }
+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 assert passed
async def test_sentences_hint(smoke_user, smoke_conn): async def test_sentences_show_answer_medium(smoke_user, smoke_conn):
"""GET /sentences/{id}/hint → sentence_pl, лимит 1 раз.""" """POST /sentences/show-answer — Medium: лимит 2 (200, 200, 403)."""
client = smoke_user client = smoke_user
# Берём предложение, которое юзер ещё НЕ проходил и НЕ брал подсказку await smoke_conn.execute(
sentence_id = await smoke_conn.fetchval(""" "UPDATE users SET difficulty = 'medium' WHERE telegram_id = $1", SMOKE_USER_ID
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)
sentence_id = await smoke_conn.fetchval("SELECT id FROM sentences ORDER BY id LIMIT 1")
if not sentence_id: if not sentence_id:
pytest.skip("Нет предложений для hint-теста") pytest.skip("Нет предложений для show-answer теста")
return return
# 1. Первый запрос — 200 # Чистим list_opened, чтобы начать с 0
resp1 = await client.get(f"/sentences/{sentence_id}/hint") await smoke_conn.execute(
ok1 = resp1.status_code == 200 "DELETE FROM sentence_progress WHERE user_id = $1 AND sentence_id = $2",
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",
SMOKE_USER_ID, sentence_id, SMOKE_USER_ID, sentence_id,
) is not None )
# 3. Второй запрос — 403 (лимит) resp1 = await client.post("/sentences/show-answer", json={"sentence_id": sentence_id})
resp2 = await client.get(f"/sentences/{sentence_id}/hint") resp2 = await client.post("/sentences/show-answer", json={"sentence_id": sentence_id})
limit_ok = resp2.status_code == 403 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( RESULTS.append(ScenarioResult(
"sentences_hint", "sentences", passed, "sentences_show_answer_medium", "sentences", passed,
f"first={resp1.status_code}, recorded={recorded}, second={resp2.status_code} (ожидали 403)", f"medium: 1={resp1.status_code}, 2={resp2.status_code}, 3={resp3.status_code} (ожидали 200/200/403)",
{"first_status": resp1.status_code, "recorded": recorded, "second_status": resp2.status_code}, {"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 assert passed