mirror of
https://github.com/sartography/spiff-arena.git
synced 2025-02-01 12:16:48 +00:00
89196daed5
b3235fad5 Merging main 09623ca61 # SpiffWorkflow: 1) Type Safe checking on correlation properties (no more str()) 2) A running workflows Correlations are once again at the key level. d6806f69d maintain a way to access the correlations in relation to the correlation keys 065a86cde BPMN Parser was returning all retrieval expressions, rather than the ones specific to a correlation property, as was intended. Adding a correlation cache - so we have a reference of all the messages and properties (though still lacking a description of keys) Adding yet another migration, maybe should squash em. 9e8832c93 Merge remote-tracking branch 'origin/main' into feature/message_fixes 8efa922ae run_pyl 72a7e535a BPMN.io -- Just show the message names not the ids - to assure we are only exposing the names. SpiffWorkflow - - start_messages function should return message names, not ids. - don't catch external thrown messages within the same workflow process - add an expected value to the Correlation Property Model so we can use this well defined class as an external communication tool (rather than building an arbitrary dictionary) - Added a "get_awaiting_correlations" to an event, so we can get a list of the correlation properties related to the workflows currently defined correlation values. - workflows.waiting_events() function now returns the above awaiting correlations as the value on returned message events Backend - Dropping MessageModel and MessageCorrelationProperties - at least for now. We don't need them to send / receive messages though we may eventually want to track the messages and correlations defined across the system - these things (which are ever changing) should not be directly connected to the Messages which may be in flux - and the cross relationships between the tables could cause unexpected and unceissary errors. Commented out the caching logic so we can turn this back on later. - Slight improvement to API Errors - MessageInstances are no longer in a many-to-many relationship with Correlations - Each message instance has a unique set of message correlations specific to the instance. - Message Instances have users, and can be linked through a "counterpart_id" so you can see what send is connected to what recieve. - Message Correlations are connected to recieving message instances. It is not to a process instance, and not to a message model. They now include the expected value and retrieval expression required to validate an incoming message. - A process instance is not connected to message correlations. - Message Instances are not always tied to a process instance (for example, a Send Message from an API) - API calls to create a message use the same logic as all other message catching code. - Make use of the new waiting_events() method to check for any new recieve messages in the workflow (much easier than churning through all of the tasks) - One giant mother of a migration. cb2ff8a93 * SpiffWorkflow event_definitions wanted to return a message event's correlation properties mested within correlation keys. But messages are directly related to properties, not to keys - and it forced a number of conversions that made for tricky code. So Messages now contain a dictionary of correlation properties only. * SpiffWorkflow did not serialize correlations - so they were lost between save and retrieve. d4852a1a5 * Re-work message tests so I could wrap my simple head around what was happening - just needed an example that made sense to me. * Clear out complex get_message_instance_receive how that many-to-many works. * Create decent error messages when correlations fail * Move correlation checks into the MessageInstance class * The APIError could bomb out ugly if it hit a workflow exception with not Task Spec. git-subtree-dir: SpiffWorkflow git-subtree-split: b3235fad598ee3c4680a23f26adb09cdc8f2807b
71 lines
2.7 KiB
Python
71 lines
2.7 KiB
Python
# -*- coding: utf-8 -*-
|
|
|
|
import unittest
|
|
|
|
from SpiffWorkflow.task import TaskState
|
|
from SpiffWorkflow.bpmn.workflow import BpmnWorkflow
|
|
from .BaseTestCase import BaseTestCase
|
|
__author__ = 'kellym'
|
|
|
|
|
|
class StartMessageTest(BaseTestCase):
|
|
|
|
def setUp(self):
|
|
self.spec, self.subprocesses = self.load_workflow_spec('message_test.bpmn', 'ThrowCatch')
|
|
self.workflow = BpmnWorkflow(self.spec, self.subprocesses)
|
|
|
|
def testParserCanReturnStartMessages(self):
|
|
parser = self.get_parser('message_test.bpmn')
|
|
self.assertEqual(
|
|
parser.process_parsers['ThrowCatch'].start_messages(), ['ApprovalRequest'])
|
|
|
|
parser = self.get_parser('random_fact.bpmn')
|
|
self.assertEqual(
|
|
parser.process_parsers['random_fact'].start_messages(), [])
|
|
|
|
|
|
def testRunThroughHappy(self):
|
|
self.actual_test(save_restore=False)
|
|
|
|
def testThroughSaveRestore(self):
|
|
self.actual_test(save_restore=True)
|
|
|
|
def actual_test(self,save_restore = False):
|
|
steps = [('Activity_EnterPlan',{'plan_details':'Bad'}),
|
|
('Activity_ApproveOrDeny', {'approved':'No'}),
|
|
('Activity_EnterPlan', {'plan_details':'Better'}),
|
|
('Activity_ApproveOrDeny', {'approved':'No'}),
|
|
('Activity_EnterPlan', {'plan_details':'Best'}),
|
|
('Activity_ApproveOrDeny', {'approved':'Yes'}),
|
|
('Activity_EnablePlan',{'Done':'OK!'})]
|
|
self.workflow.do_engine_steps() # get around start task
|
|
ready_tasks = self.workflow.get_tasks(TaskState.READY)
|
|
waiting_tasks = self.workflow.get_tasks(TaskState.WAITING)
|
|
self.assertEqual(1, len(ready_tasks),'Expected to have one ready task')
|
|
self.assertEqual(1, len(waiting_tasks), 'Expected to have one waiting task')
|
|
|
|
for step in steps:
|
|
current_task = ready_tasks[0]
|
|
self.assertEqual(current_task.task_spec.name,step[0])
|
|
current_task.update_data(step[1])
|
|
current_task.complete()
|
|
self.workflow.do_engine_steps()
|
|
self.workflow.refresh_waiting_tasks()
|
|
if save_restore:
|
|
self.save_restore()
|
|
ready_tasks = self.workflow.get_tasks(TaskState.READY)
|
|
|
|
self.assertEqual(self.workflow.is_completed(),True,'Expected the workflow to be complete at this point')
|
|
self.assertEqual(self.workflow.last_task.data,
|
|
{
|
|
'plan_details': 'Best',
|
|
'ApprovalResult': 'Yes',
|
|
'Done': 'OK!'
|
|
})
|
|
|
|
|
|
def suite():
|
|
return unittest.TestLoader().loadTestsFromTestCase(StartMessageTest)
|
|
if __name__ == '__main__':
|
|
unittest.TextTestRunner(verbosity=2).run(suite())
|