Join proposal on staff perm checks

Author: gfrn

src/pato/crud/groups.py

@@ -41,7 +41,7 @@ def get_collection_group(group_id: int):
         .filter(DataCollectionGroup.dataCollectionGroupId == group_id)
     ).one()
 
-
+# TODO: make session and proposal required
 def get_collection_groups(
     limit: int,
     page: int,
@@ -96,9 +96,9 @@ def get_collection_groups(
                     db.session.execute(session_id_query).all()
                 )
             )
-    return db.paginate(check_session(query, user), limit, page, slow_count=True)
-
+    return db.paginate(check_session(query, user, join_proposal=(not proposal)), limit, page, slow_count=True)
 
+# TODO: make group ID required
 def get_collections(
     limit: int,
     page: int,
@@ -132,6 +132,7 @@ def get_collections(
     sub_with_row = check_session(
         base_sub_query,
         user,
+        join_proposal=True
     )
 
     if groupId is not None:

src/pato/crud/sessions.py

@@ -128,7 +128,7 @@ def get_sessions(
             )
         )
 
-    query = check_session(query, user)
+    query = check_session(query, user, join_proposal=(proposal is None))
 
     if countCollections:
         query = query.join(

src/pato/utils/auth.py

@@ -39,13 +39,14 @@ def _get_staff_perms(user: GenericUser):
 
         return BLSession.beamLineName.in_(allowed_beamlines)
 
-def check_session(query: Select, user: GenericUser):
+def check_session(query: Select, user: GenericUser, join_proposal: bool = False):
     """Include filters in provided query to ensure that only sessions the user has permission to view
     are returned.
 
     Args:
         query: Original query
         user: User to check against
+        join_proposal: Join proposal when building query
 
     Returns
         Modified query"""
@@ -56,6 +57,8 @@ def check_session(query: Select, user: GenericUser):
 
     staff_perms = _get_staff_perms(user)
     if staff_perms is not None:
+        if Config.facility.users_only_on_industrial and join_proposal:
+            query = query.join(Proposal, BLSession.proposalId == Proposal.proposalId)
         or_expressions.append(staff_perms)
 
     return (