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

pyl w/ burnettk

This commit is contained in:
jasquat 2022-11-14 10:17:18 -05:00
parent 013cc56367
commit 3cbb4e986a
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spiffworkflow-backend/src/spiffworkflow_backend/models/message_correlation.py
View File

@ -44,9 +44,7 @@ class MessageCorrelationModel(SpiffworkflowBaseDBModel):
updated_at_in_seconds: int = db.Column(db.Integer) updated_at_in_seconds: int = db.Column(db.Integer)
created_at_in_seconds: int = db.Column(db.Integer) created_at_in_seconds: int = db.Column(db.Integer)
message_correlation_property = relationship( message_correlation_property = relationship("MessageCorrelationPropertyModel")
"MessageCorrelationPropertyModel"
)
message_correlations_message_instances = relationship( message_correlations_message_instances = relationship(
"MessageCorrelationMessageInstanceModel", cascade="delete" "MessageCorrelationMessageInstanceModel", cascade="delete"
) )

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

@ -1,5 +1,4 @@
"""APIs for dealing with process groups, process models, and process instances.""" """APIs for dealing with process groups, process models, and process instances."""
import dataclasses
import json import json
import os import os
import random import random
@ -14,10 +13,6 @@ from typing import Union
import connexion # type: ignore import connexion # type: ignore
import flask.wrappers import flask.wrappers
import jinja2 import jinja2
from spiffworkflow_backend.models import message_correlation_message_instance
from spiffworkflow_backend.models.message_correlation import MessageCorrelationModel
from spiffworkflow_backend.models.message_correlation_message_instance import MessageCorrelationMessageInstanceModel
from spiffworkflow_backend.models.message_correlation_property import MessageCorrelationPropertyModel
import werkzeug import werkzeug
from flask import Blueprint from flask import Blueprint
from flask import current_app from flask import current_app
@ -44,6 +39,7 @@ from spiffworkflow_backend.models.active_task import ActiveTaskModel
from spiffworkflow_backend.models.active_task_user import ActiveTaskUserModel from spiffworkflow_backend.models.active_task_user import ActiveTaskUserModel
from spiffworkflow_backend.models.file import FileSchema from spiffworkflow_backend.models.file import FileSchema
from spiffworkflow_backend.models.group import GroupModel from spiffworkflow_backend.models.group import GroupModel
from spiffworkflow_backend.models.message_correlation import MessageCorrelationModel
from spiffworkflow_backend.models.message_instance import MessageInstanceModel from spiffworkflow_backend.models.message_instance import MessageInstanceModel
from spiffworkflow_backend.models.message_model import MessageModel from spiffworkflow_backend.models.message_model import MessageModel
from spiffworkflow_backend.models.message_triggerable_process_model import ( from spiffworkflow_backend.models.message_triggerable_process_model import (
@ -597,13 +593,23 @@ def message_instance_list(
for message_instance in message_instances: for message_instance in message_instances:
message_correlations: dict = {} message_correlations: dict = {}
for mcmi in message_instance.MessageInstanceModel.message_correlations_message_instances: for (
mc = MessageCorrelationModel.query.filter_by(id=mcmi.message_correlation_id).all() mcmi
) in (
message_instance.MessageInstanceModel.message_correlations_message_instances
):
mc = MessageCorrelationModel.query.filter_by(
id=mcmi.message_correlation_id
).all()
for m in mc: for m in mc:
if m.name not in message_correlations: if m.name not in message_correlations:
message_correlations[m.name] = {} message_correlations[m.name] = {}
message_correlations[m.name][m.message_correlation_property.identifier] = m.value message_correlations[m.name][
message_instance.MessageInstanceModel.message_correlations = message_correlations m.message_correlation_property.identifier
] = m.value
message_instance.MessageInstanceModel.message_correlations = (
message_correlations
)
response_json = { response_json = {
"results": message_instances.items, "results": message_instances.items,