[Track-298] Filter RF team member query by active staff (#2462)

bcgov · Dec 2, 2024 · ff51a5c · ff51a5c
1 parent 6d54b75
commit ff51a5c
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/epictrack-api/src/api/reports/resource_forecast_report.py b/epictrack-api/src/api/reports/resource_forecast_report.py
@@ -727,9 +727,14 @@ def _get_work_team_members(self, work_id) -> Tuple[List[str], str]:
         work_lead = ""
         work_team_members = (
             db.session.query(StaffWorkRole)
-            .filter(StaffWorkRole.work_id == work_id)
-            .filter(StaffWorkRole.is_active.is_(True))
             .join(Staff, Staff.id == StaffWorkRole.staff_id)
+            .filter(
+                StaffWorkRole.work_id == work_id,
+                StaffWorkRole.is_deleted.is_(False),
+                StaffWorkRole.is_active.is_(True),
+                Staff.is_active.is_(True),
+                Staff.is_deleted.is_(False)
+            )
             .add_columns(
                 Staff.first_name.label("first_name"),
                 Staff.last_name.label("last_name"),