Final

theNatePi · Jan 28, 2024 · cdef33b · cdef33b
1 parent a71696a
commit cdef33b
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 27 deletions.
diff --git a/backend/__pycache__/api.cpython-311.pyc b/backend/__pycache__/api.cpython-311.pyc
diff --git a/backend/__pycache__/database.cpython-311.pyc b/backend/__pycache__/database.cpython-311.pyc
diff --git a/backend/components/__pycache__/backend_components.cpython-311.pyc b/backend/components/__pycache__/backend_components.cpython-311.pyc
diff --git a/backend/database.py b/backend/database.py
@@ -225,5 +225,5 @@ def delete_rows():
   "version": "2.29.0"
 }
 if __name__ == "__main__":
-    print(get_all_users())
+    print(get_names_with_tags("petr"))
 
diff --git a/backend/db.db b/backend/db.db
diff --git a/backend/endpoints/__pycache__/get.cpython-311.pyc b/backend/endpoints/__pycache__/get.cpython-311.pyc
diff --git a/backend/endpoints/__pycache__/post.cpython-311.pyc b/backend/endpoints/__pycache__/post.cpython-311.pyc
diff --git a/backend/endpoints/get.py b/backend/endpoints/get.py
@@ -5,28 +5,13 @@
 import requests
 
 
-#url = "https://globalemail.melissadata.net/v4/WEB/GlobalEmail/doGlobalEmail"
-
-
-
-# # Make a GET request using the requests library
-# response = requests.get(url, params=params)
-
-# def check_email(email):
-#     params = {
-#         'id': "gxEnKiQsOnDEki3tgvSky_**nSAcwXpxhQ0PC2lXxuDAZ-**",
-#         'opt': "VerifyMailBox:Premium,DomainCorrection:off,WhoIs:on",
-#         'format': "json",
-#         'email': f"{email}"
-#     }
-#     response = requests.get(url, params=params)
-#     if response.status_code == 200:
-#         result = response.json()
-#         result_dict = json.loads(result)
-#         score = int(result_dict["Records"]["DeliverabilityConfidenceScore"])
-#         return score > 30
-#     else:
-#         return False
+url = "https://globalemail.melissadata.net/v4/WEB/GlobalEmail/doGlobalEmail"
+
+
+
+# Make a GET request using the requests library
+
+
 
 @app.get("/schools/")
 def get_schools():

diff --git a/backend/endpoints/post.py b/backend/endpoints/post.py
@@ -2,6 +2,27 @@
 import json
 from components import userLogin, newUser, pageData, newBio, newTags, tagsSearch
 from database import get_user, get_email_domain, get_password_from_user, add_new_users, add_page_with_user, set_new_page_with_user, update_bio, update_tags, get_names_with_tags, get_all_users
+import requests
+
+url = "https://globalemail.melissadata.net/v4/WEB/GlobalEmail/doGlobalEmail"
+
+
+def check_email(email):
+    params = {
+        'id': "gxEnKiQsOnDEki3tgvSky_**nSAcwXpxhQ0PC2lXxuDAZ-**",
+        'opt': "VerifyMailBox:Premium,DomainCorrection:off,WhoIs:on",
+        'format': "json",
+        'email': f"{email}"
+    }
+    response = requests.get(url, params=params)
+    if response.status_code == 200:
+        result_dict = response.json()
+        print(result_dict)
+        score = int(result_dict["Records"][0]["DeliverabilityConfidenceScore"])
+        return score > 20
+    else:
+        return False
+
 
 
 
@@ -31,10 +52,13 @@ async def post_search_results(search_tags: tagsSearch):
     results = ','.join(list(results))
     json_result = json.dumps({"username": results})
     return {json_result}
+
 @app.post("/get_all_users/")
 async def post_all_users():
     results = get_all_users()
-    return {results}
+    results = ','.join(list(results))
+    json_result = json.dumps({"username": results})
+    return {json_result}
 
 
 
@@ -47,9 +71,12 @@ async def post_create_user(user_info: newUser):
     elif not user_info.school_email.__contains__(domain_result[0][0]):
         return {1}
     else:
-        add_new_users(user_info.username, user_info.password, user_info.email, user_info.school_email, user_info.school_id)
-        set_new_page_with_user(user_info.username, user_info.school_id)
-        return {2}
+        if check_email(user_info.school_email):
+            add_new_users(user_info.username, user_info.password, user_info.email, user_info.school_email, user_info.school_id)
+            set_new_page_with_user(user_info.username, user_info.school_id)
+            return {2}
+        else:
+            return {1}
 
     # turn it from json to dict
     # verify that username is avail