diff --git a/allfence.py b/allfence.py index 2aef315..0a772a1 100644 --- a/allfence.py +++ b/allfence.py @@ -1,4 +1,5 @@ import bcrypt +import datetime def create_user(db, login_info, user_info): @@ -7,8 +8,8 @@ def create_user(db, login_info, user_info): Args: db (psycopg2.connection): connection to postgres database - login_info (dict of str:int): username and password info - user_info (dict of str:int): name and dob info + login_info (dict of str:str): username and password info + user_info (dict of str:value): name (str) and dob (datetime.date) info Returns: bool, str: status, message @@ -37,7 +38,7 @@ def get_user_details(db, user_id): id (int): user id Returns: - bool, dict of str to str, dict of str to str: user existance, login info (username, password), user info (name, dob) + bool, dict of str to str, dict of str to value: user existance, login info (username, password), user info (name (str), dob (datetime.date)) """ with db: @@ -49,8 +50,14 @@ 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): - pass +def create_event(db, name, timestamp): + """ + with db: + with db.cursor() as curs: + curs.execute("INSERT INTO Events (name, datetime, users, results) VALUES (%s, %s, %s, %s)", (username, password_hash, name, dob)) + db.commit() + return True, "Success" + """ def finish_event(db, event): pass diff --git a/app.py b/app.py index 751d6b4..8c1551e 100644 --- a/app.py +++ b/app.py @@ -1,4 +1,5 @@ import allfence as af +import datetime from flask import Flask import psycopg2 as sql from textwrap import dedent @@ -20,20 +21,22 @@ with db_connection.cursor() as cursor: username varchar(255), password_hash varchar(255), name varchar(255), - dob varchar(255) + dob date ); CREATE TABLE IF NOT EXISTS Events ( id SERIAL PRIMARY KEY, name varchar(255), - datetime varchar(255), - users varchar(255), + datetime datetime, + max_age int, + completed boolean, + registration varchar(255), results varchar(255) ); CREATE TABLE IF NOT EXISTS Tournaments ( id SERIAL PRIMARY KEY, name varchar(255), - start_date varchar(255), - end_date varchar(255), + start_date date, + end_date date, events varchar(255) ); """))