Sep 4 - Add link relavant issues function

This commit is contained in:
2026-09-04 16:53:53 -04:00
parent d291dfc513
commit e9005b9b9c
20 changed files with 3208 additions and 72 deletions
+22 -14
View File
@@ -18,6 +18,7 @@ that no facility-level scoping is required (full access applies).
"""
import logging
from app import db
from app.models.project import CustomerAssignment
from app.models.facility import Facility
@@ -43,30 +44,34 @@ def get_customer_scope(user) -> list[int] | None:
if user.role != 'customer':
return None # no scoping needed for internal staff
assignments = CustomerAssignment.query.filter_by(user_id=user.id).all()
# Select only the two columns needed. The previous .all() built full
# CustomerAssignment ORM objects (and their identity-map entries) purely to
# read two integers off each one; this function runs on nearly every
# request for a customer, sometimes more than once.
assignments = db.session.query(
CustomerAssignment.project_id,
CustomerAssignment.facility_id,
).filter(CustomerAssignment.user_id == user.id).all()
if not assignments:
return []
# Separate direct facility assignments from project-level assignments
direct_facility_ids = {a.facility_id for a in assignments if a.facility_id}
project_ids = {a.project_id for a in assignments if not a.facility_id}
direct_facility_ids = {fac_id for _, fac_id in assignments if fac_id}
project_ids = {proj_id for proj_id, fac_id in assignments if not fac_id}
facility_ids = set(direct_facility_ids)
# Single bulk query for all project-scoped facilities — replaces the
# previous per-assignment Facility.query loop (N+1 pattern).
# previous per-assignment Facility.query loop (N+1 pattern). Only the id
# column is read; nothing here needs a hydrated Facility.
if project_ids:
project_facilities = (
Facility.query
.filter(
facility_ids.update(
fid for (fid,) in db.session.query(Facility.id).filter(
Facility.project_id.in_(project_ids),
Facility.active == True,
)
.all()
).all()
)
for f in project_facilities:
facility_ids.add(f.id)
logger.debug(
'SCOPE | customer_scope | user_id=%s username=%s facility_ids=%s',
@@ -102,16 +107,19 @@ def get_inspector_scope(user) -> list[int] | None:
from app.models.inspector_assignment import InspectorAssignment
# Column-only selects — see the note in get_customer_scope(). This runs on
# every scoped request for both inspector roles.
project_ids = [
a.project_id
for a in InspectorAssignment.query.filter_by(user_id=user.id).all()
pid for (pid,) in
db.session.query(InspectorAssignment.project_id)
.filter(InspectorAssignment.user_id == user.id).all()
]
if not project_ids:
return [] # strict: no assignments = no access
facility_ids = [
f.id for f in Facility.query.filter(
fid for (fid,) in db.session.query(Facility.id).filter(
Facility.project_id.in_(project_ids),
Facility.active == True,
).all()