sf_migrate 1.2.8 → 1.3.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YzAxYzI3YTAyMWJlMzlmNGEwY2M5ZDNhMGVkNjhlYmZiYjFkZmEzYw==
-  data.tar.gz: !binary |-
-    ZTk1OTFhZjJhMjlkNDJjY2UwN2MzZjNjYzJiMjhhZGQ1OTk2ZmI3Mw==
+SHA1:
+  metadata.gz: 82aec29fedabcbd9db839de6f4f4fc4af4778adf
+  data.tar.gz: 517dda0a66207a3462337df126134976fe8cad94
 SHA512:
-  metadata.gz: !binary |-
-    MzA3N2VlNWE0NDEyMTE0NmViNDM3MTU2NDVjODM3NDA5MTlkYTg5MjM4YzIx
-    MWViNjUwODE2YjIyYTI1ZTYzNTc1MzJjOTNhZTU2Y2FlOTZjYWZlMzRjODU0
-    NjU4NDdlMDk0MWM0MzI1ZmZhNzAwNWE5Yjg4ZmE2MjFhN2Y1NWM=
-  data.tar.gz: !binary |-
-    MWQ4NDlmMzQzNDA0ODNiYzc2MzQ2MDQwYzgxZTBkOWJhYzAxNjliOGNiMTMx
-    ZDk2OWU1Njk5ZTJjZTgxYjg0ODVkZTM5YmVkNzFiNTcyM2RkNDcxMWMxNGZj
-    OWY3NjI2MzUxNjEzZjk3Njk1Y2U5MzFlZjM0NDU3MTI0ZWM2MzQ=
+  metadata.gz: 9a2456753dcd1539acd4353fdc435fefb33b28103c4de19b84c7fbeb934beb6b4de95e1f81e3539d691f521f85ced4098c8726e1ce37a48a2d6d6826408ea92b
+  data.tar.gz: 0b3b78950a7c826f03d98f55e794b55b745b79e48d1da70462b2e9d82e39f145141a7961e46d57522ef4732784c72a7e12158d253e9230f0185f21c6f6335bfd

data/lib/export.rb

@@ -5,13 +5,13 @@ module SalesforceMigration
     # Initilize migration export object, authenticates to SalesForce and start the export
     #
     # @param [Hash] options hash representing passed command line options
-    def initialize(options)
-      @csv_dir            = options[:csv_dir]
-      @action             = options[:action]
-      @last_modified_date = options[:last_modified_date]
+    def initialize
+      @csv_dir            = $options[:csv_dir]
+      @action             = $options[:action]
+      @last_modified_date = $options[:last_modified_date]
       $logger.info("Export action has started!")
-      @client = Databasedotcom::Client.new :client_id => $credentials['salesforce_consumer_key'], :client_secret => $credentials['salesforce_consumer_secret']
-      @client.authenticate :username => $credentials['salesforce_username'], :password => $credentials['salesforce_password']
+      @client = Databasedotcom::Client.new :client_id => $config['salesforce_consumer_key'], :client_secret => $config['salesforce_consumer_secret']
+      @client.authenticate :username => $config['salesforce_username'], :password => $config['salesforce_password']
       $logger.info("Authentication to SalesForce successfull")
       start
       $logger.info("Export action completed successfully!")
@@ -20,7 +20,7 @@ module SalesforceMigration
     private
     def start
       %w(ISOs__c Agent__c Account Acquirer__c Contract Payment_Methods__c Banks__c MerchantToAPM__c ccrmbasic__Email__c Email_Association__c User).each do |type|
-        $logger.info "Writing CSV for #{type}"
+        $logger.info("Writing CSV for #{type}")
         write_to_csv type
       end
     end
@@ -59,11 +59,12 @@ module SalesforceMigration
     #   generate_name('Account') #=> '/tmp/update/2012-07-07/Account_export.csv'
     def generate_name(type)
       if @action == 'initial_run'
-        FileUtils.mkdir_p("#{@csv_dir}/initial/") unless Dir.exists? "#{@csv_dir}/initial/"
-        "#{@csv_dir}/initial/#{type}_export.csv"
+        csv_initial_dir = "#{@csv_dir}/initial/"
+        FileUtils.mkdir_p(csv_initial_dir) unless Dir.exists? csv_initial_dir
+        "#{csv_initial_dir}/#{type}_export.csv"
       else
         today = lambda { Date.today.to_s }
-        dir = "#{@csv_dir}/update/#{today.call}"
+        dir   = "#{@csv_dir}/update/#{today.call}"
         FileUtils.mkdir_p(dir) unless Dir.exists? dir
         "#{dir}/#{type}_export.csv"
       end
@@ -101,12 +102,12 @@ module SalesforceMigration
     # @return [Databasedotcom::Collection] the requested records
     def get_records(type)
       if @action == 'initial_run'
-        $logger.info "Getting all records from SalesForce for #{type} object"
+        $logger.info "Getting all records for SalesForce Object: #{type}"
       else
         if @last_modified_date.blank?
-          $logger.info "Getting records for yesterday from SalesForce for #{type} object"
+          $logger.info "Getting records since yesterday for SalesForce Object: #{type}"
         else
-          $logger.info "Getting records from #{Date.parse(@last_modified_date)} up until now from SalesForce for #{type} object"
+          $logger.info "Getting records from #{Date.parse(@last_modified_date)} up until now for SalesForce Object: #{type}"
         end
       end
       get_all_sobjects(type)

data/lib/fields.rb

@@ -1,16 +1,16 @@
 module SalesforceMigration
   class Fields
     # Salesforce objects and the fields for import
-    ISOS_FIELDS                 = %w{Active__c Address__c Adult_Chargeback_Fee__c Adult_Commission__c Adult_Transaction_Fee__c Agreement_Received__c Background_Check_Complete__c Business_Phone_Number__c Cell_Phone_Number__c Comments__c CreatedById CreatedDate Curren__c CurrencyIsoCode Email_Address__c Fax_Number__c Gambling_Chargeback_Fee__c Gambling_Commission_Fee__c Gambling_Transaction_Fee__c General_Conventional_Chargeback_Fee__c General_Conventional_Commission_Fee__c General_Conventional_Transaction_Fee__c General_Non_Conventional_Chargeback_Fee__c General_Non_Conventional_Commission_Fee__c General_Non_Conventional_Transaction_Fee__c ISO_ID_Assigned__c ISO_ID_Number__c ISO_Owner_Name__c Id IsDeleted KYC_Gathered__c LastActivityDate LastModifiedBy LastModifiedById LastModifiedDate Name New_Hire_Package_Received__c Owner OwnerId Pharmacy_Chargeback_Fee__c Pharmacy_Commission_Fee__c Pharmacy_Transaction_Fee__c Projected_Deals_Count__c Recruiter__c Region__c System_Access_Granted__c Training_Completed__c Welcome_Call_Completed__c Welcome_Package_Sent__c eMerchantPay_ISO_ID__c}
-    AGENT_FIELDS                = %w{Id IsDeleted Name LastActivityDate CreatedDate CreatedById LastModifiedDate LastModifiedById LastModifiedBy Owner OwnerId Agent_Billing_Address__c Agent_Cell_Phone__c Agent_Id__c Agent_Phone__c Agent_Skype__c Agreement_Received__c Agreement_Sent__c Background_Check_Complete__c Business_Phone_Number__c Comments__c Commission_Fee__c Email_Address__c eMerchantPay_Agent_ID__c Fee_Comments__c ISO_Company__c New_Hire_Package_Received__c One_Time_Commission_Currency__c Recruiter__c Region__c Split_percentage__c System_Access_Granted__c Title__c Transaction_Fee__c}
-    ACCOUNT_FIELDS              = %w{Additional_Url__c Agents__c AnnualRevenue Approval_Citeria__c Approve_1__c Approve_2__c Approve_3__c BillingCity BillingCountry BillingPostalCode BillingState BillingStreet City__c CreatedById CreatedDate Credit_Card__c CurrencyIsoCode Current_Volume__c Description Descriptor__c FD_Merchant_Number__c Fax ISO_Name__c Id IsDeleted Industry Info_Capture__c Integration__c Integrator__c Integrator_2__c Iovation__c IPSP__c IPSP_Name2__c IsPartner Jigsaw LastModifiedById LastModifiedDate Merchant_Email__c Merchant_Type__c Name NumberOfEmployees Overlying_Company__c OwnerId Phone Projected_Monthly_Volume__c Recruiter__c Risk_Analyst__c Secondary_FD_Merchant_Number__c ShippingCity ShippingCountry ShippingPostalCode ShippingState ShippingStreet Status_Comments__c Status__c Threat_Metrix__c Type__c Url__c VBV_MC3D__c Vacation1__c Website} # OwnerName OwnerPhone OwnerEmail}
-    PAYMENT_METHODS_FIELDS      = %w{Accounts__c Business_Contact__c Business_Type_Coments__c Business_type__c Buy_Rates__c Chargeback_Comments__c Chargeback__c Client_Integration__c Countries2__c Countries__c CreatedById CreatedDate CurrencyIsoCode Id IsDeleted Integration__c LastModifiedBy LastModifiedById LastModifiedDate Name Our_Buy_Rates__c Owner OwnerId Proccessing_Currency__c Processing_Currency__c Rebilling_Comments__c Rebilling__c Refund_Comments__c Refund__c Release_Date__c Settlement_Currency__c Settlement_Cycle__c Settlement__c Tech_Contact__c Type__c V_terminal_Comments__c V_terminal__c}
+    ISOS_FIELDS                 = %w{Active__c Address__c Adult_Chargeback_Fee__c Adult_Commission__c Adult_Transaction_Fee__c Agreement_Received__c Background_Check_Complete__c Business_Phone_Number__c Cell_Phone_Number__c Comments__c CreatedById CreatedDate Curren__c CurrencyIsoCode Email_Address__c Fax_Number__c Gambling_Chargeback_Fee__c Gambling_Commission_Fee__c Gambling_Transaction_Fee__c General_Conventional_Chargeback_Fee__c General_Conventional_Commission_Fee__c General_Conventional_Transaction_Fee__c General_Non_Conventional_Chargeback_Fee__c General_Non_Conventional_Commission_Fee__c General_Non_Conventional_Transaction_Fee__c ISO_ID_Assigned__c ISO_ID_Number__c ISO_Owner_Name__c Id IsDeleted KYC_Gathered__c LastActivityDate LastModifiedById LastModifiedDate Name New_Hire_Package_Received__c OwnerId Pharmacy_Chargeback_Fee__c Pharmacy_Commission_Fee__c Pharmacy_Transaction_Fee__c Projected_Deals_Count__c Recruiter__c Region__c System_Access_Granted__c Training_Completed__c Welcome_Call_Completed__c Welcome_Package_Sent__c eMerchantPay_ISO_ID__c}
+    AGENT_FIELDS                = %w{Id IsDeleted Name LastActivityDate CreatedDate CreatedById LastModifiedDate LastModifiedById OwnerId Agent_Billing_Address__c Agent_Cell_Phone__c Agent_Id__c Agent_Phone__c Agent_Skype__c Agreement_Received__c Agreement_Sent__c Background_Check_Complete__c Business_Phone_Number__c Comments__c Commission_Fee__c Email_Address__c eMerchantPay_Agent_ID__c Fee_Comments__c ISO_Company__c New_Hire_Package_Received__c One_Time_Commission_Currency__c Recruiter__c Region__c Split_percentage__c System_Access_Granted__c Title__c Transaction_Fee__c}
+    ACCOUNT_FIELDS              = %w{Additional_Url__c Agents__c AnnualRevenue Approval_Citeria__c Approve_1__c Approve_2__c Approve_3__c BillingCity BillingCountry BillingPostalCode BillingState BillingStreet City__c CreatedById CreatedDate Credit_Card__c CurrencyIsoCode Current_Volume__c Description Descriptor__c FD_Merchant_Number__c Fax ISO_Name__c Id IsDeleted Industry Info_Capture__c Integration__c Integrator__c Integrator_2__c Iovation__c IPSP__c IPSP_Name2__c IsPartner Jigsaw LastModifiedById LastModifiedDate Merchant_Email__c Merchant_Type__c Name NumberOfEmployees Overlying_Company__c OwnerId Phone Projected_Monthly_Volume__c Recruiter__c Risk_Analyst__c Secondary_FD_Merchant_Number__c ShippingCity ShippingCountry ShippingPostalCode ShippingState ShippingStreet Status_Comments__c Status__c Threat_Metrix__c Type__c Url__c VBV_MC3D__c Vacation1__c Website}
+    PAYMENT_METHODS_FIELDS      = %w{Accounts__c Business_Contact__c Business_Type_Coments__c Business_type__c Buy_Rates__c Chargeback_Comments__c Chargeback__c Client_Integration__c Countries2__c Countries__c CreatedById CreatedDate CurrencyIsoCode Id IsDeleted Integration__c LastModifiedById LastModifiedDate Name Our_Buy_Rates__c OwnerId Proccessing_Currency__c Processing_Currency__c Rebilling_Comments__c Rebilling__c Refund_Comments__c Refund__c Release_Date__c Settlement_Currency__c Settlement_Cycle__c Settlement__c Tech_Contact__c Type__c V_terminal_Comments__c V_terminal__c}
     BANKS_FIELDS                = %w{Account_Number__c BIC_Code__c Merchant_2__c Bank_Address__c Bank_Name__c Contract__c CreatedById CreatedDate CurrencyIsoCode Holder_Address__c IBAN__c Id IsDeleted LastModifiedById LastModifiedDate Name OwnerId Processing_Currency__c Routing_Number__c SWIFT__c Settlement_Currency__c}
     MERCHANTTOAPM_FIELDS        = %w{Merchant__c Payment_Methods__c}
     CCRMBASIC__EMAIL_FIELDS     = %w{Actual_Subject__c Agent__c ccrmbasic__Account__c ccrmbasic__Body__c ccrmbasic__Cc__c ccrmbasic__Direction__c ccrmbasic__From__c ccrmbasic__Internal_Contact__c ccrmbasic__To__c Id IsDeleted Name}
     EMAIL_ASSOCIATION_FIELDS    = %w{Merchant_Name__c Email__c}
     CONTRACT_FIELDS             = %w{Id IsDeleted AccountId CurrencyIsoCode StartDate EndDate BillingStreet BillingCity BillingState BillingPostalCode BillingCountry ContractTerm OwnerId Status StatusCode ContractNumber CreatedDate CreatedById LastModifiedDate LastModifiedById SystemModstamp LastActivityDate Commission_Fee__c Transaction_Fee_Approved__c Transaction_Fee_Declined__c Charge_Back_Fee__c Rolling_Reserve__c Rolling_Reserve_Period__c VBV_Fee__c Wiring_Fee__c PCI_Compliance_Test_Fee__c Billing_Period_Duration_Weekly__c Discover__c Delay_in_Payment_Weeks__c Amex__c Guaranty__c Amount_Number__c Currency__c Treasury_Executive__c Acquirer__c Proccessing_Start_Date__c Proccessing_End_Date__c Acquirer_Approval_Timeframe__c Url__c Date_of_Submission_to_the_Acquirer__c Date_of_Approval__c Refund_Fee__c Registration_Fee__c Integrator_1__c Integrator_2__c Descriptor__c City_Field__c Acquirer_Rejection_Timeframe__c Date_of_Rejection__c Date_of_Issuing_the_MID__c Date_of_Terminal_Setup__c Date_of_Activation__c Deactivation_Date__c Comments__c Threat_Matrix__c Iovation__c Info_Capture__c VBV_MC3D__c PCI_Compliance__c Website_Compliance__c Reason_of_Deactivation__c VISA__c MC__c JCB__c UATP__c Integration_Type__c Payment_Status__c Payment_Suspension_Reason__c IPSP_name__c Visa_MCC_Code__c MC_MCC_Code__c Rejection_Reason__c Type_Of_Agreement__c}
-    ACQUIRER_FIELDS             = %w{Id IsDeleted OwnerId Owner Name CurrencyIsoCode CreatedDate CreatedById LastModifiedDate LastModifiedById LastModifiedBy SystemModstamp LastActivityDate Acquirer_Address__c Acquirer_Country__c SPLIT__c Chargeback_Fee__c One_time_Setup_Fee__c Swift_Wire_Transfer_Fee__c Card_Type__c Card_Scheme__c Currency__c Risk_Level__c Transaction__c Fees_Approved__c Fees_Declined__c Fees_other__c Flat_Commision_Fee__c EUR_Interchange__c Non_EUR_Interchange__c }
+    ACQUIRER_FIELDS             = %w{Id IsDeleted OwnerId Name CurrencyIsoCode CreatedDate CreatedById LastModifiedDate LastModifiedById SystemModstamp LastActivityDate Acquirer_Address__c Acquirer_Country__c SPLIT__c Chargeback_Fee__c One_time_Setup_Fee__c Swift_Wire_Transfer_Fee__c Card_Type__c Card_Scheme__c Currency__c Risk_Level__c Transaction__c Fees_Approved__c Fees_Declined__c Fees_other__c Flat_Commision_Fee__c EUR_Interchange__c Non_EUR_Interchange__c }
     SYSTEM_FIELDS               = %w{id acquirer ownerid createddate createdbyid integrator ipsp iso lastactivitydate lastmodifieddate lastmodifiedbyid systemmodstamp recruiter region risk_analyst}
     SYSTEM_READABLE_FIELDS      = %w{id acquirer_id owner_id created_date created_by_id integrator_id ipsp_id iso_id last_activity_date last_modified_date last_modified_by_id system_modstamp recruiter_id region_id risk_analyst_id}
     USER_FIELDS                 = %w{Id FirstName LastName Phone Email}

data/lib/import.rb

@@ -14,9 +14,9 @@ module SalesforceMigration
     # Initialize migration import object and start the import
     #
     # @param [Hash] options hash representing passed command line options
-    def initialize(options)
-      @csv_dir = options[:csv_dir]
-      @action = options[:action]
+    def initialize
+      @csv_dir  = $options[:csv_dir]
+      @action   = $options[:action]
       @isos, @agents, @merchants, @bank_accounts, @agent_users, @iso_users, @emails  = [], [], [], [], [], [], []
       @payment_to_merchants, @emails_to_merchants, @acquirers, @contracts, @users = [], [], [], [],  []
       $logger.info("Import action has started!")
@@ -124,11 +124,10 @@ module SalesforceMigration
 
       case @action
         when "initial_run"
-          filename = "#{@csv_dir}/initial/#{module_name}_export.csv"
+          filename  = "#{@csv_dir}/initial/#{module_name}_export.csv"
         when "update"
-          today = lambda { Date.today.to_s }
-          dir = "#{@csv_dir}/update/#{today.call}"
-          filename = "#{dir}/#{module_name}_export.csv"
+          today     = lambda { Date.today.to_s }
+          filename  = "#{@csv_dir}/update/#{today.call}/#{module_name}_export.csv"
       end
 
       $logger.error("Could not create or find a csv filename for module #{module_name}") unless defined? filename
@@ -145,7 +144,7 @@ module SalesforceMigration
     def transform_csv_file(csv_file)
       $logger.info("Transforming CSV file")
       transformed = []
-      headers = csv_file.shift
+      headers     = csv_file.shift
       headers.map!(&method(:prepare_custom_headers))
 
       csv_file.each do |row|
@@ -167,11 +166,11 @@ module SalesforceMigration
     #
     # @return [Array<SugarCRM::Namespace::Object>] records
     def prefix_sf_attribute_names(records)
-      field_names_default   = SalesforceMigration::Fields::SYSTEM_FIELDS
+      field_names_system    = SalesforceMigration::Fields::SYSTEM_FIELDS
       field_names_readable  = SalesforceMigration::Fields::SYSTEM_READABLE_FIELDS
 
       records.each do |record|
-        field_names_default.each_with_index do |field, index|
+        field_names_system.each_with_index do |field, index|
           if record.key?(field)
             record["sf_#{field_names_readable[index].downcase}"] = record[field]
             record.delete(field)
@@ -235,7 +234,7 @@ module SalesforceMigration
       $logger.info("Transforming Acquirer fields")
       records.each do |record|
         record['currency_iso_code'] = record['currencyisocode']
-        record['fees_transaction'] = record['transaction']
+        record['fees_transaction']  = record['transaction']
 
         record.delete 'currencyisocode'
         record.delete 'transaction'
@@ -245,37 +244,37 @@ module SalesforceMigration
     def transform_contracts!(records)
       $logger.info("Transforming Contract fields")
       records.each do |record|
-        record['name'] = record['contractnumber']
-        record['sf_account_id'] = record['accountid']
-        record['currency_iso_code'] = record['currencyisocode']
-        record['start_date'] = record['startdate']
-        record['end_date'] = record['enddate']
-        record['billing_street'] = record['billingstreet']
-        record['billing_city'] = record['billingcity']
-        record['billing_state'] = record['billingstate']
-        record['billing_postal_code'] = record['billingpostalcode']
-        record['billing_country'] = record['billingcountry']
-        record['contract_term'] = record['contractterm']
-        record['status_code'] = record['statuscode']
-        record['contract_number'] = record['contractnumber']
-        record['guarantee'] = record['guaranty']
-        record['guaranteed_amount'] = record['amount_number']
-        record['treasury_executive_sf_id'] = record['treasury_executive']
-        record['processing_start_date'] = record['proccessing_start_date']
-        record['processing_end_date'] = record['proccessing_end_date']
+        record['name']                          = record['contractnumber']
+        record['sf_account_id']                 = record['accountid']
+        record['currency_iso_code']             = record['currencyisocode']
+        record['start_date']                    = record['startdate']
+        record['end_date']                      = record['enddate']
+        record['billing_street']                = record['billingstreet']
+        record['billing_city']                  = record['billingcity']
+        record['billing_state']                 = record['billingstate']
+        record['billing_postal_code']           = record['billingpostalcode']
+        record['billing_country']               = record['billingcountry']
+        record['contract_term']                 = record['contractterm']
+        record['status_code']                   = record['statuscode']
+        record['contract_number']               = record['contractnumber']
+        record['guarantee']                     = record['guaranty']
+        record['guaranteed_amount']             = record['amount_number']
+        record['treasury_executive_sf_id']      = record['treasury_executive']
+        record['processing_start_date']         = record['proccessing_start_date']
+        record['processing_end_date']           = record['proccessing_end_date']
         record['date_of_submission_to_acqirer'] = record['date_of_submission_to_the_acquirer']
-        record['chargeback_fee'] = record['charge_back_fee']
-        record['billing_period_duration'] = record['billing_period_duration_weekly']
-        record['payment_delay'] = record['delay_in_payment_weeks']
-        record['integrator_1_sf_id'] = record['integrator_1']
-        record['integrator_2_sf_id'] = record['integrator_2']
-        record['date_of_issuing_mid'] = record['date_of_issuing_the_mid']
-        record['date_of_deactivation'] = record['deactivation_date']
-        record['threatmetrix'] = record['threat_matrix']
-        record['deactivation_reason'] = record['reason_of_deactivation']
-        record['mastercard'] = record['mc']
-        record['ipsp_name_sf_id'] = record['ipsp_name']
-        record['mastercard_mcc_code'] = record['mc_mcc_code']
+        record['chargeback_fee']                = record['charge_back_fee']
+        record['billing_period_duration']       = record['billing_period_duration_weekly']
+        record['payment_delay']                 = record['delay_in_payment_weeks']
+        record['integrator_1_sf_id']            = record['integrator_1']
+        record['integrator_2_sf_id']            = record['integrator_2']
+        record['date_of_issuing_mid']           = record['date_of_issuing_the_mid']
+        record['date_of_deactivation']          = record['deactivation_date']
+        record['threatmetrix']                  = record['threat_matrix']
+        record['deactivation_reason']           = record['reason_of_deactivation']
+        record['mastercard']                    = record['mc']
+        record['ipsp_name_sf_id']               = record['ipsp_name']
+        record['mastercard_mcc_code']           = record['mc_mcc_code']
 
         record.delete 'contractnumber'
         record.delete 'accountid'
@@ -501,6 +500,7 @@ module SalesforceMigration
         when 'initial_run'
             $logger.info("Creating new records for #{type} type")
             records.each do |record|
+              correct_field_types! record
               create_sugar_record(module_type, record, type)
             end
         when 'update'
@@ -511,7 +511,7 @@ module SalesforceMigration
 
             if existing_record
               if existing_record.is_a?(Array)
-                $logger.error("More than one record for #{type} #{record['name']} - SalesForce Id (#{record['sf_id']}")
+                $logger.error("Duplicated record found: #{record['name']} (#{type}) - SalesForceId (#{record['sf_id']}")
                 existing_record = existing_record.first
               end
 
@@ -539,14 +539,14 @@ module SalesforceMigration
     # @param record [SugarCRM::Namespace::Object]
     # @param type
     def create_sugar_record(module_type, record, type)
-      correct_field_types!(record)
-
+      
       obj = module_type.new(record)
       obj.save!
-      obj = create_associations(obj, type) unless %(email payment_method).include? type
+      obj = create_associations(obj, type)
+
       create_security_group_iso obj if type == 'iso'
-      
       create_user(obj, type) if %(iso agent).include? type
+
       populate_var_pool(obj, type)
     end
     
@@ -617,19 +617,14 @@ module SalesforceMigration
 
       case type
         when "agent"
-          associate_with!('iso', @isos, 'sf_id', obj)
-
-          associate_with!('email', @emails, 'sf_agent_id', obj)
+          associate_with! 'iso', @isos, 'sf_id', obj
+          associate_with! 'email', @emails, 'sf_agent_id', obj
         when "merchant"
-          associate_with!('agent', @agents, 'sf_id', obj)
-
-          associate_with!('contract', @contracts, 'sf_account_id', obj)
-
-          associate_with!('email', @emails_to_merchants, 'sf_merchant_id', obj)
-
-          associate_with!('payment_method', @payment_to_merchants, 'sf_merchant_id', obj)
-
-          associate_with!('settlement_bank_account', @bank_accounts, 'sf_merchant_id', obj)
+          associate_with! 'agent', @agents, 'sf_id', obj
+          associate_with! 'contract', @contracts, 'sf_account_id', obj
+          associate_with! 'email', @emails_to_merchants, 'sf_merchant_id', obj
+          associate_with! 'payment_method', @payment_to_merchants, 'sf_merchant_id', obj
+          associate_with! 'settlement_bank_account', @bank_accounts, 'sf_merchant_id', obj
 
           assign_user_as_owner_to_record(obj, obj)
       end
@@ -660,7 +655,7 @@ module SalesforceMigration
           user.user_name                  = (type == 'agent') ? obj.emerchantpay_agent_id : obj.emerchantpay_iso_id
           user.last_name                  = obj.name
           user.emp_type                   = type
-          user.email1                     = obj.email_address || ""
+          user.email1                     = obj.email_address
           user.status                     = 'Inactive'
           user.salesforce_id              = obj.sf_id
           user.system_generated_password  = false
@@ -742,9 +737,8 @@ module SalesforceMigration
 
       return if user.blank?
 
-      # Warn the user that we might've stumbbled upon some duplication or non-empty database (SalesForce Ids shoud be unique)
       if user.is_a?(Array)
-        $logger.error("We found a SalesForce Id with two created SugarCRM users.")
+        $logger.error("Duplicated User found, SalesForceId: #{salesforce_id}")
         user = user.first
       end
 
@@ -763,19 +757,18 @@ module SalesforceMigration
         when "initial_run"
           relation_data.each do |record|
             # Check if we are dealing with file-relations (stored as Array)
-            # OR if we're using SugarCRM records (store as Object)
-
             record_id  = (relation_data.first.is_a?(Hash)) ? record['sf_id'] : record.sf_id
+            # OR if we're using SugarCRM records (store as Object)
             relate_id  = (relation_data.first.is_a?(Hash)) ? record[relation_field] : record.send(relation_field.to_sym)
 
             search_results << record_id if compare_salesforce_ids(relate_id, related_to_id)
           end
         when "update"
-          # Check if we are dealing with file-relations (stored as Array)
           unless relation_data.is_a?(String)
+            # Check if we are dealing with file-relations (stored as Array)
             relation_data.each { |record| search_results << record['sf_id'] if compare_salesforce_ids(record[relation_field], related_to_id) }
-          # OR extract the objects from SugarCRM
           else
+            # OR extract the objects from SugarCRM
             records = find_sugarcrm_object(relation_data, relation_field, related_to_id)
 
             return if records.blank?

data/lib/mailer.rb

@@ -4,10 +4,10 @@ module SalesforceMigration
   
   class Mailer
     
-    def initialize(options)
-      @smtp_options = { :address              => $credentials['smtp_host'],
-                        :port                 => $credentials['smtp_port'],
-                        :domain               => $credentials['smtp_domain'],
+    def initialize
+      @smtp_options = { :address              => $config['smtp_host'],
+                        :port                 => $config['smtp_port'],
+                        :domain               => $config['smtp_domain'],
                         :authentication       => nil,
                         :enable_starttls_auto => true}
 
@@ -58,7 +58,7 @@ module SalesforceMigration
     # @return [Boolean] true on successful delivery / false otherwise
     def send_mail(email, username, password)
       mail = Mail.new do
-        from    @@config['mail_from']
+        from    $config['mail_from']
         to      email
         subject 'Welcome to Emerchantpay Agent Portal'
         html_part do
@@ -87,14 +87,14 @@ module SalesforceMigration
       email_template = <<-TEMPLATE
         Dear Valued Partner,<br/><br/>
 
-        We have created an account for you to access the newly created eMerchantPay <a href="#{@@config["sugar_url"]}">Agent Portal</a><br/><br/>
+        We have created an account for you to access the newly created eMerchantPay <a href="#{$config["sugar_url"]}">Agent Portal</a><br/><br/>
 
         Your account data is:<br/><br/>
 
         Login: <b>#{username}</b><br/>
         Password: <b>#{password}</b><br/><br/>
 
-        Note: We've made significant upgrades to the <a href="#{@@config["sugar_url"]}">Agent Portal</a>. Please be so kind enough to use your new credentials, enhanced for security and better hashing.<br/><br/>
+        Note: We've made significant upgrades to the <a href="#{$config["sugar_url"]}">Agent Portal</a>. Please be so kind enough to use your new credentials, enhanced for security and better hashing.<br/><br/>
 
         Features:<br/>
 
@@ -108,7 +108,7 @@ module SalesforceMigration
           </ul>
 
         <br/>
-        If you have any questions, send an email to support@emerchantpay.com (also available by clicking the Support link from the main menu in the <a href="#{@@config["sugar_url"]}">Agent Portal</a>)
+        If you have any questions, send an email to support@emerchantpay.com (also available by clicking the Support link from the main menu in the <a href="#{$config["sugar_url"]}">Agent Portal</a>)
         <br/><br/>
         ---<br/><br/>
         

data/lib/sf_migrate.rb

@@ -5,85 +5,90 @@ require 'csv'
 require 'yaml'
 require 'fileutils'
 require 'databasedotcom'
-require 'sugarcrm'
-require 'mail'
-require 'securerandom'
-require 'unix_crypt'
-require 'fields'
 require 'export'
+require 'fields'
+require 'sugarcrm'
 require 'import'
+require 'mail'
 require 'mailer'
+require 'unix_crypt'
+require 'securerandom'
 
 module SalesforceMigration
 	module Runner
 		extend self
-
-		# Start the migration dependening on command line argument: `initial_run` or `update`
 		def start
-			options = {}
-			# Where do we need to store the csvs?
-			options[:csv_dir] = "/var/sugarcrm/csv"
-			options[:log_dir] = "/var/log/sugarcrm"
-			options[:config_file] = "/var/sugarcrm/credentials.yaml"
-			@log_dir = options[:log_dir]
-			create_logger
+			options 				= {}
+			options[:config_file]	= "/var/sugarcrm/credentials.yaml"
+			options[:csv_dir] 		= "/var/sugarcrm/csv"
+			options[:log_dir] 		= "/var/log/sugarcrm"
 			optparse = OptionParser.new do |opts|
 				opts.banner = "Usage: sf_migrate [options]"
-				opts.on("-a", "--action NAME", "Start the initial_run or the daily update") do |action|
+				opts.on("-a", "--action NAME", "Specify the action type: initial_run or update") do |action|
 					options[:action] = action
 				end
-				opts.on("-f", "--config_file CONFIG_FILE", "Supply an optional config file") do |f|
+				opts.on("-f", "--config-file CONFIG_FILE", "Supply an optional config file") do |f|
 					options[:config_file] = File.expand_path(f) if File.exists? f
 				end 
-				opts.on("-c", "--csv_dir CSV_DIR", "Set the directory in which exported csv from Salesforce will be kept") do |c|
+				opts.on("-c", "--csv-dir CSV_DIR", "Set the directory for storing SalesForce's exported CSV objects") do |c|
 					options[:csv_dir] = c
 				end
-				opts.on("-l", "--log_dir LOG_DIR", "Set the directory in which the logger will reside") do |l|
+				opts.on("-l", "--log-dir LOG_DIR", "Set the directory for migration.log (invactive in Verbose mode)") do |l|
 					options[:log_dir] = l
 				end
-				opts.on("-t", "--last_modified_date DATE/DATETIME", "Set the date from which you would like to get results") do |t|
+				opts.on("-t", "--last-modified-date DATE/DATETIME", "Set the date from which you would like to get results (up until now)") do |t|
 					options[:last_modified_date] = t
 				end
-				opts.on("-m", "--send_mail", "Send activation email to every new user") do |m|
+				opts.on("-m", "--send-mail", "Send activation email to every new user") do |m|
 					options[:send_mail] = m
 				end
+				opts.on("-v", "--verbose", "Set verbose logging to the terminal") do |v|
+					options[:verbose] = v
+				end
 				opts.on("-h", "--help", "Display this screen") do
              		puts opts
              		exit
         		end
 			end
 			optparse.parse!
+			pre_init_with options
 			begin
-				pre_init_with options
 				alter_log_formatter_to "EXPORT"
-				SalesforceMigration::Export.new(options) if options[:action]
+				SalesforceMigration::Export.new() if options[:action]
 				alter_log_formatter_to "IMPORT"
-				SalesforceMigration::Import.new(options) if options[:action]
-				alter_log_formatter_to "MAIL"
-				SalesforceMigration::Mailer.new(options) if options[:send_mail]
+				SalesforceMigration::Import.new() if options[:action]
+				alter_log_formatter_to "MAILER"
+				SalesforceMigration::Mailer.new() if options[:send_mail]
 			rescue => e
 	      		$logger.error(e)
 			end
 		end
 
 		def pre_init_with options
-			$logger = create_logger
-			$credentials = YAML.load_file(options[:config_file])
-			SugarCRM.connect($credentials['sugar_url'], $credentials['sugar_username'], $credentials['sugar_password'])
+			$options 	= options
+			$config 	= YAML.load_file(options[:config_file])
+			$logger 	= start_log
+
+			SugarCRM.connect($config['sugar_url'], $config['sugar_username'], $config['sugar_password'])
 		end
 		
-		def create_logger
-	      formatter = Logger::Formatter.new
-	      today 	= lambda { Date.today.to_s }
-	      dateDir 	= "#{@log_dir}/#{today.call}"
-	      dateLog 	= "#{dateDir}/migration.log"
-	      FileUtils.mkdir_p(dateDir) unless Dir.exists? dateDir
+		def start_log
+	     	formatter 	= Logger::Formatter.new
+	      	today 		= lambda { Date.today.to_s }
+	      	dateDir 	= "#{$options[:log_dir]}/#{today.call}"
+	      	dateLog 	= "#{dateDir}/migration.log"
+	      	FileUtils.mkdir_p(dateDir) unless Dir.exists? dateDir
+
+			unless $options[:verbose]
+	      		logger = Logger.new dateLog
+			else
+				logger = Logger.new STDOUT
+			end
 
-	      logger = Logger.new(dateLog)
-	      logger.formatter = proc { |severity, datetime, progname, msg|
-	        formatter.call("IMPORT", datetime, progname, msg)
-	      }
-	      logger
+			logger.formatter = proc { |severity, datetime, progname, msg|
+	        	formatter.call("IMPORT", datetime, progname, msg)
+	      	}
+	      	logger
 		end
 
 		def alter_log_formatter_to action

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sf_migrate
 version: !ruby/object:Gem::Version
-  version: 1.2.8
+  version: 1.3.0
 platform: ruby
 authors:
 - Emil Petkov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-20 00:00:00.000000000 Z
+date: 2014-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sugarcrm_emp
@@ -107,17 +107,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Makes a bridge between Salesforce and SugarCRM