Merge pull request #13 from gtech-mulearn/dev-server

prod server
gtech-mulearn · Aug 2, 2024 · 984d2da · 984d2da
2 parents cf2af55 + 9389477
commit 984d2da
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 17 deletions.
diff --git a/.env.sample b/.env.sample
@@ -3,4 +3,5 @@ DATABASE_USER =
 DATABASE_PASSWORD =
 DATABASE_NAME =
 DATABASE_PORT =
-DEBUG=
+DEBUG=
+BASE_URL=
diff --git a/models/queries.py b/models/queries.py
@@ -1,15 +1,16 @@
 from models.connection import DBConnection
 from utils.types import OrgType, RolesType
+from decouple import config as decouple_config
 
 db = DBConnection()
 
 
 def fetch_queries(muid):
     query = """
         SELECT
+            user.id,
             user.muid,
             user.full_name,
-            user.profile_pic,
             role.title AS role,
             wallet.karma,
             interest_group.name AS interest_group_name,
@@ -28,26 +29,38 @@ def fetch_queries(muid):
         LEFT JOIN organization ON user_organization_link.org_id = organization.id and org_type = :org_type
         WHERE user.muid = :muid;
     """
-    user_data = db.fetch_all_data(query, params={'muid': muid, 'org_type': OrgType.COLLEGE.value})
+    user_data = db.fetch_all_data(
+        query, params={"muid": muid, "org_type": OrgType.COLLEGE.value}
+    )
 
     if user_data:
         data = {
-            "muid": f"{user_data[0][0]}",
-            "name": f"{user_data[0][1]}",
-            "profile_pic": user_data[0][3],
-            "karma": str(user_data[0][5]),
-            "github_username": user_data[0][7],
-            "org_code": list(set([row[8] for row in user_data if row[8]])),
-            "roles": list(set([row[4] for row in user_data if row[4]])),
-            "ig_name": list(set([row[6] for row in user_data if row[6]])),
-            'org_types': list(set([row[9] for row in user_data if row[9]]))
+            "muid": f"{user_data[0][1]}",
+            "name": f"{user_data[0][2]}",
+            "profile_pic": f"{decouple_config("BASE_URL")/{user_data[0][0]}.png}",
+            "karma": str(user_data[0][4]),
+            "github_username": user_data[0][6],
+            "org_code": list(set([row[7] for row in user_data if row[7]])),
+            "roles": list(set([row[3] for row in user_data if row[3]])),
+            "ig_name": list(set([row[5] for row in user_data if row[5]])),
+            "org_types": list(set([row[8] for row in user_data if row[8]])),
         }
     else:
         return None
 
-    main_role = next((role for role in data["roles"] if
-                      role in [RolesType.STUDENT.value, RolesType.MENTOR.value, RolesType.ENABLER.value]),
-                     RolesType.MULEARNER.value)
+    main_role = next(
+        (
+            role
+            for role in data["roles"]
+            if role
+            in [
+                RolesType.STUDENT.value,
+                RolesType.MENTOR.value,
+                RolesType.ENABLER.value,
+            ]
+        ),
+        RolesType.MULEARNER.value,
+    )
 
     if main_role in [RolesType.MENTOR.value, RolesType.ENABLER.value]:
         rank_query = """
@@ -60,7 +73,7 @@ def fetch_queries(muid):
             ORDER BY wallet.karma DESC;
 
         """
-        params = {'title': main_role}
+        params = {"title": main_role}
     else:
         rank_query = """
             SELECT wallet.karma, user.muid
@@ -76,7 +89,7 @@ def fetch_queries(muid):
             ORDER BY wallet.karma DESC;
 
         """
-        params = {'enabler': RolesType.ENABLER.value, "mentor": RolesType.MENTOR.value}
+        params = {"enabler": RolesType.ENABLER.value, "mentor": RolesType.MENTOR.value}
 
     rank_list = db.fetch_all_data(rank_query, params)