From bf25c1cefbce580d0cb0ed19b8eaaa473c8c9241 Mon Sep 17 00:00:00 2001 From: Dan Date: Mon, 27 Feb 2023 14:05:00 -0500 Subject: [PATCH] run_pyl --- src/spiffworkflow_backend/models/message_instance.py | 1 - src/spiffworkflow_backend/services/message_service.py | 8 +++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/spiffworkflow_backend/models/message_instance.py b/src/spiffworkflow_backend/models/message_instance.py index 3c278b92..99168ec3 100644 --- a/src/spiffworkflow_backend/models/message_instance.py +++ b/src/spiffworkflow_backend/models/message_instance.py @@ -104,7 +104,6 @@ class MessageInstanceModel(SpiffworkflowBaseDBModel): # Then there is nothing more to match on -- we accept any message with the given name. return True - # Loop over the receives' correlation keys - if any of the keys fully match, then we match. for expected_values in self.correlation_keys.values(): if self.payload_matches_expected_values( diff --git a/src/spiffworkflow_backend/services/message_service.py b/src/spiffworkflow_backend/services/message_service.py index ddd4f497..fb9ef6c4 100644 --- a/src/spiffworkflow_backend/services/message_service.py +++ b/src/spiffworkflow_backend/services/message_service.py @@ -1,7 +1,8 @@ """Message_service.""" from spiffworkflow_backend.models.db import db -from spiffworkflow_backend.models.message_instance import MessageInstanceModel, MessageTypes +from spiffworkflow_backend.models.message_instance import MessageInstanceModel from spiffworkflow_backend.models.message_instance import MessageStatuses +from spiffworkflow_backend.models.message_instance import MessageTypes from spiffworkflow_backend.models.message_triggerable_process_model import ( MessageTriggerableProcessModel, ) @@ -42,8 +43,9 @@ class MessageService: # Find available messages that might match available_receive_messages = MessageInstanceModel.query.filter_by( - name=message_instance_send.name, status=MessageStatuses.ready.value, - message_type=MessageTypes.receive.value + name=message_instance_send.name, + status=MessageStatuses.ready.value, + message_type=MessageTypes.receive.value, ).all() message_instance_receive: MessageInstanceModel | None = None try: