resolving conflict

Author: pitchmuc

docs/property.md

@@ -22,7 +22,7 @@ Here are shortlinks to the different methods explanation.
 
 ## Get methods
 
-When you have your property instance created, the methods that you may want to call first are the get methods. They never take any argument, they don't actually need any argument.\
+When you have your property instance created, the methods that you may want to call first are the get methods. They never take any argument, they don’t actually need any argument.
 The only thing important to know is that you must run the getRules() method before the getRuleComponents() method.
 
 The different get methods are the following :

docs/synchronizer.md

@@ -131,4 +131,4 @@ An example on how the data element looks like:
  ]
  }
 ]
-```
+```

docs/translator.md

@@ -13,13 +13,15 @@ What is really required is the base property extensions and rules. The id of the
 This is an assumption that I have when I created this facilitator, you would have a blueprint that you will use to copy elements from.
 The translator class provide 2 methods to add base rule and base extension ids:
 
-* setBaseExtensions
-* setBaseRules
-
-Both elements are taking the 2 same arguments:
-
-* base_property : list of all of the extensions or rules that you want to remember for matching.
-* property_name : name to establish the matching.
+* **setBaseExtensions** : Pass all the extensions from the base property to start building the table. 
+ Arguments: 
+ * base_property : REQUIRED : list of all extensions retrieve through getExtensions method
+ * property_name : REQUIRED : name of your base property.
+
+* **setBaseRules**: Pass all the rules from the base property to start building the table. 
+ Arguments: 
+ * base_property : REQUIRED : list of all rules retrieve through getExtensions method
+ * property_name : REQUIRED : name of your base property.
 
 ## Set Target Rule and Extensions ids
 

launchpy/synchronizer.py

@@ -139,20 +139,21 @@ def syncComponent(self,componentName:str=None,componentId:str=None,publishedVers
  cmp_baseDict['copy'] = copySettings(publishedVersion)
  ## handling the data element
  if cmp_baseDict['component']['type'] == 'data_elements':
- latestCompVersion = self.base['api'].getDataElement(cmp_baseDict['id'],cmp_baseDict['component'])
+ latestCompVersion = self.base['api'].getDataElement(cmp_baseDict['id']).get('data',cmp_baseDict['component'])
  cmp_baseDict = {'id':latestCompVersion['id'],'name':latestCompVersion['attributes']['name'],'component':latestCompVersion,'copy':copySettings(latestCompVersion)}
  for target in list(self.targets.keys()):
  flagAllowList = False
  ## check if the component is in the exclComponentList
  if any([bool(re.search(key,cmp_baseDict['name'])) for key in self.target_configs.get(target,{}).get('exclComponents',[])]):
  return {cmp_baseDict['name']:False}
- translatedComponent = self.translator.translate(target,data_element=cmp_baseDict['copy'])
  ## if there is an allow list for that property
  if len(self.target_configs.get(target,{}).get('inclComponents',[]))>0:
  if any([bool(re.search(key,cmp_baseDict['name'])) for key in self.target_configs.get(target,{}).get('inclComponents',[])]):
  flagAllowList = True
  ## if there is no allow list for that property, or no match in the list of target properties, or component was allow
  if len(self.target_configs.get(target,{}).get('inclComponents',[]))==0 or flagAllowList:
+ translatedComponent = self.translator.translate(target,data_element=cmp_baseDict['copy'])
+ ## if it does not exist
  if cmp_baseDict['name'] not in [de['attributes']['name'] for de in self.targets[target]['dataElements']]:
  comp = self.targets[target]['api'].createDataElement(
  name=cmp_baseDict['name'],
@@ -191,7 +192,7 @@ def syncComponent(self,componentName:str=None,componentId:str=None,publishedVers
  self.targets[target]['libraryStack']['dataElements'].append(comp)
  ## Rules part
  if cmp_baseDict['component']['type'] == 'rules':
- latestCompVersion = self.base['api'].getRule(cmp_baseDict['id'],cmp_baseDict['component'])
+ latestCompVersion = self.base['api'].getRule(cmp_baseDict['id']).get('data',cmp_baseDict['component'])
  cmp_baseDict = {'id':latestCompVersion['id'],'name':latestCompVersion['attributes']['name'],'component':latestCompVersion,'copy':copySettings(latestCompVersion)}
  ## fetching all rule components associated with a rule.
  rcsLink = cmp_baseDict['component'].get('relationships',{}).get('rule_components',{}).get('links',{}).get('related')