Changeset 527c097 for uc_users.py

Timestamp:

04/05/26 20:02:04 (3 months ago)

Author:

teo <teodorbogoeski@…>

Branches:

main

Parents:

95cf703

Message:

Add connection pooling and transaction management

File:

• uc_users.py (modified) (4 diffs)

uc_users.py

@@ -3 +3 @@
 import bcrypt
 
-from db import get_connection, pick_from_list
+from db import get_connection, get_transaction, pick_from_list
 
 
@@ -40 +40 @@
         return
 
-    # Step 3: Check email uniqueness
-    with get_connection() as conn:
-        with conn.cursor() as cur:
-            cur.execute("SELECT COUNT(*) FROM users WHERE email = %s", (email,))
-            exists = cur.fetchone()[0]
-    if exists > 0:
-        print(f"\n  ERROR: A user with email '{email}' already exists.")
-        return
-
-    # Step 4: Enter password
+    # Step 3: Enter password
     password = getpass.getpass("  Initial password: ").strip()
     if not password:
@@ -59 +50 @@
         return
 
-    # Step 5: Hash and insert
+    # Step 4: Hash password
     hashed = bcrypt.hashpw(password.encode(), bcrypt.gensalt()).decode()
 
-    conn = get_connection()
+    # Step 5: Transaction — check email uniqueness + insert atomically
+    # This prevents a race condition where two users register with the
+    # same email simultaneously (one check passes, both insert).
     try:
-        with conn.cursor() as cur:
-            cur.execute(
-                """
-                INSERT INTO users (first_name, last_name, email, password, type_id)
-                VALUES (%s, %s, %s, %s, %s)
-                RETURNING user_id, first_name, last_name, email
-                """,
-                (first_name, last_name, email, hashed, type_id),
-            )
-            result = cur.fetchone()
-        conn.commit()
+        with get_transaction() as conn:
+            with conn.cursor() as cur:
+                cur.execute("SELECT COUNT(*) FROM users WHERE email = %s", (email,))
+                if cur.fetchone()[0] > 0:
+                    raise ValueError(f"A user with email '{email}' already exists.")
 
-        # Step 6: Confirmation
+                cur.execute(
+                    """
+                    INSERT INTO users (first_name, last_name, email, password, type_id)
+                    VALUES (%s, %s, %s, %s, %s)
+                    RETURNING user_id, first_name, last_name, email
+                    """,
+                    (first_name, last_name, email, hashed, type_id),
+                )
+                result = cur.fetchone()
+
+        # Transaction committed automatically — Step 6: Confirmation
         print(f"\n  User created successfully!")
         print(f"  User ID:  {result[0]}")
@@ -82 +79 @@
         print(f"  Email:    {result[3]}")
         print(f"  Role:     {role_name}")
+    except ValueError as e:
+        print(f"\n  ERROR: {e}")
     except Exception as e:
-        conn.rollback()
         print(f"\n  Error creating user: {e}")
-    finally:
-        conn.close()