sf_migrate 1.2.1 → 1.2.2

data/config/credentials.yaml.example

@@ -1,13 +1,16 @@
-sugar_url: <url>
-sugar_username: <username>
-sugar_password: <password>
+# SalesForce API Keys (required for export)
+salesforce_consumer_key		: <SF_consumer_key>
+salesforce_consumer_secret	: <SF_consumer_secret>
+salesforce_username			: <SF_username>
+salesforce_password			: <SF_password>
 
-salesforce_consumer_key: <SF_consumer_key>
-salesforce_consumer_secret: <SF_consumer_secret>
-salesforce_username: <SF_username>
-salesforce_password: <SF_password>
+# SugarCRM instance and credentials (required for import)
+sugar_url					: <url>
+sugar_username				: <username>
+sugar_password				: <password>
 
-db_type: mysql2
-db_user: <db_user>
-db_password: <db_password>
-db_database: <schema_name>
+# Email Settings
+mail_from					: <email_from_address>
+smtp_host					: <smtp_host>
+smtp_port					: <smtp_port>
+smtp_domain					: <smtp_domain>

data/lib/import.rb

@@ -864,7 +864,6 @@ module SalesforceMigration
               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
@@ -873,23 +872,6 @@ module SalesforceMigration
       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
 

data/lib/mailer.rb

@@ -6,19 +6,16 @@ module SalesforceMigration
     
     def initialize(options)
       @@config = YAML.load_file(options[:config_file])
-      @logger = SalesforceMigration::Runner::create_logger
-      
-      # Ugly way to fix the bug with user_hash update
-      # We set up a connection and update it manually.update_attributes does not work.
-      # The issue is forwarded to sugarcrm gem crew
-      ActiveRecord::Base.establish_connection(
-        :adapter  => @@config['db_type'],
-        :host     => "localhost",
-        :username => @@config['db_user'],
-        :password => @@config['db_password'],
-        :database => @@config['db_database']
-      )
+    
+      @smtp_options = { :address              => @@config['smtp_host'],
+                        :port                 => @@config['smtp_port'],
+                        :domain               => @@config['smtp_domain'],
+                        :authentication       => nil,
+                        :enable_starttls_auto => true}
+
+      SugarCRM.connect(@@config['sugar_url'], @@config['sugar_username'], @@config['sugar_password'])
       
+      @logger = SalesforceMigration::Runner::create_logger
       @logger.info("Starting the mailer")
       start
       @logger.info("Mailer finished")
@@ -26,8 +23,10 @@ module SalesforceMigration
     
     private
  
-    #Search the agent portal database for all users, who are inactive
-    #This is the script, that activates them
+    #
+    # Fetch all Inactive users from the Database and send each one an email.
+    # On the backend: set a hashed password and set status to 'Active'
+    #
     def start
       inactive_users = SugarCRM::User.find_all_by_status('Inactive')
 
@@ -35,26 +34,36 @@ module SalesforceMigration
         inactive_users.each do |user|
           @logger.info("Sending email to #{user.last_name}")
 
-          plain_password = generate_password
-          hash_password = Digest::MD5.hexdigest plain_password
+          plain_password  = generate_password
+          md5_password    = Digest::MD5.hexdigest plain_password
+          crypt_password  = UnixCrypt::MD5.build md5_password
           
-          sm = send_mail(user.email1, user.user_name, plain_password)
-          if sm
-            query = "UPDATE users SET user_hash='#{hash_password}', status='Active' WHERE id='#{user.id}'"
-            ActiveRecord::Base.connection.execute(query);
+          email_is_delivered = send_mail(user.email1, user.user_name, plain_password)
+
+          if email_is_delivered
+            user.status     = 'Active'
+            user.user_hash  = crypt_password
+            user.save!
 
             @logger.info("Updated user #{user.last_name} status to active")
+          else
+            @logger.info("Couldn't send credentials for #{user.last_name} to email address #{user.email1}")
           end
         end
+      else
+        @logger.info("No unnotified users found in database")
       end
     end
     
-    #Send the welcoming email to the user
-    #We need the welcoming text
-    #@param [String] the email address
+    # Send the welcoming email to the user
+    # We need the welcoming text
+    #
+    # @param [String] the email address
+    #
+    # @return [Boolean] true on successful delivery / false otherwise
     def send_mail(email, username, password)
       mail = Mail.new do
-        from    'agentportal@emerchantpay.com'
+        from    @@config['mail_from']
         to      email
         subject 'Welcome to Emerchantpay Agent Portal'
         html_part do
@@ -62,22 +71,18 @@ module SalesforceMigration
           body  Mailer::create_template(username, password)
         end
       end
-      mail.delivery_method :smtp, {:address        => "emp-ldn-exch01.emp.internal.com",
-                                   :port           => 25,
-                                   :domain         => "emp.internal.com",
-                                   :authentication => nil,
-                                   :enable_starttls_auto => true}
+      mail.delivery_method :smtp, @smtp_options
 
       if mail.deliver!
         true
       else
-        @logger.error("Email for user #{last_name} failed!")  
+        false
       end
     end
     
-    # Generates the plain text password that is going to be
-    # send to the user in the email
-    # ActiveSupport::SecureRandom is deprecated in Rails  > 3.1
+    #
+    # Generates the plain text password
+    #
     def generate_password
       str = SecureRandom.hex(6)
       str
@@ -85,17 +90,19 @@ module SalesforceMigration
     
     def self.create_template(username, password)
       email_template = <<-TEMPLATE
-        Dear valued partner,<br/><br/>
+        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/>
 
         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/>
+
         Features:<br/>
-        
+
           <ul>
             <li>Based on the acclaimed SugarCRM, check details <a href="http://www.sugarcrm.com">here</a></li>
             <li>Exports of merchants and various data items in different formats for further processing</li>
@@ -104,7 +111,7 @@ module SalesforceMigration
             <li>Can be accessed by mobile phone</li>
             <li>And many others...</li>
           </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>)
         <br/><br/>
@@ -115,4 +122,4 @@ module SalesforceMigration
       email_template
     end
   end
-end
+end

data/lib/sf_migrate.rb

@@ -7,8 +7,8 @@ require 'fileutils'
 require 'databasedotcom'
 require 'sugarcrm'
 require 'mail'
-require 'active_support/core_ext'
-require 'active_record'
+require 'securerandom'
+require 'unix_crypt'
 require 'fields'
 require 'export'
 require 'import'
@@ -24,7 +24,7 @@ module SalesforceMigration
 			# Where do we need to store the csvs?
 			options[:csv_dir] = "/var/sugarcrm/csv"
 			options[:log_dir] = "/var/log/sugarcrm"
-			options[:config_file] = File.join(File.dirname(__FILE__), "../config/credentials.yaml")
+			options[:config_file] = "/var/sugarcrm/credentials.yaml"
 			@log_dir = options[:log_dir]
 			create_logger
 			optparse = OptionParser.new do |opts|
@@ -48,18 +48,18 @@ module SalesforceMigration
 					options[:send_mail] = m
 				end
 				opts.on( '-h', '--help', 'Display this screen' ) do
-             puts opts
-             exit
-        end
+             		puts opts
+             		exit
+        		end
 			end
 			optparse.parse!
-				begin
-					SalesforceMigration::Export.new(options)
-					SalesforceMigration::Import.new(options)
-					SalesforceMigration::Mailer.new(options) if options[:send_mail]
-				rescue => e
-	      	@logger.error(e)
-				end
+			begin
+				SalesforceMigration::Export.new(options) if options[:action]
+				SalesforceMigration::Import.new(options) if options[:action]
+				SalesforceMigration::Mailer.new(options) if options[:send_mail]
+			rescue => e
+	      		@logger.error(e)
+			end
 		end
 		
 		def create_logger
@@ -73,7 +73,6 @@ module SalesforceMigration
 	        original_formatter.call("IMPORT", datetime, progname, msg)
 	      }
 	      @logger
-	    end
-	  
+		end
 	end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sf_migrate
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 1
   - 2
-  - 1
-  version: 1.2.1
+  - 2
+  version: 1.2.2
 platform: ruby
 authors: 
 - Emil Petkov
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-02-04 00:00:00 Z
+date: 2014-02-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sugarcrm_emp
@@ -51,69 +51,53 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: activesupport
+  name: mail
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 29
         segments: 
-        - 3
         - 2
-        - 6
-        version: 3.2.6
+        - 5
+        - 3
+        version: 2.5.3
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: activerecord
+  name: roo
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 59
         segments: 
-        - 3
+        - 1
+        - 10
         - 2
-        - 13
-        version: 3.2.13
+        version: 1.10.2
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: mail
+  name: unix_crypt
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 29
+        hash: 27
         segments: 
-        - 2
-        - 5
+        - 1
         - 3
-        version: 2.5.3
+        - 0
+        version: 1.3.0
   type: :runtime
   version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: roo
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 59
-        segments: 
-        - 1
-        - 10
-        - 2
-        version: 1.10.2
-  type: :runtime
-  version_requirements: *id006
 description: SalesForce to SugarCRM migration tool
 email: 
 - p.manchev@emerchantpay.com