maestrano-connector-rails 0.2.16 → 0.2.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ac017da954066c7397861d757d620250c1f9d17
-  data.tar.gz: 95034e887a9a9e1ea69c66e397bcc1c9c698e824
+  metadata.gz: fb5c07cb2cd6e41eed0cf6d969bccfaca04bbfd7
+  data.tar.gz: 597eff9e10f8091d32df3efa8fe3d401686471b1
 SHA512:
-  metadata.gz: 9f47439af3beb4b4795d47ba4b5a9685ec35557d9aff988f90486d5ed313499752b46b55c2a7e469e93c34ecb6dd200efc2e570ed6d1aca30d395118a6e97aea
-  data.tar.gz: 9c91c0d18bb5edde590ce3a63349ac3fcd00fde0f359c30a8bd93d07372316c8998de736fa63a05b78250b1812553d554a12c8ea0c4e81277ef56bd49289402e
+  metadata.gz: 8255bd1676f26950267b98125e88679f3d91d5d127e650fbcfe4bc7d72c55b4d3d5ef3742022b6e2cdd267d5cab9d0fa449ed4197817f94c8ee43400320c4a55
+  data.tar.gz: 897a96ac9045cb71828ade21e216586f34db7af9bbec6ea7d6c1dca7cdbcbf9666e44a4a5dcb8f1fdb74fcd2fa194fa6f8386125f49b8cc21c73fc4dc372a65c

data/Gemfile

@@ -4,6 +4,9 @@ source "http://rubygems.org"
 gem 'maestrano-rails'
 gem 'hash_mapper'
 gem 'sidekiq'
+gem 'haml-rails'
+gem 'bootstrap-sass'
+gem 'autoprefixer-rails'
 
 # Add dependencies to develop your gem here.
 group :development do

data/Gemfile.lock

@@ -38,6 +38,11 @@ GEM
       tzinfo (~> 1.1)
     addressable (2.4.0)
     arel (6.0.3)
+    autoprefixer-rails (6.3.3.1)
+      execjs
+    bootstrap-sass (3.3.6)
+      autoprefixer-rails (>= 5.2.1)
+      sass (>= 3.3.4)
     builder (3.2.2)
     concurrent-ruby (1.0.0)
     connection_pool (2.2.0)
@@ -48,6 +53,7 @@ GEM
     domain_name (0.5.20160128)
       unf (>= 0.0.5, < 1.0.0)
     erubis (2.7.0)
+    execjs (2.6.0)
     factory_girl (4.5.0)
       activesupport (>= 3.0.0)
     factory_girl_rails (4.6.0)
@@ -65,10 +71,23 @@ GEM
       oauth2
     globalid (0.3.6)
       activesupport (>= 4.1.0)
+    haml (4.0.7)
+      tilt
+    haml-rails (0.9.0)
+      actionpack (>= 4.0.1)
+      activesupport (>= 4.0.1)
+      haml (>= 4.0.6, < 5.0)
+      html2haml (>= 1.0.1)
+      railties (>= 4.0.1)
     hash_mapper (0.2.1)
       activesupport (~> 4)
     hashie (3.4.3)
     highline (1.7.8)
+    html2haml (2.0.0)
+      erubis (~> 2.7.0)
+      haml (~> 4.0.0)
+      nokogiri (~> 1.6.0)
+      ruby_parser (~> 3.5)
     http-cookie (1.0.2)
       domain_name (~> 0.5)
     httparty (0.13.7)
@@ -174,6 +193,10 @@ GEM
       rspec-mocks (~> 3.4.0)
       rspec-support (~> 3.4.0)
     rspec-support (3.4.1)
+    ruby_parser (3.8.1)
+      sexp_processor (~> 4.1)
+    sass (3.4.21)
+    sexp_processor (4.7.0)
     shoulda (3.5.0)
       shoulda-context (~> 1.0, >= 1.0.1)
       shoulda-matchers (>= 1.4.1, < 3.0)
@@ -200,6 +223,7 @@ GEM
     systemu (2.6.5)
     thor (0.19.1)
     thread_safe (0.3.5)
+    tilt (2.0.2)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     unf (0.1.4)
@@ -212,8 +236,11 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  autoprefixer-rails
+  bootstrap-sass
   bundler (~> 1.0)
   factory_girl_rails
+  haml-rails
   hash_mapper
   jeweler (~> 2.0.1)
   maestrano-rails

data/VERSION

@@ -1 +1 @@
-0.2.16
+0.2.17

data/app/helpers/maestrano/connector/rails/session_helper.rb

@@ -6,12 +6,16 @@ module Maestrano::Connector::Rails
     end
 
     def current_organization
-      Organization.find_by(uid: session[:org_uid], tenant: session[:tenant])
+      @current_organization ||= Organization.find_by(uid: session[:org_uid], tenant: session[:tenant])
     end
 
     def current_user
       @current_user ||= User.find_by(uid: session[:uid], tenant: session[:tenant])
     end
 
+    def is_admin
+      @is_admin ||= current_user && current_organization && is_admin?(current_user, current_organization)
+    end
+
   end
 end

data/app/models/maestrano/connector/rails/complex_entity.rb

@@ -52,14 +52,14 @@ module Maestrano::Connector::Rails
     # -------------------------------------------------------------
     #          General methods
     # -------------------------------------------------------------
-    def map_to_external_with_idmap(entity, organization, connec_entity_name, external_entity_name, sub_entity_instance)
-      idmap = IdMap.find_by(connec_id: entity['id'], connec_entity: connec_entity_name.downcase, external_entity: external_entity_name.downcase, organization_id: organization.id)
+    def map_to_external_with_idmap(entity, organization, external_entity_name, sub_entity_instance)
+      idmap = sub_entity_instance.find_idmap({connec_id: entity['id'], external_entity: external_entity_name, organization_id: organization.id})
 
-      if idmap && idmap.last_push_to_external && idmap.last_push_to_external > entity['updated_at']
-        ConnectorLogger.log('info', organization, "Discard Connec! #{connec_entity_name} : #{entity}")
+      if idmap && ((!idmap.to_external) || idmap.last_push_to_external && idmap.last_push_to_external > entity['updated_at'])
+        ConnectorLogger.log('info', organization, "Discard Connec! #{sub_entity_instance.entity_name} : #{entity}")
         nil
       else
-        {entity: sub_entity_instance.map_to(external_entity_name, entity, organization), idmap: idmap || IdMap.create(connec_id: entity['id'], connec_entity: connec_entity_name.downcase, external_entity: external_entity_name.downcase, organization_id: organization.id, name: sub_entity_instance.object_name_from_connec_entity_hash(entity))}
+        {entity: sub_entity_instance.map_to(external_entity_name, entity, organization), idmap: idmap || sub_entity_instance.create_idmap_from_connec_entity(entity, external_entity_name, organization)}
       end
     end
 
@@ -95,41 +95,22 @@ module Maestrano::Connector::Rails
           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)
+            idmap = sub_entity_instance.find_idmap(external_id: sub_entity_instance.get_id_from_external_entity_hash(entity), connec_entity: connec_entity_name, organization_id: organization.id)
 
             # No idmap: creating one, nothing else to do
             unless idmap
-              next {entity: sub_entity_instance.map_to(connec_entity_name, entity, organization), idmap: IdMap.create(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, name: sub_entity_instance.object_name_from_external_entity_hash(entity))}
+              next {entity: sub_entity_instance.map_to(connec_entity_name, entity, organization), idmap: sub_entity_instance.create_idmap_from_external_entity(entity, connec_entity_name, organization)}
             end
 
+            # Not pushing entity to Connec!
+            next nil unless idmap.to_connec
+
             # Entity has not been modified since its last push to connec!
-            if idmap.last_push_to_connec && idmap.last_push_to_connec > sub_entity_instance.get_last_update_date_from_external_entity_hash(entity)
-              ConnectorLogger.log('info', organization, "Discard #{@@external_name} #{external_entity_name} : #{entity}")
-              next nil
-            end
+            next nil if Maestrano::Connector::Rails::Entity.not_modified_since_last_push_to_connec(idmap, entity, sub_entity_instance, organization)
 
-            equivalent_connec_entities = connec_entities[connec_entity_name][external_entity_name] || []
             # Check for conflict with entities from connec!
-            if idmap.connec_id && connec_entity = equivalent_connec_entities.detect{|connec_entity| connec_entity['id'] == idmap.connec_id}
-              # We keep the most recently updated entity
-              if !opts[:connec_preemption].nil?
-                keep_external = !opts[:connec_preemption]
-              else
-                keep_external = connec_entity['updated_at'] < sub_entity_instance.get_last_update_date_from_external_entity_hash(entity)
-              end
-
-              if keep_external
-                ConnectorLogger.log('info', organization, "Conflict between #{@@external_name} #{external_entity_name} #{entity} and Connec! #{connec_entity_name} #{connec_entity}. Entity from #{@@external_name} kept")
-                equivalent_connec_entities.delete(connec_entity)
-                {entity: sub_entity_instance.map_to(connec_entity_name, entity, organization), idmap: idmap}
-              else
-                ConnectorLogger.log('info', organization, "Conflict between #{@@external_name} #{external_entity_name} #{entity} and Connec! #{connec_entity_name} #{connec_entity}. Entity from Connec! kept")
-                nil
-              end
-
-            else
-              {entity: sub_entity_instance.map_to(connec_entity_name, entity, organization), idmap: idmap}
-            end
+            equivalent_connec_entities = modeled_connec_entities[connec_entity_name][external_entity_name] || []
+            Maestrano::Connector::Rails::Entity.solve_conflict(entity, sub_entity_instance, equivalent_connec_entities, connec_entity_name, idmap, organization, opts)
           }.compact!
         end
       end
@@ -138,7 +119,7 @@ module Maestrano::Connector::Rails
         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)
+            self.map_to_external_with_idmap(entity, organization, external_entity_name, sub_entity_instance)
           }.compact!
         end
       end

data/app/models/maestrano/connector/rails/concerns/entity.rb

@@ -17,116 +17,159 @@ module Maestrano::Connector::Rails::Concerns::Entity
   # ----------------------------------------------
   # Map a Connec! entity to the external format
   def map_to_external(entity, organization)
-    self.mapper_class.normalize(entity)
+    mapper_class.normalize(entity)
   end
 
   # Map an external entity to Connec! format
   def map_to_connec(entity, organization)
-    self.mapper_class.denormalize(entity)
+    mapper_class.denormalize(entity)
   end
 
+  # ----------------------------------------------
+  #                 IdMap methods
+  # ----------------------------------------------
+  def names_hash
+    {
+      connec_entity: connec_entity_name.downcase,
+      external_entity: external_entity_name.downcase
+    }
+  end
+
+  def find_or_create_idmap(organization_and_id)
+    Maestrano::Connector::Rails::IdMap.find_or_create_by(names_hash.merge(organization_and_id))
+  end
+
+  # organization_and_id can be either:
+  # * {connec_id: 'id', organization_id: 'id'}
+  # * {external_id: 'id', organization_id: 'id'}
+  # Needs to include either connec_entity or external_entity for complex entities
+  def find_idmap(organization_and_id)
+    Maestrano::Connector::Rails::IdMap.find_by(names_hash.merge(organization_and_id))
+  end
+
+  def create_idmap_from_external_entity(entity, organization)
+    h = names_hash.merge({
+      external_id: get_id_from_external_entity_hash(entity),
+      name: object_name_from_external_entity_hash(entity),
+      organization_id: organization.id
+    })
+    Maestrano::Connector::Rails::IdMap.create(h)
+  end
+
+  def create_idmap_from_connec_entity(entity, organization)
+    h = names_hash.merge({
+      connec_id: entity['id'],
+      name: object_name_from_connec_entity_hash(entity),
+      organization_id: organization.id
+    })
+    Maestrano::Connector::Rails::IdMap.create(h)
+  end
   # ----------------------------------------------
   #                 Connec! methods
   # ----------------------------------------------
   def normalized_connec_entity_name
-    if self.singleton?
-      self.connec_entity_name.downcase
+    if singleton?
+      connec_entity_name.downcase
     else
-      self.connec_entity_name.downcase.pluralize
+      connec_entity_name.downcase.pluralize
     end
   end
 
   def get_connec_entities(client, last_synchronization, organization, opts={})
-    Maestrano::Connector::Rails::ConnectorLogger.log('info', organization, "Fetching Connec! #{self.connec_entity_name}")
+    Maestrano::Connector::Rails::ConnectorLogger.log('info', organization, "Fetching Connec! #{connec_entity_name}")
 
     entities = []
 
     # Fetch first page
     if last_synchronization.blank? || opts[:full_sync]
-      Maestrano::Connector::Rails::ConnectorLogger.log('debug', organization, "entity=#{self.connec_entity_name}, fetching all data")
-      response = client.get("/#{self.normalized_connec_entity_name}")
+      Maestrano::Connector::Rails::ConnectorLogger.log('debug', organization, "entity=#{connec_entity_name}, fetching all data")
+      response = client.get("/#{normalized_connec_entity_name}")
     else
-      Maestrano::Connector::Rails::ConnectorLogger.log('debug', organization, "entity=#{self.connec_entity_name}, fetching data since #{last_synchronization.updated_at.iso8601}")
+      Maestrano::Connector::Rails::ConnectorLogger.log('debug', organization, "entity=#{connec_entity_name}, fetching data since #{last_synchronization.updated_at.iso8601}")
       query_param = URI.encode("$filter=updated_at gt '#{last_synchronization.updated_at.iso8601}'")
-      response = client.get("/#{self.normalized_connec_entity_name}?#{query_param}")
+      response = client.get("/#{normalized_connec_entity_name}?#{query_param}")
     end
-    raise "No data received from Connec! when trying to fetch #{self.connec_entity_name.pluralize}" unless response
+    raise "No data received from Connec! when trying to fetch #{connec_entity_name.pluralize}" unless response
 
     response_hash = JSON.parse(response.body)
-    Maestrano::Connector::Rails::ConnectorLogger.log('debug', organization, "received first page entity=#{self.connec_entity_name}, response=#{response.body}")
-    if response_hash["#{self.normalized_connec_entity_name}"]
-      entities << response_hash["#{self.normalized_connec_entity_name}"]
+    Maestrano::Connector::Rails::ConnectorLogger.log('debug', organization, "received first page entity=#{connec_entity_name}, response=#{response.body}")
+    if response_hash["#{normalized_connec_entity_name}"]
+      entities << response_hash["#{normalized_connec_entity_name}"]
     else
-      raise "Received unrecognized Connec! data when trying to fetch #{self.connec_entity_name.pluralize}"
+      raise "Received unrecognized Connec! data when trying to fetch #{connec_entity_name.pluralize}"
     end
 
     # Fetch subsequent pages
     while response_hash['pagination'] && response_hash['pagination']['next']
       # ugly way to convert https://api-connec/api/v2/group_id/organizations?next_page_params to /organizations?next_page_params
-      next_page = response_hash['pagination']['next'].gsub(/^(.*)\/#{self.normalized_connec_entity_name}/, self.normalized_connec_entity_name)
+      next_page = response_hash['pagination']['next'].gsub(/^(.*)\/#{normalized_connec_entity_name}/, normalized_connec_entity_name)
       response = client.get(next_page)
 
-      raise "No data received from Connec! when trying to fetch subsequent page of #{self.connec_entity_name.pluralize}" unless response
-      Maestrano::Connector::Rails::ConnectorLogger.log('debug', organization, "received next page entity=#{self.connec_entity_name}, response=#{response.body}")
+      raise "No data received from Connec! when trying to fetch subsequent page of #{connec_entity_name.pluralize}" unless response
+      Maestrano::Connector::Rails::ConnectorLogger.log('debug', organization, "received next page entity=#{connec_entity_name}, response=#{response.body}")
 
       response_hash = JSON.parse(response.body)
-      if response_hash["#{self.normalized_connec_entity_name}"]
-        entities << response_hash["#{self.normalized_connec_entity_name}"]
+      if response_hash["#{normalized_connec_entity_name}"]
+        entities << response_hash["#{normalized_connec_entity_name}"]
       else
-        raise "Received unrecognized Connec! data when trying to fetch subsequent page of #{self.connec_entity_name.pluralize}"
+        raise "Received unrecognized Connec! data when trying to fetch subsequent page of #{connec_entity_name.pluralize}"
       end
     end
 
     entities = entities.flatten
-    Maestrano::Connector::Rails::ConnectorLogger.log('info', organization, "Received data: Source=Connec!, Entity=#{self.connec_entity_name}, Data=#{entities}")
+    Maestrano::Connector::Rails::ConnectorLogger.log('info', organization, "Received data: Source=Connec!, Entity=#{connec_entity_name}, Data=#{entities}")
     entities
   end
 
   def push_entities_to_connec(connec_client, mapped_external_entities_with_idmaps, organization)
-    self.push_entities_to_connec_to(connec_client, mapped_external_entities_with_idmaps, self.connec_entity_name, organization)
+    push_entities_to_connec_to(connec_client, mapped_external_entities_with_idmaps, connec_entity_name, organization)
   end
 
   def push_entities_to_connec_to(connec_client, mapped_external_entities_with_idmaps, connec_entity_name, organization)
-    Maestrano::Connector::Rails::ConnectorLogger.log('info', organization, "Sending #{@@external_name} #{self.external_entity_name.pluralize} to Connec! #{connec_entity_name.pluralize}")
+    Maestrano::Connector::Rails::ConnectorLogger.log('info', organization, "Sending #{@@external_name} #{external_entity_name.pluralize} to Connec! #{connec_entity_name.pluralize}")
     mapped_external_entities_with_idmaps.each do |mapped_external_entity_with_idmap|
       external_entity = mapped_external_entity_with_idmap[:entity]
       idmap = mapped_external_entity_with_idmap[:idmap]
 
-      if idmap.connec_id.blank?
-        connec_entity = self.create_connec_entity(connec_client, external_entity, connec_entity_name, organization)
-        idmap.update_attributes(connec_id: connec_entity['id'], connec_entity: connec_entity_name.downcase, last_push_to_connec: Time.now, message: nil)
-      else
-        connec_entity = self.update_connec_entity(connec_client, external_entity, idmap.connec_id, connec_entity_name, organization)
-        idmap.update_attributes(last_push_to_connec: Time.now, message: nil)
+      begin
+        if idmap.connec_id.blank?
+          connec_entity = create_connec_entity(connec_client, external_entity, connec_entity_name, organization)
+          idmap.update_attributes(connec_id: connec_entity['id'], connec_entity: connec_entity_name.downcase, last_push_to_connec: Time.now, message: nil)
+        else
+          connec_entity = update_connec_entity(connec_client, external_entity, idmap.connec_id, connec_entity_name, organization)
+          idmap.update_attributes(last_push_to_connec: Time.now, message: nil)
+        end
+      rescue => e
+        # Store Connec! error if any
+        idmap.update_attributes(message: e.message)
       end
-
-      # Store Connec! error if any
-      idmap.update_attributes(message: connec_entity['errors'].first['title']) unless connec_entity.blank? || connec_entity['errors'].blank?
     end
   end
 
   def create_connec_entity(connec_client, mapped_external_entity, connec_entity_name, organization)
     Maestrano::Connector::Rails::ConnectorLogger.log('info', organization, "Sending create #{connec_entity_name}: #{mapped_external_entity} to Connec!")
     response = connec_client.post("/#{normalized_connec_entity_name}", { "#{normalized_connec_entity_name}".to_sym => mapped_external_entity })
-    raise "No response received from Connec! when trying to create a #{self.connec_entity_name}" unless response
-    JSON.parse(response.body)["#{normalized_connec_entity_name}"]
+    response = JSON.parse(response.body)
+    raise "Connec!: #{response['errors']['title']}" if response['errors'] && response['errors']['title']
+    response["#{normalized_connec_entity_name}"]
   end
 
   def update_connec_entity(connec_client, mapped_external_entity, connec_id, connec_entity_name, organization)
     Maestrano::Connector::Rails::ConnectorLogger.log('info', organization, "Sending update #{connec_entity_name}: #{mapped_external_entity} to Connec!")
     response = connec_client.put("/#{normalized_connec_entity_name}/#{connec_id}", { "#{normalized_connec_entity_name}".to_sym => mapped_external_entity })
-    raise "No response received from Connec! when trying to update a #{self.connec_entity_name}" unless response
-    JSON.parse(response.body)["#{normalized_connec_entity_name}"]
+    response = JSON.parse(response.body)
+    raise "Connec!: #{response['errors']['title']}" if response['errors'] && response['errors']['title']
+    response["#{normalized_connec_entity_name}"]
   end
 
   def map_to_external_with_idmap(entity, organization)
-    idmap = Maestrano::Connector::Rails::IdMap.find_by(connec_id: entity['id'], connec_entity: self.connec_entity_name.downcase, organization_id: organization.id)
+    idmap = find_idmap({connec_id: entity['id'], organization_id: organization.id})
 
     if idmap && ((!idmap.to_external) || (idmap.last_push_to_external && idmap.last_push_to_external > entity['updated_at']))
-      Maestrano::Connector::Rails::ConnectorLogger.log('info', organization, "Discard Connec! #{self.connec_entity_name} : #{entity}")
+      Maestrano::Connector::Rails::ConnectorLogger.log('info', organization, "Discard Connec! #{connec_entity_name} : #{entity}")
       nil
     else
-      {entity: self.map_to_external(entity, organization), idmap: idmap || Maestrano::Connector::Rails::IdMap.create(connec_id: entity['id'], connec_entity: self.connec_entity_name.downcase, organization_id: organization.id, name: object_name_from_connec_entity_hash(entity))}
+      {entity: map_to_external(entity, organization), idmap: idmap || create_idmap_from_connec_entity(entity, organization)}
     end
   end
 
@@ -134,18 +177,18 @@ module Maestrano::Connector::Rails::Concerns::Entity
   #                 External methods
   # ----------------------------------------------
   def get_external_entities(client, last_synchronization, organization, opts={})
-    Maestrano::Connector::Rails::ConnectorLogger.log('info', organization, "Fetching #{@@external_name} #{self.external_entity_name.pluralize}")
+    Maestrano::Connector::Rails::ConnectorLogger.log('info', organization, "Fetching #{@@external_name} #{external_entity_name.pluralize}")
     raise "Not implemented"
   end
 
   def push_entities_to_external(external_client, mapped_connec_entities_with_idmaps, organization)
-    push_entities_to_external_to(external_client, mapped_connec_entities_with_idmaps, self.external_entity_name, organization)
+    push_entities_to_external_to(external_client, mapped_connec_entities_with_idmaps, external_entity_name, organization)
   end
 
   def push_entities_to_external_to(external_client, mapped_connec_entities_with_idmaps, external_entity_name, organization)
-    Maestrano::Connector::Rails::ConnectorLogger.log('info', organization, "Sending Connec! #{self.connec_entity_name.pluralize} to #{@@external_name} #{external_entity_name.pluralize}")
+    Maestrano::Connector::Rails::ConnectorLogger.log('info', organization, "Sending Connec! #{connec_entity_name.pluralize} to #{@@external_name} #{external_entity_name.pluralize}")
     mapped_connec_entities_with_idmaps.each do |mapped_connec_entity_with_idmap|
-      self.push_entity_to_external(external_client, mapped_connec_entity_with_idmap, external_entity_name, organization)
+      push_entity_to_external(external_client, mapped_connec_entity_with_idmap, external_entity_name, organization)
     end
   end
 
@@ -155,10 +198,10 @@ module Maestrano::Connector::Rails::Concerns::Entity
 
     begin
       if idmap.external_id.blank?
-        external_id = self.create_external_entity(external_client, connec_entity, external_entity_name, organization)
+        external_id = create_external_entity(external_client, connec_entity, external_entity_name, organization)
         idmap.update_attributes(external_id: external_id, external_entity: external_entity_name.downcase, last_push_to_external: Time.now, message: nil)
       else
-        self.update_external_entity(external_client, connec_entity, idmap.external_id, external_entity_name, organization)
+        update_external_entity(external_client, connec_entity, idmap.external_id, external_entity_name, organization)
         idmap.update_attributes(last_push_to_external: Time.now, message: nil)
       end
     rescue => e
@@ -193,54 +236,56 @@ module Maestrano::Connector::Rails::Concerns::Entity
   # * Maps not discarded entities and associates them with their idmap, or create one if there isn't any
   # * Return a hash {connec_entities: [], external_entities: []}
   def consolidate_and_map_data(connec_entities, external_entities, organization, opts={})
+    return consolidate_and_map_singleton(connec_entities, external_entities, organization, opts) if singleton?
+
     mapped_external_entities = external_entities.map{|entity|
-      idmap = Maestrano::Connector::Rails::IdMap.find_by(external_id: self.get_id_from_external_entity_hash(entity), external_entity: self.external_entity_name.downcase, organization_id: organization.id)
+      idmap = find_idmap({external_id: get_id_from_external_entity_hash(entity), organization_id: organization.id})
       # No idmap: creating one, nothing else to do
       unless idmap
-        next {entity: self.map_to_connec(entity, organization), idmap: Maestrano::Connector::Rails::IdMap.create(external_id: self.get_id_from_external_entity_hash(entity), external_entity: self.external_entity_name.downcase, organization_id: organization.id, name: self.object_name_from_external_entity_hash(entity))}
+        next {entity: map_to_connec(entity, organization), idmap: create_idmap_from_external_entity(entity, organization)}
       end
 
       # Not pushing entity to Connec!
       next nil unless idmap.to_connec
 
       # Entity has not been modified since its last push to connec!
-      if idmap.last_push_to_connec && idmap.last_push_to_connec > self.get_last_update_date_from_external_entity_hash(entity)
-        Maestrano::Connector::Rails::ConnectorLogger.log('info', organization, "Discard #{@@external_name} #{self.external_entity_name} : #{entity}")
-        next nil
-      end
+      next nil if self.class.not_modified_since_last_push_to_connec(idmap, entity, self, organization)
 
       # Check for conflict with entities from connec!
-      if idmap.connec_id && connec_entity = connec_entities.detect{|connec_entity| connec_entity['id'] == idmap.connec_id}
-        # We keep the most recently updated entity
-        if !opts[:connec_preemption].nil?
-          keep_external = !opts[:connec_preemption]
-        else
-          keep_external = connec_entity['updated_at'] < self.get_last_update_date_from_external_entity_hash(entity)
-        end
-
-        if keep_external
-          Maestrano::Connector::Rails::ConnectorLogger.log('info', organization, "Conflict between #{@@external_name} #{self.external_entity_name} #{entity} and Connec! #{self.connec_entity_name} #{connec_entity}. Entity from #{@@external_name} kept")
-          connec_entities.delete(connec_entity)
-          {entity: self.map_to_connec(entity, organization), idmap: idmap}
-        else
-          Maestrano::Connector::Rails::ConnectorLogger.log('info', organization, "Conflict between #{@@external_name} #{self.external_entity_name} #{entity} and Connec! #{self.connec_entity_name} #{connec_entity}. Entity from Connec! kept")
-          nil
-        end
-
-      else
-        {entity: self.map_to_connec(entity, organization), idmap: idmap}
-      end
+      self.class.solve_conflict(entity, self, connec_entities, connec_entity_name, idmap, organization, opts)
     }
     mapped_external_entities.compact!
 
     mapped_connec_entities = connec_entities.map{|entity|
-      self.map_to_external_with_idmap(entity, organization)
+      map_to_external_with_idmap(entity, organization)
     }
     mapped_connec_entities.compact!
 
     return {connec_entities: mapped_connec_entities, external_entities: mapped_external_entities}
   end
 
+  def consolidate_and_map_singleton(connec_entities, external_entities, organization, opts={})
+    return {connec_entities: [], external_entities: []} if external_entities.empty? && connec_entities.empty?
+
+    idmap = find_or_create_idmap({organization_id: organization.id})
+
+    if external_entities.empty?
+      keep_external = false
+    elsif connec_entities.empty?
+      keep_external = true
+    elsif !opts[:connec_preemption].nil?
+      keep_external = !opts[:connec_preemption]
+    else
+      keep_external = self.class.is_external_more_recent?(connec_entities.first, external_entities.first, self)
+    end
+    if keep_external
+      idmap.update(external_id: get_id_from_external_entity_hash(external_entities.first))
+      return {connec_entities: [], external_entities: [{entity: map_to_connec(external_entities.first, organization), idmap: idmap}]}
+    else
+      idmap.update(connec_id: connec_entities.first['id'])
+      return {connec_entities: [{entity: map_to_external(connec_entities.first, organization), idmap: idmap}], external_entities: []}
+    end
+  end
 
   # ----------------------------------------------
   #             Entity specific methods
@@ -275,4 +320,47 @@ module Maestrano::Connector::Rails::Concerns::Entity
   def object_name_from_external_entity_hash(entity)
     raise "Not implemented"
   end
+
+
+  # ----------------------------------------------
+  #             Internal helper methods
+  # ----------------------------------------------
+  module ClassMethods
+    def not_modified_since_last_push_to_connec(idmap, entity, entity_instance, organization)
+      result = idmap.last_push_to_connec && idmap.last_push_to_connec > entity_instance.get_last_update_date_from_external_entity_hash(entity)
+      Maestrano::Connector::Rails::ConnectorLogger.log('info', organization, "Discard #{entity_instance.external_entity_name} : #{entity}") unless result
+      result
+    end
+
+    def is_external_more_recent?(connec_entity, external_entity, entity_instance)
+      connec_entity['updated_at'] < entity_instance.get_last_update_date_from_external_entity_hash(external_entity)
+    end
+
+    def solve_conflict(external_entity, entity_instance, connec_entities, connec_entity_name, idmap, organization, opts)
+      if idmap.connec_id && connec_entity = connec_entities.detect{|connec_entity| connec_entity['id'] == idmap.connec_id}
+        # We keep the most recently updated entity
+        if !opts[:connec_preemption].nil?
+          keep_external = !opts[:connec_preemption]
+        else
+          keep_external = is_external_more_recent?(connec_entity, external_entity, entity_instance)
+        end
+
+        if keep_external
+          Maestrano::Connector::Rails::ConnectorLogger.log('info', organization, "Conflict between #{entity_instance.external_entity_name} #{external_entity} and Connec! #{connec_entity_name} #{connec_entity}. Entity from external kept")
+          connec_entities.delete(connec_entity)
+          entity_instance.map_external_entity_with_idmap(external_entity, connec_entity_name, idmap, organization)
+        else
+          Maestrano::Connector::Rails::ConnectorLogger.log('info', organization, "Conflict between #{entity_instance.external_entity_name} #{external_entity} and Connec! #{connec_entity_name} #{connec_entity}. Entity from Connec! kept")
+          nil
+        end
+
+      else
+        entity_instance.map_external_entity_with_idmap(external_entity, connec_entity_name, idmap, organization)
+      end
+    end
+  end
+
+  def map_external_entity_with_idmap(external_entity, connec_entity_name, idmap, organization)
+    {entity: map_to_connec(external_entity, organization), idmap: idmap}
+  end
 end