Refactoring

Author: ssimic1144

bpmn_types.py

@@ -137,48 +137,36 @@ def parse(self, element):
         super(ServiceTask, self).parse(element)
         for ee in element.findall(".//bpmn:extensionElements", NS):
             #Find direct children inputOutput, Input/Output tab in Camunda
-            self.parse_input_output_variables(ee, self.input_variables, self.output_variables)
+            self._parse_input_output_variables(ee, self.input_variables, self.output_variables)
             #Find connector data, Connector tab in Camunda
             for con in ee.findall(".camunda:connector", NS):
-                self.parse_input_output_variables(con, self.connector_fields["input_variables"], self.connector_fields["output_variables"])
+                self._parse_input_output_variables(con, self.connector_fields["input_variables"], self.connector_fields["output_variables"])
                 self.connector_fields["connector_id"] = con.find("camunda:connectorId",NS).text
-
-        #Find all property fields
-        for f in element.findall(".//camunda:property",NS):
-            if ',' in f.attrib["value"]:
-                self.properties_fields[f.attrib["name"]] = list(f.attrib["value"].split(','))
-            else:
-                self.properties_fields[f.attrib["name"]] = f.attrib["value"]
-    
-    @staticmethod
-    def parse_input_output_variables(element, input_dict, output_dict):
+   
+    def _parse_input_output_variables(self, element, input_dict, output_dict):
         for io in element.findall(".camunda:inputOutput",NS):
             for inparam in io.findall(".camunda:inputParameter",NS):
-                if inparam.findall(".camunda:list",NS):
-                    helper_list = []
-                    for lv in inparam.find("camunda:list",NS):
-                        helper_list.append(lv.text)
-                    input_dict[inparam.attrib["name"]] = helper_list
-                elif inparam.findall(".camunda:map",NS):
-                    helper_dict = {}
-                    for mv in inparam.find("camunda:map",NS):
-                        helper_dict[mv.attrib["key"]] = mv.text
-                    input_dict[inparam.attrib["name"]] = helper_dict
-                elif inparam.findall(".camunda:script",NS):
-                    #script not supported
-                    pass
-                else:
-                    input_dict[inparam.attrib["name"]] = inparam.text if inparam.text else ""
+                self.parse_input_output_parameters(inparam, input_dict)
             for outparam in io.findall(".camunda:outputParameter",NS):
-                if outparam.findall(".camunda:map",NS):
-                    output_dict[outparam.attrib["name"]]={}
-                elif outparam.findall(".camunda:list",NS):
-                    output_dict[outparam.attrib["name"]]=[]
-                elif outparam.findall(".camunda:script",NS):
-                    #script not supported
-                    pass
-                else:
-                    output_dict[outparam.attrib["name"]]=""
+                self.parse_input_output_parameters(outparam, output_dict)
+    
+    def _parse_input_output_parameters(self, element, dictionary):
+        if element.findall(".camunda:list",NS):
+            helper_list = []
+            for lv in element.find("camunda:list",NS):
+                helper_list.append(lv.text) if lv.text else ""
+            dictionary[element.attrib["name"]] = helper_list
+        elif element.findall(".camunda:map",NS):
+            helper_dict = {}
+            for mv in element.find("camunda:map",NS):
+                helper_dict[mv.attrib["key"]] = mv.text
+            dictionary[element.attrib["name"]] = helper_dict
+        elif element.findall(".camunda:script",NS):
+            #script not supported
+            pass
+        else:
+            dictionary[element.attrib["name"]] = element.text if element.text else ""
+            
 
     def run_connector(self, variables, instance_id):
         #Check for URL parameters
@@ -243,6 +231,13 @@ def parse(self, element):
         if element.attrib.get(f"{{{NS['camunda']}}}calledElementBinding") and element.attrib.get(f"{{{NS['camunda']}}}calledElementBinding") == "deployment":
             self.deployment = True 
 
+@bpmn_tag("bpmn:businessRule")
+class BusinessRule(ServiceTask):
+    def __init__(self):
+        self.decision_ref = None
+    def parse(self, element):
+        super(BusinessRule, self).parse(element)
+
 @bpmn_tag("bpmn:event")
 class Event(BpmnObject):
     pass

utils/common.py

@@ -1,6 +1,12 @@
 def parse_expression(expression, process_variables):
     if expression[:2] == "${":
         target_value = expression[2:].split("}")[0]
-        return process_variables[target_value]
+        parsed_variable = process_variables
+        for target in target_value.split("."):
+            try:
+                parsed_variable = parsed_variable[target]
+            except KeyError:
+                return expression 
+        return parsed_variable
     else:
         return expression