maestrano-connector-rails 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efabe776dea52e8b1601a0de62be567ad16961a1
-  data.tar.gz: b2c779a4717875396a79a9dae1bd2d80017d0095
+  metadata.gz: 43df5981576854c5a7433146a874a38b6826a030
+  data.tar.gz: 865f0399ab96db0323b281f18ab80f7f38359e5d
 SHA512:
-  metadata.gz: c064cc33f54e2a4571f93ba294b26ae52a889a678d7b5f7a26968ef3a25997d29108c61a6d0518c19142520e10642cf8b9f8279da08a77a3cb04a1c4b4b8bfde
-  data.tar.gz: c0ad8eee085a0bf878786773bc61a7e698368c8cf57d0aa0651f8e51c1ed78f1aa9c382f45cd2c6c8c94111aefd780a9643608ea0f0ad8357c94170d51bdc534
+  metadata.gz: b9e01ee3b43e36ad310f5babf1819b9a215be1d325afbb378092213cdad72802cac6ae5cf77b4546189b4649a5b4635bf3af1a37c21ba19fa04552c9940b2eac
+  data.tar.gz: 77fbe67ebc5496d2f1b8e74ea9237b53fa3b880121fbc73b0a9b4265235c83833e79bdb418c77f4eb0ffdd3a0545af3decdd8cb470f2ad4ae708128cd580a901

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/app/controllers/maestrano/auth/saml_controller.rb

@@ -25,7 +25,7 @@ class Maestrano::Auth::SamlController < Maestrano::Rails::SamlBaseController
     end
 
     if session[:settings]
-      session.delete(:setting)
+      session.delete(:settings)
       redirect_to main_app.root_path
     else
       if current_organization && current_organization.oauth_uid && current_organization.sync_enabled

data/app/controllers/maestrano/connec_controller.rb

@@ -5,31 +5,33 @@ class Maestrano::ConnecController < Maestrano::Rails::WebHookController
 
     begin
       params.except(:tenant, :controller, :action).each do |entity_name, entities|
-        if entity_instance_hash = find_entity_instance(entity_name)
-          entity_instance = entity_instance_hash[:instance]
-
-          entities.each do |entity|
-            if (organization = Maestrano::Connector::Rails::Organization.find_by(uid: entity[:group_id], tenant: params[:tenant])) && organization.oauth_uid
-              Maestrano::Connector::Rails::ConnectorLogger.log('info', organization, "Received entity from Connec! webhook: Entity=#{entity_name}, Data=#{entity}")
-              if organization.sync_enabled && organization.synchronized_entities[entity_instance_hash[:name].to_sym]
-                external_client = Maestrano::Connector::Rails::External.get_client(organization)
-
-                # Build expected input for consolidate_and_map_data
-                if entity_instance_hash[:is_complex]
-                  mapped_entity = entity_instance.consolidate_and_map_data(Hash[ *entity_instance.class.connec_entities_names.collect{|name| name.parameterize('_').pluralize == entity_name ? [name, [entity]] : [ name, []]}.flatten(1) ], Hash[ *entity_instance.class.external_entities_names.collect{|name| [ name, []]}.flatten(1) ], organization, {})
-                else
-                  mapped_entity = entity_instance.consolidate_and_map_data([entity], [], organization, {})
-                end
-
-                entity_instance.push_entities_to_external(external_client, mapped_entity[:connec_entities], organization)
-              end
-
-            else
-              Rails.logger.warn "Received notification from Connec! for unknown group or group without oauth: #{entity['group_id']} (tenant: #{params[:tenant]})"
-            end
+
+        entity_instance_hash = find_entity_instance(entity_name)
+        next Rails.logger.info "Received notification from Connec! for unknow entity: #{entity_name}" unless entity_instance_hash
+
+        entity_instance = entity_instance_hash[:instance]
+
+        entities.each do |entity|
+          organization = Maestrano::Connector::Rails::Organization.find_by_uid_and_tenant(entity[:group_id], params[:tenant])
+          next Rails.logger.warn "Received notification from Connec! for unknown group or group without oauth: #{entity['group_id']} (tenant: #{params[:tenant]})" unless organization && organization.oauth_uid
+          next unless organization.sync_enabled && organization.synchronized_entities[entity_instance_hash[:name].to_sym]
+
+
+          Maestrano::Connector::Rails::ConnectorLogger.log('info', organization, "Received entity from Connec! webhook: Entity=#{entity_name}, Data=#{entity}")
+          connec_client = Maestrano::Connec::Client[organization.tenant].new(organization.uid)
+          external_client = Maestrano::Connector::Rails::External.get_client(organization)
+          last_synchronization = organization.last_successful_synchronization
+
+          entity_instance.before_sync(connec_client, external_client, last_synchronization, organization, {})
+          # Build expected input for consolidate_and_map_data
+          if entity_instance_hash[:is_complex]
+            mapped_entity = entity_instance.consolidate_and_map_data(Hash[ *entity_instance.class.connec_entities_names.collect{|name| name.parameterize('_').pluralize == entity_name ? [name, [entity]] : [ name, []]}.flatten(1) ], Hash[ *entity_instance.class.external_entities_names.collect{|name| [ name, []]}.flatten(1) ], organization, {})
+          else
+            mapped_entity = entity_instance.consolidate_and_map_data([entity], [], organization, {})
           end
-        else
-          Rails.logger.info "Received notification from Connec! for unknow entity: #{entity_name}"
+          entity_instance.push_entities_to_external(external_client, mapped_entity[:connec_entities], organization)
+
+          entity_instance.after_sync(connec_client, external_client, last_synchronization, organization, {})
         end
       end
     rescue => e
@@ -40,7 +42,6 @@ class Maestrano::ConnecController < Maestrano::Rails::WebHookController
   end
 
 
-
   private
     def find_entity_instance(entity_name)
       Maestrano::Connector::Rails::Entity.entities_list.each do |entity_name_from_list|

data/app/jobs/maestrano/connector/rails/push_to_connec_job.rb

@@ -3,22 +3,29 @@ module Maestrano::Connector::Rails
     queue_as :default
 
     # expected hash: {"external_entity_name1" => [entity1, entity2], "external_entity_name2" => []}
-    def perform(organization, entities_hash)
+    def perform(organization, entities_hash, opts={})
       return unless organization.sync_enabled && organization.oauth_uid
 
       connec_client = Maestrano::Connec::Client[organization.tenant].new(organization.uid)
+      external_client = Maestrano::Connector::Rails::External.get_client(organization)
+      last_synchronization = organization.last_successful_synchronization
 
       entities_hash.each do |external_entity_name, entities|
         if entity_instance_hash = find_entity_instance(external_entity_name)
-          entity_instance = entity_instance_hash[:instance]
           next unless organization.synchronized_entities[entity_instance_hash[:name].to_sym]
+
+          entity_instance = entity_instance_hash[:instance]
+
+          entity_instance.before_sync(connec_client, external_client, last_synchronization, organization, opts)
+          # Build expected input for consolidate_and_map_data
           if entity_instance_hash[:is_complex]
             mapped_entities = entity_instance.consolidate_and_map_data(Hash[ *entity_instance.class.connec_entities_names.collect{|name| [ name, []]}.flatten(1) ], Hash[ *entity_instance.class.external_entities_names.collect{|name| name == external_entity_name ? [name, entities] : [ name, []]}.flatten(1) ], organization, {})
           else
             mapped_entities = entity_instance.consolidate_and_map_data([], entities, organization, {})
           end
-
           entity_instance.push_entities_to_connec(connec_client, mapped_entities[:external_entities], organization)
+
+          entity_instance.after_sync(connec_client, external_client, last_synchronization, organization, opts)
         else
           Rails.logger.warn "Called push to connec job with unknow entity: #{external_entity_name}"
         end

data/app/jobs/maestrano/connector/rails/synchronization_job.rb

@@ -3,7 +3,7 @@ module Maestrano::Connector::Rails
     queue_as :default
 
     # Supported options:
-    #  * :forced => true  synchronization has been triggered manually (for logging purposes only)
+    #  * :forced => true  synchronization has been triggered manually
     #  * :only_entities => [person, tasks_list]
     #  * :full_sync => true  synchronization is performed without date filtering
     #  * :connec_preemption => true|false : preemption is always|never given to connec in case of conflict (if not set, the most recently updated entity is kept)
@@ -17,8 +17,8 @@ module Maestrano::Connector::Rails
       end
 
       # Check if recovery mode: last 3 synchronizations have failed
-      if Synchronization.where(organization_id: organization.id, status: 'ERROR').order(created_at: :desc).limit(3).count == 3 \
-          && Synchronization.where(organization_id: organization.id).order(created_at: :desc).limit(1).first.updated_at > 1.day.ago
+      if !opts[:forced] && organization.last_three_synchronizations_failed? \
+          && organization.synchronizations.order(created_at: :desc).limit(1).first.updated_at > 1.day.ago
         ConnectorLogger.log('info', organization, "Synchronization skipped: Recovery mode (three previous synchronizations have failed)")
         return
       end
@@ -28,7 +28,7 @@ module Maestrano::Connector::Rails
       current_synchronization = Synchronization.create_running(organization)
 
       begin
-        last_synchronization = Synchronization.where(organization_id: organization.id, status: 'SUCCESS', partial: false).order(updated_at: :desc).first
+        last_synchronization = organization.last_successful_synchronization
         connec_client = Maestrano::Connec::Client[organization.tenant].new(organization.uid)
         external_client = External.get_client(organization)
 

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

@@ -56,11 +56,13 @@ module Maestrano::Connector::Rails::Concerns::ComplexEntity
     idmap = sub_entity_instance.class.find_idmap({connec_id: entity['id'], external_entity: external_entity_name.downcase, organization_id: organization.id})
 
     if idmap
-      idmap.update(name: sub_entity_instance.class.object_name_from_connec_entity_hash(entity))
-      if (!idmap.to_external) || idmap.last_push_to_external && idmap.last_push_to_external > entity['updated_at']
+      return nil if idmap.external_inactive || !idmap.to_external
+
+      if idmap.last_push_to_external && idmap.last_push_to_external > entity['updated_at']
         Maestrano::Connector::Rails::ConnectorLogger.log('info', organization, "Discard Connec! #{sub_entity_instance.class.entity_name} : #{entity}")
         nil
       else
+        idmap.update(name: sub_entity_instance.class.object_name_from_connec_entity_hash(entity))
         {entity: sub_entity_instance.map_to(external_entity_name, entity, organization), idmap: idmap}
       end
     else
@@ -103,18 +105,23 @@ module Maestrano::Connector::Rails::Concerns::ComplexEntity
           idmap = sub_entity_instance.class.find_idmap(external_id: sub_entity_instance.class.id_from_external_entity_hash(entity), connec_entity: connec_entity_name.downcase, organization_id: organization.id)
 
           # No idmap: creating one, nothing else to do
-          if idmap
-            idmap.update(name: sub_entity_instance.class.object_name_from_external_entity_hash(entity))
-          else
+          unless idmap
             next {entity: sub_entity_instance.map_to(connec_entity_name, entity, organization), idmap: sub_entity_instance.class.create_idmap_from_external_entity(entity, connec_entity_name, organization)}
           end
 
           # Not pushing entity to Connec!
           next nil unless idmap.to_connec
 
+          # Not pushing to Connec! and flagging as inactive if inactive in external application
+          inactive = sub_entity_instance.class.inactive_from_external_entity_hash?(entity)
+          idmap.update(external_inactive: inactive)
+          next nil if inactive
+
           # Entity has not been modified since its last push to connec!
           next nil if Maestrano::Connector::Rails::Entity.not_modified_since_last_push_to_connec?(idmap, entity, sub_entity_instance, organization)
 
+          idmap.update(name: sub_entity_instance.class.object_name_from_external_entity_hash(entity))
+
           # Check for conflict with entities from connec!
           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)

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

@@ -75,6 +75,21 @@ module Maestrano::Connector::Rails::Concerns::Entity
       raise "Not implemented"
     end
 
+    # Return a string representing the object from a connec! entity hash
+    def object_name_from_connec_entity_hash(entity)
+      raise "Not implemented"
+    end
+
+    # Return a string representing the object from an external entity hash
+    def object_name_from_external_entity_hash(entity)
+      raise "Not implemented"
+    end
+
+    # Returns a boolean
+    # Returns true is the entity is flagged as inactive (deleted) in the external application
+    def inactive_from_external_entity_hash?(entity)
+      false
+    end
     # ----------------------------------------------
     #             Entity specific methods
     # Those methods need to be define in each entity
@@ -99,19 +114,7 @@ module Maestrano::Connector::Rails::Concerns::Entity
       raise "Not implemented"
     end
 
-    # Return a string representing the object from a connec! entity hash
-    def object_name_from_connec_entity_hash(entity)
-      raise "Not implemented"
-    end
-
-    # Return a string representing the object from an external entity hash
-    def object_name_from_external_entity_hash(entity)
-      raise "Not implemented"
-    end
-
     # [{reference_class: Entities::.., connec_field: 'account_id', external_field: 'account/something/id'}]
-    # ledger_account_idmap = Entities::Account.find_idmap({connec_id: entity['account_id'], organization_id: organization.id})
-    # ledger_account_id = ledger_account_idmap && ledger_account_idmap.external_id
     def references
       []
     end
@@ -286,11 +289,13 @@ module Maestrano::Connector::Rails::Concerns::Entity
     idmap = self.class.find_idmap({connec_id: entity['id'], organization_id: organization.id})
 
     if idmap
-      idmap.update(name: self.class.object_name_from_connec_entity_hash(entity))
-      if (!idmap.to_external) || (idmap.last_push_to_external && idmap.last_push_to_external > entity['updated_at'])
+      return nil if idmap.external_inactive || !idmap.to_external
+
+      if idmap.last_push_to_external && idmap.last_push_to_external > entity['updated_at']
         Maestrano::Connector::Rails::ConnectorLogger.log('info', organization, "Discard Connec! #{self.class.connec_entity_name} : #{entity}")
         nil
       else
+        idmap.update(name: self.class.object_name_from_connec_entity_hash(entity))
         {entity: map_to_external(entity, organization), idmap: idmap}
       end
     else
@@ -360,28 +365,32 @@ module Maestrano::Connector::Rails::Concerns::Entity
 
     mapped_external_entities = external_entities.map{|entity|
       idmap = self.class.find_idmap({external_id: self.class.id_from_external_entity_hash(entity), organization_id: organization.id})
+
       # No idmap: creating one, nothing else to do
-      if idmap
-        idmap.update(name: self.class.object_name_from_external_entity_hash(entity))
-      else
+      unless idmap
         next {entity: map_to_connec(entity, organization), idmap: self.class.create_idmap_from_external_entity(entity, organization)}
       end
 
       # Not pushing entity to Connec!
       next nil unless idmap.to_connec
 
+      # Not pushing to Connec! and flagging as inactive if inactive in external application
+      inactive = self.class.inactive_from_external_entity_hash?(entity)
+      idmap.update(external_inactive: inactive)
+      next nil if inactive
+
       # Entity has not been modified since its last push to connec!
       next nil if self.class.not_modified_since_last_push_to_connec?(idmap, entity, self, organization)
 
+      idmap.update(name: self.class.object_name_from_external_entity_hash(entity))
+
       # Check for conflict with entities from connec!
       self.class.solve_conflict(entity, self, connec_entities, self.class.connec_entity_name, idmap, organization, opts)
-    }
-    mapped_external_entities.compact!
+    }.compact
 
     mapped_connec_entities = connec_entities.map{|entity|
       map_to_external_with_idmap(entity, organization)
-    }
-    mapped_connec_entities.compact!
+    }.compact
 
     return {connec_entities: mapped_connec_entities, external_entities: mapped_external_entities}
   end

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

@@ -59,5 +59,14 @@ module Maestrano::Connector::Rails
       self.instance_url = auth.credentials.instance_url
       self.save!
     end
+
+    def last_three_synchronizations_failed?
+      arr = self.synchronizations.last(3).map(&:is_error?)
+      arr.count == 3 && arr.uniq == [true]
+    end
+
+    def last_successful_synchronization
+      self.synchronizations.where(status: 'SUCCESS', partial: false).order(updated_at: :desc).first
+    end
   end
 end

data/db/migrate/20160427112250_add_inactive_to_idmaps.rb

@@ -0,0 +1,5 @@
+class AddInactiveToIdmaps < ActiveRecord::Migration
+  def change
+    add_column :id_maps, :external_inactive, :boolean, default: false
+  end
+end

data/lib/generators/connector/templates/entity.rb

@@ -46,4 +46,10 @@ class Maestrano::Connector::Rails::Entity
     # e.g entity['last_update']
   end
 
+  def self.inactive_from_external_entity_hash?(entity)
+    # TODO
+    # This method return true is entity is inactive in the external application
+    # e.g entity['status'] == 'INACTIVE'
+  end
+
 end

data/maestrano-connector-rails.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: maestrano-connector-rails 0.4.1 ruby lib
+# stub: maestrano-connector-rails 0.4.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "maestrano-connector-rails"
-  s.version = "0.4.1"
+  s.version = "0.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Pierre Berard"]
-  s.date = "2016-04-19"
+  s.date = "2016-04-29"
   s.description = "Maestrano is the next generation marketplace for SME applications. See https://maestrano.com for details."
   s.email = "pierre.berard@maestrano.com"
   s.executables = ["rails"]
@@ -62,6 +62,7 @@ Gem::Specification.new do |s|
     "db/migrate/20151122163449_create_id_maps.rb",
     "db/migrate/20160205132857_add_sync_enabled_to_organizations.rb",
     "db/migrate/20160215103120_add_name_to_id_map.rb",
+    "db/migrate/20160427112250_add_inactive_to_idmaps.rb",
     "lib/generators/connector/USAGE",
     "lib/generators/connector/complex_entity_generator.rb",
     "lib/generators/connector/install_generator.rb",

data/spec/controllers/connec_controller_spec.rb

@@ -70,8 +70,10 @@ describe Maestrano::ConnecController, type: :controller do
           let!(:organization) { create(:organization, uid: group_id, oauth_uid: 'lala', sync_enabled: true, synchronized_entities: {contact_and_lead: true}) }
 
           it 'process the data and push them' do
+            expect_any_instance_of(Entities::ContactAndLead).to receive(:before_sync)
             expect_any_instance_of(Entities::ContactAndLead).to receive(:consolidate_and_map_data).with({"Lead"=>[entity]}, {}, organization, {}).and_return({})
             expect_any_instance_of(Entities::ContactAndLead).to receive(:push_entities_to_external)
+            expect_any_instance_of(Entities::ContactAndLead).to receive(:after_sync)
             subject
           end
         end
@@ -135,8 +137,10 @@ describe Maestrano::ConnecController, type: :controller do
             let!(:organization) { create(:organization, uid: group_id, oauth_uid: 'lala', sync_enabled: true, synchronized_entities: {person: true}) }
 
             it 'process the data and push them' do
+              expect_any_instance_of(Entities::Person).to receive(:before_sync)
               expect_any_instance_of(Entities::Person).to receive(:consolidate_and_map_data).with([entity], [], organization, {}).and_return({})
               expect_any_instance_of(Entities::Person).to receive(:push_entities_to_external)
+              expect_any_instance_of(Entities::Person).to receive(:after_sync)
               subject
             end
           end

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20160215103120) do
+ActiveRecord::Schema.define(version: 20160427120963) do
 
   create_table "id_maps", force: :cascade do |t|
     t.string   "connec_id"
@@ -21,12 +21,13 @@ ActiveRecord::Schema.define(version: 20160215103120) do
     t.integer  "organization_id"
     t.datetime "last_push_to_connec"
     t.datetime "last_push_to_external"
-    t.datetime "created_at",                           null: false
-    t.datetime "updated_at",                           null: false
+    t.datetime "created_at",                            null: false
+    t.datetime "updated_at",                            null: false
     t.boolean  "to_connec",             default: true
     t.boolean  "to_external",           default: true
     t.string   "name"
     t.string   "message"
+    t.boolean  "external_inactive",     default: false
   end
 
   add_index "id_maps", ["connec_id", "connec_entity", "organization_id"], name: "idmap_connec_index"
@@ -40,6 +41,7 @@ ActiveRecord::Schema.define(version: 20160215103120) do
     t.string   "tenant"
     t.string   "oauth_provider"
     t.string   "oauth_uid"
+    t.string   "oauth_name"
     t.string   "oauth_token"
     t.string   "refresh_token"
     t.string   "instance_url"
@@ -78,6 +80,8 @@ ActiveRecord::Schema.define(version: 20160215103120) do
     t.string   "first_name"
     t.string   "last_name"
     t.string   "email"
+    t.string   "locale"
+    t.string   "timezone"
     t.string   "tenant"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false

data/spec/jobs/push_to_connec_job_spec.rb

@@ -60,7 +60,7 @@ describe Maestrano::Connector::Rails::PushToConnecJob do
       end
     end
 
-    describe 'with entities in syncrhonized entities' do
+    describe 'with entities in synchronized entities' do
 
       describe 'complex entity' do
         before { organization.update(synchronized_entities: {:"#{entity_name1}" => false, :"#{entity_name2}" => true})}
@@ -75,6 +75,12 @@ describe Maestrano::Connector::Rails::PushToConnecJob do
           expect_any_instance_of(Entities::Entity1).to_not receive(:consolidate_and_map_data)
           subject
         end
+
+        it 'calls before and after sync' do
+          expect_any_instance_of(Entities::Entity2).to receive(:before_sync)
+          expect_any_instance_of(Entities::Entity2).to receive(:after_sync)
+          subject
+        end
       end
 
       describe 'non complex entity' do
@@ -91,6 +97,13 @@ describe Maestrano::Connector::Rails::PushToConnecJob do
           expect_any_instance_of(Entities::Entity2).to_not receive(:consolidate_and_map_data)
           subject
         end
+
+        it 'calls before and after sync' do
+          allow_any_instance_of(Entities::Entity1).to receive(:consolidate_and_map_data).and_return({})
+          expect_any_instance_of(Entities::Entity1).to receive(:before_sync)
+          expect_any_instance_of(Entities::Entity1).to receive(:after_sync)
+          subject
+        end
       end
     end
   end

data/spec/jobs/synchronization_job_spec.rb

@@ -2,52 +2,72 @@ require 'spec_helper'
 
 describe Maestrano::Connector::Rails::SynchronizationJob do
   let(:organization) { create(:organization) }
-  subject { Maestrano::Connector::Rails::SynchronizationJob.perform_now(organization, {}) }
+  let(:opts) { {} }
+  subject { Maestrano::Connector::Rails::SynchronizationJob.perform_now(organization, opts) }
+
+  def does_not_perform
+    expect_any_instance_of(Maestrano::Connector::Rails::SynchronizationJob).to_not receive(:sync_entity)
+    expect{ subject }.to change{ Maestrano::Connector::Rails::Synchronization.count }.by(0)
+  end
+
+  def performes
+    expect{ subject }.to change{ Maestrano::Connector::Rails::Synchronization.count }.by(1)
+  end
 
   describe 'perform' do
     context 'with sync_enabled set to false' do
-      it 'does not creates a syncrhonization' do
-        expect{ subject }.to change{ Maestrano::Connector::Rails::Synchronization.count }.by(0)
-      end
-
-      it 'does not calls sync entity' do
-        expect_any_instance_of(Maestrano::Connector::Rails::SynchronizationJob).to_not receive(:sync_entity)
-        subject
-      end
+      it { does_not_perform }
     end
 
     context 'with sync_enabled set to true' do
       before {organization.update(sync_enabled: true)}
 
+      context 'with a sync still running for less than 30 minutes' do
+        let!(:running_sync) { create(:synchronization, organization: organization, status: 'RUNNING', created_at: 29.minutes.ago) }
+        it { does_not_perform }
+      end
+
+      context 'with a sync still running for more than 30 minutes' do
+        let!(:running_sync) { create(:synchronization, organization: organization, status: 'RUNNING', created_at: 31.minutes.ago) }
+        it { performes }
+      end
+
       describe 'recovery mode' do
-        describe 'skipping' do
+        context 'three last sync failed and last sync less than 24 hours ago' do
           before {
             3.times do
-              organization.synchronizations.create(status: 'ERROR')
+              organization.synchronizations.create(status: 'ERROR', created_at: 2.hour.ago)
             end
           }
+          it { does_not_perform }
 
-          it 'skipped the sync if 3 failed sync' do
-            expect{ subject }.to_not change{ Maestrano::Connector::Rails::Synchronization.count }
+          context 'synchronization is forced' do
+            let(:opts) { {forced: true} }
+            it { performes }
           end
         end
 
-        describe 'not skipping' do
+        context 'three last sync failed and last sync more than 24 hours ago' do
           before {
             3.times do
               organization.synchronizations.create(status: 'ERROR', created_at: 2.day.ago, updated_at: 2.day.ago)
             end
           }
+          it { performes }
+        end
 
-          it 'does not skip the sync if 3 failed sync but last sync more than a day ago' do
-            expect{ subject }.to change{ Maestrano::Connector::Rails::Synchronization.count }.by(1)
-          end
+        context 'three sync failed but last sync is successfull' do
+          before {
+            3.times do
+              organization.synchronizations.create(status: 'ERROR', created_at: 2.hour.ago)
+            end
+            organization.synchronizations.create(status: 'SUCCESS', created_at: 1.hour.ago)
+          }
+          it { performes }
         end
       end
 
-      it 'creates a synchronization' do
-        expect{ subject }.to change{ Maestrano::Connector::Rails::Synchronization.count }.by(1)
-      end
+      it { performes }
 
       it 'calls sync entity on all the organization synchronized entities set to true' do
         organization.synchronized_entities[organization.synchronized_entities.keys.first] = false
@@ -58,7 +78,7 @@ describe Maestrano::Connector::Rails::SynchronizationJob do
 
       context 'with options' do
         context 'with only_entities' do
-          subject { Maestrano::Connector::Rails::SynchronizationJob.perform_now(organization, {only_entities: %w(people price)}) }
+          let(:opts) { {only_entities: %w(people price)} }
 
           it 'calls sync entity on the specified entities' do
             expect_any_instance_of(Maestrano::Connector::Rails::SynchronizationJob).to receive(:sync_entity).twice

data/spec/models/complex_entity_spec.rb

@@ -80,6 +80,14 @@ describe Maestrano::Connector::Rails::ComplexEntity do
           expect(subject.map_to_external_with_idmap(entity, organization, external_name, sub_instance)).to be_nil
         end
       end
+
+      context 'when entity has an idmap with external_inactive set to true' do
+        let!(:idmap) { create(:idmap, organization: organization, connec_id: id, connec_entity: connec_name.downcase, external_inactive: true, external_entity: external_name.downcase) }
+
+        it 'discards the entity' do
+          expect(subject.map_to_external_with_idmap(entity, organization, external_name, sub_instance)).to be_nil
+        end
+      end
     end
 
   end
@@ -218,7 +226,7 @@ describe Maestrano::Connector::Rails::ComplexEntity do
             expect(mapped_entities).to eql(external_entities: {
               'sc_e1' => {'Connec1' => [{entity: mapped_entity1, idmap: Maestrano::Connector::Rails::IdMap.first}]},
               'ScE2' => {
-                'Connec1' => [{entity: mapped_entity1, idmap: Maestrano::Connector::Rails::IdMap.all[1]}],
+                'Connec1' => [{entity: mapped_entity1, idmap: Maestrano::Connector::Rails::IdMap.second}],
                 'connec2' => [{entity: mapped_entity2, idmap: Maestrano::Connector::Rails::IdMap.last}],
               }
             },
@@ -244,6 +252,75 @@ describe Maestrano::Connector::Rails::ComplexEntity do
           end
         end
 
+        describe 'external_inactive flagging' do
+
+          context 'idmaps external_inactive set to true' do
+            let!(:idmap1) { create(:idmap, organization: organization, external_id: id1, external_entity: 'sc_e1', connec_entity: 'connec1', external_inactive: true) }
+            let!(:idmap21) { create(:idmap, organization: organization, external_id: id1, external_entity: 'sce2', connec_entity: 'connec1', external_inactive: true) }
+            let!(:idmap22) { create(:idmap, organization: organization, external_id: id2, external_entity: 'sce2', connec_entity: 'connec2', external_inactive: true) }
+
+            context 'entities inactive' do
+              before {
+                allow(Entities::SubEntities::ScE2).to receive(:inactive_from_external_entity_hash?).and_return(true)
+                allow(Entities::SubEntities::ScE1).to receive(:inactive_from_external_entity_hash?).and_return(true)
+              }
+
+              it 'discards the entities' do
+                expect(subject.consolidate_and_map_data({}, external_hash, organization, opt)).to eql(external_entities: {
+                  'sc_e1' => {'Connec1' => []},
+                  'ScE2' => {
+                    'Connec1' => [],
+                    'connec2' => [],
+                  }
+                },
+                connec_entities: {})
+              end
+            end
+
+            context 'entities active' do
+              before {
+                allow(Entities::SubEntities::ScE2).to receive(:inactive_from_external_entity_hash?).and_return(false)
+                allow(Entities::SubEntities::ScE1).to receive(:inactive_from_external_entity_hash?).and_return(false)
+                [idmap1, idmap21, idmap22].each{|i| i.update(last_push_to_connec: 1.second.ago)} #Used only to simplify specing
+              }
+
+              it 'updates the idmaps' do
+                subject.consolidate_and_map_data({}, external_hash, organization, opt)
+                expect(idmap1.reload.external_inactive).to be false
+                expect(idmap21.reload.external_inactive).to be false
+                expect(idmap22.reload.external_inactive).to be false
+              end 
+            end
+          end
+
+          context 'idmaps external_inactive set to false' do
+            let!(:idmap1) { create(:idmap, organization: organization, external_id: id1, external_entity: 'sc_e1', connec_entity: 'connec1', external_inactive: false) }
+            let!(:idmap21) { create(:idmap, organization: organization, external_id: id1, external_entity: 'sce2', connec_entity: 'connec1', external_inactive: false) }
+            let!(:idmap22) { create(:idmap, organization: organization, external_id: id2, external_entity: 'sce2', connec_entity: 'connec2', external_inactive: false) }
+
+            context 'entities inactive' do
+              before {
+                allow(Entities::SubEntities::ScE2).to receive(:inactive_from_external_entity_hash?).and_return(true)
+                allow(Entities::SubEntities::ScE1).to receive(:inactive_from_external_entity_hash?).and_return(true)
+              }
+
+              it 'discards the entities and updates the idmaps' do
+                expect(subject.consolidate_and_map_data({}, external_hash, organization, opt)).to eql(external_entities: {
+                  'sc_e1' => {'Connec1' => []},
+                  'ScE2' => {
+                    'Connec1' => [],
+                    'connec2' => [],
+                  }
+                },
+                connec_entities: {})
+                expect(idmap1.reload.external_inactive).to be true
+                expect(idmap21.reload.external_inactive).to be true
+                expect(idmap22.reload.external_inactive).to be true
+              end
+            end
+          end
+        end
+
         context 'when entities have idmaps with more recent last_push_to_connec' do
           let!(:idmap1) { create(:idmap, organization: organization, external_id: id1, external_entity: 'sc_e1', connec_entity: 'connec1', last_push_to_connec: 1.second.ago) }
           let!(:idmap21) { create(:idmap, organization: organization, external_id: id1, external_entity: 'sce2', connec_entity: 'connec1', last_push_to_connec: 1.second.ago) }

data/spec/models/entity_spec.rb

@@ -474,6 +474,17 @@ describe Maestrano::Connector::Rails::Entity do
               expect(subject.map_to_external_with_idmap(entity, organization)).to be_nil
             end
           end
+
+          context 'when external_inactive is true' do
+            let(:entity) { {'id' => id, 'name' => 'John' } }
+            before {
+              idmap.update(external_inactive: true)
+            }
+
+            it 'discards the entity' do
+              expect(subject.map_to_external_with_idmap(entity, organization)).to be_nil
+            end
+          end
         end
 
         context 'when entity has no idmap' do
@@ -706,6 +717,39 @@ describe Maestrano::Connector::Rails::Entity do
             end
           end
 
+          describe 'inactive flagging' do
+            context 'when idmap is inactive' do
+              let!(:idmap) { create(:idmap, external_entity: external_name.downcase, connec_entity: connec_name.downcase, external_id: id, organization: organization, external_inactive: true) }
+
+              context 'when entity is inactive' do
+                before { allow(subject.class).to receive(:inactive_from_external_entity_hash?).and_return(true) }
+
+                it 'discards the entity' do
+                  expect(subject.consolidate_and_map_data([], entities, organization)).to eql({connec_entities: [], external_entities: []})
+                end
+              end
+
+              context 'when entity is active' do
+                before { allow(subject.class).to receive(:inactive_from_external_entity_hash?).and_return(false) }
+
+                it 'set the idmap as active' do
+                  subject.consolidate_and_map_data([], entities, organization)
+                  expect(idmap.reload.external_inactive).to be false
+                end
+              end
+            end
+
+            context 'when idmap is active and entity is inactive' do
+              let!(:idmap) { create(:idmap, external_entity: external_name.downcase, connec_entity: connec_name.downcase, external_id: id, organization: organization, external_inactive: false) }
+              before { allow(subject.class).to receive(:inactive_from_external_entity_hash?).and_return(true) }
+
+              it 'set the idmap as inactive and discards the entity' do
+                expect(subject.consolidate_and_map_data([], entities, organization)).to eql({connec_entities: [], external_entities: []})
+                expect(idmap.reload.external_inactive).to be true
+              end
+            end
+          end
+
           context 'when entity has an idmap with a last_push_to_connec more recent than date' do
             let!(:idmap) { create(:idmap, connec_entity: connec_name.downcase, external_entity: external_name.downcase, external_id: id, organization: organization, last_push_to_connec: 2.minute.ago) }
 

data/spec/models/organization_spec.rb

@@ -102,6 +102,47 @@ describe Maestrano::Connector::Rails::Organization do
     describe 'from_omniauth' do
       #TODO
     end
+
+    describe 'last_three_synchronizations_failed?' do
+      it 'returns true when last three syncs are failed' do
+        3.times do
+          subject.synchronizations.create(status: 'ERROR')
+        end
+        expect(subject.last_three_synchronizations_failed?).to be true
+      end
+
+      it 'returns false when on of the last three sync is success' do
+        subject.synchronizations.create(status: 'SUCCESS')
+        2.times do
+          subject.synchronizations.create(status: 'ERROR')
+        end
+
+        expect(subject.last_three_synchronizations_failed?).to be false
+      end
+
+      it 'returns false when no sync' do
+        expect(subject.last_three_synchronizations_failed?).to be false
+      end
+
+      it 'returns false when less than three sync' do
+        2.times do
+          subject.synchronizations.create(status: 'ERROR')
+        end
+        
+        expect(subject.last_three_synchronizations_failed?).to be false
+      end
+    end
+
+    describe 'last_successful_synchronization' do
+      let!(:running_sync) { create(:synchronization, organization: subject, status: 'RUNNING') }
+      let!(:failed_sync) { create(:synchronization, organization: subject, status: 'ERROR') }
+      let!(:success_sync) { create(:synchronization, organization: subject, status: 'SUCCESS') }
+      let!(:success_sync2) { create(:synchronization, organization: subject, status: 'SUCCESS', updated_at: 3.hours.ago) }
+      let!(:partial) { create(:synchronization, organization: subject, status: 'SUCCESS', partial: true) }
+
+      it { expect(subject.last_successful_synchronization).to eql(success_sync) }
+    end
   end
 
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maestrano-connector-rails
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Pierre Berard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-19 00:00:00.000000000 Z
+date: 2016-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: maestrano-rails
@@ -272,6 +272,7 @@ files:
 - db/migrate/20151122163449_create_id_maps.rb
 - db/migrate/20160205132857_add_sync_enabled_to_organizations.rb
 - db/migrate/20160215103120_add_name_to_id_map.rb
+- db/migrate/20160427112250_add_inactive_to_idmaps.rb
 - lib/generators/connector/USAGE
 - lib/generators/connector/complex_entity_generator.rb
 - lib/generators/connector/install_generator.rb