From 53a0ca7fcf3c389f6e6aedc414aa2c4e74ec7e8f Mon Sep 17 00:00:00 2001
From: asleal2 <asleal2@tamu.edu>
Date: Tue, 17 Apr 2018 10:17:17 -0500
Subject: [PATCH] adding database functionality

---
 __pycache__/mocha_server.cpython-36.pyc | Bin 0 -> 2126 bytes
 mocha.db                                | Bin 8192 -> 8192 bytes
 mocha_server.py                         |  31 +++++++++++++++++++-----
 test.py                                 |   5 ++++
 4 files changed, 30 insertions(+), 6 deletions(-)
 create mode 100644 __pycache__/mocha_server.cpython-36.pyc
 create mode 100644 test.py

diff --git a/__pycache__/mocha_server.cpython-36.pyc b/__pycache__/mocha_server.cpython-36.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..1091d27bd2dc73960be4c144908a84fe04441576
GIT binary patch
literal 2126
zcmZuy-EQ1O6!whmUB}sk(3YPfsH{kpvJuHfv=RuVDQUV@TgnzTDM&`eay_$&H(rlB
zGj52rd&9y5@EAM{w_Ny^tG+_6IA=CVLt0C7X3qScpYMFWwXon%7XJwy&$9ltE_@Wm
z-#}BpfM8Z=F~Vp@LSlLvQf7xXr$dL^Qxdu`YH&Ada(C!Wt<Yl*bAPwOIo4oJ=zZp~
zIq2t^&*q_Tu@+l^eu2?ltG!s=^dH7K%XqN;{i8tgmnBzP1zH69fCntr@rzh-|23Fm
z^(t>9l7o1iy-3hV{IDm`cAzOAgtn$I!7R9(^xC9$3z_D+P3vZ<xQtR3E|mq`%UOgI
zc|78OS<-=%C!3uEG2$I2h3MSp>QIZKV;)?Cjjy<ThZ4<J){EoXpIsYCar6-yV=N@H
z0poLPZBVcoYgb?}w#H;YCsbQQ2=ACqDX}yi+UNuH&bcqNSKUZ+cufc3jtJ0p6}*Zw
zh*z+3_w&2$wp%xnQYs<qCjXTurRKGhh&&G)i5QJiUAsvp6mQ!SO$fa+_iHEBd}Kl}
z6D};*{_Hh$=M&Hspai1rkrwfYY{59eu;Yi0o;&p;C}Tj(p)Ef)PSLS7Am~=^8yzqM
zu31AmwI)Q{LuZDUF}ZI|$&|pHJ8YoaW5ODTRQ6eOLdFEr=~YL50AHW$Qsyd%gU7p1
zdx3Z{<cSWzQyr&yn(rIroFa)c6Df0UJ5wS^;v7(h7r^-}RXPxZAkMPWfTja80GI@K
z?gY!L%jRTFR;!!4-6!3hy<jzX(0}^f>Gq!<cKhA46L(hbwyUe}*!I6jA<}lCscRti
zAy&^@;4^qTC4bVF&h8A009=Qq3F4NnZ-h2v;ZlN5{7p0;Qd?}T<9(QhhE?4daGe|&
zY_D%-B8fA#1%tD#75({nuicbQ*ex-qp=S<22x@1jL|(hB92H8=;RY<IHZ^#u8=}-j
zsV|vP`)}S`hTZB42&>_dCF%oOt`QHULnV599tT9rIb!aCGPZ_*nJMrLv;Uyi0U3~e
z=eot*L#mcF`He7pLSYWp3@WxXYR&6_8JI^V@v6T~u4Zfk3<C6ll)`gX2q>9#v$|7C
z$#b0@2dXRzA+`G2%p<PWpv_9WW2&pOj2%E>8CT!nZic#nc|jFCNeAggnBms9u3E*}
zH{ThA%~fxq&{%XrI<K+9dJ<*m8X^i^W7%uWb=$68Rb)`ti`xo`Ar*O7N+C_G+rZJK
zOhdPb!AW@)4qVRMdxaDUS1LNKl`mnB!pgRqS0H^3ZIKq0Sp4Vwh0K6$2b$`EU=V%)
zuZ4+$RM=yi*@vDCm@}cwMICspfh$1&bDC<H!7?AveL8W*z<6T^$zg2oV~NjKH;nTm
z!J;FzpF;MuJPu3(%|g}qVq+tC`fWJh@BZ+tySo=X>p$vM3%56J2R)&K2cpbbZB_2G
zy$5SwowRm<72u9FeO&O9rMQ52B{4>-gIKQ?&(@#td|w{`)ISBM<Yyq-j&Z$i@H`QW
z*S6BKwlkgs&o+7fDwQG+7nO$aLI71EfSkhy=(?PRJ6t-Ojt+RtfUYkmVE%$Vk1?WH
zB$neq*r8^iYJ5t`6_64utG!q^qlk$lisbvChfVbovd?dY-u>;p?R(q1-LQ##4{T_v
zH?;fWD4YlChz4<@g*={BJ^qmlgBze2FU<oN%tMlr<~QJNLN3aTZ{d{s5QGCi0M7yA
Ou%Gj6&+|U;uKowSI0i2O

literal 0
HcmV?d00001

diff --git a/mocha.db b/mocha.db
index 6bb9d3f05d65ce9d73c9441d57d9722f1324d898..6f7a339b0a4f01510957f10929682547f76e68c6 100644
GIT binary patch
delta 70
zcmZp0XmFSy&B!)U#+jduK~G^OF9QPuBmXi6{$-m51uXa{FXNBnVd1~P!2g~94gYQa
a3qa8W{M?)@%nXu=c_~Gy<&$sAs{#OO2@@Lt

delta 59
zcmZp0XmFSy&B!`Y#+jd$K~G@@F9QPuBmXi6{$-m51uXa{FXNBnV&=ci!2g~94gYPR
P*na+r0eq8h%c}wavc3>{

diff --git a/mocha_server.py b/mocha_server.py
index 37363f6..33af5cd 100755
--- a/mocha_server.py
+++ b/mocha_server.py
@@ -6,24 +6,43 @@ import json
 import sqlite3
 
 
-DATABASE = '/usr/local/www/mocha-server/mocha.db'
+# DATABASE = '/usr/local/www/mocha-server/mocha.db'
+DATABASE = 'mocha.db'
+
+conn = sqlite3.connect(DATABASE)
+conn.row_factory = sqlite3.Row
+cursor = conn.cursor()
+
+
 
 # TODO: Add fetching of list of users
 # TODO: Add fetching of top N users by score
 # TODO: Add ability to store and retrieve avatars (as image files?)
 
+# add new parameters as needed
+def update_row(user_id, updated_username):
+    print()
+
+def insert_row(user_id, username):
+    """
+	Inserts a row for a NEW user with given parameters
+	This may work better with AUTOINCREMENT to avoid arbitrary ids and duplicates
+	"""
+
+    item = (user_id, username)
+    cursor.execute('insert into users values (?,?)', item)
+    conn.commit()
+    conn.close()
+
 
 def fetch_user(user_id):
     """
     Returns a JSON object containing the requested user
     Also can return a list of all users if user_id == "*"
     """
-    conn = sqlite3.connect(DATABASE)
-    conn.row_factory = sqlite3.Row
-    cursor = conn.cursor()
 
-    if user_id != '*':
-        cursor.execute("SELECT * FROM users WHERE user_id=?", user_id)
+    if user_id != '*': # must use (?), (item,) format
+        cursor.execute("SELECT * FROM users WHERE user_id=(?)", (user_id,))
     else:
         cursor.execute("SELECT * FROM users")
 
diff --git a/test.py b/test.py
new file mode 100644
index 0000000..2950d04
--- /dev/null
+++ b/test.py
@@ -0,0 +1,5 @@
+import mocha_server
+
+#mocha_server.insert_row(4, 'andrew')
+
+print(mocha_server.fetch_user(3))