JoshvaR88 · Oct 21, 2014 · Oct 21, 2014 · Oct 21, 2014 · Oct 21, 2014 · Oct 21, 2014
diff --git a/.gitignore b/.gitignore
@@ -18,3 +18,4 @@ _yardoc
 doc/
 
 .bundle/install.log
+.env
diff --git a/.rspec b/.rspec
@@ -0,0 +1,2 @@
+--color
+--order rand
diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,24 @@
+FROM rlister/ruby:2.1.5
+MAINTAINER Ric Lister, ric@spreecommerce.com
+
+## bundle deps for nokogiri and github gems
+RUN DEBIAN_FRONTEND=noninteractive \
+    apt-get update && \
+    apt-get install -y \
+    libxslt-dev libxml2-dev \
+    git
+
+## help docker cache bundle
+WORKDIR /tmp
+ADD ./Gemfile /tmp/
+ADD ./Gemfile.lock /tmp/
+RUN bundle install
+RUN rm -f /tmp/Gemfile /tmp/Gemfile.lock
+
+WORKDIR /app
+ADD ./ /app
+
+EXPOSE 5000
+
+ENTRYPOINT [ "bundle", "exec" ]
+CMD [ "unicorn", "-c", "./config/unicorn.rb", "-p", "5000" ]
diff --git a/Gemfile b/Gemfile
@@ -8,10 +8,12 @@ gem 'endpoint_base', github: 'spree/endpoint_base'
 gem 'executrix'
 gem 'honeybadger'
 gem 'rollbar'
+gem 'rake'
 
-group :development do
-  gem "rake"
-  gem "pry"
+group :development, :test do
+  gem 'pry'
+  gem 'pry-byebug'
+  gem 'dotenv'
 end
 
 group :test do

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: git://github.com/spree/endpoint_base.git
-  revision: f6c1859af1175bd4e29aa36823c8b02a2bb722c2
+  revision: f9e595fbf41c1509a4afc58ab805a7b0e5c74a51
   specs:
     endpoint_base (0.3)
       activesupport
@@ -10,16 +10,21 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.1.0)
+    activesupport (4.1.8)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.1)
       tzinfo (~> 1.1)
-    addressable (2.3.5)
+    addressable (2.3.6)
+    byebug (2.7.0)
+      columnize (~> 0.3)
+      debugger-linecache (~> 1.2)
     coderay (1.1.0)
+    columnize (0.8.9)
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
+    debugger-linecache (1.2.0)
     diff-lcs (1.2.5)
     dotenv (0.11.1)
       dotenv-deployment (~> 0.0.2)
@@ -40,16 +45,16 @@ GEM
     hashie (2.0.5)
     honeybadger (1.13.0)
       json
-    i18n (0.6.9)
-    jbuilder (2.0.6)
+    i18n (0.6.11)
+    jbuilder (2.2.5)
       activesupport (>= 3.0.0, < 5)
       multi_json (~> 1.2)
     json (1.8.1)
     kgio (2.9.2)
     method_source (0.8.2)
     mini_portile (0.5.3)
-    minitest (5.3.2)
-    multi_json (1.9.2)
+    minitest (5.5.0)
+    multi_json (1.10.1)
     multipart-post (1.2.0)
     nokogiri (1.6.1)
       mini_portile (~> 0.5.0)
@@ -58,6 +63,9 @@ GEM
       coderay (~> 1.0)
       method_source (~> 0.8)
       slop (~> 3.4)
+    pry-byebug (1.3.2)
+      byebug (~> 2.7)
+      pry (~> 0.9.12)
     rack (1.5.2)
     rack-protection (1.5.2)
       rack
@@ -81,38 +89,40 @@ GEM
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.6)
     rubyzip (1.1.3)
-    safe_yaml (1.0.1)
+    safe_yaml (1.0.4)
     sinatra (1.4.4)
       rack (~> 1.4)
       rack-protection (~> 1.4)
       tilt (~> 1.3, >= 1.3.4)
     slop (3.5.0)
     thor (0.19.1)
-    thread_safe (0.3.3)
+    thread_safe (0.3.4)
     tilt (1.4.1)
     tilt-jbuilder (0.5.3)
       jbuilder
       tilt (<= 1.4.1)
-    tzinfo (1.1.0)
+    tzinfo (1.2.2)
       thread_safe (~> 0.1)
     unicorn (4.8.2)
       kgio (~> 2.6)
       rack
       raindrops (~> 0.7)
-    vcr (2.8.0)
-    webmock (1.17.4)
-      addressable (>= 2.2.7)
+    vcr (2.9.3)
+    webmock (1.19.0)
+      addressable (>= 2.3.6)
       crack (>= 0.3.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  dotenv
   endpoint_base!
   executrix
   foreman
   honeybadger
   pry
+  pry-byebug
   rack-test
   rake
   restforce

diff --git a/README.md b/README.md
@@ -9,6 +9,7 @@ product. With this integration you can perform the following functions:
 * Send returns to Salesforce
 * Send products to Salesforce
 * Send customers to Salesforce
+* Send custom fields to Salesforce
 
 [Wombat](http://wombat.co) allows you to connect to your own custom integrations.
 Feel free to modify the source code and host your own version of the integration

diff --git a/Rakefile b/Rakefile
@@ -0,0 +1,32 @@
+$stdout.sync = true
+
+require 'bundler'
+Bundler.require(:default)
+
+desc 'Open pry console'
+task :console do
+  require 'pry'
+  require_relative 'lib/salesforce_integration'
+
+  env_file = File.join File.expand_path('..', __FILE__), '.env'
+
+  if File.exist? env_file
+    require 'dotenv'
+    Dotenv.load
+
+    @client = Restforce.new(
+      instance_url:    ENV['SALESFORCE_INSTANCE_URL'],
+      oauth_token:     ENV['SALESFORCE_ACCESS_TOKEN'],
+      refresh_token:   ENV['SALESFORCE_REFRESH_TOKEN'],
+      client_id:       ENV['SALESFORCE_CLIENT_ID'],
+      client_secret:   ENV['SALESFORCE_CLIENT_SECRET']
+    )
+  end
+
+  def client
+    @client
+  end
+
+  ARGV.clear
+  Pry.start
+end
diff --git a/app.rb b/app.rb
diff --git a/config.ru b/config.ru
@@ -1,2 +1,7 @@
-require './app'
+require 'rubygems'
+require 'bundler'
+
+Bundler.require(:default)
+require './salesforce_endpoint.rb'
+
 run SalesforceEndpoint
diff --git a/config/environment.rb b/config/environment.rb
diff --git a/config/environments/development.rb b/config/environments/development.rb
diff --git a/config/environments/production.rb b/config/environments/production.rb
diff --git a/config/environments/test.rb b/config/environments/test.rb
diff --git a/lib/SF_services/account.rb b/lib/SF_services/account.rb
@@ -3,5 +3,31 @@ class Account < Base
     def initialize(config)
       super("Account", config)
     end
+
+    def find_account_id_by_email(email)
+      results = salesforce.query("SELECT Contact.Account.Id FROM Contact WHERE Email = '#{email}'")
+      results.any? ? results.first['Account']['Id'] : nil
+    end
+
+    def fetch_contacts_along(ids)
+      fields = ["Account.Id",
+                "Account.BillingCity",
+                "Account.BillingCountry",
+                "Account.BillingPostalCode",
+                "Account.BillingState",
+                "Account.BillingStreet",
+                "Account.Name",
+                "Account.Phone",
+                "Account.ShippingCity",
+                "Account.ShippingCountry",
+                "Account.ShippingPostalCode",
+                "Account.ShippingState",
+                "Account.ShippingStreet"].join(", ")
+
+      contacts = "SELECT FirstName, LastName, Email FROM Contacts"
+      filter = "Id IN (#{ids.join(", ")})"
+
+      salesforce.query("SELECT #{fields}, (#{contacts}) FROM Account WHERE #{filter}")
+    end
   end
 end
diff --git a/lib/SF_services/base.rb b/lib/SF_services/base.rb
@@ -1,10 +1,25 @@
 module SFService
+  # Note about `query` methods: 
+  #
+  #   http://www.salesforce.com/us/developer/docs/api_rest/Content/resources_query.htm
+  #
+  #   If the query results are too large, the response contains the first batch
+  #   of results and a query identifier in the nextRecordsUrl field of the
+  #   response. The identifier can be used in an additional request to retrieve
+  #   the next batch.
+  #
+  #
+  # About Salesforce Object Query Language (SOQL):
+  #
+  #   http://www.salesforce.com/us/developer/docs/soql_sosl/index.htm
+  #
   class Base
     attr_reader :salesforce, :config, :model_name
 
     def initialize(model_name, config)
       @model_name = model_name
       @config = config
+      @salesforce = config[:salesforce] || client
     end
 
     def create!(attributes = {})
@@ -15,16 +30,45 @@ def update!(attributes = {})
       salesforce.update!(model_name, attributes)
     end
 
+    def client
+      Restforce.new user_credentials.merge(app_credentials)
+    end
+
     private
+      def user_credentials
+        if config[:salesforce_instance_url].present?
+          oauth_params
+        else
+          user_passwd_params
+        end
+      end
 
-    def salesforce
-      @salesforce ||= Restforce.new(
-        username: config['salesforce_username'],
-        password: config['salesforce_password'],
-        security_token: config['salesforce_security_token'],
-        client_id: config['salesforce_client_id'],
-        client_secret: config['salesforce_client_secret']
-      )
-    end
+      def app_credentials
+        {
+          client_id: ENV['SALESFORCE_CLIENT_ID'],
+          client_secret: ENV['SALESFORCE_CLIENT_SECRET']
+        }
+      end
+
+      def oauth_params
+        initial = {
+          instance_url: config[:salesforce_instance_url],
+          oauth_token: config[:salesforce_access_token]
+        }
+
+        if config[:salesforce_refresh_token].present?
+          initial.merge refresh_token: config[:salesforce_refresh_token]
+        else
+          initial
+        end
+      end
+
+      def user_passwd_params
+        {
+          username: config[:salesforce_username],
+          password: config[:salesforce_password],
+          security_token: config[:salesforce_security_token],
+        }
+      end
   end
 end
diff --git a/lib/SF_services/contact.rb b/lib/SF_services/contact.rb
@@ -11,13 +11,51 @@ def find_id_by_email(email)
     end
 
     def find_account_id_by_email(email)
-      results = salesforce.query("select Account__c from Contact where Email = '#{email}'")
-      results.any? ? results.first['Account__c'] : nil
+      results = salesforce.query("select AccountId from Contact where Email = '#{email}'")
+      results.any? ? results.first['AccountId'] : nil
     end
 
     def upsert!(email, attributes = {})
       contact_id = find_id_by_email(email)
       contact_id.present? ? update!(attributes.merge({ Id: contact_id })) : create!(attributes)
     end
+
+    def person_contact_update!(account_id, attributes)
+      results = salesforce.query("select Id from Contact where AccountId = '#{account_id}'")
+      update! attributes.merge(Id: results.first.to_h['Id'])
+    end
+
+    def latest_updates(time = Time.now.utc.iso8601)
+      since = time ? Time.parse(time).utc.iso8601 : Time.now.utc.iso8601
+
+      fields = ["Contact.Id",
+                "Contact.Firstname",
+                "Contact.Lastname",
+                "Contact.Email",
+                "Contact.Account.Name",
+                "Contact.Account.AccountNumber",
+                "Contact.Account.BillingCity",
+                "Contact.Account.BillingCountry",
+                # "Contact.Account.BillingCountryCode",
+                "Contact.Account.BillingPostalCode",
+                "Contact.Account.BillingState",
+                # "Contact.Account.BillingStateCode",
+                "Contact.Account.BillingStreet",
+                "Contact.Account.Rating",
+                "Contact.Account.Phone",
+                "Contact.Account.ShippingCity",
+                "Contact.Account.ShippingCountry",
+                # "Contact.Account.ShippingCountryCode",
+                "Contact.Account.ShippingPostalCode",
+                "Contact.Account.ShippingState",
+                # "Contact.Account.ShippingStateCode",
+                "Contact.Account.ShippingStreet",
+                "Contact.Account.Website",
+                "Contact.Account.Type",
+                "Contact.LastModifiedDate"]
+
+      filter = "LastModifiedDate > #{since} ORDER BY LastModifiedDate ASC LIMIT 100"
+      salesforce.query("SELECT #{fields.join(", ")} FROM Contact WHERE #{filter}")
+    end
   end
 end