fixed linter

backend/project/endpoints/users.py

@@ -17,7 +17,8 @@ def get(self):
         It should return all users from the database.
         """
         users = UserModel.query.all()
-        users_list = [{"uid": user.uid, "is_teacher": user.is_teacher, "is_admin": user.is_admin} for user in users]
+        users_list = [{"uid": user.uid, "is_teacher": user.is_teacher, "is_admin": user.is_admin}
+                      for user in users]
         return users_list
 
     def post(self):
@@ -47,31 +48,33 @@ def post(self):
         return {"Message": "User created successfully!"}
 
     def patch(self):
-            """
-            Update the user's information.
-
-            Returns:
-                dict: A dictionary containing the message indicating the success or failure of the update.
-            """
-            uid = request.json.get('uid')
-            is_teacher = request.json.get('is_teacher')
-            is_admin = request.json.get('is_admin')
-            if uid is None:
-                return {"Message": "User ID is required!"}, 400
-
-            user = UserModel.query.get(uid)
-            if user is None:
-                return {"Message": "User not found!"}, 404
-
-            if is_teacher is not None:
-                user.is_teacher = is_teacher
-            if is_admin is not None:
-                user.is_admin = is_admin
-
-            # Save the changes to the database
-            db.session.commit()
-            return {"Message": "User updated successfully!"}
-
+        """
+        Update the user's information.
+
+        Returns:
+            dict: A dictionary containing the message indicating the success
+             or failure of the update.
+        """
+        uid = request.json.get('uid')
+        is_teacher = request.json.get('is_teacher')
+        is_admin = request.json.get('is_admin')
+        if uid is None:
+            return {"Message": "User ID is required!"}, 400
+
+
+        user = db.session.get(UserModel,uid)
+        if user is None:
+            return {"Message": "User not found!"}, 404
+
+        if is_teacher is not None:
+            user.is_teacher = is_teacher
+        if is_admin is not None:
+            user.is_admin = is_admin
+
+        # Save the changes to the database
+        db.session.commit()
+        return {"Message": "User updated successfully!"}
+
     def delete(self):
         """
         This function will respond to DELETE requests made to /users.
@@ -82,7 +85,7 @@ def delete(self):
         if uid is None:
             return {"Message": "User ID is required!"}, 400
 
-        user = UserModel.query.get(uid)
+        user = db.session.get(UserModel, uid)
         if user is None:
             return {"Message": "User not found!"}, 404
 

backend/tests/__init__.py

@@ -1,3 +1,13 @@
+"""
+This module is used to create a SQLAlchemy URL object for a PostgreSQL database.
+
+It uses environment variables to get the necessary database configuration details:
+- 'POSTGRES_DB': The name of the database.
+- 'POSTGRES_USER': The username to connect to the database.
+- 'POSTGRES_PASSWORD': The password to connect to the database.
+- 'POSTGRES_HOST': The host where the database is located.
+
+"""
 import os
 from sqlalchemy.engine.url import URL
 from dotenv import load_dotenv
@@ -13,4 +23,4 @@
     host=DATABASE_HOST,
     database=DATABSE_NAME,
     password=DATABASE_PASSWORD
-)
+)

backend/tests/endpoints/conftest.py

@@ -1,7 +1,7 @@
 """ Configuration for pytest, Flask, and the test client."""
 import pytest
-from project import create_app_with_db
 from sqlalchemy import create_engine
+from project import create_app_with_db
 from project import db
 from tests import db_url
 

backend/tests/endpoints/user_test.py

@@ -1,3 +1,12 @@
+"""
+This module tests user management endpoints.
+
+- test_post_delete_user: Tests user creation, deletion, and error handling for deletion
+    of non-existent user.
+- test_get_users: Tests retrieval of all users, ensuring the response is a list.
+- test_patch_user: Tests user update functionality and error handling for updating
+    non-existent user.
+"""
 def test_post_delete_user(client):
     """Test whether the users page is accessible"""
     response = client.post("/users", json={
@@ -9,7 +18,7 @@ def test_post_delete_user(client):
     # Delete the user
     response = client.delete("/users", json={'uid': 'del'})
     assert response.status_code == 200
-    assert response.json == {"Message": f"User with id: del deleted successfully!"}
+    assert response.json == {"Message": "User with id: del deleted successfully!"}
 
     # Try to delete the user again
     response = client.delete("/users", json={'uid': 'del'})
@@ -53,4 +62,4 @@ def test_patch_user(client):
         'is_teacher': False,
         'is_admin': True
     })
-    assert response.status_code == 404
+    assert response.status_code == 404

backend/tests/models/conftest.py

@@ -2,12 +2,9 @@
 Configuration for the models tests. Contains all the fixtures needed for multiple models tests.
 """
 
-import os
 from datetime import datetime
 from sqlalchemy import create_engine
 from sqlalchemy.orm import sessionmaker
-from sqlalchemy.engine.url import URL
-from dotenv import load_dotenv
 import pytest
 from project import db
 from project.models.courses import Courses