From b5e1de3589a1e3dd6e5e5174af32cf9eb6b2116c Mon Sep 17 00:00:00 2001
From: Vladless <curov2014@yandex.ru>
Date: Sat, 23 Nov 2024 17:30:39 +0300
Subject: [PATCH 1/2] fix users

---
 database.py | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/database.py b/database.py
index db48ef93..b915e99d 100644
--- a/database.py
+++ b/database.py
@@ -9,21 +9,6 @@ from logger import logger
 async def init_db():
     conn = await asyncpg.connect(DATABASE_URL)
 
-    # Таблица для хранения информации о платежах
-    await conn.execute(
-        """
-        CREATE TABLE IF NOT EXISTS payments (
-            id SERIAL PRIMARY KEY,
-            tg_id BIGINT NOT NULL,
-            amount REAL NOT NULL,
-            payment_system TEXT NOT NULL,
-            status TEXT DEFAULT 'success',
-            created_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP,
-            FOREIGN KEY (tg_id) REFERENCES users(tg_id)
-        )
-        """
-    )
-
     # Таблица для хранения основной информации о пользователях из Telegram
     await conn.execute(
         """
@@ -51,6 +36,21 @@ async def init_db():
         """
     )
 
+    # Таблица для хранения информации о платежах
+    await conn.execute(
+        """
+        CREATE TABLE IF NOT EXISTS payments (
+            id SERIAL PRIMARY KEY,
+            tg_id BIGINT NOT NULL,
+            amount REAL NOT NULL,
+            payment_system TEXT NOT NULL,
+            status TEXT DEFAULT 'success',
+            created_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP,
+            FOREIGN KEY (tg_id) REFERENCES users(tg_id)
+        )
+        """
+    )
+
     # Таблица для хранения ключей
     await conn.execute(
         """

From 45469da513dd8631674070f4cf5c89cf0af010d0 Mon Sep 17 00:00:00 2001
From: Vladless <curov2014@yandex.ru>
Date: Sat, 23 Nov 2024 20:21:47 +0300
Subject: [PATCH 2/2] update clusters

---
 handlers/utils.py | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/handlers/utils.py b/handlers/utils.py
index 355a6e36..e3ca2857 100644
--- a/handlers/utils.py
+++ b/handlers/utils.py
@@ -42,33 +42,24 @@ async def get_least_loaded_cluster() -> str:
     Returns:
         str: Идентификатор наименее загруженного кластера.
     """
-    cluster_loads: dict[str, int] = {}
+    cluster_loads: dict[str, int] = {cluster_id: 0 for cluster_id in CLUSTERS.keys()}
 
     async with asyncpg.create_pool(DATABASE_URL) as pool:
         async with pool.acquire() as conn:
-            keys = await conn.fetch("SELECT * FROM keys")
+            keys = await conn.fetch("SELECT server_id FROM keys")
 
             for key in keys:
                 cluster_id = key["server_id"]
-                if re.match(r"^cluster\d+$", cluster_id):
-                    cluster_loads[cluster_id] = cluster_loads.get(cluster_id, 0) + 1
+                if cluster_id in cluster_loads:
+                    cluster_loads[cluster_id] += 1
 
-    logger.info(f"Cluster loads: {cluster_loads}")
+    logger.info(f"Cluster loads after database query: {cluster_loads}")
 
     if not cluster_loads:
-        available_clusters = [cluster_id for cluster_id in CLUSTERS.keys() if re.match(r"^cluster\d+$", cluster_id)]
-
-        logger.info(f"Available clusters from config: {available_clusters}")
-
-        if available_clusters:
-            selected_cluster = available_clusters[0]
-            logger.info(f"Returning the first available cluster: {selected_cluster}")
-            return selected_cluster
-
-        logger.warning("No valid clusters found in config, returning 'cluster1'.")
+        logger.warning("No clusters found in database or configuration.")
         return "cluster1"
 
-    least_loaded_cluster = min(cluster_loads, key=lambda k: (cluster_loads.get(k, 0), k))
+    least_loaded_cluster = min(cluster_loads, key=lambda k: (cluster_loads[k], k))
 
     logger.info(f"Least loaded cluster selected: {least_loaded_cluster}")