From c6add58ee1c500774a7573bfbe639bd4fa3cbcfd Mon Sep 17 00:00:00 2001
From: James Wang <jameswang9909@hotmail.com>
Date: Wed, 23 Dec 2015 19:40:59 -0500
Subject: [PATCH] Begin work on a few other models

---
 server/api/models.py | 69 +++++++++++++++++++++++++++++++++++---------
 server/api/utils.py  |  2 +-
 2 files changed, 57 insertions(+), 14 deletions(-)

diff --git a/server/api/models.py b/server/api/models.py
index c63243f..acc73c2 100644
--- a/server/api/models.py
+++ b/server/api/models.py
@@ -4,17 +4,60 @@ import utils
 db = SQLAlchemy()
 
 class Users(db.Model):
-	id = db.Column(db.Integer, primary_key=True)
-	name = db.Column(db.String(64))
-	username = db.Column(db.String(64), unique=True)
-	username_lower = db.Column(db.String(64), unique=True)
-	email = db.Column(db.String(64), unique=True)
-	password = db.Column(db.String(128))
-	admin = db.Column(db.Boolean)
+    uid = db.Column(db.Integer, primary_key=True)
+    tid = db.Column(db.Integer)
+    name = db.Column(db.String(64))
+    username = db.Column(db.String(64), unique=True)
+    username_lower = db.Column(db.String(64), unique=True)
+    email = db.Column(db.String(64), unique=True)
+    password = db.Column(db.String(128))
+    admin = db.Column(db.Boolean)
 
-	def __init__(self, name, username, email, password):
-		self.name = name
-		self.username = username
-		self.username_lower = username.lower()
-		self.email = email.lower()
-		self.password = utils.hash_password(password)
\ No newline at end of file
+    def __init__(self, name, tid, username, email, password):
+        self.name = name
+        self.tid = tid
+        self.username = username
+        self.username_lower = username.lower()
+        self.email = email.lower()
+        self.password = utils.hash_password(password)
+
+class Teams(db.Model):
+    tid = db.Column(db.Integer, primary_key=True)
+    name = db.Column(db.String(64), unique=True)
+    join_code = db.Column(db.String(128), unique=True)
+    school = db.Column(db.String)
+    size = db.Column(db.Integer)
+    score = db.Column(db.Integer)
+    observer = db.Column(db.Boolean)
+    owner = db.Column(db.Integer)
+
+    def __init__(self, name, school):
+        self.name = name
+        self.school = school
+
+class Problems(db.Model):
+    pid = db.Column(db.Integer, primary_key=True)
+    name = db.Column(db.String(128))
+    description = db.Column(db.Text)
+    hint = db.Column(db.Text)
+    flag = db.Column(db.Text)
+    disabled = db.Column(db.Boolean)
+    value = db.Column(db.Integer)
+    solves = db.Column(db.Integer)
+
+    def __init__(self, name, description, hint, flag, value):
+        self.name = name
+        self.description = description
+        self.hint = hint
+        self.flag = flag
+        self.value = value
+
+class Solves(db.Model):
+    sid = db.Column(db.Integer, primary_key=True)
+    pid = db.Column(db.Integer)
+    tid = db.Column(db.Integer)
+    date = db.Column(db.Integer, default=utils.get_time_since_epoch())
+
+    def __init__(self, pid, tid):
+        self.pid = pid
+        self.tid = tid
diff --git a/server/api/utils.py b/server/api/utils.py
index 8ecbd6a..f638462 100644
--- a/server/api/utils.py
+++ b/server/api/utils.py
@@ -40,4 +40,4 @@ def api_wrapper(f):
 			traceback.print_exc()
 			web_result = { "success": 0, "message": "Something went wrong! Please notify us about this immediately.", error: traceback.format_exc() }
 		return json.dumps(web_result), response, { "Content-Type": "application/json; charset=utf-8" }
-	return wrapper
\ No newline at end of file
+	return wrapper