killbill-zendesk 0.1.1 → 0.2.0

data/Jarfile

@@ -1,3 +1,5 @@
-jar 'com.ning.billing:killbill-api', '0.1.80'
-jar 'com.ning.billing:killbill-util:tests', '0.1.80'
+jar 'com.ning.billing:killbill-api', '0.3.0'
+jar 'com.ning.billing.plugin:killbill-plugin-api-notification', '0.2.4'
+jar 'com.ning.billing.plugin:killbill-plugin-api-payment', '0.2.4'
+jar 'com.ning.billing:killbill-util:tests', '0.2.6-SNAPSHOT'
 jar 'javax.servlet:javax.servlet-api', '3.0.1'

data/NEWS

@@ -0,0 +1,9 @@
+0.2.0
+    Save local mapping if the user already exists in Zendesk
+    Update to killbill 1.1.2
+
+0.1.1
+    Fix activerecord connections leak
+
+0.1.0
+    Initial version

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/killbill-zendesk.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
 
   s.rdoc_options << '--exclude' << '.'
 
-  s.add_dependency 'killbill', '~> 1.0.19'
+  s.add_dependency 'killbill', '~> 1.1.2'
   s.add_dependency 'sinatra', '~> 1.3.4'
   s.add_dependency 'zendesk_api', '~> 0.3.10'
   s.add_dependency 'activerecord', '~> 3.2.1'

data/lib/zendesk/user_updater.rb

@@ -11,9 +11,10 @@ module Killbill::Zendesk
 
       user = find_by_kb_account(kb_account)
       user = create_user(kb_account) if user.nil?
+      save_kb_zd_mapping(kb_account, user)
 
       user.name = kb_account.name
-      user.external_id = kb_account.external_key || kb_account.id.to_s
+      user.external_id = kb_account.external_key || kb_account.id
       user.locale = kb_account.locale
       user.timezone = kb_account.time_zone
       user.email = kb_account.email
@@ -31,15 +32,10 @@ module Killbill::Zendesk
 
     # Find the Kill Bill account associated with that lookup_key (account id or external key)
     def lookup_kb_account(lookup_key)
-      if lookup_key.is_a?(Killbill::Plugin::Model::UUID)
-        @kb_apis.get_account_by_id(lookup_key)
+      if lookup_key =~ /[A-Fa-f0-9]{8}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{12}/
+        @kb_apis.account_user_api.get_account_by_id(lookup_key, @kb_apis.create_context)
       else
-        lookup_key_s = lookup_key.to_s
-        if lookup_key_s =~ /[A-Fa-f0-9]{8}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{12}/
-          lookup_kb_account(Killbill::Plugin::Model::UUID.new(lookup_key_s))
-        else
-          @kb_apis.get_account_by_key(lookup_key_s)
-        end
+        @kb_apis.account_user_api.get_account_by_key(lookup_key, @kb_apis.create_context)
       end
     end
 
@@ -49,26 +45,25 @@ module Killbill::Zendesk
       (details.reject { |detail| detail.blank? }).join(', ')
     end
 
-    # Create a user in Zendesk and save the id mapping locally
+    # Create a user in Zendesk
     def create_user(kb_account)
-      # Create the user in Zendesk
-      user = @client.users.create(:name => kb_account.name)
+      @client.users.create(:name => kb_account.name)
+    end
 
+    def save_kb_zd_mapping(kb_account, user)
       # Save the mapping locally - this is required due to the indexing lag on the Zendesk side,
       # see https://support.zendesk.com/entries/20239737:
       #   When you add new data to your Zendesk, it typically takes about 2 to 3 minutes before it's indexed and can be searched.
       # This is unacceptable for us: if an account creation event is quickly followed by a account update event,
       # we wouldn't be able to retrieve the user, potentially causing duplicates and/or triggering validation errors, e.g.
       #   Email 1370587241-test@tester.com is already being used by another user
-      ZendeskUser.create! :kb_account_id => kb_account.id.to_s, :zd_user_id => user.id
-
-      user
+      ZendeskUser.where(:kb_account_id => kb_account.id, :zd_user_id => user.id).first_or_create!
     end
 
     # Find the Zendesk user associated with that Kill Bill account
     def find_by_kb_account(kb_account)
       # Do we have already a mapping for that user?
-      zd_account = find_by_id(kb_account.id.to_s)
+      zd_account = find_by_id(kb_account.id)
       return zd_account if zd_account
 
       # TODO In the search results below, should we worry about potential dups?
@@ -79,7 +74,7 @@ module Killbill::Zendesk
       return zd_account if zd_account
 
       # ...or the Kill Bill account id
-      zd_account = find_by_external_id(kb_account.id.to_s)
+      zd_account = find_by_external_id(kb_account.id)
       return zd_account if zd_account
 
       # At this point, we haven't matched this user yet. To reconcile it, use the email address which is guaranteed

data/lib/zendesk.rb

@@ -25,7 +25,7 @@ module Killbill::Zendesk
     end
 
     def on_event(event)
-      @updater.update(event.account_id) if [:ACCOUNT_CREATION, :ACCOUNT_CHANGE].include?(event.event_type.enum)
+      @updater.update(event.account_id) if [:ACCOUNT_CREATION, :ACCOUNT_CHANGE].include?(event.event_type)
     end
   end
 end

data/pom.xml

@@ -25,7 +25,7 @@
     <groupId>com.ning.killbill.ruby</groupId>
     <artifactId>zendesk-plugin</artifactId>
     <packaging>pom</packaging>
-    <version>0.1.1</version>
+    <version>0.2.0</version>
     <name>zendesk-plugin</name>
     <url>http://github.com/killbill/killbill-zendesk-plugin</url>
     <description>Plugin to mirror Kill Bill data into Zendesk</description>

data/spec/spec_helper.rb

@@ -2,6 +2,7 @@ require 'bundler'
 require 'zendesk'
 
 require 'logger'
+require 'ostruct'
 
 require 'rspec'
 
@@ -18,3 +19,18 @@ ActiveRecord::Base.establish_connection(
 )
 # Create the schema
 require File.expand_path(File.dirname(__FILE__) + '../../db/schema.rb')
+
+begin
+  require 'securerandom'
+  SecureRandom.uuid
+rescue LoadError, NoMethodError
+  # See http://jira.codehaus.org/browse/JRUBY-6176
+  module SecureRandom
+    def self.uuid
+      ary = self.random_bytes(16).unpack("NnnnnN")
+      ary[2] = (ary[2] & 0x0fff) | 0x4000
+      ary[3] = (ary[3] & 0x3fff) | 0x8000
+      "%08x-%04x-%04x-%04x-%04x%08x" % ary
+    end unless respond_to?(:uuid)
+  end
+end

data/spec/zendesk/remote/integration_spec.rb

@@ -1,27 +1,18 @@
 require 'spec_helper'
 
-class KillbillApiWithFakeGetAccountById < Killbill::Plugin::KillbillApi
-  def initialize(*args)
-    super(*args)
-    @accounts = {}
-  end
+class FakeJavaUserAccountApi
+  attr_accessor :accounts
 
-  def create_account(id, external_key, name, email)
-    @accounts[id.to_s] = Killbill::Plugin::Model::Account.new(id, nil, nil, nil, external_key, name, 1, email, 1, 'USD', nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, false, true)
+  def initialize
+    @accounts = []
   end
 
-  def get_account_by_id(id)
-    @accounts[id.to_s]
+  def get_account_by_id(id, context)
+    @accounts.find { |account| account.id == id.to_s }
   end
-end
-
-class MockEvent
-  attr_reader :event_type
-  attr_reader :account_id
 
-  def initialize(event_type, account_id)
-    @event_type = event_type
-    @account_id = account_id
+  def get_account_by_key(external_key, context)
+    @accounts.find { |account| account.external_key == external_key.to_s }
   end
 end
 
@@ -34,7 +25,9 @@ describe Killbill::Zendesk::ZendeskPlugin do
     logger.level = Logger::DEBUG
     @plugin.logger = logger
 
-    @plugin.kb_apis = KillbillApiWithFakeGetAccountById.new(nil)
+    @account_api = FakeJavaUserAccountApi.new
+    svcs = {:account_user_api => @account_api}
+    @plugin.kb_apis = Killbill::Plugin::KillbillApi.new('zendesk', svcs)
 
     @plugin.start_plugin
   end
@@ -53,7 +46,7 @@ describe Killbill::Zendesk::ZendeskPlugin do
     @plugin.updater.find_by_external_id(external_key).should be_nil
 
     # Send a creation event
-    @plugin.on_event MockEvent.new(Killbill::Plugin::Model::ExtBusEventType.new(:ACCOUNT_CREATION), kb_account_id)
+    @plugin.on_event OpenStruct.new(:event_type => :ACCOUNT_CREATION, :account_id => kb_account_id)
 
     # We should now verify the account exists, but we can't, due to indexing lag :/
     #@plugin.updater.find_by_external_id(external_key).email.should == email
@@ -61,7 +54,7 @@ describe Killbill::Zendesk::ZendeskPlugin do
     Killbill::Zendesk::ZendeskUser.count.should == 1
 
     # Send an update event
-    @plugin.on_event MockEvent.new(Killbill::Plugin::Model::ExtBusEventType.new(:ACCOUNT_CHANGE), kb_account_id)
+    @plugin.on_event OpenStruct.new(:event_type => :ACCOUNT_CHANGE, :account_id => kb_account_id)
 
     # Verify we didn't create dups
     #@plugin.updater.find_all_by_external_id(external_key).count.should == 1
@@ -69,7 +62,7 @@ describe Killbill::Zendesk::ZendeskPlugin do
 
     # Create a new user
     external_key, kb_account_id = create_kb_account
-    @plugin.on_event MockEvent.new(Killbill::Plugin::Model::ExtBusEventType.new(:ACCOUNT_CREATION), kb_account_id)
+    @plugin.on_event OpenStruct.new(:event_type => :ACCOUNT_CREATION, :account_id => kb_account_id)
 
     Killbill::Zendesk::ZendeskUser.count.should == 2
   end
@@ -78,9 +71,17 @@ describe Killbill::Zendesk::ZendeskPlugin do
 
   def create_kb_account
     external_key = Time.now.to_i.to_s + '-test'
-    kb_account_id = Killbill::Plugin::Model::UUID.new(external_key)
+    kb_account_id = SecureRandom.uuid
     email = external_key + '@tester.com'
-    @plugin.kb_apis.create_account(kb_account_id, external_key, 'Test tester', email)
+
+    account = Killbill::Plugin::Model::Account.new
+    account.id = kb_account_id
+    account.external_key = external_key
+    account.email = email
+    account.name = 'Integration spec'
+
+    @account_api.accounts << account
+
     return external_key, kb_account_id
   end
 end

data/spec/zendesk/user_updater_spec.rb

@@ -26,9 +26,32 @@ describe Killbill::Zendesk::UserUpdater do
     updater.build_details_field(account).should == '493 Slro road, apt 33, Fola, FG, 140, Floq'
   end
 
+  it 'should save the mappings locally' do
+    updater = Killbill::Zendesk::UserUpdater.new(nil, nil, nil)
+    kb_account = OpenStruct.new(:id => '11-22-33-44-55')
+    zd_user = OpenStruct.new(:id => 9402871)
+
+    Killbill::Zendesk::ZendeskUser.all.size.should == 0
+
+    updater.save_kb_zd_mapping kb_account, zd_user
+    Killbill::Zendesk::ZendeskUser.all.size.should == 1
+    Killbill::Zendesk::ZendeskUser.find_by_kb_account_id(kb_account.id).zd_user_id.should == zd_user.id
+
+    updater.save_kb_zd_mapping kb_account, zd_user
+    Killbill::Zendesk::ZendeskUser.all.size.should == 1
+    Killbill::Zendesk::ZendeskUser.find_by_kb_account_id(kb_account.id).zd_user_id.should == zd_user.id
+  end
+
   private
 
   def build_account(address1, address2, city, state_or_province, postal_code, country)
-    Killbill::Plugin::Model::Account.new(nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, address1, address2, nil, city, state_or_province, postal_code, country, nil, nil, nil)
+    account = Killbill::Plugin::Model::Account.new
+    account.address1 = address1
+    account.address2 = address2
+    account.city = city
+    account.state_or_province = state_or_province
+    account.postal_code = postal_code
+    account.country = country
+    account
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: killbill-zendesk
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease:
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-06-13 00:00:00.000000000 Z
+date: 2013-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: killbill
@@ -17,13 +17,13 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.19
+        version: 1.1.2
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.19
+        version: 1.1.2
     none: false
   prerelease: false
   type: :runtime
@@ -164,6 +164,7 @@ files:
 - ".gitignore"
 - Gemfile
 - Jarfile
+- NEWS
 - README.md
 - Rakefile
 - VERSION