status-im/spiff-arena
2
0
Fork 0
mirror of https://github.com/status-im/spiff-arena.git synced 2025-02-21 14:08:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

updated with tasks waiting for me query to include tasks manually assigned to the user w/ burnettk (#467)

Browse Source 
Co-authored-by: jasquat <jasquat@users.noreply.github.com>
This commit is contained in:
jasquat 2023-09-07 13:41:41 -04:00 committed by GitHub
parent a30bb6cca3
commit ecba3f7c38
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
spiffworkflow-backend/src/spiffworkflow_backend/services/process_instance_report_service.py
View File

@ -553,13 +553,30 @@ class ProcessInstanceReportService:
HumanTaskModel, HumanTaskModel,
and_( and_(
HumanTaskModel.process_instance_id == ProcessInstanceModel.id, HumanTaskModel.process_instance_id == ProcessInstanceModel.id,
HumanTaskModel.lane_assignment_id.is_(None), # type: ignore
HumanTaskModel.completed.is_(False), # type: ignore HumanTaskModel.completed.is_(False), # type: ignore
), ),
).join( ).join(
HumanTaskUserModel, HumanTaskUserModel,
and_(HumanTaskUserModel.human_task_id == HumanTaskModel.id, HumanTaskUserModel.user_id == user.id), and_(HumanTaskUserModel.human_task_id == HumanTaskModel.id, HumanTaskUserModel.user_id == user.id),
) )
user_group_assignment_for_lane_assignment = aliased(UserGroupAssignmentModel)
process_instance_query = process_instance_query.outerjoin(
user_group_assignment_for_lane_assignment,
and_(
user_group_assignment_for_lane_assignment.group_id == HumanTaskModel.lane_assignment_id,
user_group_assignment_for_lane_assignment.user_id == user.id,
),
).filter(
# it should show up in your "Waiting for me" list IF:
# 1) task is not assigned to a group OR
# 2) you are not in the group
# In the case of number 2, it probably means you were added to the task individually by an admin
or_(
HumanTaskModel.lane_assignment_id.is_(None), # type: ignore
user_group_assignment_for_lane_assignment.group_id.is_(None),
)
)
human_task_already_joined = True human_task_already_joined = True
restrict_human_tasks_to_user = user restrict_human_tasks_to_user = user