From f43caa7489a8ba07257e9bdd2ec663f961c3feb8 Mon Sep 17 00:00:00 2001 From: MpakobecEx Date: Wed, 27 May 2026 23:46:34 +0500 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=D0=B8=20=D1=84=D1=83=D0=BD=D0=BA=D1=86=D0=B8=D1=8E=20?= =?UTF-8?q?=D0=B4=D0=BB=D1=8F=20=D0=B2=D0=BE=D0=B7=D0=B2=D1=80=D0=B0=D1=89?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BD=D0=BE=D0=BC=D0=B5=D1=80=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- database.py | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/database.py b/database.py index 64bb924..fe721dc 100644 --- a/database.py +++ b/database.py @@ -50,29 +50,39 @@ def add_record(record_type: str, phone: str = None, qr_code: str = None, qr_data def get_random_record(): - """Возвращает случайную запись""" + """Возвращает случайную запись из тех, у кого минимальный usage_count (с ограничением выборки)""" with sqlite3.connect(DB_NAME) as conn: conn.row_factory = sqlite3.Row + # Общее количество записей total_count = conn.execute("SELECT COUNT(*) as count FROM records").fetchone()["count"] + if total_count == 0: + return None + + # Определяем лимит для выборки if total_count <= 50: limit = 10 else: limit = max(10, min(50, int(total_count * 0.2))) - oldest = conn.execute(""" - SELECT *, COALESCE(used_at, created_at) as sort_date - FROM records - ORDER BY sort_date ASC - LIMIT ? - """, (limit,)).fetchall() + # Находим минимальный usage_count + min_usage = conn.execute("SELECT MIN(usage_count) as min_usage FROM records").fetchone()["min_usage"] - if not oldest: + # Берём записи с минимальным usage_count, но не больше limit + candidates = conn.execute(""" + SELECT * FROM records + WHERE usage_count = ? + LIMIT ? + """, (min_usage, limit)).fetchall() + + if not candidates: return None - selected = random.choice(oldest) + # Из них выбираем случайную + selected = random.choice(candidates) + # Обновляем счётчик и дату использования conn.execute(""" UPDATE records SET usage_count = usage_count + 1, used_at = ? WHERE id = ?