From 1df1119d1198f38666409c6e7885e34f718560ad Mon Sep 17 00:00:00 2001 From: Drobysh Date: Fri, 16 Oct 2026 11:58:50 +0000 Subject: [PATCH 1/4] =?UTF-8?q?[Eva]=20B5.1:=20/next=20=E2=80=94=20=D1=83?= =?UTF-8?q?=D0=B1=D1=80=D0=B0=D1=82=D1=8C=20=D1=84=D0=B8=D0=BB=D1=8C=D1=82?= =?UTF-8?q?=D1=80=20=D0=BF=D0=BE=20=D1=83=D1=80=D0=BE=D0=B2=D0=BD=D1=8E=20?= =?UTF-8?q?(=D0=B5=D0=B4=D0=B8=D0=BD=D1=8B=D0=B9=20=D0=BF=D1=83=D0=BB)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- routers/sentences.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/routers/sentences.py b/routers/sentences.py index c732c98..9511304 100644 --- a/routers/sentences.py +++ b/routers/sentences.py @@ -100,25 +100,23 @@ async def get_next_sentence(request: Request): pool = await get_pool() async with pool.acquire() as conn: user = await conn.fetchrow( - "SELECT app_language, current_level, difficulty FROM users WHERE telegram_id = $1", telegram_id + "SELECT app_language, difficulty FROM users WHERE telegram_id = $1", telegram_id ) if not user: raise HTTPException(401, "User not registered") lang = user["app_language"] or "pl" - current_level = user["current_level"] or "A1" difficulty = user["difficulty"] or "medium" - # Находим случайное непройденное предложение нужного уровня + # Находим случайное непройденное предложение (единый пул) row = await conn.fetchrow(""" SELECT s.* FROM sentences s - WHERE s.level = $1 - AND s.id NOT IN ( - SELECT sentence_id FROM sentence_progress WHERE user_id = $2 AND completed_at IS NOT NULL + WHERE s.id NOT IN ( + SELECT sentence_id FROM sentence_progress WHERE user_id = $1 AND completed_at IS NOT NULL ) ORDER BY RANDOM() LIMIT 1 - """, current_level, telegram_id) + """, telegram_id) if not row: return {"completed": True, "message": "All sentences completed!"} From 5810eccde1a1eb4d755c241bf79f03e700da951c Mon Sep 17 00:00:00 2001 From: Drobysh Date: Fri, 16 Oct 2026 11:58:53 +0000 Subject: [PATCH 2/4] =?UTF-8?q?[Eva]=20B5.2:=20init=5Fsentences=20?= =?UTF-8?q?=E2=80=94=20=D0=B5=D0=B4=D0=B8=D0=BD=D1=8B=D0=B9=20=D0=BF=D1=83?= =?UTF-8?q?=D0=BB,=20=D1=81=D0=BA=D0=B2=D0=BE=D0=B7=D0=BD=D0=B0=D1=8F=20?= =?UTF-8?q?=D0=BD=D1=83=D0=BC=D0=B5=D1=80=D0=B0=D1=86=D0=B8=D1=8F=201..400?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- routers/sentences.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/routers/sentences.py b/routers/sentences.py index 9511304..871ba29 100644 --- a/routers/sentences.py +++ b/routers/sentences.py @@ -65,6 +65,7 @@ async def init_sentences(): ("B1", "sentences_b1.csv"), ] + offset = 0 for level, filename in level_files: sentences = load_sentences_from_csv(filename) for i, s in enumerate(sentences): @@ -74,11 +75,12 @@ async def init_sentences(): await conn.execute( """INSERT INTO sentences (sentence_number, sentence_pl, translation_ru, translation_uk, translation_en, difficulty, level) VALUES ($1, $2, $3, $4, $5, $6, $7) - ON CONFLICT (level, sentence_number) DO NOTHING""", - i + 1, s["sentence_pl"], + ON CONFLICT (sentence_number) DO NOTHING""", + offset + i + 1, s["sentence_pl"], s["translation_ru"], s["translation_uk"], s["translation_en"], difficulty, level ) + offset += len(sentences) def normalize_word_for_display(word: str) -> str: From 3c9548540ce0d074c7e9a634a3daa7b4f5834492 Mon Sep 17 00:00:00 2001 From: Drobysh Date: Fri, 16 Oct 2026 11:58:59 +0000 Subject: [PATCH 3/4] =?UTF-8?q?[Eva]=20B5.3:=20database.py=20=E2=80=94=20U?= =?UTF-8?q?NIQUE(sentence=5Fnumber)=20+=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BD?= =?UTF-8?q?=D1=83=D0=BC=D0=B5=D1=80=D0=B0=D1=86=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- database.py | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/database.py b/database.py index c62b308..dad15c5 100644 --- a/database.py +++ b/database.py @@ -258,20 +258,31 @@ async def init_db(): ) """) - # ============ Убираем старый UNIQUE constraint с sentences.sentence_number ============ + # ============ Убираем составной UNIQUE (level, sentence_number) ============ 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(""" DO $$ BEGIN IF NOT EXISTS ( SELECT 1 FROM pg_constraint - WHERE conname = 'sentences_sentence_number_unique' + WHERE conname = 'sentences_sentence_number_key' ) 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 $$; """) From ba9a43dcfaaa4d26d3edab231c0b6c96f4b3c3d7 Mon Sep 17 00:00:00 2001 From: Drobysh Date: Fri, 16 Oct 2026 11:59:03 +0000 Subject: [PATCH 4/4] =?UTF-8?q?[Eva]=20B5.4:=20/stats=20=E2=80=94=20=D1=83?= =?UTF-8?q?=D0=B1=D1=80=D0=B0=D1=82=D1=8C=20=D1=84=D0=B8=D0=BB=D1=8C=D1=82?= =?UTF-8?q?=D1=80=20=D0=BF=D0=BE=20=D1=83=D1=80=D0=BE=D0=B2=D0=BD=D1=8E=20?= =?UTF-8?q?=D0=B8=20=D0=BF=D0=BE=D0=BB=D0=B5=20level?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- routers/sentences.py | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/routers/sentences.py b/routers/sentences.py index 871ba29..22b56bc 100644 --- a/routers/sentences.py +++ b/routers/sentences.py @@ -410,21 +410,14 @@ async def get_sentence_stats(request: Request): pool = await get_pool() async with pool.acquire() as conn: - user = await conn.fetchrow( - "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 - ) + total = await conn.fetchval("SELECT COUNT(*) FROM sentences") completed = await conn.fetchval( - "SELECT COUNT(*) FROM sentence_progress WHERE user_id = $1 AND level = $2", - telegram_id, current_level + "SELECT COUNT(*) FROM sentence_progress WHERE user_id = $1 AND completed_at IS NOT NULL", + telegram_id ) total_score = await conn.fetchval( - "SELECT COALESCE(SUM(score), 0) FROM sentence_progress WHERE user_id = $1 AND level = $2", - telegram_id, current_level + "SELECT COALESCE(SUM(score), 0) FROM sentence_progress WHERE user_id = $1 AND completed_at IS NOT NULL", + telegram_id ) return { @@ -433,5 +426,4 @@ async def get_sentence_stats(request: Request): "remaining": total - (completed or 0), "total_score": total_score or 0, "progress_percent": round(((completed or 0) / total * 100), 1) if total > 0 else 0, - "level": current_level, } \ No newline at end of file