complex_entity.rb in maestrano-connector-rails-0.2.13

- old
+ new

@@ -26,11 +26,11 @@
     #             connec_entities_names[1]: {
     #               external_entities_names[0]: [unmapped_connec_entitiy3],
     #               external_entities_names[1]: [unmapped_connec_entitiy4]
     #             }
     #          }
-    def connec_model_to_external_model!(connec_hash_of_entities)
+    def connec_model_to_external_model(connec_hash_of_entities)
       raise "Not implemented"
     end
 
     # input :  {
     #             external_entities_names[0]: [unmapped_external_entity1}, unmapped_external_entity2],
@@ -43,11 +43,11 @@
     #             },
     #             external_entities_names[1]: {
     #               connec_entities_names[0]: [unmapped_external_entity3, unmapped_external_entity4]
     #             }
     #           }
-    def external_model_to_connec_model!(external_hash_of_entities)
+    def external_model_to_connec_model(external_hash_of_entities)
       raise "Not implemented"
     end
 
     # -------------------------------------------------------------
     #          General methods
@@ -85,14 +85,14 @@
       end
       entities
     end
 
     def consolidate_and_map_data(connec_entities, external_entities, organization, opts)
-      external_model_to_connec_model!(external_entities)
-      connec_model_to_external_model!(connec_entities)
+      modeled_external_entities = external_model_to_connec_model(external_entities)
+      modeled_connec_entities = connec_model_to_external_model(connec_entities)
 
-      external_entities.each do |external_entity_name, entities_in_connec_model|
+      modeled_external_entities.each do |external_entity_name, entities_in_connec_model|
         entities_in_connec_model.each do |connec_entity_name, entities|
           sub_entity_instance = "Entities::SubEntities::#{external_entity_name.titleize.split.join}".constantize.new
 
           entities.map!{|entity|
             idmap = IdMap.find_by(external_id: sub_entity_instance.get_id_from_external_entity_hash(entity), external_entity: external_entity_name.downcase, connec_entity: connec_entity_name.downcase, organization_id: organization.id)
@@ -132,17 +132,19 @@
             end
           }.compact!
         end
       end
 
-      connec_entities.each do |connec_entity_name, entities_in_external_model|
+      modeled_connec_entities.each do |connec_entity_name, entities_in_external_model|
         entities_in_external_model.each do |external_entity_name, entities|
           sub_entity_instance = "Entities::SubEntities::#{connec_entity_name.titleize.split.join}".constantize.new
           entities.map!{|entity|
             self.map_to_external_with_idmap(entity, organization, connec_entity_name, external_entity_name, sub_entity_instance)
           }.compact!
         end
       end
+
+      return {connec_entities: modeled_connec_entities, external_entities: modeled_external_entities}
     end
 
     # input : {
     #             external_entities_names[0]: {
     #               connec_entities_names[0]: [mapped_external_entity1],
\ No newline at end of file