sartography/cr-connect-workflow
1
0
Fork 0
mirror of https://github.com/sartography/cr-connect-workflow.git synced 2025-02-23 13:18:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #367 from sartography/value-error-expression-428

Browse Source 
Value error expression #428
This commit is contained in:
Dan Funk 2021-09-03 14:32:46 -04:00 committed by GitHub
commit 86c017a6a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 96 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
crc/services/workflow_service.py
View File

@ -220,8 +220,9 @@ class WorkflowService(object):
# A task should only have default_value **or** value expression, not both. # A task should only have default_value **or** value expression, not both.
if field.has_property(Task.FIELD_PROP_VALUE_EXPRESSION) and (hasattr(field, 'default_value') and field.default_value): if field.has_property(Task.FIELD_PROP_VALUE_EXPRESSION) and (hasattr(field, 'default_value') and field.default_value):
raise ApiError(code='default value and value_expression', raise ApiError.from_task(code='default value and value_expression',
message='This task has both a default_value and value_expression. Please fix this to only have one or the other.') message=f'This task ({task.get_name()}) has both a default_value and value_expression. Please fix this to only have one or the other.',
task=task)
# If we have a default_value or value_expression, try to set the default # If we have a default_value or value_expression, try to set the default
if field.has_property(Task.FIELD_PROP_VALUE_EXPRESSION) or (hasattr(field, 'default_value') and field.default_value): if field.has_property(Task.FIELD_PROP_VALUE_EXPRESSION) or (hasattr(field, 'default_value') and field.default_value):
form_data[field.id] = WorkflowService.get_default_value(field, task) form_data[field.id] = WorkflowService.get_default_value(field, task)

84
tests/data/default_value_expression/default_value_expression.bpmn Normal file
View File

@ -0,0 +1,84 @@
<?xml version="1.0" encoding="UTF-8"?>
<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="Definitions_0kwhkcg" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="3.5.0">
<bpmn:process id="Process_09qy7hp" name="Test Default Value and Value Expression" isExecutable="true">
<bpmn:startEvent id="StartEvent_1">
<bpmn:outgoing>SequenceFlow_0efs0fk</bpmn:outgoing>
</bpmn:startEvent>
<bpmn:sequenceFlow id="SequenceFlow_0efs0fk" sourceRef="StartEvent_1" targetRef="Task_0zremzf" />
<bpmn:userTask id="Task_0zremzf" name="Set Value Expression" camunda:formKey="valueExpression">
<bpmn:extensionElements>
<camunda:formData>
<camunda:formField id="value_expression_expression" label="Expression Value" type="string">
<camunda:validation>
<camunda:constraint name="required" config="True" />
</camunda:validation>
</camunda:formField>
</camunda:formData>
</bpmn:extensionElements>
<bpmn:incoming>SequenceFlow_0efs0fk</bpmn:incoming>
<bpmn:outgoing>SequenceFlow_0wor210</bpmn:outgoing>
</bpmn:userTask>
<bpmn:sequenceFlow id="SequenceFlow_0wor210" sourceRef="Task_0zremzf" targetRef="Task_GetName" />
<bpmn:userTask id="Task_GetName" name="Get Name" camunda:formKey="getName">
<bpmn:extensionElements>
<camunda:formData>
<camunda:formField id="name" label="Name" type="string" defaultValue="World">
<camunda:properties>
<camunda:property id="value_expression" value="value_expression_expression" />
</camunda:properties>
</camunda:formField>
</camunda:formData>
</bpmn:extensionElements>
<bpmn:incoming>SequenceFlow_0wor210</bpmn:incoming>
<bpmn:outgoing>SequenceFlow_1fu62xl</bpmn:outgoing>
</bpmn:userTask>
<bpmn:sequenceFlow id="SequenceFlow_1fu62xl" sourceRef="Task_GetName" targetRef="Task_1ncwuip" />
<bpmn:manualTask id="Task_1ncwuip" name="Say Hello">
<bpmn:documentation># Hello
Hello {{ name }}
</bpmn:documentation>
<bpmn:incoming>SequenceFlow_1fu62xl</bpmn:incoming>
<bpmn:outgoing>SequenceFlow_15apauw</bpmn:outgoing>
</bpmn:manualTask>
<bpmn:endEvent id="EndEvent_1n2m3qs">
<bpmn:incoming>SequenceFlow_15apauw</bpmn:incoming>
</bpmn:endEvent>
<bpmn:sequenceFlow id="SequenceFlow_15apauw" sourceRef="Task_1ncwuip" targetRef="EndEvent_1n2m3qs" />
</bpmn:process>
<bpmndi:BPMNDiagram id="BPMNDiagram_1">
<bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Process_09qy7hp">
<bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="StartEvent_1">
<dc:Bounds x="179" y="99" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_0efs0fk_di" bpmnElement="SequenceFlow_0efs0fk">
<di:waypoint x="215" y="117" />
<di:waypoint x="270" y="117" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="UserTask_0mopxz9_di" bpmnElement="Task_0zremzf">
<dc:Bounds x="270" y="77" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_0wor210_di" bpmnElement="SequenceFlow_0wor210">
<di:waypoint x="370" y="117" />
<di:waypoint x="430" y="117" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="UserTask_14t3km3_di" bpmnElement="Task_GetName">
<dc:Bounds x="430" y="77" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_1fu62xl_di" bpmnElement="SequenceFlow_1fu62xl">
<di:waypoint x="530" y="117" />
<di:waypoint x="590" y="117" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="ManualTask_0b4upj5_di" bpmnElement="Task_1ncwuip">
<dc:Bounds x="590" y="77" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="EndEvent_1n2m3qs_di" bpmnElement="EndEvent_1n2m3qs">
<dc:Bounds x="752" y="99" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_15apauw_di" bpmnElement="SequenceFlow_15apauw">
<di:waypoint x="690" y="117" />
<di:waypoint x="752" y="117" />
</bpmndi:BPMNEdge>
</bpmndi:BPMNPlane>
</bpmndi:BPMNDiagram>
</bpmn:definitions>

9
tests/workflow/test_workflow_value_expression.py
View File

@ -33,3 +33,12 @@ class TestValueExpression(BaseTest):
self.assertEqual('black', second_task.data['value_expression_value']) self.assertEqual('black', second_task.data['value_expression_value'])
self.assertIn('color', second_task.data) self.assertIn('color', second_task.data)
self.assertEqual('black', second_task.data['color']['value']) self.assertEqual('black', second_task.data['color']['value'])
def test_validate_task_with_both_default_and_expression(self):
# This actually fails validation.
# We are testing the error message is correct.
self.load_example_data()
spec_model = self.load_test_spec('default_value_expression')
rv = self.app.get('/v1.0/workflow-specification/%s/validate' % spec_model.id, headers=self.logged_in_headers())
self.assertEqual('default value and value_expression', rv.json[0]['code'])
self.assertIn('Task_GetName', rv.json[0]['message'])