killbill-client 2.2.3 → 2.3.0

data/lib/killbill_client/models/nodes_info.rb

@@ -67,7 +67,7 @@ module KillBillClient
           return res if res
 
           node_command = KillBillClient::Model::NodeCommandAttributes.new
-          node_command.system_command_type = true
+          node_command.is_system_command_type = true
           node_command.node_command_type = node_command_type
           node_command.node_command_properties = []
           node_command.node_command_properties << {:key => 'pluginKey', :value => plugin_key} if plugin_key

data/lib/killbill_client/models/overdue.rb

@@ -8,24 +8,47 @@ module KillBillClient
 
       class << self
 
-        def get_tenant_overdue_config(format, options = {})
+        def get_tenant_overdue_config_xml(options = {})
 
           require_multi_tenant_options!(options, "Retrieving an overdue config is only supported in multi-tenant mode")
 
-          get KILLBILL_API_OVERDUE_PREFIX,
+          get "#{KILLBILL_API_OVERDUE_PREFIX}/xml",
               {},
               {
-                  :head => {'Accept' => "application/#{format}"},
-                  :content_type => "application/#{format}",
+                  :head => {'Accept' => "text/xml"}
               }.merge(options)
         end
 
-        def upload_tenant_overdue_config_xml(overdue_config_xml, user = nil, reason = nil, comment = nil, options = {})
-          upload_tenant_overdue_config('xml', overdue_config_xml, user, reason, comment, options)
+        def get_tenant_overdue_config_json(options = {})
+
+          require_multi_tenant_options!(options, "Retrieving an overdue config is only supported in multi-tenant mode")
+
+          get KILLBILL_API_OVERDUE_PREFIX,
+              {},
+              {
+                  :head => {'Accept' => "application/json"}
+              }.merge(options)
         end
 
+        def upload_tenant_overdue_config_xml(body, user = nil, reason = nil, comment = nil, options = {})
 
-        def upload_tenant_overdue_config(format, body, user = nil, reason = nil, comment = nil, options = {})
+          require_multi_tenant_options!(options, "Uploading an overdue config is only supported in multi-tenant mode")
+
+          post "#{KILLBILL_API_OVERDUE_PREFIX}/xml",
+               body,
+               {
+               },
+               {
+                   :head => {'Accept' => 'text/xml'},
+                   :content_type => 'text/xml',
+                   :user => user,
+                   :reason => reason,
+                   :comment => comment,
+               }.merge(options)
+          get_tenant_overdue_config_xml(options)
+        end
+
+        def upload_tenant_overdue_config_json(body, user = nil, reason = nil, comment = nil, options = {})
 
           require_multi_tenant_options!(options, "Uploading an overdue config is only supported in multi-tenant mode")
 
@@ -34,20 +57,17 @@ module KillBillClient
                {
                },
                {
-                   :head => {'Accept' => "application/#{format}"},
-                   :content_type => "application/#{format}",
+                   :head => {'Accept' => 'application/json'},
+                   :content_type => 'application/json',
                    :user => user,
                    :reason => reason,
                    :comment => comment,
                }.merge(options)
-          get_tenant_overdue_config(format, options)
+          get_tenant_overdue_config_json(options)
         end
 
       end
 
-      def upload_tenant_overdue_config_json(user = nil, reason = nil, comment = nil, options = {})
-        self.class.upload_tenant_overdue_config('json', to_json, user, reason, comment, options)
-      end
     end
   end
 end

data/lib/killbill_client/models/payment_method.rb

@@ -83,7 +83,7 @@ module KillBillClient
         end
 
         def refresh(account_id, user = nil, reason = nil, comment = nil, options = {})
-          post "#{Account::KILLBILL_API_ACCOUNTS_PREFIX}/#{account_id}/paymentMethods/refresh",
+          put "#{Account::KILLBILL_API_ACCOUNTS_PREFIX}/#{account_id}/paymentMethods/refresh",
                nil,
                {},
                {

data/lib/killbill_client/models/resource.rb

@@ -75,7 +75,9 @@ module KillBillClient
               response.body
             when %r{text/plain}
               response.body
-            when %r{application/xml}
+            when %r{application/octet-stream}
+              response.body
+            when %r{text/xml}
               if response['location']
                 response['location']
               else

data/lib/killbill_client/models/subscription.rb

@@ -53,7 +53,7 @@ module KillBillClient
       # @ call_completion : whether the call should wait for invoice/payment to be completed before calls return
       #
       def change_plan(input, user = nil, reason = nil, comment = nil,
-                      requested_date = nil, billing_policy = nil, call_completion = false, options = {})
+                      requested_date = nil, billing_policy = nil, target_phase_type = nil, call_completion = false, options = {})
 
         params                  = {}
         params[:callCompletion] = call_completion
@@ -63,15 +63,17 @@ module KillBillClient
         # Make sure account_id is set
         input[:accountId] = @account_id
         input[:productCategory] = @product_category
+        input[:phaseType] = target_phase_type
 
-        return self.class.put "#{KILLBILL_API_ENTITLEMENT_PREFIX}/#{@subscription_id}",
-                              input.to_json,
-                              params,
-                              {
-                                  :user    => user,
-                                  :reason  => reason,
-                                  :comment => comment,
-                              }.merge(options)
+        self.class.put "#{KILLBILL_API_ENTITLEMENT_PREFIX}/#{@subscription_id}",
+                       input.to_json,
+                       params,
+                       {
+                           :user    => user,
+                           :reason  => reason,
+                           :comment => comment,
+                       }.merge(options)
+        self.class.find_by_id(@subscription_id, options)
       end
 
       #
@@ -135,20 +137,20 @@ module KillBillClient
       #
       # Block a Subscription
       #
-      def set_blocking_state(state_name, service, block_change, block_entitlement, block_billing, requested_date = nil, user = nil, reason = nil, comment = nil, options = {})
+      def set_blocking_state(state_name, service, is_block_change, is_block_entitlement, is_block_billing, requested_date = nil, user = nil, reason = nil, comment = nil, options = {})
 
         body = KillBillClient::Model::BlockingStateAttributes.new
         body.state_name = state_name
         body.service = service
-        body.block_change = block_change
-        body.block_entitlement = block_entitlement
-        body.block_billing = block_billing
+        body.is_block_change = is_block_change
+        body.is_block_entitlement = is_block_entitlement
+        body.is_block_billing = is_block_billing
         body.type = "SUBSCRIPTION"
 
         params = {}
         params[:requestedDate] = requested_date unless requested_date.nil?
 
-        self.class.put "#{KILLBILL_API_ENTITLEMENT_PREFIX}/#{subscription_id}/block",
+        self.class.post "#{KILLBILL_API_ENTITLEMENT_PREFIX}/#{subscription_id}/block",
                        body.to_json,
                        params,
                        {
@@ -161,16 +163,16 @@ module KillBillClient
       #
       # Create an entitlement with addOn products
       #
-      def create_entitlement_with_add_on(entitlements, requested_date, entitlement_date, billing_date, migrated = false, call_completion_sec = nil, user = nil, reason = nil, comment = nil, options = {})
+      def create_entitlement_with_add_on(entitlements, entitlement_date, billing_date, migrated = false, rename_key_if_exists_and_unused = true, call_completion_sec = nil, user = nil, reason = nil, comment = nil, options = {})
         params = {}
-        params[:requestedDate] = requested_date if requested_date
         params[:entitlementDate] = entitlement_date if entitlement_date
         params[:billingDate] = billing_date if billing_date
         params[:migrated] = migrated
+        params[:renameKeyIfExistsAndUnused] = rename_key_if_exists_and_unused
         params[:callCompletion] = true unless call_completion_sec.nil?
         params[:callTimeoutSec] = call_completion_sec unless call_completion_sec.nil?
 
-        self.class.post "#{KILLBILL_API_ENTITLEMENT_PREFIX}/createEntitlementWithAddOns",
+        self.class.post "#{KILLBILL_API_ENTITLEMENT_PREFIX}/createSubscriptionWithAddOns",
                         entitlements.to_json,
                         params,
                         {

data/lib/killbill_client/models/tenant.rb

@@ -52,7 +52,7 @@ module KillBillClient
               {},
               {
               }.merge(options),
-              KillBillClient::Model::TenantKeyAttributes
+              KillBillClient::Model::TenantKeyValueAttributes
         end
 
 
@@ -65,7 +65,7 @@ module KillBillClient
               {},
               {
               }.merge(options),
-              KillBillClient::Model::TenantKeyAttributes
+              KillBillClient::Model::TenantKeyValueAttributes
         end
 
 

data/lib/killbill_client/models/transaction.rb

@@ -121,6 +121,7 @@ module KillBillClient
                                 :reason  => reason,
                                 :comment => comment,
                             }.merge(options)
+          KillBillClient::Model::Payment.find_by_id(payment_id, false, false, options)
         end
       end
 
@@ -220,6 +221,7 @@ module KillBillClient
                              :reason => reason,
                              :comment => comment
                          }.merge(options)
+          KillBillClient::Model::Payment.find_by_id(payment_id, false, false, options)
         end
       end
 

data/lib/killbill_client/version.rb

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

data/spec/killbill_client/remote/api_spec.rb

@@ -24,7 +24,7 @@ describe KillBillClient::API do
     rescue KillBillClient::API::Conflict => e
       billing_exception = JSON.parse(e.response.body)
       expect(billing_exception['className']).to eq('org.killbill.billing.tenant.api.TenantApiException')
-      expect(billing_exception['stackTrace'].size).to be >= 70
+      expect(billing_exception['stackTrace'].size).to be >= 71
     ensure
       KillBillClient.return_full_stacktraces = false
     end

data/spec/killbill_client/remote/model_spec.rb

@@ -156,7 +156,7 @@ describe KillBillClient::Model do
     invoice_item.amount = 123.98
 
     invoice_item = invoice_item.create false, true, 'KillBill Spec test'
-    invoice = KillBillClient::Model::Invoice.find_by_id_or_number invoice_item.invoice_id
+    invoice = KillBillClient::Model::Invoice.find_by_id invoice_item.invoice_id
 
     expect(invoice.amount).to eq(123.98)
     expect(invoice.balance).to eq(0)
@@ -220,8 +220,8 @@ describe KillBillClient::Model do
     invoice_id = invoice.invoice_id
     invoice_number = invoice.invoice_number
 
-    invoice_with_id = KillBillClient::Model::Invoice.find_by_id_or_number invoice_id
-    invoice_with_number = KillBillClient::Model::Invoice.find_by_id_or_number invoice_number
+    invoice_with_id = KillBillClient::Model::Invoice.find_by_id invoice_id
+    invoice_with_number = KillBillClient::Model::Invoice.find_by_number invoice_number
 
     expect(invoice_with_id.invoice_id).to eq(invoice_with_number.invoice_id)
     expect(invoice_with_id.invoice_number).to eq(invoice_with_number.invoice_number)
@@ -229,7 +229,7 @@ describe KillBillClient::Model do
     # Create an external payment for each unpaid invoice
     invoice_payment = KillBillClient::Model::InvoicePayment.new
     invoice_payment.account_id = account.account_id
-    invoice_payment.bulk_create true, 'KillBill Spec test'
+    invoice_payment.bulk_create true, nil, nil, 'KillBill Spec test'
 
     # Try to retrieve it
     payments = KillBillClient::Model::Payment.find_in_batches(0, search_limit)
@@ -286,7 +286,7 @@ describe KillBillClient::Model do
     expect(invoice_payment.credited_amount).to eq(0)
 
     # Refund the payment (with item adjustment)
-    invoice_item = KillBillClient::Model::Invoice.find_by_id_or_number(invoice_number, true).items.first
+    invoice_item = KillBillClient::Model::Invoice.find_by_number(invoice_number, true).items.first
     item = KillBillClient::Model::InvoiceItem.new
     item.invoice_item_id = invoice_item.invoice_item_id
     item.amount = invoice_item.amount
@@ -308,7 +308,7 @@ describe KillBillClient::Model do
     expect { new_credit.create(true, 'KillBill Spec test') }.to raise_error(KillBillClient::API::BadRequest)
 
     # Verify the invoice item of the credit
-    invoice = KillBillClient::Model::Invoice.find_by_id_or_number invoice_id
+    invoice = KillBillClient::Model::Invoice.find_by_id invoice_id
     expect(invoice.items).not_to be_empty
     item = invoice.items.last
     expect(item.invoice_id).to eq(invoice_id)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: killbill-client
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.3.0
 platform: ruby
 authors:
 - Killbill core team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-18 00:00:00.000000000 Z
+date: 2018-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -141,7 +141,7 @@ files:
 - lib/killbill_client/models/gen/tag_attributes.rb
 - lib/killbill_client/models/gen/tag_definition_attributes.rb
 - lib/killbill_client/models/gen/tenant_attributes.rb
-- lib/killbill_client/models/gen/tenant_key_attributes.rb
+- lib/killbill_client/models/gen/tenant_key_value_attributes.rb
 - lib/killbill_client/models/gen/tier_attributes.rb
 - lib/killbill_client/models/gen/tier_price_override_attributes.rb
 - lib/killbill_client/models/gen/tiered_block_attributes.rb