testing tg bot library and set the db connection for dev and production

bot.py

@@ -1,10 +1,12 @@
 import os
 import logging
-from database.models import testModel
+from database.models import Students 
-from telebot.types import InlineKeyboardMarkup, InlineKeyboardButton
+from telebot import types
+from datetime import datetime
 
 logger = logging.getLogger(__name__)
 
+authenticated_users = {2032936226}
 _bot = None
 
 def get_bot():
@@ -16,33 +18,125 @@ def get_bot():
         
         @_bot.message_handler(commands=["start"])
         def start(message):
-            _bot.reply_to(message, "Welcome! Use /getdata to fetch from database.")
+            if message.from_user.id in authenticated_users:
+                _bot.reply_to(message, "authorized user! Welcome. Use /getstudents to fetch from database.")
+                return
+            _bot.reply_to(message, "Welcome! Use /getstudents to fetch from database.")
 
-        @_bot.message_handler(commands=["getdata"])
+        @_bot.message_handler(commands=["getstudents"])
         def get_data(message):
             try:
-                data = testModel.getAllUsers()
+                data = Students.getAllStudents()
                 if data:
-                    _bot.reply_to(message, f"Data: {data}")
 
-                    response = "";
+                    markup = types.InlineKeyboardMarkup(row_width=2)
-                    for i in range(3):
+                    for row in data:
-                        response += "\n";
+                        btn = types.InlineKeyboardButton(f"{row[0]}: @{row[1]}", callback_data=f"student_{row[0]}")
-                        response += f"""
+                        markup.add(btn)
-                        <b>📚 {data[i][0]}</b>
+
-                        <i>نویسنده:</i> {data[i][1]}
+                    _bot.send_message(message.chat.id, "Here is the data:", reply_markup=markup)
-                        <i>موجودی:</i> {data[i][3]}/{data[i][8]}
-                        <code>کد: {data[i][1]}</code>
-                        """
-                    _bot.reply_to(message, response, parse_mode='HTML')
                 else:
-                    _bot.reply_to(message, "No data found or database error.")
+                    _bot.reply_to(message, "No data found.")
+                    return                    
             except Exception as e:
                 logger.error(f"Error in getdata handler: {e}")
                 _bot.reply_to(message, "Sorry, an error occurred.")
         
+        # Single handler for all student selections
+        @_bot.callback_query_handler(func=lambda call: call.data.startswith('student_'))
+        def show_student_details(call):
+            student_id = call.data.split('_')[1]
+            student = Students.getStudentById(student_id)
+
+            if student:
+                details = format_student_info(student)
+                markup = types.InlineKeyboardMarkup()
+                markup.add(types.InlineKeyboardButton("🔙 Back", callback_data="back_to_students"))
+                _bot.send_message(call.message.chat.id, details, reply_markup=markup, parse_mode="HTML")
+            else:
+                _bot.send_message(call.message.chat.id, "Student not found.")
+
+        def format_student_info(student):
+            """
+            Format student data into a nice message
+            student is a tuple: (id, username, created_at, email, phone_number, last_seen, is_verified, birthday)
+            """
+            print(student);
+            id, username, created_at, email, phone_number, last_seen, is_verfied, birthday = student
+            
+            verified_status = "✅ Verified" if is_verfied else "❌ Not Verified"
+            
+            # Format dates nicely
+            created_date = format_date(created_at)
+            last_seen_date = format_date(last_seen)
+            
+            # Calculate age from birthday
+            age = calculate_age(birthday)
+            
+            details = f"""
+            <b>👤 Student Profile</b>
+
+            <b>Username:</b> {username}
+            <b>Email:</b> {email}
+            <b>Phone:</b> {phone_number}
+            <b>Birthday:</b> {birthday} (Age: {age})
+            <b>Account Status:</b> {verified_status}
+
+            <b>📅 Account Info</b>
+            <b>Joined:</b> {created_date}
+            <b>Last Seen:</b> {last_seen_date}
+            <b>ID:</b> <code>{id}</code>
+            """
+            return details.strip()
+
+        def format_date(date_string):
+            """Convert database date to readable format"""
+            if not date_string:
+                return "N/A"
+            
+            try:
+                # If date_string is already a datetime object
+                if isinstance(date_string, datetime):
+                    return date_string.strftime("%d %b %Y, %H:%M")
+                
+                # If it's a string, parse it first
+                date_obj = datetime.strptime(str(date_string), "%Y-%m-%d %H:%M:%S")
+                return date_obj.strftime("%d %b %Y, %H:%M")
+            except:
+                return str(date_string)
+
+        def calculate_age(birthday_string):
+            """Calculate age from birthday"""
+            if not birthday_string:
+                return "N/A"
+            
+            try:
+                birth_date = datetime.strptime(str(birthday_string), "%Y-%m-%d").date()
+                today = datetime.now().date()
+                age = today.year - birth_date.year - ((today.month, today.day) < (birth_date.month, birth_date.day))
+                return age
+            except:
+                return "N/A"
+    
+
+        @_bot.message_handler(commands=["test"])
+        def test_handler(message):
+            markup = types.ReplyKeyboardMarkup(row_width=2, one_time_keyboard=True)
+            btn1 = types.KeyboardButton("Option 1")
+            btn2 = types.KeyboardButton("Option 2")
+            markup.add(btn1, btn2)
+            _bot.reply_to(message, "Test command received!", reply_markup=markup)
+
+        @_bot.message_handler(func=lambda message: message.text in ["Option 1", "Option 2"])
+        def handle_test_options(message):
+            option = message.text
+            _bot.send_message(message.chat.id, f"You selected: {option}")
+
         @_bot.message_handler(func=lambda message: True)
-        def echo_all(message):
+        def handle_student_selection(message):
+            chat_id = message.chat.id
+            selected_text = message.text
+
             _bot.reply_to(message, f"You said: {message.text}")
         
     return _bot

database/connection.py

@@ -9,15 +9,18 @@ logger = logging.getLogger(__name__)
 _connection_pool = None
 
 def get_connection_pool():
+    """Create a connection pool"""
     global _connection_pool
     if _connection_pool is None:
         try:
-            DATABASE_URL = os.environ.get("DATABASE_URL")
+            # --- Production settings
-            _connection_pool = psycopg2.pool.SimpleConnectionPool(
+            # DATABASE_URL = os.environ.get("DATABASE_URL")
-                1,  # minimum connections
+            # _connection_pool = psycopg2.pool.SimpleConnectionPool(1, 5, DATABASE_URL);
-                5,  # maximum connections
+            
-                DATABASE_URL
+            # --- Development settings
-            )
+            dev_url = "postgresql://postgres:123@localhost:5432/OLP"
+            _connection_pool = psycopg2.pool.SimpleConnectionPool(1, 5, dev_url);
+            
             logger.info("Database connection pool created")
         except Exception as e:
             logger.error(f"Failed to create connection pool: {e}")

database/models.py

@@ -4,8 +4,8 @@ import database.connection as connection
 logger = logging.getLogger(__name__)
 
 
-class testModel:
+class Students:
-    def getAllUsers():
+    def getAllStudents():
         conn = None
         try:
             conn = connection.get_db_connection()
@@ -13,13 +13,33 @@ class testModel:
                 return None
             
             cursor = conn.cursor()
-            cursor.execute("SELECT * FROM students");
+            cursor.execute("SELECT id,name FROM students");
             result = cursor.fetchall()
             cursor.close()
 
             return result if result else None
         except Exception as e:
-            logger.error(f"Database query error: {e}")
+            logger.error(f"Database query error in getAllStudents: {e}")
+            return None
+        finally:
+            if conn:
+                connection.release_db_connection(conn)
+
+    def getStudentById(student_id):
+        conn = None
+        try:
+            conn = connection.get_db_connection()
+            if not conn:
+                return None
+            
+            cursor = conn.cursor()
+            cursor.execute("SELECT id,username, created_at, email, phone_number, last_seen, is_verfied, birthday FROM students WHERE id = %s", (student_id,))
+            result = cursor.fetchall()
+            cursor.close()
+
+            return result[0] if result else None
+        except Exception as e:
+            logger.error(f"Database query error in getStudentById: {e}")
             return None
         finally:
             if conn: