From 9e2ff9936b0df037c0dac2159ab3abf2452d0eab Mon Sep 17 00:00:00 2001
From: asleal2 <asleal2@tamu.edu>
Date: Tue, 17 Apr 2018 12:31:13 -0500
Subject: [PATCH] adding database functionality

---
 __pycache__/mocha_server.cpython-36.pyc | Bin 2502 -> 3262 bytes
 mocha_server.py                         |  55 ++++++++++++++++++++----
 test.py                                 |   8 +++-
 3 files changed, 52 insertions(+), 11 deletions(-)

diff --git a/__pycache__/mocha_server.cpython-36.pyc b/__pycache__/mocha_server.cpython-36.pyc
index 29b16bfd18d02e28972a817a8aac34b0b79b28ea..7c2ae9ef713aae005855784574b82525aadade22 100644
GIT binary patch
delta 1512
zcma)6L2TSa6rCB{yR%NVbv9+wR0$oZ)YcF!2vh-5niMq`4s2Ud3D{CBV^6Z)?AqJ$
zn6#@6Ic(2J#R!Qz7cN|K=g5&G2XjH<&V?Hi690RXZ5kDUB|m%r{Q2|tz5o5w;*ZOh
z-mKT{JFQ<jU(6HoJ2`PNc)tO68b7(TU3bET$E0&MWFHW>@#M?5-={~Z20Tr;Z({04
z06S!#KD<08Tjc(W`%IG_4e6L|(+Q(wOyM`1khdV`f&C%TM$ZgcXyktzOAT|Esk<Sp
zj42#qwMUn8LC-bzx>8AzrBcQIKwiJP>E^$ht(EVIOA9lM0`0PbwO%g_mFy`btyumI
zefQumd%Yi}I!Fe?jTIz^YZWqD-I3bEa%pS5p9FqC-GG<l%n`eH->nvvAX90gimH4l
zgG|eUZ%Z9?{eHhNdub9ER+tTjX<-IQ97A?87)07Niuy56?*K~{l_b-{Om~bdRY&BI
zVFjS5&4@ISUITzoliKtQb=Wz|4Ngs_79bj+$ata9GqFE~A7c;~WV=wx%*F(SW+-&*
z9F!sBX=tkazENs!hSp;;HnzxwPAJ5zUS&eSA0w<lxlUN!H^v6Iz(<iS;Ce3>LzV0(
znWinfb~95-#=8G#P3W!^4>GA9iB!r#Ds&?D61BS~u6>qip`^}K9K}1r7ig6T6Pb!Q
z(NIl-1)ocis8Fg_dC1+-tKj&mvnfKE2BIH<rebsS3I^+&!hafr4tVVV{dB29ZCs{M
z7G)t!djQ{1W>p2a2KO`m>tyJ)|IPolTU8vl)(~ujIRuyxqUs1|06uojj+07X1zm6G
zE9gxvRmVi?1#K$_^PZ(Lb-X<KDy&W&w>WJuhjC-(_+tJiy>sQ%Ry!MpzLp*|`3>BQ
z%Y>?CzRQ-+V|$l&Q?Q#(J3zCZk$=YyZ<{Cn%Zxk-_5y6`@Z)|xP1TNK@JHi$TacKd
zyrkk#wRHG{@d;hS^Z%##_wwu38{7Xa=n<#qDrcADSB~v1q*D${g~OoOjMJHP%ZI;N
zyR^NG<O~=(6?H7|MyJm$dKOwbfR6T*gceS<#L8$gsWzap$>!-iQy24ZtAEsAf~a~K
zz%?QAHGhXX`Omz$a>}MTe>m(%fv=+^-utSyx^M-zI7QX-!X)rKHJ7()g4Xj}wPv@J
z1m{~VBH&j*Eg>L(brAu#pRlGpt^9cK^+6J5eYt_gq!$28$|<)@X5+KU8~i*s`5bTZ
F#y?~ZLvR29

delta 903
zcmZWn&1=*^6rY()w$tn`yY^$X(4~R;l}l;u#Y!m^&n}3d7?co_**0Z2i8B+FQt?o{
zcq;)<o)s^G)U)3F6FlVN!MotqlkcTqm-WH>z0Aw|_|1FsW$D}e>Snv`yz71U@6HnP
zlS~MM?_E$mJXsyu>^||jCvR^0=te<ngWdtvR{;z;pfNonM>J+{*)gNUumkIu)Rv=-
zEhxed7abQQN!?s!drE3upAWB>@2&o$eBB)-<HWf6hR1xCuY+z3JiBT{h0>X-X5@1j
z6-HJ(%F-0v*%-nrI~rwLLP}T5P(}Me9;$FGjZ_sKd>~4cpXu%8YIaYWz+`za=ppY0
z0O4~~Q00`ieearpv#J5cK`N)n<Iu=JWzSqV>-zFkwaXXwl6x6E=a(M-cjfY<efrQ=
zn4>HNj({^$*w<sK1*Q^(mMR6VXMHD{Cn@|f*nAZN&&W2qNVaqOsqvU@Vys6i9w(9U
zSjE=XeG8(e3jJ}mM~OBtsC?&Exg~DA{71<bLusP@a5Sp;fzHy(j*D@w&zMe<Y-EMW
z3o})@a_aN|Z?J|G=Kx4U&@OYBpbJz0a;7eVH=_6t#3H9Z#1lF|r)T+Ap%UMQZ5gd_
zC(|uD@Jb?hB!QAo3#m>0-f(baW)Avr)}k$@`sHiqS9=BXT>y`R=T&oy_R6o#-tyE|
zn_-@hk|;DumOdzdH~SZ^U{0r+34%C_f<P^lD=nAua<|nB>tQ)qxsA|4K<=uKfSD7N
i&$lPG$5~vA<PL6KUjpE;Il(z|&<f!QOEkrznEwkeWV=`Z

diff --git a/mocha_server.py b/mocha_server.py
index dd84dbe..536f204 100755
--- a/mocha_server.py
+++ b/mocha_server.py
@@ -5,6 +5,7 @@ Handle API requests to the database
 import json
 import sqlite3
 
+# NOTE: closing a database makes the next query in a script not work
 
 # DATABASE = '/usr/local/www/mocha-server/mocha.db'
 DATABASE = 'mocha.db'
@@ -14,24 +15,60 @@ 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?)
 
-def get_top_N(search_parameter, N):
+def get_users(username_list):
     """
-    in progress
-    """
-    cursor.execute("select * from users order by p0 desc limit p1", {'p0':search_parameter, 'p1':N})
+	Gets a list of users searching by name.
+	This can also easily be done by user_id.
+	"""
+    output = []
+    for usr in username_list:
+        cursor.execute("select * from users where username=(?)", (usr,))
+        output += cursor.fetchall()
+
+    output = json.dumps([dict(row) for row in output])
     conn.commit()
-    conn.close()
+    #conn.close()
+
+    if output == '[]':
+        output = None
+
+    return output
+
+
+def get_top_N(search_parameter, desc, N):
+    """
+    In progress.
+	Currently the query seems to work, but returning a dict does not preserve order.
+
+	Store an orderd id list and put that in the json?
+    """
+    if desc == True:
+        cursor.execute("select * from users order by ? desc limit ?", (search_parameter, N))
+    else:
+        cursor.execute("select * from users order by ? asc limit ?", (search_parameter, N))
+
+    output = cursor.fetchall()
+    #print(output)
+
+    output = json.dumps([dict(row) for row in output])
+    conn.commit()
+    #conn.close()
+
+    if output == '[]':
+        output = None
+
+    return output
 
 
 # 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
@@ -40,7 +77,7 @@ def insert_row(user_id, username):
 
     cursor.execute("insert into users values (?,?)", (user_id, username))
     conn.commit()
-    conn.close()
+    #conn.close()
 
 
 def fetch_user(user_id):
@@ -56,7 +93,8 @@ def fetch_user(user_id):
 
     output = cursor.fetchall()
     output = json.dumps([dict(row) for row in output])
-    conn.close()
+    conn.commit()
+    #conn.close()
 
     if output == '[]':
         output = None
@@ -82,7 +120,6 @@ def process_request(uri):
     return output
 
 
-
 def application(environ, start_response):
     """
     mod_wsgi entry point
diff --git a/test.py b/test.py
index b65663c..9cf54e4 100644
--- a/test.py
+++ b/test.py
@@ -2,7 +2,11 @@ import mocha_server
 
 #mocha_server.insert_row(4, 'andrew')
 
-print(mocha_server.fetch_user(3))
+#print(mocha_server.fetch_user(3))
 
-print(mocha_server.get_top_N('username', 2))
+#print(mocha_server.get_top_N('user_id', False, 3))
+
+username_list = ['andrew', 'Corder']
+
+print(mocha_server.get_users(username_list))