Merge branch 'main' of git.ingemanngade.net:NikolajDanger/UIS_Prototype

aula/models.py

@@ -1,25 +1,21 @@
 # write all your SQL queries in this file.
-from aula import conn, login_manager
 from flask_login import UserMixin
-from psycopg2 import sql
+
+from aula import conn, login_manager
 
 @login_manager.user_loader
 def load_user(user_id):
     cur = conn.cursor()
 
-    schema = 'users'
-    _id = 'user_id'
-
-    user_sql = sql.SQL("""
-    SELECT * FROM {}
-    WHERE {} = %s
-    """).format(sql.Identifier(schema),  sql.Identifier(_id))
+    user_sql = """
+    SELECT * FROM users
+    WHERE user_id = %s
+    """
 
     cur.execute(user_sql, (user_id,))
-    if cur.rowcount > 0:
-        User(cur.fetchone())
-    else:
-        return None
+    user = User(cur.fetchone()) if cur.rowcount > 0 else None
+    cur.close()
+    return user
 
 #
 # Models
@@ -66,7 +62,7 @@ class User(tuple, UserMixin):
         self.role = user_data[6]
 
     def get_id(self):
-           return (self.user_id)
+        return self.user_id
 
     def get_groups(self):
         cur = conn.cursor()
@@ -113,6 +109,21 @@ def select_users_by_email(email):
     cur.execute(sql_call, (email,))
     user = User(cur.fetchone()) if cur.rowcount > 0 else None
     cur.close()
+<<<<<<< HEAD
     return 
 
 
+=======
+    return user
+
+def get_posts_for_user(user_id):
+    cur = conn.cursor()
+    sql_call = """
+    SELECT * FROM posts
+    """
+    cur.execute(sql_call, ())
+    posts = [Post(i) for i in cur.fetchmany(10)]
+    print(posts)
+    cur.close()
+    return posts
+>>>>>>> 44c5063a11505828679f1ebd8455debca1f8cf84