adding connection pooling

Author: Aayush-Agnihotri

src/database.py

@@ -1,8 +1,7 @@
 from pymongo import MongoClient
 import os
 from dotenv import load_dotenv
-import threading
-import time
+import pymongo
 
 load_dotenv()
 
@@ -14,15 +13,33 @@
     file_name = "/etc/ssl/ca-certificate.crt"
     use_tls = True
 
-# Initialize MongoDB client
+# Connection pooling settings
+max_pool_size = 10  # Maximum number of connections in the pool
+min_pool_size = 3  # Minimum number of connections to maintain
+max_idle_time_ms = 60000  # 1 minute
+
+# Initialize MongoDB client with optimized settings
 if use_tls:
     client = MongoClient(
         os.getenv("MONGO_URI"),
         tls=True,
         tlsCAFile=file_name,
+        maxPoolSize=max_pool_size,
+        minPoolSize=min_pool_size,
+        maxIdleTimeMS=max_idle_time_ms,
+        waitQueueTimeoutMS=2000,  # Wait 2 seconds for connection before timeout
+        retryWrites=True,
+        # Remove serverSelectionTimeoutMS to use MongoDB default
     )
 else:
-    client = MongoClient(os.getenv("MONGO_URI"))
+    client = MongoClient(
+        os.getenv("MONGO_URI"),
+        maxPoolSize=max_pool_size,
+        minPoolSize=min_pool_size,
+        maxIdleTimeMS=max_idle_time_ms,
+        waitQueueTimeoutMS=2000,
+        retryWrites=True,
+    )
 
 # Force connection on startup
 try:
@@ -32,44 +49,47 @@
     print(f"❌ MongoDB connection failed on startup: {e}")
     raise e
 
-
-# Start a keep-alive thread
-def keep_connection_alive():
-    while True:
-        try:
-            client.admin.command("ping")
-            print("🔁 MongoDB keep-alive ping successful")
-        except Exception as e:
-            print(f"⚠️ MongoDB keep-alive ping failed: {e}")
-        time.sleep(300)  # ping every 5 minutes
-
-
-threading.Thread(target=keep_connection_alive, daemon=True).start()
-
 # Access the database
 db = client[os.getenv("MONGO_DB", "score_db")]
 
 
+# Setup indexes only if they don't exist
 def setup_database_indexes():
     """Set up MongoDB indexes for optimal query performance"""
     try:
         game_collection = db["game"]
 
-        # Create single field indexes for commonly queried fields
-        game_collection.create_index([("sport", 1)], background=True)
-        game_collection.create_index([("date", 1)], background=True)
-        game_collection.create_index([("gender", 1)], background=True)
-
-        # Create compound indexes for common query combinations
-        game_collection.create_index([("sport", 1), ("gender", 1)], background=True)
-
-        # Index for sorting operations
-        game_collection.create_index([("date", -1)], background=True)
-
-        print("✅ MongoDB indexes created successfully")
+        # Get existing indexes
+        existing_indexes = game_collection.index_information()
+
+        # Define indexes we want
+        indexes = [
+            ("sport", pymongo.ASCENDING),
+            ("date", pymongo.ASCENDING),
+            ("gender", pymongo.ASCENDING),
+            [("sport", pymongo.ASCENDING), ("gender", pymongo.ASCENDING)],
+            ("date", pymongo.DESCENDING),
+        ]
+
+        # Create only missing indexes
+        for index in indexes:
+            # Convert single field index to list format for consistency
+            index_list = [index] if not isinstance(index, list) else index
+
+            # Generate index name
+            index_name = "_".join(
+                [f"{field}_{direction}" for field, direction in index_list]
+            )
+
+            if index_name not in existing_indexes:
+                game_collection.create_index(index_list, background=True)
+                print(f"Created index: {index_name}")
+
+        print("✅ MongoDB indexes verified")
     except Exception as e:
-        print(f"❌ Failed to create MongoDB indexes: {e}")
-        raise e
+        print(f"❌ Failed to verify MongoDB indexes: {e}")
+        # Don't raise exception here, just log the error
 
 
+# Setup indexes
 setup_database_indexes()