sf_migrate 1.2.0 → 1.2.1

data/lib/import.rb

@@ -604,14 +604,14 @@ module SalesforceMigration
     end
 
     # Associate an object with selected ids
-    def associate_module_by_ids!(obj, type, list_of_ids, assign_to_user = false, reverse_association = false)
+    def associate_module_by_ids!(object, type, list_of_ids, assign_to_user = false, reverse_association = false)
       if list_of_ids.is_a?(Array)
         list_of_ids.each do |record_id|
           sugar_object = find_sugarcrm_object(type, 'sf_id', record_id)
           if reverse_association
-            sugar_object.associate! obj if sugar_object
+            sugar_object.associate! object if sugar_object
           else
-            obj.associate! sugar_object if sugar_object
+            object.associate! sugar_object if sugar_object
           end
           assign_user_as_owner_to_record(object, sugar_object) if assign_to_user
         end
@@ -640,9 +640,9 @@ module SalesforceMigration
       return if found_records.blank?
 
       if %(contract email settlement_bank_account).include? type
-        associate_module_by_ids!(obj, type, found_records, true, false)
+        associate_module_by_ids!(object, type, found_records, true, false)
       else
-        associate_module_by_ids!(obj, type, found_records, false, false)
+        associate_module_by_ids!(object, type, found_records, false, false)
       end
     end
 
@@ -689,7 +689,7 @@ module SalesforceMigration
     def assign_user_as_owner_to_record(id_object, object_to_assign)
       return unless id_object and object_to_assign
 
-      salesforce_id = (id_object.sf_agent_id.blank?) ? id_object.sf_id : id_object.sf_agent_id
+      salesforce_id = (defined? id_object.sf_agent_id) ? id_object.sf_agent_id : id_object.sf_id
 
       user = find_sugarcrm_object('users', 'salesforce_id', salesforce_id)
 
@@ -742,7 +742,7 @@ module SalesforceMigration
     def create_security_group_iso(iso)
       @logger.info("Creating SecurityGroup #{iso.name}")
       security_group = SugarCRM::SecurityGroup.new(:name => iso.name) unless find_sugarcrm_object('security_group','name', iso.name)
-      security_group.save!
+      security_group.save! if security_group
     end
     
     # Assign all records, to their ISO's SecurityGroup
@@ -800,10 +800,12 @@ module SalesforceMigration
           security_group = find_sugarcrm_object('security_group','name', iso.name)
 
           if security_group
-            user = SugarCRM::User.find_by_last_name(iso.name)
+            @logger.info("Puting ISO #{iso.name} into its ISO group")
             iso.associate! security_group
             role.associate! security_group
 
+            user = SugarCRM::User.find_by_last_name(iso.name)
+
             if user.nil?
               @logger.error("ISO (#{iso.name}) doesn't have a user record")
             else
@@ -823,6 +825,13 @@ module SalesforceMigration
           security_group = find_sugarcrm_object('security_group','name', agent.emp_iso.first.name) unless agent.emp_iso.empty?
           role = SugarCRM::ACLRole.find_by_name('agents')
             if security_group
+
+              @logger.info("Puting Agent #{agent.name} in Security Group #{security_group.name}")
+              agent.associate! security_group
+              role.associate! security_group
+              
+              put_email_objects_into_iso_group(security_group, 'agent', agent)
+
               user = SugarCRM::User.find_by_last_name(agent.name)
 
               if user.nil?
@@ -830,11 +839,6 @@ module SalesforceMigration
               else
                 user.associate! security_group
               end
-
-              @logger.info("Puting Agent #{agent.name} in Security Group #{security_group.name}")
-              agent.associate! security_group
-              role.associate! security_group
-              put_email_objects_into_iso_group(security_group, 'agent', agent)
             else
               @logger.error("Couldn't find a ISO SecurityGroup for Agent - #{agent.emp_iso.first.name}")
             end
@@ -856,9 +860,11 @@ module SalesforceMigration
             if security_group
               @logger.info("Puting merchant #{merchant.name} into ISO group")
               merchant.associate! security_group
-              put_bank_accounts_into_iso_group(security_group, merchant)
+
               put_email_objects_into_iso_group(security_group, 'merchant', merchant)
               put_payment_methods_objects_into_iso_group(security_group, merchant)
+              put_bank_accounts_into_iso_group(security_group, merchant)
+              put_contracts_into_iso_group(security_group, merchant)
             else
               @logger.error("Couldn't find a ISO SecurityGroup for Merchant - #{merchant.name}")
             end
@@ -866,7 +872,24 @@ module SalesforceMigration
         end
       end
     end
-    
+
+    def put_contracts_into_iso_group(security_group, merchant)
+      return unless security_group and merchant
+
+      @logger.info("Putting Contracts for #{merchant.name} into ISO group")
+
+      case @action
+        when "initial_run"
+          contracts_for_merchant_id = find_related_records(@contracts, 'sf_account_id', merchant.sf_id)
+        when "update"
+          contracts_for_merchant_id = find_related_records('contract', 'sf_account_id', merchant.sf_id)
+      end
+
+      return if contracts_for_merchant_id.blank?
+
+      associate_module_by_ids!(security_group, 'contract', contracts_for_merchant_id, false, true)
+    end
+
     def put_bank_accounts_into_iso_group(security_group, merchant)
       return unless security_group and merchant
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sf_migrate
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 1
   - 2
-  - 0
-  version: 1.2.0
+  - 1
+  version: 1.2.1
 platform: ruby
 authors: 
 - Emil Petkov
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-02-03 00:00:00 Z
+date: 2014-02-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sugarcrm_emp