add event creation

allfence.py

@@ -12,7 +12,7 @@ def create_user(db, login_info, user_info):
         user_info (dict of str:value): name (str) and dob (datetime.date) info
 
     Returns:
-        bool, str: status, message
+        int: 0 if the username is non-unique, user id otherwise
     """
 
     username, password = login_info["username"], login_info["password"]
@@ -23,10 +23,32 @@ def create_user(db, login_info, user_info):
             curs.execute("SELECT * FROM Users WHERE username = %s", (username,))
             conflicts = curs.fetchall()
             if conflicts:
-                return False, "Duplicate username"
+                return 0
-            curs.execute("INSERT INTO Users (username, password_hash, name, dob) VALUES (%s, %s, %s, %s)", (username, password_hash, name, dob))
+            curs.execute("INSERT INTO Users (username, password_hash, name, dob) VALUES (%s, %s, %s, %s) RETURNING id", (username, password_hash, name, dob))
+            user_id = curs.fetchone()[0]
         db.commit()
-    return True, "Success"
+    return user_id
+
+def get_user_from_username(db, username):
+
+    """
+    Get a user id based on their username
+    
+    Args:
+        db (psycopg2.connection): connection to postgres database
+        username (str): the username used to query
+
+    Returns:
+        int: 0 if the username is not in the system, user id otherwise
+    """
+
+    with db:
+        with db.cursor() as curs:
+            curs.execute("SELECT * FROM Users WHERE username = %s", (username,))
+            users = curs.fetchall()
+    if not users:
+        return 0
+    return users[0][0]
 
 def get_user_details(db, user_id):
 
@@ -50,17 +72,30 @@ def get_user_details(db, user_id):
     user = user[0]
     return True, {"username": user[1], "password_hash": user[2]}, {"name": user[3], "dob": user[4]}
 
-def create_event(db, name, timestamp):
+def create_event(db, name, time, max_age):
+
     """
-    with db:
+    Creates a new event in the database
-        with db.cursor() as curs:
+    
-            curs.execute("INSERT INTO Events (name, datetime, users, results) VALUES (%s, %s, %s, %s)", (username, password_hash, name, dob))
+    Args:
-        db.commit()
+        db (psycopg2.connection): connection to postgres database
-    return True, "Success"
+        name (str): event name
+        time (date.datetime): event time
+        max_age (int): how old a fencer is allowed to be at the time of the event starting
+
+    Returns:
+        int: id of the event created
     """
 
-def finish_event(db, event):
+    with db:
-    pass
+        with db.cursor() as curs:
+            curs.execute("INSERT INTO Events (name, datetime, max_age, completed, registration, results) VALUES (%s, %s, %s, False, '', '') RETURNING id", (name, time, max_age))
+            event_id = curs.fetchone()[0]
+        db.commit()
+    return event_id
 
 def create_tournament(db, events):
     pass
+
+def finish_event(db, event):
+    pass