get_messages

Lab2/database_helper.py

@@ -105,14 +105,29 @@ def get_data_email(email):
         cursor.execute("SELECT * FROM USERS WHERE EMAIL=?;", [email])
         result = cursor.fetchone()
         if result:
-            data = []
-            for r in result:
-                data.append(r)
-            return data
+            return result
+        else:
+            return None
+    except:
         return None
+
+
+def get_messages_email(email):
+    try:
+        cursor = get_db().cursor()
+        cursor.execute("SELECT MESSAGE, EMAIL_SENDER FROM MESSAGES WHERE EMAIL_RECIPIENT=?;", [email])
+        result = cursor.fetchall()
+        return result
     except:
         return None
 
+def check_user_exists(email):
+    cursor = get_db().cursor()
+    cursor.execute("SELECT EMAIL FROM USERS WHERE EMAIL=?", [email])
+    email = cursor.fetchone()
+    if email:
+        return True
+    return False
 
 def change_password(email, newpassword):
     try:

Lab2/server.py

@@ -3,6 +3,7 @@ from flask import Flask, request, jsonify
 import database_helper
 import random
 import string
+import json
 
 app = Flask(__name__)
 
@@ -95,7 +96,7 @@ def change_password():
             else:
                 return "", 401
         else:
-            return "", 406
+            return "", 405
     else:
         return "", 400
 
@@ -128,6 +129,41 @@ def get_user_data_email(token, email):
     else:
         return "", 401
 
+
+@app.route("/account/get/message/<token>", methods = ['GET'])
+def get_user_message_token(token):
+    email = database_helper.tokenToEmail(token)
+    if email:
+        return get_user_message_email(token, email)
+    else:
+        return "", 401
+
+
+@app.route("/account/get/message/<token>/<email>", methods = ['GET'])
+def get_user_message_email(token, email):
+    if database_helper.is_online(token):
+        data = database_helper.get_messages_email(email)
+        #this user has message(s)
+        if(data and database_helper.check_user_exists(email)):
+            values = {}
+            r_value = []
+            for d in data:
+                values = {
+                    "message": d[0],
+                    "writer": d[1]
+                }
+                r_value.append(values)
+            return jsonify(r_value), 200
+        #this user has no messages
+        elif (not data and database_helper.check_user_exists(email)):
+            return "", 204
+        #this user does not exist
+        else:
+            return "", 404
+    else:
+        return "", 401
+
+
 @app.route("/account/post_message", methods = ['POST'])
 def post_message():
     data = request.get_json()
@@ -154,6 +190,7 @@ def generate_token():
     characters = string.ascii_letters + string.digits
     return ''.join(random.choices(characters, k=36))
 
+
 if __name__ == '__main__':
     app.debug = True
     app.run()