killbill-client 2.2.2 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4ba3d6fe46c4834ecf4a07d9478c84a7a1f2da3
-  data.tar.gz: e6c95190aea365b25dc1c635495320963fbda811
+  metadata.gz: '090e46016d6dc90be768bc6a3cbfea49b915371b'
+  data.tar.gz: c46832276e369c9e98a178998ba293805c7734bc
 SHA512:
-  metadata.gz: aeecba9a272ac0d0b3983aaaaaa8f746448f6dc4c8631a407856e4adde4473304d2480947f53e3f8060f75302bffdce39931bd6a39086b8978ef4aa7bee828b5
-  data.tar.gz: b411ce93126ccd566eec52ceffe9a91ba1ddfe29602bb8934fa09574e96489ce8c235516bbbf6f0358fd18e72da1da2b4d9b9c4bef80cc3599ed2a2e0a2123bd
+  metadata.gz: ac458f17fa4d8a794aa63ea8cbfc0e462c4d897b18d013dc2dbbfc871f2c427ef05fb1dd15fce976dfa481fe404418cff27cdcd0d878f7a1bc7c945266b16e0f
+  data.tar.gz: a88991d5d604182320d92f5440728cfa2690094785c8759e5fbf0fd6fd182f9fe1d9e94493a0467cef1f37d94f76a7f042c4c6eb10021c922fd669ac8ca15eed

data/lib/killbill_client/models/account.rb

@@ -6,9 +6,11 @@ module KillBillClient
 
       include KillBillClient::Model::TagHelper
       include KillBillClient::Model::CustomFieldHelper
+      include KillBillClient::Model::AuditLogWithHistoryHelper
 
       has_custom_fields KILLBILL_API_ACCOUNTS_PREFIX, :account_id
       has_tags KILLBILL_API_ACCOUNTS_PREFIX, :account_id
+      has_audit_logs_with_history KILLBILL_API_ACCOUNTS_PREFIX, :account_id
 
       has_many :audit_logs, KillBillClient::Model::AuditLog
 
@@ -275,6 +277,13 @@ module KillBillClient
                        AccountEmailAttributes
       end
 
+      def email_audit_logs_with_history(account_email_id, options = {})
+        self.class.get "#{KILLBILL_API_ACCOUNTS_PREFIX}/#{account_id}/emails/#{account_email_id}/auditLogsWithHistory",
+                       {},
+                       options,
+                       AuditLog
+      end
+
       def email_notifications(options = {})
         self.class.get "#{KILLBILL_API_ACCOUNTS_PREFIX}/#{account_id}/emailNotifications",
                        {},
@@ -371,6 +380,13 @@ module KillBillClient
                        options,
                        InvoicePayment
       end
+
+      def audit(options = {})
+        self.class.get "#{KILLBILL_API_ACCOUNTS_PREFIX}/#{account_id}/auditLogs",
+                       {},
+                       options,
+                       AuditLog
+      end
     end
   end
 end

data/lib/killbill_client/models/bulk_subscription.rb

@@ -1,6 +1,6 @@
 module KillBillClient
   module Model
-    class BulkSubscription < BulkBaseSubscriptionAndAddOnsAttributes
+    class BulkSubscription < BulkSubscriptionsBundleAttributes
 
       include KillBillClient::Model::CustomFieldHelper
 

data/lib/killbill_client/models/custom_field.rb

@@ -2,10 +2,14 @@ module KillBillClient
   module Model
     class CustomField < CustomFieldAttributes
 
+      include KillBillClient::Model::AuditLogWithHistoryHelper
+
       KILLBILL_API_CUSTOM_FIELDS_PREFIX = "#{KILLBILL_API_PREFIX}/customFields"
 
       has_many :audit_logs, KillBillClient::Model::AuditLog
 
+      has_audit_logs_with_history KILLBILL_API_CUSTOM_FIELDS_PREFIX, :custom_field_id
+
       class << self
         def find_in_batches(offset = 0, limit = 100, options = {})
           get "#{KILLBILL_API_CUSTOM_FIELDS_PREFIX}/#{Resource::KILLBILL_API_PAGINATION_PREFIX}",

data/lib/killbill_client/models/gen/audit_log_attributes.rb

@@ -30,10 +30,13 @@ module KillBillClient
     class AuditLogAttributes < Resource
       attribute :change_type
       attribute :change_date
+      attribute :object_type
+      attribute :object_id
       attribute :changed_by
       attribute :reason_code
       attribute :comments
       attribute :user_token
+      attribute :history
     end
   end
 end

data/lib/killbill_client/models/gen/{bulk_base_subscription_and_add_ons_attributes.rb → bulk_subscriptions_bundle_attributes.rb}

@@ -27,7 +27,7 @@
 
 module KillBillClient
   module Model
-    class BulkBaseSubscriptionAndAddOnsAttributes < Resource
+    class BulkSubscriptionsBundleAttributes < Resource
       attribute :base_entitlement_and_add_ons
     end
   end

data/lib/killbill_client/models/gen/credit_attributes.rb

@@ -35,6 +35,7 @@ module KillBillClient
       attribute :effective_date
       attribute :account_id
       attribute :description
+      attribute :item_details
       attribute :audit_logs
     end
   end

data/lib/killbill_client/models/gen/require_gen.rb

@@ -31,7 +31,6 @@ require 'killbill_client/models/gen/account_email_attributes'
 require 'killbill_client/models/gen/tag_attributes'
 require 'killbill_client/models/gen/invoice_attributes'
 require 'killbill_client/models/gen/plugin_property_attributes'
-require 'killbill_client/models/gen/bulk_base_subscription_and_add_ons_attributes'
 require 'killbill_client/models/gen/account_timeline_attributes'
 require 'killbill_client/models/gen/overdue_state_attributes'
 require 'killbill_client/models/gen/user_roles_attributes'
@@ -43,6 +42,7 @@ require 'killbill_client/models/gen/plugin_info_attributes'
 require 'killbill_client/models/gen/tag_definition_attributes'
 require 'killbill_client/models/gen/account_attributes'
 require 'killbill_client/models/gen/hosted_payment_page_form_descriptor_attributes'
+require 'killbill_client/models/gen/bulk_subscriptions_bundle_attributes'
 require 'killbill_client/models/gen/blocking_state_attributes'
 require 'killbill_client/models/gen/invoice_item_attributes'
 require 'killbill_client/models/gen/role_definition_attributes'

data/lib/killbill_client/models/helpers/audit_log_with_history_helper.rb

@@ -0,0 +1,23 @@
+module KillBillClient
+  module Model
+    module AuditLogWithHistoryHelper
+
+      module ClassMethods
+        def has_audit_logs_with_history(url_prefix, id_alias)
+          define_method('audit_logs_with_history') do |*args|
+            options = args[0] || {}
+
+            self.class.get "#{url_prefix}/#{send(id_alias)}/auditLogsWithHistory",
+                           {},
+                           options,
+                           AuditLog
+          end
+        end
+      end
+
+      def self.included(klass)
+        klass.extend ClassMethods
+      end
+    end
+  end
+end

data/lib/killbill_client/models/models.rb

@@ -5,6 +5,7 @@ require 'killbill_client/models/gen/require_gen'
 
 require 'killbill_client/models/helpers/tag_helper'
 require 'killbill_client/models/helpers/custom_field_helper'
+require 'killbill_client/models/helpers/audit_log_with_history_helper'
 
 require 'killbill_client/models/audit_log'
 require 'killbill_client/models/event_subscription'

data/lib/killbill_client/models/payment.rb

@@ -4,6 +4,7 @@ module KillBillClient
 
       include KillBillClient::Model::CustomFieldHelper
       include KillBillClient::Model::TagHelper
+      include KillBillClient::Model::AuditLogWithHistoryHelper
 
       KILLBILL_API_PAYMENTS_PREFIX = "#{KILLBILL_API_PREFIX}/payments"
 
@@ -13,6 +14,7 @@ module KillBillClient
 
       has_custom_fields KILLBILL_API_PAYMENTS_PREFIX, :payment_id
       has_tags KILLBILL_API_PAYMENTS_PREFIX, :payment_id
+      has_audit_logs_with_history KILLBILL_API_PAYMENTS_PREFIX, :payment_id
 
       class << self
         def find_by_id(payment_id, with_plugin_info = false, with_attempts = false, options = {})
@@ -60,6 +62,13 @@ module KillBillClient
               },
               options
         end
+
+        def attempt_audit_logs_with_history(payment_attempt_id, options = {})
+          get "#{KILLBILL_API_PAYMENTS_PREFIX}/attempts/#{payment_attempt_id}/auditLogsWithHistory",
+                         {},
+                         options,
+                         AuditLog
+        end
       end
     end
   end

data/lib/killbill_client/models/payment_method.rb

@@ -1,11 +1,16 @@
 module KillBillClient
   module Model
     class PaymentMethod < PaymentMethodAttributes
+
+      include KillBillClient::Model::AuditLogWithHistoryHelper
+
       KILLBILL_API_PAYMENT_METHODS_PREFIX = "#{KILLBILL_API_PREFIX}/paymentMethods"
       EXTERNAL_PAYMENT = '__EXTERNAL_PAYMENT__'.freeze
 
       has_many :audit_logs, KillBillClient::Model::AuditLog
 
+      has_audit_logs_with_history KILLBILL_API_PAYMENT_METHODS_PREFIX, :payment_method_id
+
       class << self
         def find_by_id(payment_method_id, with_plugin_info = false, options = {})
           get "#{KILLBILL_API_PAYMENT_METHODS_PREFIX}/#{payment_method_id}",

data/lib/killbill_client/models/tag.rb

@@ -2,10 +2,14 @@ module KillBillClient
   module Model
     class Tag < TagAttributes
 
+      include KillBillClient::Model::AuditLogWithHistoryHelper
+
       KILLBILL_API_TAGS_PREFIX = "#{KILLBILL_API_PREFIX}/tags"
 
       has_many :audit_logs, KillBillClient::Model::AuditLog
 
+      has_audit_logs_with_history KILLBILL_API_TAGS_PREFIX, :tag_id
+
       class << self
         def find_in_batches(offset = 0, limit = 100, options = {})
           get "#{KILLBILL_API_TAGS_PREFIX}/#{Resource::KILLBILL_API_PAGINATION_PREFIX}",

data/lib/killbill_client/models/tag_definition.rb

@@ -1,8 +1,13 @@
 module KillBillClient
   module Model
     class TagDefinition < TagDefinitionAttributes
+
+      include KillBillClient::Model::AuditLogWithHistoryHelper
+
       KILLBILL_API_TAG_DEFINITIONS_PREFIX = "#{KILLBILL_API_PREFIX}/tagDefinitions"
 
+      has_audit_logs_with_history KILLBILL_API_TAG_DEFINITIONS_PREFIX, :id
+
       class << self
         def all(audit = 'NONE', options = {})
           get KILLBILL_API_TAG_DEFINITIONS_PREFIX,

data/lib/killbill_client/models/transaction.rb

@@ -4,11 +4,15 @@ module KillBillClient
   module Model
     class Transaction < PaymentTransactionAttributes
 
+      include KillBillClient::Model::AuditLogWithHistoryHelper
+
       KILLBILL_API_TRANSACTIONS_PREFIX = "#{KILLBILL_API_PREFIX}/paymentTransactions"
 
       has_many :properties, KillBillClient::Model::PluginPropertyAttributes
       has_many :audit_logs, KillBillClient::Model::AuditLog
 
+      has_audit_logs_with_history KILLBILL_API_TRANSACTIONS_PREFIX, :transaction_id
+
       def auth(account_id, payment_method_id = nil, user = nil, reason = nil, comment = nil, options = {}, refresh_options = nil)
         @transaction_type = 'AUTHORIZE'
         query_map = {}

data/lib/killbill_client/version.rb

@@ -2,7 +2,7 @@ module KillBillClient
   module Version
     MAJOR = 2
     MINOR = 2
-    PATCH = 2
+    PATCH = 3
     PRE = nil
 
     VERSION = [MAJOR, MINOR, PATCH, PRE].compact.join('.').freeze

data/spec/killbill_client/remote/api_spec.rb

@@ -21,10 +21,10 @@ describe KillBillClient::API do
       KillBillClient.return_full_stacktraces = true
       tenant.create(true, 'KillBill Spec test')
       fail
-    rescue KillBillClient::API::InternalServerError => e
+    rescue KillBillClient::API::Conflict => e
       billing_exception = JSON.parse(e.response.body)
-      expect(billing_exception['className']).to eq('java.lang.RuntimeException')
-      expect(billing_exception['stackTrace'].size).to be >= 90
+      expect(billing_exception['className']).to eq('org.killbill.billing.tenant.api.TenantApiException')
+      expect(billing_exception['stackTrace'].size).to be >= 70
     ensure
       KillBillClient.return_full_stacktraces = false
     end
@@ -32,18 +32,18 @@ describe KillBillClient::API do
     begin
       tenant.create(true, 'KillBill Spec test')
       fail
-    rescue KillBillClient::API::InternalServerError => e
+    rescue KillBillClient::API::Conflict => e
       billing_exception = JSON.parse(e.response.body)
-      expect(billing_exception['className']).to eq('java.lang.RuntimeException')
+      expect(billing_exception['className']).to eq('org.killbill.billing.tenant.api.TenantApiException')
       expect(billing_exception['stackTrace'].size).to be == 0
     end
 
     begin
       tenant.create(true, 'KillBill Spec test', nil, nil, {:return_full_stacktraces => true})
       fail
-    rescue KillBillClient::API::InternalServerError => e
+    rescue KillBillClient::API::Conflict => e
       billing_exception = JSON.parse(e.response.body)
-      expect(billing_exception['className']).to eq('java.lang.RuntimeException')
+      expect(billing_exception['className']).to eq('org.killbill.billing.tenant.api.TenantApiException')
       expect(billing_exception['stackTrace'].size).to be >= 50
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: killbill-client
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.2.3
 platform: ruby
 authors:
 - Killbill core team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-10 00:00:00.000000000 Z
+date: 2018-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -81,7 +81,7 @@ files:
 - lib/killbill_client/models/gen/billing_exception_attributes.rb
 - lib/killbill_client/models/gen/block_price_override_attributes.rb
 - lib/killbill_client/models/gen/blocking_state_attributes.rb
-- lib/killbill_client/models/gen/bulk_base_subscription_and_add_ons_attributes.rb
+- lib/killbill_client/models/gen/bulk_subscriptions_bundle_attributes.rb
 - lib/killbill_client/models/gen/bundle_attributes.rb
 - lib/killbill_client/models/gen/bundle_timeline_attributes.rb
 - lib/killbill_client/models/gen/catalog_attributes.rb
@@ -151,6 +151,7 @@ files:
 - lib/killbill_client/models/gen/usage_price_override_attributes.rb
 - lib/killbill_client/models/gen/usage_record_attributes.rb
 - lib/killbill_client/models/gen/user_roles_attributes.rb
+- lib/killbill_client/models/helpers/audit_log_with_history_helper.rb
 - lib/killbill_client/models/helpers/custom_field_helper.rb
 - lib/killbill_client/models/helpers/tag_helper.rb
 - lib/killbill_client/models/hosted_payment_page.rb