Refactor sqlalchemy functions

Author: jaswanthDuddu

labconnect/main/profile_routes.py

@@ -1,8 +1,6 @@
 from flask import Response, jsonify, request
 from flask_jwt_extended import get_jwt_identity, jwt_required
 
-from sqlalchemy import select, delete
-
 from labconnect import db
 from labconnect.models import Majors, RPIDepartments, User, UserDepartments, UserMajors
 
@@ -13,7 +11,7 @@ def user_to_dict(user: User) -> dict:
     """Helper function to serialize User object data."""
     user_departments = (
         db.session.execute(
-            select(UserDepartments.department_id).where(
+            db.select(UserDepartments.department_id).where(
                 UserDepartments.user_id == user.id
             )
         )
@@ -23,7 +21,7 @@ def user_to_dict(user: User) -> dict:
 
     user_majors = (
         db.session.execute(
-            select(UserMajors.major_code).where(UserMajors.user_id == user.id)
+            db.select(UserMajors.major_code).where(UserMajors.user_id == user.id)
         )
         .scalars()
         .all()
@@ -50,7 +48,7 @@ def get_profile() -> Response:
     """GET /profile: current user profile"""
     user_email = get_jwt_identity()
     user = db.session.execute(
-        select(User).where(User.email == user_email)
+        db.select(User).where(User.email == user_email)
     ).scalar_one_or_none()
 
     if not user:
@@ -65,7 +63,7 @@ def update_profile() -> Response:
     """PUT /profile: Updates current user profile"""
     user_email = get_jwt_identity()
     user = db.session.execute(
-        select(User).where(User.email == user_email)
+        db.select(User).where(User.email == user_email)
     ).scalar_one_or_none()
 
     if not user:
@@ -85,13 +83,13 @@ def update_profile() -> Response:
 
     if "departments" in json_data:
         db.session.execute(
-            delete(UserDepartments).where(UserDepartments.user_id == user.id)
+            db.delete(UserDepartments).where(UserDepartments.user_id == user.id)
         )
 
         req_dept_ids = set(json_data["departments"])
         if req_dept_ids: # Only query if list is not empty
             valid_dept_ids = db.session.execute(
-                select(RPIDepartments.id).where(
+                db.select(RPIDepartments.id).where(
                     RPIDepartments.id.in_(req_dept_ids)
                 )
             ).scalars().all()
@@ -102,13 +100,13 @@ def update_profile() -> Response:
 
     if "majors" in json_data:
         db.session.execute(
-            delete(UserMajors).where(UserMajors.user_id == user.id)
+            db.delete(UserMajors).where(UserMajors.user_id == user.id)
         )
 
         req_major_codes = set(json_data["majors"])
         if req_major_codes: # Only query if list is not empty
             valid_major_codes = db.session.execute(
-                select(Majors.code).where(Majors.code.in_(req_major_codes))
+                db.select(Majors.code).where(Majors.code.in_(req_major_codes))
             ).scalars().all()
 
             for major_code in valid_major_codes: # Add only the valid ones