From 5a6b81da1dda46b598566bfe25f994e9f91b4451 Mon Sep 17 00:00:00 2001 From: Drobysh Date: Wed, 14 Oct 2026 16:49:17 +0000 Subject: [PATCH 1/4] =?UTF-8?q?[Eva]=20=D0=9F=D0=BE=D0=BF=D1=80=D0=B0?= =?UTF-8?q?=D0=B2=D0=B8=D1=82=D1=8C=20=D1=81=D1=87=D1=91=D1=82=D1=87=D0=B8?= =?UTF-8?q?=D0=BA=20=D0=B4=D0=BE=D1=81=D1=82=D0=B8=D0=B6=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=B9=2052=20=E2=86=92=2055?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- routers/achievements.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/achievements.py b/routers/achievements.py index 9134392..1faa0f2 100644 --- a/routers/achievements.py +++ b/routers/achievements.py @@ -8,7 +8,7 @@ logger = logging.getLogger(__name__) router = APIRouter(prefix="/achievements", tags=["achievements"]) -# ============ Данные 52 достижений ============ +# ============ Данные 55 достижений ============ ACHIEVEMENTS_DATA = [ # ===== Word Search (11) ===== {"code": "first_level", "category": "wordsearch", "icon": "🔰", From 5fc49d086d13ff06914e4889bf346874ab117994 Mon Sep 17 00:00:00 2001 From: Drobysh Date: Wed, 14 Oct 2026 16:49:27 +0000 Subject: [PATCH 2/4] =?UTF-8?q?[Eva]=20=D0=9F=D0=BE=D0=BF=D1=80=D0=B0?= =?UTF-8?q?=D0=B2=D0=B8=D1=82=D1=8C=20=D1=81=D1=87=D1=91=D1=82=D1=87=D0=B8?= =?UTF-8?q?=D0=BA=20=D1=81=D0=B5=D0=BA=D1=86=D0=B8=D0=B8=20General=2015=20?= =?UTF-8?q?=E2=86=92=209?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- routers/achievements.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/achievements.py b/routers/achievements.py index 1faa0f2..df6aee9 100644 --- a/routers/achievements.py +++ b/routers/achievements.py @@ -245,7 +245,7 @@ ACHIEVEMENTS_DATA = [ "desc_pl": "Ukończ poziom w mniej niż 30 sekund", "desc_ru": "Пройти уровень быстрее 30 секунд", "desc_uk": "Пройти рівень швидше 30 секунд", "desc_en": "Complete a level in under 30 seconds", "type": "bubble_speed", "value": 30}, - # ===== General (15) ===== + # ===== General (9) ===== {"code": "score_1000", "category": "general", "icon": "🌟", "name_pl": "Wschodząca gwiazda", "name_ru": "Восходящая звезда", "name_uk": "Висхідна зірка", "name_en": "Rising Star", "desc_pl": "Zdobądź 1000 punktów", "desc_ru": "Набрать 1000 очков", "desc_uk": "Набрати 1000 балів", "desc_en": "Earn 1000 points", From 1afc7a1654f9985f6b9f412ab0a879afbda8fa56 Mon Sep 17 00:00:00 2001 From: Drobysh Date: Wed, 14 Oct 2026 16:50:21 +0000 Subject: [PATCH 3/4] =?UTF-8?q?[Eva]=20=D0=A3=D0=B4=D0=B0=D0=BB=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=207=20=D0=BD=D0=B5=D0=B0=D0=BA=D1=82=D1=83=D0=B0?= =?UTF-8?q?=D0=BB=D1=8C=D0=BD=D1=8B=D1=85=20=D0=B4=D0=BE=D1=81=D1=82=D0=B8?= =?UTF-8?q?=D0=B6=D0=B5=D0=BD=D0=B8=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- routers/achievements.py | 35 ----------------------------------- 1 file changed, 35 deletions(-) diff --git a/routers/achievements.py b/routers/achievements.py index df6aee9..e6cb9b6 100644 --- a/routers/achievements.py +++ b/routers/achievements.py @@ -291,42 +291,7 @@ ACHIEVEMENTS_DATA = [ "desc_pl": "Zmień język interfejsu", "desc_ru": "Сменить язык интерфейса", "desc_uk": "Змінити мову інтерфейсу", "desc_en": "Change interface language", "type": "language_changed", "value": 1}, - # 🔧 ИСПРАВЛЕНО: Заменено достижение "Открой Грамматику" на "Открой меню учителя" - {"code": "open_teacher_menu", "category": "general", "icon": "🎓", - "name_pl": "Uczeń", "name_ru": "Ученик", "name_uk": "Учень", "name_en": "Student", - "desc_pl": "Otwórz menu nauczyciela", "desc_ru": "Открыть меню учителя", "desc_uk": "Відкрити меню вчителя", "desc_en": "Open the teacher menu", - "type": "teacher_menu_opened", "value": 1}, - {"code": "open_cheatsheets", "category": "general", "icon": "📝", - "name_pl": "Ciekawski", "name_ru": "Любознательный", "name_uk": "Допитливий", "name_en": "Curious", - "desc_pl": "Otwórz sekcję Ściągi", "desc_ru": "Открыть раздел Шпаргалки", "desc_uk": "Відкрити розділ Шпаргалки", "desc_en": "Open the Cheatsheets section", - "type": "cheatsheets_opened", "value": 1}, - - {"code": "open_pronunciation", "category": "general", "icon": "🔊", - "name_pl": "Słuchacz", "name_ru": "Слушатель", "name_uk": "Слухач", "name_en": "Listener", - "desc_pl": "Otwórz sekcję Wymowa", "desc_ru": "Открыть раздел Произношение", "desc_uk": "Відкрити розділ Вимова", "desc_en": "Open the Pronunciation section", - "type": "pronunciation_opened", "value": 1}, - - {"code": "open_ai_assistant", "category": "general", "icon": "🤖", - "name_pl": "Asystent AI", "name_ru": "AI-помощник", "name_uk": "AI-помічник", "name_en": "AI Assistant", - "desc_pl": "Otwórz Asystenta AI", "desc_ru": "Открыть AI-помощника", "desc_uk": "Відкрити AI-помічника", "desc_en": "Open the AI Assistant", - "type": "ai_assistant_opened", "value": 1}, - - {"code": "open_alphabet", "category": "general", "icon": "🔤", - "name_pl": "Alfabetysta", "name_ru": "Алфавитист", "name_uk": "Алфавітист", "name_en": "Alphabetist", - "desc_pl": "Otwórz sekcję Alfabet", "desc_ru": "Открыть раздел Алфавит", "desc_uk": "Відкрити розділ Алфавіт", "desc_en": "Open the Alphabet section", - "type": "alphabet_opened", "value": 1}, - - {"code": "open_rules", "category": "general", "icon": "📐", - "name_pl": "Gramatyk", "name_ru": "Грамматик", "name_uk": "Граматик", "name_en": "Grammarian", - "desc_pl": "Otwórz sekcję Zasady", "desc_ru": "Открыть раздел Правила", "desc_uk": "Відкрити розділ Правила", "desc_en": "Open the Rules section", - "type": "rules_opened", "value": 1}, - - # 🔧 НОВОЕ: Достижение за открытие Прогресса - {"code": "open_progress", "category": "general", "icon": "📊", - "name_pl": "Planista", "name_ru": "Планировщик", "name_uk": "Планувальник", "name_en": "Planner", - "desc_pl": "Otwórz sekcję Postęp", "desc_ru": "Открыть раздел Прогресс", "desc_uk": "Відкрити розділ Прогрес", "desc_en": "Open the Progress section", - "type": "progress_opened", "value": 1}, ] From 89183095011ac033407cd1285d58c0a76df36e22 Mon Sep 17 00:00:00 2001 From: Drobysh Date: Wed, 14 Oct 2026 16:50:33 +0000 Subject: [PATCH 4/4] =?UTF-8?q?[Eva]=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D1=82=D1=8C=20=D1=83=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20=D0=BE=D1=81=D0=B8=D1=80=D0=BE=D1=82=D0=B5=D0=B2=D1=88?= =?UTF-8?q?=D0=B8=D1=85=20=D0=B4=D0=BE=D1=81=D1=82=D0=B8=D0=B6=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D0=B9=20=D0=B2=20init=5Fachievements?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- routers/achievements.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/routers/achievements.py b/routers/achievements.py index e6cb9b6..9ac5092 100644 --- a/routers/achievements.py +++ b/routers/achievements.py @@ -334,6 +334,20 @@ async def init_achievements(): requirement_value = EXCLUDED.requirement_value """, rows) + # 🔧 Удаление осиротевших достижений (которых больше нет в ACHIEVEMENTS_DATA) + await conn.execute(""" + DELETE FROM user_achievements + WHERE achievement_id IN ( + SELECT id FROM achievements + WHERE code NOT IN (SELECT unnest($1::text[])) + ) + """, [a["code"] for a in ACHIEVEMENTS_DATA]) + + await conn.execute(""" + DELETE FROM achievements + WHERE code NOT IN (SELECT unnest($1::text[])) + """, [a["code"] for a in ACHIEVEMENTS_DATA]) + logger.info(f"[achievements] init: upserted {len(rows)} achievements")