sartography/spiff-arena
1
0
Fork 0
mirror of https://github.com/sartography/spiff-arena.git synced 2025-02-26 16:10:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

try to fix postgres and mysql group by

Browse Source
This commit is contained in:
burnettk 2023-03-16 00:02:02 -04:00
parent e305b22b5a
commit dc355e90e9
2 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
spiffworkflow-backend/src/spiffworkflow_backend/routes/tasks_controller.py
View File

@ -107,6 +107,7 @@ def task_list_my_tasks(
potential_owner_usernames_from_group_concat_or_similar = _get_potential_owner_usernames(assigned_user) potential_owner_usernames_from_group_concat_or_similar = _get_potential_owner_usernames(assigned_user)
# FIXME: this breaks postgres. Look at commit c147cdb47b1481f094b8c3d82dc502fe961f4977 for # FIXME: this breaks postgres. Look at commit c147cdb47b1481f094b8c3d82dc502fe961f4977 for
# UPDATE: maybe fixed in postgres and mysql. remove comment if so.
# the postgres fix but it breaks the method for mysql. # the postgres fix but it breaks the method for mysql.
# error in postgres: # error in postgres:
# psycopg2.errors.GroupingError) column \"process_instance.process_model_identifier\" must # psycopg2.errors.GroupingError) column \"process_instance.process_model_identifier\" must
@ -117,19 +118,12 @@ def task_list_my_tasks(
HumanTaskModel.task_title, HumanTaskModel.task_title,
HumanTaskModel.process_model_display_name, HumanTaskModel.process_model_display_name,
HumanTaskModel.process_instance_id, HumanTaskModel.process_instance_id,
ProcessInstanceModel.process_model_identifier, func.max(ProcessInstanceModel.process_model_identifier).label("process_model_identifier"),
ProcessInstanceModel.status.label("process_instance_status"), # type: ignore func.max(ProcessInstanceModel.status).label("process_instance_status"), # type: ignore
ProcessInstanceModel.updated_at_in_seconds, func.max(ProcessInstanceModel.updated_at_in_seconds).label("updated_at_in_seconds"),
ProcessInstanceModel.created_at_in_seconds, func.max(ProcessInstanceModel.created_at_in_seconds).label("created_at_in_seconds"),
process_initiator_user.username.label("process_initiator_username"), func.max(process_initiator_user.username).label("process_initiator_username"),
GroupModel.identifier.label("assigned_user_group_identifier"), func.max(GroupModel.identifier).label("assigned_user_group_identifier"),
# func.max does not seem to return columns so we need to call both
func.max(ProcessInstanceModel.process_model_identifier),
func.max(ProcessInstanceModel.status.label("process_instance_status")), # type: ignore
func.max(ProcessInstanceModel.updated_at_in_seconds),
func.max(ProcessInstanceModel.created_at_in_seconds),
func.max(process_initiator_user.username.label("process_initiator_username")),
func.max(GroupModel.identifier.label("assigned_user_group_identifier")),
potential_owner_usernames_from_group_concat_or_similar, potential_owner_usernames_from_group_concat_or_similar,
).paginate(page=page, per_page=per_page, error_out=False) ).paginate(page=page, per_page=per_page, error_out=False)
@ -486,12 +480,22 @@ def _get_tasks(
potential_owner_usernames_from_group_concat_or_similar = _get_potential_owner_usernames(assigned_user) potential_owner_usernames_from_group_concat_or_similar = _get_potential_owner_usernames(assigned_user)
process_model_identifier_column = ProcessInstanceModel.process_model_identifier
process_instance_status_column = ProcessInstanceModel.status.label("process_instance_status") # type: ignore
user_username_column = UserModel.username.label("process_initiator_username") # type: ignore
group_identifier_column = GroupModel.identifier.label("assigned_user_group_identifier")
if current_app.config['SPIFFWORKFLOW_BACKEND_DATABASE_TYPE'] == 'postgres':
process_model_identifier_column = func.max(ProcessInstanceModel.process_model_identifier).label("process_model_identifier")
process_instance_status_column = func.max(ProcessInstanceModel.status).label("process_instance_status") # type: ignore
user_username_column = func.max(UserModel.username).label("process_initiator_username") # type: ignore
group_identifier_column = func.max(GroupModel.identifier).label("assigned_user_group_identifier")
human_tasks = ( human_tasks = (
human_tasks_query.add_columns( human_tasks_query.add_columns(
ProcessInstanceModel.process_model_identifier, process_model_identifier_column,
ProcessInstanceModel.status.label("process_instance_status"), # type: ignore process_instance_status_column,
UserModel.username.label("process_initiator_username"), # type: ignore user_username_column,
GroupModel.identifier.label("assigned_user_group_identifier"), group_identifier_column,
HumanTaskModel.task_name, HumanTaskModel.task_name,
HumanTaskModel.task_title, HumanTaskModel.task_title,
HumanTaskModel.process_model_display_name, HumanTaskModel.process_model_display_name,

8
spiffworkflow-backend/tests/spiffworkflow_backend/integration/test_process_api.py
View File

@ -2211,10 +2211,10 @@ class TestProcessApi(BaseTest):
# + 2 -Two messages logged for the API Calls used to create the processes. # + 2 -Two messages logged for the API Calls used to create the processes.
assert len(response.json["results"]) == 6 assert len(response.json["results"]) == 6
@pytest.mark.skipif( # @pytest.mark.skipif(
os.environ.get("SPIFFWORKFLOW_BACKEND_DATABASE_TYPE") == "postgres", # os.environ.get("SPIFFWORKFLOW_BACKEND_DATABASE_TYPE") == "postgres",
reason="look at comment in tasks_controller method task_list_my_tasks", # reason="look at comment in tasks_controller method task_list_my_tasks",
) # )
def test_correct_user_can_get_and_update_a_task( def test_correct_user_can_get_and_update_a_task(
self, self,
app: Flask, app: Flask,