killbill-client 2.2.3 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '090e46016d6dc90be768bc6a3cbfea49b915371b'
-  data.tar.gz: c46832276e369c9e98a178998ba293805c7734bc
+  metadata.gz: 83130edfd69e4755b2870008a499dffbf8018514
+  data.tar.gz: adc1f2acc20d39b5b360209ffc71141fe0863af9
 SHA512:
-  metadata.gz: ac458f17fa4d8a794aa63ea8cbfc0e462c4d897b18d013dc2dbbfc871f2c427ef05fb1dd15fce976dfa481fe404418cff27cdcd0d878f7a1bc7c945266b16e0f
-  data.tar.gz: a88991d5d604182320d92f5440728cfa2690094785c8759e5fbf0fd6fd182f9fe1d9e94493a0467cef1f37d94f76a7f042c4c6eb10021c922fd669ac8ca15eed
+  metadata.gz: c90240811ecbbc19b9ef1e390e2005d7fb2826d035490107d9f2d84335df929ed1d8451704169149dd1a21eccad2afb7c307294ed0b2ec6d76f980c833b59eb8
+  data.tar.gz: d71174faf6cb5493963550de3dd2dde1542e74a6bc53b85282242a02d14c5cdf61f546c52d163d72ec831fb31049a43dfea586e844c2f3050b13b191b3b0df3a

data/.circleci/config.yml

@@ -8,7 +8,7 @@ jobs:
   build-jruby-1.7.26:
     <<: *defaults
     docker:
-      - image: killbill/kbbuild:0.4.0
+      - image: killbill/kbbuild:0.5.0
     steps:
       - checkout
       - restore_cache:
@@ -27,8 +27,8 @@ jobs:
   test-mysql-jruby-1.7.26:
     <<: *defaults
     docker:
-      - image: killbill/kbbuild:0.4.0
-      - image: killbill/killbill:0.19.6
+      - image: killbill/kbbuild:0.5.0
+      - image: killbill/killbill:0.19.16
       - image: killbill/mariadb:0.19
         environment:
         - MYSQL_ROOT_PASSWORD=root
@@ -88,7 +88,7 @@ jobs:
   build-ruby-2.2.2:
     <<: *defaults
     docker:
-      - image: killbill/kbbuild:0.4.0
+      - image: killbill/kbbuild:0.5.0
     steps:
       - checkout
       - restore_cache:
@@ -109,8 +109,8 @@ jobs:
   test-mysql-ruby-2.2.2:
     <<: *defaults
     docker:
-      - image: killbill/kbbuild:0.4.0
-      - image: killbill/killbill:0.19.6
+      - image: killbill/kbbuild:0.5.0
+      - image: killbill/killbill:0.19.16
       - image: killbill/mariadb:0.19
         environment:
         - MYSQL_ROOT_PASSWORD=root
@@ -172,7 +172,7 @@ jobs:
   build-ruby-2.4.2:
     <<: *defaults
     docker:
-      - image: killbill/kbbuild:0.4.0
+      - image: killbill/kbbuild:0.5.0
     steps:
       - checkout
       - restore_cache:
@@ -193,8 +193,8 @@ jobs:
   test-mysql-ruby-2.4.2:
     <<: *defaults
     docker:
-      - image: killbill/kbbuild:0.4.0
-      - image: killbill/killbill:0.19.6
+      - image: killbill/kbbuild:0.5.0
+      - image: killbill/killbill:0.19.16
       - image: killbill/mariadb:0.19
         environment:
         - MYSQL_ROOT_PASSWORD=root
@@ -256,7 +256,7 @@ jobs:
   build-jruby-9.1.14.0:
     <<: *defaults
     docker:
-      - image: killbill/kbbuild:0.4.0
+      - image: killbill/kbbuild:0.5.0
     steps:
       - checkout
       - restore_cache:
@@ -277,8 +277,8 @@ jobs:
   test-mysql-jruby-9.1.14.0:
     <<: *defaults
     docker:
-      - image: killbill/kbbuild:0.4.0
-      - image: killbill/killbill:0.19.6
+      - image: killbill/kbbuild:0.5.0
+      - image: killbill/killbill:0.19.16
       - image: killbill/mariadb:0.19
         environment:
         - MYSQL_ROOT_PASSWORD=root

data/lib/killbill_client/models/account.rb

@@ -63,7 +63,7 @@ module KillBillClient
                 :accountWithBalance       => with_balance,
                 :accountWithBalanceAndCBA => with_balance_and_cba
               },
-           options
+              options
         end
       end
 
@@ -84,45 +84,47 @@ module KillBillClient
         params = {}
         params[:treatNullAsReset] = treat_null_as_reset
 
-        updated_account = self.class.put "#{KILLBILL_API_ACCOUNTS_PREFIX}/#{account_id}",
-                                         to_json,
-                                         params,
-                                         {
-                                             :user    => user,
-                                             :reason  => reason,
-                                             :comment => comment,
-                                         }.merge(options)
-        updated_account.refresh(options)
+        self.class.put "#{KILLBILL_API_ACCOUNTS_PREFIX}/#{account_id}",
+                       to_json,
+                       params,
+                       {
+                           :user    => user,
+                           :reason  => reason,
+                           :comment => comment,
+                       }.merge(options)
+
+        self.class.find_by_id(account_id, nil, nil, options)
+
       end
 
 
       def close(cancel_subscriptions, writeoff_unpaid_invoices,  item_adjust_unpaid_invoices, user = nil, reason = nil, comment = nil, options = {})
         created_account = self.class.delete "#{KILLBILL_API_ACCOUNTS_PREFIX}/#{account_id}",
-                                          {},
-                                          {
-                                              :cancelAllSubscriptions => cancel_subscriptions,
-                                              :writeOffUnpaidInvoices => writeoff_unpaid_invoices,
-                                              :itemAdjustUnpaidInvoices => item_adjust_unpaid_invoices
-                                          },
-                                          {
-                                              :user    => user,
-                                              :reason  => reason,
-                                              :comment => comment,
-                                          }.merge(options)
+                                            {},
+                                            {
+                                                :cancelAllSubscriptions => cancel_subscriptions,
+                                                :writeOffUnpaidInvoices => writeoff_unpaid_invoices,
+                                                :itemAdjustUnpaidInvoices => item_adjust_unpaid_invoices
+                                            },
+                                            {
+                                                :user    => user,
+                                                :reason  => reason,
+                                                :comment => comment,
+                                            }.merge(options)
         created_account.refresh(options)
       end
 
 
 
       def transfer_child_credit(user = nil, reason = nil, comment = nil, options = {})
-        self.class.post "#{KILLBILL_API_ACCOUNTS_PREFIX}/#{account_id}/transferCredit",
-                                         {},
-                                         {},
-                                         {
-                                             :user    => user,
-                                             :reason  => reason,
-                                             :comment => comment,
-                                         }.merge(options)
+        self.class.put "#{KILLBILL_API_ACCOUNTS_PREFIX}/#{account_id}/transferCredit",
+                        {},
+                        {},
+                        {
+                            :user    => user,
+                            :reason  => reason,
+                            :comment => comment,
+                        }.merge(options)
       end
 
 
@@ -336,7 +338,7 @@ module KillBillClient
 
       end
 
-      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 = {})
 
         params = {}
         params[:requestedDate] = requested_date if requested_date
@@ -344,23 +346,23 @@ module KillBillClient
         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
 
-        self.class.put "#{KILLBILL_API_ACCOUNTS_PREFIX}/#{account_id}/block",
-                       body.to_json,
-                       params,
-                       {
-                           :user => user,
-                           :reason => reason,
-                           :comment => comment,
-                       }.merge(options)
+        self.class.post "#{KILLBILL_API_ACCOUNTS_PREFIX}/#{account_id}/block",
+                        body.to_json,
+                        params,
+                        {
+                            :user => user,
+                            :reason => reason,
+                            :comment => comment,
+                        }.merge(options)
         blocking_states(nil, nil, 'NONE', options)
       end
 
       def cba_rebalancing(user = nil, reason = nil, comment = nil, options = {})
-        self.class.post "#{KILLBILL_API_ACCOUNTS_PREFIX}/#{account_id}/cbaRebalancing",
+        self.class.put "#{KILLBILL_API_ACCOUNTS_PREFIX}/#{account_id}/cbaRebalancing",
                         {},
                         {},
                         {

data/lib/killbill_client/models/bulk_subscription.rb

@@ -4,7 +4,7 @@ module KillBillClient
 
       include KillBillClient::Model::CustomFieldHelper
 
-      KILLBILL_API_BULK_ENTITLEMENT_PREFIX = "#{KILLBILL_API_PREFIX}/subscriptions/createEntitlementsWithAddOns"
+      KILLBILL_API_BULK_ENTITLEMENT_PREFIX = "#{KILLBILL_API_PREFIX}/subscriptions/createSubscriptionsWithAddOns"
 
       has_many :base_entitlement_and_add_ons, KillBillClient::Model::SubscriptionAttributes
 

data/lib/killbill_client/models/bundle.rb

@@ -65,7 +65,7 @@ module KillBillClient
         params[:requestedDate] = requested_date unless requested_date.nil?
         params[:billingPolicy] = billing_policy unless billing_policy.nil?
 
-        result                 = self.class.put "#{KILLBILL_API_BUNDLES_PREFIX}/#{bundle_id}",
+        result                 = self.class.post "#{KILLBILL_API_BUNDLES_PREFIX}/#{bundle_id}",
                                                 to_json,
                                                 params,
                                                 {
@@ -110,7 +110,7 @@ module KillBillClient
 
 
       # Low level api to block/unblock a given subscription/bundle/account
-      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 = {})
 
         params                 = {}
         params[:requestedDate] = requested_date unless requested_date.nil?
@@ -118,11 +118,11 @@ module KillBillClient
         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
 
-        self.class.put "#{KILLBILL_API_BUNDLES_PREFIX}/#{@bundle_id}/block",
+        self.class.post "#{KILLBILL_API_BUNDLES_PREFIX}/#{@bundle_id}/block",
                        body.to_json,
                        params,
                        {
@@ -132,6 +132,18 @@ module KillBillClient
                        }.merge(options)
       end
 
+      def rename_external_key(user = nil, reason = nil, comment = nil, options = {})
+
+        self.class.put "#{KILLBILL_API_BUNDLES_PREFIX}/#{@bundle_id}/renameKey",
+                       to_json,
+                       {},
+                       {
+                           :user    => user,
+                           :reason  => reason,
+                           :comment => comment,
+                       }.merge(options)
+      end
+
     end
   end
 end

data/lib/killbill_client/models/catalog.rb

@@ -38,39 +38,108 @@ module KillBillClient
               options
         end
 
-        def get_tenant_catalog(format, requested_date=nil, options = {})
+        def get_tenant_catalog_xml(requested_date = nil, options = {})
 
           require_multi_tenant_options!(options, "Retrieving a catalog is only supported in multi-tenant mode")
 
           params = {}
           params[:requestedDate] = requested_date if requested_date
 
-          get KILLBILL_API_CATALOG_PREFIX,
+          get "#{KILLBILL_API_CATALOG_PREFIX}/xml",
               params,
               {
-                  :head => {'Accept' => "application/#{format}"},
-                  :content_type => "application/#{format}",
+                  :head => {'Accept' => "text/xml"},
+                  :content_type => "text/xml",
 
           }.merge(options)
 
         end
 
+        def get_tenant_catalog_json(requested_date = nil, options = {})
+
+          require_multi_tenant_options!(options, "Retrieving a catalog is only supported in multi-tenant mode")
+
+          params = {}
+          params[:requestedDate] = requested_date if requested_date
+
+          get KILLBILL_API_CATALOG_PREFIX,
+              params,
+              {
+                  :head => {'Accept' => "application/json"},
+                  :content_type => "application/json",
+
+              }.merge(options)
+
+        end
+
+        def get_catalog_phase(subscription_id, requested_date, options = {})
+
+          require_multi_tenant_options!(options, "Retrieving catalog phase is only supported in multi-tenant mode")
+
+          params = {}
+          params[:subscriptionId] = subscription_id if subscription_id
+          params[:requestedDate] = requested_date if requested_date
+
+          get "#{KILLBILL_API_CATALOG_PREFIX}/phase",
+              params,
+              options
+        end
+
+        def get_catalog_plan(subscription_id, requested_date, options = {})
+
+          require_multi_tenant_options!(options, "Retrieving catalog plan is only supported in multi-tenant mode")
+
+          params = {}
+          params[:subscriptionId] = subscription_id if subscription_id
+          params[:requestedDate] = requested_date if requested_date
+
+          get "#{KILLBILL_API_CATALOG_PREFIX}/plan",
+              params,
+              options
+        end
+
+        def get_catalog_price_list(subscription_id, requested_date, options = {})
+
+          require_multi_tenant_options!(options, "Retrieving catalog price list is only supported in multi-tenant mode")
+
+          params = {}
+          params[:subscriptionId] = subscription_id if subscription_id
+          params[:requestedDate] = requested_date if requested_date
+
+          get "#{KILLBILL_API_CATALOG_PREFIX}/priceList",
+              params,
+              options
+        end
+
+        def get_catalog_product(subscription_id, requested_date, options = {})
+
+          require_multi_tenant_options!(options, "Retrieving catalog product list is only supported in multi-tenant mode")
+
+          params = {}
+          params[:subscriptionId] = subscription_id if subscription_id
+          params[:requestedDate] = requested_date if requested_date
+
+          get "#{KILLBILL_API_CATALOG_PREFIX}/product",
+              params,
+              options
+        end
+
         def upload_tenant_catalog(catalog_xml, user = nil, reason = nil, comment = nil, options = {})
 
           require_multi_tenant_options!(options, "Uploading a catalog is only supported in multi-tenant mode")
 
-          post KILLBILL_API_CATALOG_PREFIX,
+          post "#{KILLBILL_API_CATALOG_PREFIX}/xml",
                catalog_xml,
                {
                },
                {
-                   :head => {'Accept' => 'application/xml'},
-                   :content_type => 'application/xml',
+                   :head => {'Accept' => 'application/json'},
+                   :content_type => 'text/xml',
                    :user => user,
                    :reason => reason,
                    :comment => comment,
                }.merge(options)
-          get_tenant_catalog('xml', nil, options)
+          get_tenant_catalog_json(nil, options)
         end
 
 

data/lib/killbill_client/models/export.rb

@@ -11,7 +11,7 @@ module KillBillClient
           get "#{KILLBILL_API_EXPORT_PREFIX}/#{account_id}",
           {},
           {
-            :accept => 'text/plain',
+            :accept => 'application/octet-stream',
             :user    => user,
             :reason  => reason,
             :comment => comment      

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

@@ -31,9 +31,9 @@ module KillBillClient
       attribute :blocked_id
       attribute :state_name
       attribute :service
-      attribute :block_change
-      attribute :block_entitlement
-      attribute :block_billing
+      attribute :is_block_change
+      attribute :is_block_entitlement
+      attribute :is_block_billing
       attribute :effective_date
       attribute :type
       attribute :audit_logs

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

@@ -28,6 +28,7 @@
 module KillBillClient
   module Model
     class CreditAttributes < Resource
+      attribute :credit_id
       attribute :credit_amount
       attribute :currency
       attribute :invoice_id

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

@@ -35,9 +35,11 @@ module KillBillClient
       attribute :child_account_id
       attribute :bundle_id
       attribute :subscription_id
+      attribute :product_name
       attribute :plan_name
       attribute :phase_name
       attribute :usage_name
+      attribute :pretty_product_name
       attribute :pretty_plan_name
       attribute :pretty_phase_name
       attribute :pretty_usage_name

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

@@ -28,7 +28,7 @@
 module KillBillClient
   module Model
     class NodeCommandAttributes < Resource
-      attribute :system_command_type
+      attribute :is_system_command_type
       attribute :node_command_type
       attribute :node_command_properties
     end