Compare commits
9
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8918309501 | ||
|
|
1afc7a1654 | ||
|
|
5fc49d086d | ||
|
|
5a6b81da1d | ||
|
|
7c43812475 | ||
|
|
e7c512e50e | ||
|
|
0d6b56e5c9 | ||
|
|
99dd3765d0 | ||
|
|
929420a284 |
+16
-37
@@ -8,7 +8,7 @@ logger = logging.getLogger(__name__)
|
|||||||
|
|
||||||
router = APIRouter(prefix="/achievements", tags=["achievements"])
|
router = APIRouter(prefix="/achievements", tags=["achievements"])
|
||||||
|
|
||||||
# ============ Данные 52 достижений ============
|
# ============ Данные 55 достижений ============
|
||||||
ACHIEVEMENTS_DATA = [
|
ACHIEVEMENTS_DATA = [
|
||||||
# ===== Word Search (11) =====
|
# ===== Word Search (11) =====
|
||||||
{"code": "first_level", "category": "wordsearch", "icon": "🔰",
|
{"code": "first_level", "category": "wordsearch", "icon": "🔰",
|
||||||
@@ -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",
|
"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},
|
"type": "bubble_speed", "value": 30},
|
||||||
|
|
||||||
# ===== General (15) =====
|
# ===== General (9) =====
|
||||||
{"code": "score_1000", "category": "general", "icon": "🌟",
|
{"code": "score_1000", "category": "general", "icon": "🌟",
|
||||||
"name_pl": "Wschodząca gwiazda", "name_ru": "Восходящая звезда", "name_uk": "Висхідна зірка", "name_en": "Rising Star",
|
"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",
|
"desc_pl": "Zdobądź 1000 punktów", "desc_ru": "Набрать 1000 очков", "desc_uk": "Набрати 1000 балів", "desc_en": "Earn 1000 points",
|
||||||
@@ -291,42 +291,7 @@ ACHIEVEMENTS_DATA = [
|
|||||||
"desc_pl": "Zmień język interfejsu", "desc_ru": "Сменить язык интерфейса", "desc_uk": "Змінити мову інтерфейсу", "desc_en": "Change interface language",
|
"desc_pl": "Zmień język interfejsu", "desc_ru": "Сменить язык интерфейса", "desc_uk": "Змінити мову інтерфейсу", "desc_en": "Change interface language",
|
||||||
"type": "language_changed", "value": 1},
|
"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},
|
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
||||||
@@ -369,6 +334,20 @@ async def init_achievements():
|
|||||||
requirement_value = EXCLUDED.requirement_value
|
requirement_value = EXCLUDED.requirement_value
|
||||||
""", rows)
|
""", 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")
|
logger.info(f"[achievements] init: upserted {len(rows)} achievements")
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+22
-11
@@ -101,7 +101,7 @@ async def get_next_bubble_level(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")
|
||||||
@@ -115,13 +115,9 @@ async def get_next_bubble_level(request: Request):
|
|||||||
)
|
)
|
||||||
current_bubble_level = (progress["levels_completed"] if progress else 0) + 1
|
current_bubble_level = (progress["levels_completed"] if progress else 0) + 1
|
||||||
|
|
||||||
# Прогрессия по количеству слов на уровне
|
# Количество слов по сложности
|
||||||
if current_bubble_level <= 10:
|
difficulty = user["difficulty"] if "difficulty" in user.keys() else "medium"
|
||||||
num_words = random.choice([3, 4])
|
num_words = {"easy": 3, "medium": 4, "hard": 5}.get(difficulty, 4)
|
||||||
elif current_bubble_level <= 25:
|
|
||||||
num_words = random.choice([5, 6])
|
|
||||||
else:
|
|
||||||
num_words = random.choice([7, 8])
|
|
||||||
|
|
||||||
# 🔧 ФИКС (30.09.2026): csv_words_source —
|
# 🔧 ФИКС (30.09.2026): csv_words_source —
|
||||||
# источник слов переехал с level_words (старая схема level_id IS NULL)
|
# источник слов переехал с level_words (старая схема level_id IS NULL)
|
||||||
@@ -189,6 +185,7 @@ async def get_next_bubble_level(request: Request):
|
|||||||
"words": result_words,
|
"words": result_words,
|
||||||
"bubbles": all_parts,
|
"bubbles": all_parts,
|
||||||
"level": current_bubble_level,
|
"level": current_bubble_level,
|
||||||
|
"difficulty": user["difficulty"] or "medium",
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -228,8 +225,17 @@ async def first_part_hint(request: Request):
|
|||||||
if hints_used >= 3:
|
if hints_used >= 3:
|
||||||
raise HTTPException(400, "All hints used")
|
raise HTTPException(400, "All hints used")
|
||||||
|
|
||||||
level_words = progress["current_level_words"] or []
|
raw = progress["current_level_words"]
|
||||||
hinted = set(progress["hinted_words"] or [])
|
if isinstance(raw, str):
|
||||||
|
level_words = json.loads(raw) if raw else []
|
||||||
|
else:
|
||||||
|
level_words = raw or []
|
||||||
|
|
||||||
|
raw_hinted = progress["hinted_words"]
|
||||||
|
if isinstance(raw_hinted, str):
|
||||||
|
hinted = set(json.loads(raw_hinted)) if raw_hinted else set()
|
||||||
|
else:
|
||||||
|
hinted = set(raw_hinted or [])
|
||||||
|
|
||||||
# Слова, которые ещё не собраны и которым ещё не давали подсказку
|
# Слова, которые ещё не собраны и которым ещё не давали подсказку
|
||||||
candidates = [
|
candidates = [
|
||||||
@@ -297,7 +303,12 @@ async def show_words(request: Request):
|
|||||||
if difficulty == "medium" and list_opened >= 1:
|
if difficulty == "medium" and list_opened >= 1:
|
||||||
raise HTTPException(400, "Word list already used on Medium difficulty")
|
raise HTTPException(400, "Word list already used on Medium difficulty")
|
||||||
|
|
||||||
level_words = progress["current_level_words"] or []
|
raw = progress["current_level_words"]
|
||||||
|
if isinstance(raw, str):
|
||||||
|
level_words = json.loads(raw) if raw else []
|
||||||
|
else:
|
||||||
|
level_words = raw or []
|
||||||
|
|
||||||
words = [
|
words = [
|
||||||
{"word_pl": w.get("word_pl"), "translation": w.get("translation")}
|
{"word_pl": w.get("word_pl"), "translation": w.get("translation")}
|
||||||
for w in level_words
|
for w in level_words
|
||||||
|
|||||||
Reference in New Issue
Block a user