sartography
/
spiff-arena
mirror of https://github.com/sartography/spiff-arena.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #64 from sartography/group_query 

Group query
This commit is contained in:
Kevin Burnett 2022-11-28 09:10:48 -08:00 committed by GitHub
parent 9938060acc e87b62c896
commit 692bd00e46
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
spiffworkflow-backend/src/spiffworkflow_backend/routes/process_api_blueprint.py
View File

@ -30,7 +30,6 @@ from SpiffWorkflow.task import TaskState
from sqlalchemy import and_ from sqlalchemy import and_
from sqlalchemy import asc from sqlalchemy import asc
from sqlalchemy import desc from sqlalchemy import desc
from sqlalchemy import select
from sqlalchemy.orm import joinedload from sqlalchemy.orm import joinedload
from spiffworkflow_backend.exceptions.process_entity_not_found_error import ( from spiffworkflow_backend.exceptions.process_entity_not_found_error import (
@ -899,7 +898,6 @@ def process_instance_list(
SpiffStepDetailsModel.completed_by_user_id == g.user.id SpiffStepDetailsModel.completed_by_user_id == g.user.id
) )
# TODO: not sure if this is exactly what is wanted
if report_filter.with_tasks_completed_by_my_group is True: if report_filter.with_tasks_completed_by_my_group is True:
process_instance_query = process_instance_query.filter( process_instance_query = process_instance_query.filter(
ProcessInstanceModel.status.in_(["complete", "error", "terminated"]) # type: ignore ProcessInstanceModel.status.in_(["complete", "error", "terminated"]) # type: ignore
@ -918,20 +916,16 @@ def process_instance_list(
process_instance_query = process_instance_query.filter( process_instance_query = process_instance_query.filter(
SpiffLoggingModel.spiff_step == SpiffStepDetailsModel.spiff_step SpiffLoggingModel.spiff_step == SpiffStepDetailsModel.spiff_step
) )
process_instance_query = process_instance_query.join(
my_groups = ( GroupModel,
select(UserGroupAssignmentModel) # type: ignore GroupModel.id == SpiffStepDetailsModel.lane_assignment_id,
.where(UserGroupAssignmentModel.user_id == g.user.id)
.with_only_columns(UserGroupAssignmentModel.group_id)
) )
users_in_my_groups = ( process_instance_query = process_instance_query.join(
select(UserGroupAssignmentModel) # type: ignore UserGroupAssignmentModel,
.where(UserGroupAssignmentModel.group_id.in_(my_groups)) UserGroupAssignmentModel.group_id == GroupModel.id,
.with_only_columns(UserGroupAssignmentModel.user_id)
) )
process_instance_query = process_instance_query.filter( process_instance_query = process_instance_query.filter(
SpiffStepDetailsModel.completed_by_user_id.in_(users_in_my_groups) # type: ignore UserGroupAssignmentModel.user_id == g.user.id
) )
process_instances = ( process_instances = (