schematichq 1.4.17 → 1.5.0

data/lib/schematic/integrationsapi/client.rb

@@ -38,7 +38,7 @@ module Schematic
         end
         code = response.code.to_i
         if code.between?(200, 299)
-          Schematic::Integrationsapi::Types::RunIntegrationResponse.load(response.body)
+          (response.body.to_s.empty? ? nil : Schematic::Integrationsapi::Types::RunIntegrationResponse.load(response.body))
         else
           error_class = Schematic::Errors::ResponseError.subclass_for_code(code)
           raise error_class.new(response.body, code: code)
@@ -97,7 +97,7 @@ module Schematic
         end
         code = response.code.to_i
         if code.between?(200, 299)
-          Schematic::Integrationsapi::Types::ListIntegrationsResponse.load(response.body)
+          (response.body.to_s.empty? ? nil : Schematic::Integrationsapi::Types::ListIntegrationsResponse.load(response.body))
         else
           error_class = Schematic::Errors::ResponseError.subclass_for_code(code)
           raise error_class.new(response.body, code: code)
@@ -132,7 +132,7 @@ module Schematic
         end
         code = response.code.to_i
         if code.between?(200, 299)
-          Schematic::Integrationsapi::Types::GetIntegrationWebhookUrlResponse.load(response.body)
+          (response.body.to_s.empty? ? nil : Schematic::Integrationsapi::Types::GetIntegrationWebhookUrlResponse.load(response.body))
         else
           error_class = Schematic::Errors::ResponseError.subclass_for_code(code)
           raise error_class.new(response.body, code: code)
@@ -167,7 +167,7 @@ module Schematic
         end
         code = response.code.to_i
         if code.between?(200, 299)
-          Schematic::Integrationsapi::Types::InstallIntegrationResponse.load(response.body)
+          (response.body.to_s.empty? ? nil : Schematic::Integrationsapi::Types::InstallIntegrationResponse.load(response.body))
         else
           error_class = Schematic::Errors::ResponseError.subclass_for_code(code)
           raise error_class.new(response.body, code: code)
@@ -202,7 +202,7 @@ module Schematic
         end
         code = response.code.to_i
         if code.between?(200, 299)
-          Schematic::Integrationsapi::Types::StartDataImportResponse.load(response.body)
+          (response.body.to_s.empty? ? nil : Schematic::Integrationsapi::Types::StartDataImportResponse.load(response.body))
         else
           error_class = Schematic::Errors::ResponseError.subclass_for_code(code)
           raise error_class.new(response.body, code: code)
@@ -235,7 +235,7 @@ module Schematic
         end
         code = response.code.to_i
         if code.between?(200, 299)
-          Schematic::Integrationsapi::Types::LoadSampleDataSetResponse.load(response.body)
+          (response.body.to_s.empty? ? nil : Schematic::Integrationsapi::Types::LoadSampleDataSetResponse.load(response.body))
         else
           error_class = Schematic::Errors::ResponseError.subclass_for_code(code)
           raise error_class.new(response.body, code: code)
@@ -268,7 +268,7 @@ module Schematic
         end
         code = response.code.to_i
         if code.between?(200, 299)
-          Schematic::Integrationsapi::Types::GetStripeSandboxClaimLinkResponse.load(response.body)
+          (response.body.to_s.empty? ? nil : Schematic::Integrationsapi::Types::GetStripeSandboxClaimLinkResponse.load(response.body))
         else
           error_class = Schematic::Errors::ResponseError.subclass_for_code(code)
           raise error_class.new(response.body, code: code)
@@ -301,7 +301,7 @@ module Schematic
         end
         code = response.code.to_i
         if code.between?(200, 299)
-          Schematic::Integrationsapi::Types::GetStripeSandboxKeysResponse.load(response.body)
+          (response.body.to_s.empty? ? nil : Schematic::Integrationsapi::Types::GetStripeSandboxKeysResponse.load(response.body))
         else
           error_class = Schematic::Errors::ResponseError.subclass_for_code(code)
           raise error_class.new(response.body, code: code)
@@ -336,7 +336,7 @@ module Schematic
         end
         code = response.code.to_i
         if code.between?(200, 299)
-          Schematic::Integrationsapi::Types::ClaimStripeSandboxKeysResponse.load(response.body)
+          (response.body.to_s.empty? ? nil : Schematic::Integrationsapi::Types::ClaimStripeSandboxKeysResponse.load(response.body))
         else
           error_class = Schematic::Errors::ResponseError.subclass_for_code(code)
           raise error_class.new(response.body, code: code)
@@ -371,7 +371,7 @@ module Schematic
         end
         code = response.code.to_i
         if code.between?(200, 299)
-          Schematic::Integrationsapi::Types::AssumeStripeInstalledResponse.load(response.body)
+          (response.body.to_s.empty? ? nil : Schematic::Integrationsapi::Types::AssumeStripeInstalledResponse.load(response.body))
         else
           error_class = Schematic::Errors::ResponseError.subclass_for_code(code)
           raise error_class.new(response.body, code: code)
@@ -406,7 +406,7 @@ module Schematic
         end
         code = response.code.to_i
         if code.between?(200, 299)
-          Schematic::Integrationsapi::Types::InstallStripeResponse.load(response.body)
+          (response.body.to_s.empty? ? nil : Schematic::Integrationsapi::Types::InstallStripeResponse.load(response.body))
         else
           error_class = Schematic::Errors::ResponseError.subclass_for_code(code)
           raise error_class.new(response.body, code: code)
@@ -441,7 +441,7 @@ module Schematic
         end
         code = response.code.to_i
         if code.between?(200, 299)
-          Schematic::Integrationsapi::Types::InstallStripeClaimableSandboxResponse.load(response.body)
+          (response.body.to_s.empty? ? nil : Schematic::Integrationsapi::Types::InstallStripeClaimableSandboxResponse.load(response.body))
         else
           error_class = Schematic::Errors::ResponseError.subclass_for_code(code)
           raise error_class.new(response.body, code: code)
@@ -474,7 +474,7 @@ module Schematic
         end
         code = response.code.to_i
         if code.between?(200, 299)
-          Schematic::Integrationsapi::Types::ListStripeSandboxCountriesResponse.load(response.body)
+          (response.body.to_s.empty? ? nil : Schematic::Integrationsapi::Types::ListStripeSandboxCountriesResponse.load(response.body))
         else
           error_class = Schematic::Errors::ResponseError.subclass_for_code(code)
           raise error_class.new(response.body, code: code)
@@ -509,7 +509,7 @@ module Schematic
         end
         code = response.code.to_i
         if code.between?(200, 299)
-          Schematic::Integrationsapi::Types::UninstallIntegrationResponse.load(response.body)
+          (response.body.to_s.empty? ? nil : Schematic::Integrationsapi::Types::UninstallIntegrationResponse.load(response.body))
         else
           error_class = Schematic::Errors::ResponseError.subclass_for_code(code)
           raise error_class.new(response.body, code: code)

data/lib/schematic/internal/multipart/multipart_form_data.rb

@@ -30,13 +30,18 @@ module Schematic
         # Adds a file to the multipart form data.
         #
         # @param name [String] The name of the form field
-        # @param file [#read] The file or readable object
-        # @param filename [String, nil] Optional filename (defaults to basename of path for File objects)
+        # @param file [String, #read] A path to a file on disk, or a file/readable object
+        # @param filename [String, nil] Optional filename (defaults to basename of the path for paths and File objects)
         # @param content_type [String, nil] Optional content type (e.g. "image/png")
         # @return [self] Returns self for chaining
         def add_file(name:, file:, filename: nil, content_type: nil)
           headers = content_type ? { "Content-Type" => content_type } : nil
-          filename ||= filename_for(file)
+          if file.is_a?(::String)
+            filename ||= ::File.basename(file)
+            file = ::File.binread(file)
+          else
+            filename ||= filename_for(file)
+          end
           add_part(FormDataPart.new(name:, value: file, filename:, headers:))
         end
 

data/lib/schematic/internal/types/model.rb

@@ -141,13 +141,21 @@ module Schematic
           values = Utils.symbolize_keys(values.dup)
 
           self.class.fields.each do |field_name, field|
-            value = values.delete(field.api_name.to_sym) || values.delete(field.api_name) || values.delete(field_name)
+            value = nil
+            [field.api_name.to_sym, field_name].uniq.each do |key|
+              next unless values.key?(key)
 
-            field_value = value || (if field.literal?
-                                      field.value
-                                    elsif field.default
-                                      field.default
-                                    end)
+              candidate = values.delete(key)
+              value = candidate if value.nil?
+            end
+
+            field_value = if !value.nil?
+                            value
+                          elsif field.literal?
+                            field.value
+                          elsif !field.default.nil?
+                            field.default
+                          end
 
             @data[field_name] = Utils.coerce(field.type, field_value)
           end

data/lib/schematic/licenses/client.rb

@@ -56,7 +56,7 @@ module Schematic
         end
         code = response.code.to_i
         if code.between?(200, 299)
-          Schematic::Licenses::Types::ListLicensesResponse.load(response.body)
+          (response.body.to_s.empty? ? nil : Schematic::Licenses::Types::ListLicensesResponse.load(response.body))
         else
           error_class = Schematic::Errors::ResponseError.subclass_for_code(code)
           raise error_class.new(response.body, code: code)
@@ -91,7 +91,7 @@ module Schematic
         end
         code = response.code.to_i
         if code.between?(200, 299)
-          Schematic::Licenses::Types::GetSingleLicenseResponse.load(response.body)
+          (response.body.to_s.empty? ? nil : Schematic::Licenses::Types::GetSingleLicenseResponse.load(response.body))
         else
           error_class = Schematic::Errors::ResponseError.subclass_for_code(code)
           raise error_class.new(response.body, code: code)
@@ -144,7 +144,7 @@ module Schematic
         end
         code = response.code.to_i
         if code.between?(200, 299)
-          Schematic::Licenses::Types::CountLicensesResponse.load(response.body)
+          (response.body.to_s.empty? ? nil : Schematic::Licenses::Types::CountLicensesResponse.load(response.body))
         else
           error_class = Schematic::Errors::ResponseError.subclass_for_code(code)
           raise error_class.new(response.body, code: code)

data/lib/schematic/planbundle/client.rb

@@ -50,7 +50,7 @@ module Schematic
         end
         code = response.code.to_i
         if code.between?(200, 299)
-          Schematic::Planbundle::Types::CreateCustomPlanBundleResponse.load(response.body)
+          (response.body.to_s.empty? ? nil : Schematic::Planbundle::Types::CreateCustomPlanBundleResponse.load(response.body))
         else
           error_class = Schematic::Errors::ResponseError.subclass_for_code(code)
           raise error_class.new(response.body, code: code)
@@ -93,7 +93,7 @@ module Schematic
         end
         code = response.code.to_i
         if code.between?(200, 299)
-          Schematic::Planbundle::Types::CreatePlanBundleResponse.load(response.body)
+          (response.body.to_s.empty? ? nil : Schematic::Planbundle::Types::CreatePlanBundleResponse.load(response.body))
         else
           error_class = Schematic::Errors::ResponseError.subclass_for_code(code)
           raise error_class.new(response.body, code: code)
@@ -141,7 +141,7 @@ module Schematic
         end
         code = response.code.to_i
         if code.between?(200, 299)
-          Schematic::Planbundle::Types::UpdatePlanBundleResponse.load(response.body)
+          (response.body.to_s.empty? ? nil : Schematic::Planbundle::Types::UpdatePlanBundleResponse.load(response.body))
         else
           error_class = Schematic::Errors::ResponseError.subclass_for_code(code)
           raise error_class.new(response.body, code: code)

data/lib/schematic/plangroups/client.rb

@@ -42,7 +42,7 @@ module Schematic
         end
         code = response.code.to_i
         if code.between?(200, 299)
-          Schematic::Plangroups::Types::GetPlanGroupResponse.load(response.body)
+          (response.body.to_s.empty? ? nil : Schematic::Plangroups::Types::GetPlanGroupResponse.load(response.body))
         else
           error_class = Schematic::Errors::ResponseError.subclass_for_code(code)
           raise error_class.new(response.body, code: code)
@@ -104,7 +104,7 @@ module Schematic
         end
         code = response.code.to_i
         if code.between?(200, 299)
-          Schematic::Plangroups::Types::CreatePlanGroupResponse.load(response.body)
+          (response.body.to_s.empty? ? nil : Schematic::Plangroups::Types::CreatePlanGroupResponse.load(response.body))
         else
           error_class = Schematic::Errors::ResponseError.subclass_for_code(code)
           raise error_class.new(response.body, code: code)
@@ -172,7 +172,7 @@ module Schematic
         end
         code = response.code.to_i
         if code.between?(200, 299)
-          Schematic::Plangroups::Types::UpdatePlanGroupResponse.load(response.body)
+          (response.body.to_s.empty? ? nil : Schematic::Plangroups::Types::UpdatePlanGroupResponse.load(response.body))
         else
           error_class = Schematic::Errors::ResponseError.subclass_for_code(code)
           raise error_class.new(response.body, code: code)

data/lib/schematic/plangroups/types/create_plan_group_request_body.rb

@@ -74,6 +74,8 @@ module Schematic
 
         field :trial_days, -> { Integer }, optional: true, nullable: false
 
+        field :trial_eligibility_per_plan, -> { Internal::Types::Boolean }, optional: true, nullable: false
+
         field :trial_expiry_plan_id, -> { String }, optional: true, nullable: false
 
         field :trial_expiry_plan_price_id, -> { String }, optional: true, nullable: false

data/lib/schematic/plangroups/types/update_plan_group_request_body.rb

@@ -76,6 +76,8 @@ module Schematic
 
         field :trial_days, -> { Integer }, optional: true, nullable: false
 
+        field :trial_eligibility_per_plan, -> { Internal::Types::Boolean }, optional: true, nullable: false
+
         field :trial_expiry_plan_id, -> { String }, optional: true, nullable: false
 
         field :trial_expiry_plan_price_id, -> { String }, optional: true, nullable: false

data/lib/schematic/planmigrations/client.rb

@@ -56,7 +56,7 @@ module Schematic
         end
         code = response.code.to_i
         if code.between?(200, 299)
-          Schematic::Planmigrations::Types::ListCompanyMigrationsResponse.load(response.body)
+          (response.body.to_s.empty? ? nil : Schematic::Planmigrations::Types::ListCompanyMigrationsResponse.load(response.body))
         else
           error_class = Schematic::Errors::ResponseError.subclass_for_code(code)
           raise error_class.new(response.body, code: code)
@@ -91,7 +91,7 @@ module Schematic
         end
         code = response.code.to_i
         if code.between?(200, 299)
-          Schematic::Planmigrations::Types::RetryCompanyMigrationResponse.load(response.body)
+          (response.body.to_s.empty? ? nil : Schematic::Planmigrations::Types::RetryCompanyMigrationResponse.load(response.body))
         else
           error_class = Schematic::Errors::ResponseError.subclass_for_code(code)
           raise error_class.new(response.body, code: code)
@@ -144,7 +144,7 @@ module Schematic
         end
         code = response.code.to_i
         if code.between?(200, 299)
-          Schematic::Planmigrations::Types::CountCompanyMigrationsResponse.load(response.body)
+          (response.body.to_s.empty? ? nil : Schematic::Planmigrations::Types::CountCompanyMigrationsResponse.load(response.body))
         else
           error_class = Schematic::Errors::ResponseError.subclass_for_code(code)
           raise error_class.new(response.body, code: code)
@@ -194,7 +194,7 @@ module Schematic
         end
         code = response.code.to_i
         if code.between?(200, 299)
-          Schematic::Planmigrations::Types::ListMigrationsResponse.load(response.body)
+          (response.body.to_s.empty? ? nil : Schematic::Planmigrations::Types::ListMigrationsResponse.load(response.body))
         else
           error_class = Schematic::Errors::ResponseError.subclass_for_code(code)
           raise error_class.new(response.body, code: code)
@@ -234,7 +234,7 @@ module Schematic
         end
         code = response.code.to_i
         if code.between?(200, 299)
-          Schematic::Planmigrations::Types::CreateMigrationResponse.load(response.body)
+          (response.body.to_s.empty? ? nil : Schematic::Planmigrations::Types::CreateMigrationResponse.load(response.body))
         else
           error_class = Schematic::Errors::ResponseError.subclass_for_code(code)
           raise error_class.new(response.body, code: code)
@@ -269,7 +269,7 @@ module Schematic
         end
         code = response.code.to_i
         if code.between?(200, 299)
-          Schematic::Planmigrations::Types::GetMigrationResponse.load(response.body)
+          (response.body.to_s.empty? ? nil : Schematic::Planmigrations::Types::GetMigrationResponse.load(response.body))
         else
           error_class = Schematic::Errors::ResponseError.subclass_for_code(code)
           raise error_class.new(response.body, code: code)
@@ -304,7 +304,7 @@ module Schematic
         end
         code = response.code.to_i
         if code.between?(200, 299)
-          Schematic::Planmigrations::Types::CancelMigrationResponse.load(response.body)
+          (response.body.to_s.empty? ? nil : Schematic::Planmigrations::Types::CancelMigrationResponse.load(response.body))
         else
           error_class = Schematic::Errors::ResponseError.subclass_for_code(code)
           raise error_class.new(response.body, code: code)
@@ -344,7 +344,7 @@ module Schematic
         end
         code = response.code.to_i
         if code.between?(200, 299)
-          Schematic::Planmigrations::Types::CompleteMigrationNowResponse.load(response.body)
+          (response.body.to_s.empty? ? nil : Schematic::Planmigrations::Types::CompleteMigrationNowResponse.load(response.body))
         else
           error_class = Schematic::Errors::ResponseError.subclass_for_code(code)
           raise error_class.new(response.body, code: code)
@@ -387,7 +387,7 @@ module Schematic
         end
         code = response.code.to_i
         if code.between?(200, 299)
-          Schematic::Planmigrations::Types::RetryMigrationResponse.load(response.body)
+          (response.body.to_s.empty? ? nil : Schematic::Planmigrations::Types::RetryMigrationResponse.load(response.body))
         else
           error_class = Schematic::Errors::ResponseError.subclass_for_code(code)
           raise error_class.new(response.body, code: code)
@@ -437,7 +437,7 @@ module Schematic
         end
         code = response.code.to_i
         if code.between?(200, 299)
-          Schematic::Planmigrations::Types::CountMigrationsResponse.load(response.body)
+          (response.body.to_s.empty? ? nil : Schematic::Planmigrations::Types::CountMigrationsResponse.load(response.body))
         else
           error_class = Schematic::Errors::ResponseError.subclass_for_code(code)
           raise error_class.new(response.body, code: code)
@@ -476,7 +476,7 @@ module Schematic
         end
         code = response.code.to_i
         if code.between?(200, 299)
-          Schematic::Planmigrations::Types::PreviewMigrationResponse.load(response.body)
+          (response.body.to_s.empty? ? nil : Schematic::Planmigrations::Types::PreviewMigrationResponse.load(response.body))
         else
           error_class = Schematic::Errors::ResponseError.subclass_for_code(code)
           raise error_class.new(response.body, code: code)

data/lib/schematic/plans/client.rb

@@ -46,7 +46,7 @@ module Schematic
         end
         code = response.code.to_i
         if code.between?(200, 299)
-          Schematic::Plans::Types::UpdateCompanyPlansResponse.load(response.body)
+          (response.body.to_s.empty? ? nil : Schematic::Plans::Types::UpdateCompanyPlansResponse.load(response.body))
         else
           error_class = Schematic::Errors::ResponseError.subclass_for_code(code)
           raise error_class.new(response.body, code: code)
@@ -105,7 +105,7 @@ module Schematic
         end
         code = response.code.to_i
         if code.between?(200, 299)
-          Schematic::Plans::Types::ListCustomPlanBillingsResponse.load(response.body)
+          (response.body.to_s.empty? ? nil : Schematic::Plans::Types::ListCustomPlanBillingsResponse.load(response.body))
         else
           error_class = Schematic::Errors::ResponseError.subclass_for_code(code)
           raise error_class.new(response.body, code: code)
@@ -149,7 +149,7 @@ module Schematic
         end
         code = response.code.to_i
         if code.between?(200, 299)
-          Schematic::Plans::Types::MarkCustomPlanBillingPaidResponse.load(response.body)
+          (response.body.to_s.empty? ? nil : Schematic::Plans::Types::MarkCustomPlanBillingPaidResponse.load(response.body))
         else
           error_class = Schematic::Errors::ResponseError.subclass_for_code(code)
           raise error_class.new(response.body, code: code)
@@ -192,7 +192,7 @@ module Schematic
         end
         code = response.code.to_i
         if code.between?(200, 299)
-          Schematic::Plans::Types::RetryCustomPlanBillingResponse.load(response.body)
+          (response.body.to_s.empty? ? nil : Schematic::Plans::Types::RetryCustomPlanBillingResponse.load(response.body))
         else
           error_class = Schematic::Errors::ResponseError.subclass_for_code(code)
           raise error_class.new(response.body, code: code)
@@ -230,7 +230,7 @@ module Schematic
         end
         code = response.code.to_i
         if code.between?(200, 299)
-          Schematic::Plans::Types::CreateCustomPlanResponse.load(response.body)
+          (response.body.to_s.empty? ? nil : Schematic::Plans::Types::CreateCustomPlanResponse.load(response.body))
         else
           error_class = Schematic::Errors::ResponseError.subclass_for_code(code)
           raise error_class.new(response.body, code: code)
@@ -247,6 +247,7 @@ module Schematic
       # @option params [String, nil] :company_id
       # @option params [Boolean, nil] :company_scoped_only
       # @option params [Boolean, nil] :exclude_company_scoped
+      # @option params [Boolean, nil] :exclude_unused
       # @option params [Boolean, nil] :for_fallback_plan
       # @option params [Boolean, nil] :for_initial_plan
       # @option params [Boolean, nil] :for_trial_expiry_plan
@@ -267,6 +268,7 @@ module Schematic
       #     company_id: "company_id",
       #     company_scoped_only: true,
       #     exclude_company_scoped: true,
+      #     exclude_unused: true,
       #     for_fallback_plan: true,
       #     for_initial_plan: true,
       #     for_trial_expiry_plan: true,
@@ -290,6 +292,7 @@ module Schematic
         query_params["company_id"] = params[:company_id] if params.key?(:company_id)
         query_params["company_scoped_only"] = params[:company_scoped_only] if params.key?(:company_scoped_only)
         query_params["exclude_company_scoped"] = params[:exclude_company_scoped] if params.key?(:exclude_company_scoped)
+        query_params["exclude_unused"] = params[:exclude_unused] if params.key?(:exclude_unused)
         query_params["for_fallback_plan"] = params[:for_fallback_plan] if params.key?(:for_fallback_plan)
         query_params["for_initial_plan"] = params[:for_initial_plan] if params.key?(:for_initial_plan)
         query_params["for_trial_expiry_plan"] = params[:for_trial_expiry_plan] if params.key?(:for_trial_expiry_plan)
@@ -319,7 +322,7 @@ module Schematic
         end
         code = response.code.to_i
         if code.between?(200, 299)
-          Schematic::Plans::Types::ListPlansResponse.load(response.body)
+          (response.body.to_s.empty? ? nil : Schematic::Plans::Types::ListPlansResponse.load(response.body))
         else
           error_class = Schematic::Errors::ResponseError.subclass_for_code(code)
           raise error_class.new(response.body, code: code)
@@ -357,7 +360,7 @@ module Schematic
         end
         code = response.code.to_i
         if code.between?(200, 299)
-          Schematic::Plans::Types::CreatePlanResponse.load(response.body)
+          (response.body.to_s.empty? ? nil : Schematic::Plans::Types::CreatePlanResponse.load(response.body))
         else
           error_class = Schematic::Errors::ResponseError.subclass_for_code(code)
           raise error_class.new(response.body, code: code)
@@ -400,7 +403,7 @@ module Schematic
         end
         code = response.code.to_i
         if code.between?(200, 299)
-          Schematic::Plans::Types::GetPlanResponse.load(response.body)
+          (response.body.to_s.empty? ? nil : Schematic::Plans::Types::GetPlanResponse.load(response.body))
         else
           error_class = Schematic::Errors::ResponseError.subclass_for_code(code)
           raise error_class.new(response.body, code: code)
@@ -442,7 +445,7 @@ module Schematic
         end
         code = response.code.to_i
         if code.between?(200, 299)
-          Schematic::Plans::Types::UpdatePlanResponse.load(response.body)
+          (response.body.to_s.empty? ? nil : Schematic::Plans::Types::UpdatePlanResponse.load(response.body))
         else
           error_class = Schematic::Errors::ResponseError.subclass_for_code(code)
           raise error_class.new(response.body, code: code)
@@ -477,7 +480,7 @@ module Schematic
         end
         code = response.code.to_i
         if code.between?(200, 299)
-          Schematic::Plans::Types::DeletePlanResponse.load(response.body)
+          (response.body.to_s.empty? ? nil : Schematic::Plans::Types::DeletePlanResponse.load(response.body))
         else
           error_class = Schematic::Errors::ResponseError.subclass_for_code(code)
           raise error_class.new(response.body, code: code)
@@ -520,7 +523,7 @@ module Schematic
         end
         code = response.code.to_i
         if code.between?(200, 299)
-          Schematic::Plans::Types::UpsertBillingProductPlanResponse.load(response.body)
+          (response.body.to_s.empty? ? nil : Schematic::Plans::Types::UpsertBillingProductPlanResponse.load(response.body))
         else
           error_class = Schematic::Errors::ResponseError.subclass_for_code(code)
           raise error_class.new(response.body, code: code)
@@ -560,7 +563,7 @@ module Schematic
         end
         code = response.code.to_i
         if code.between?(200, 299)
-          Schematic::Plans::Types::UpsertPlanForBillingProductResponse.load(response.body)
+          (response.body.to_s.empty? ? nil : Schematic::Plans::Types::UpsertPlanForBillingProductResponse.load(response.body))
         else
           error_class = Schematic::Errors::ResponseError.subclass_for_code(code)
           raise error_class.new(response.body, code: code)
@@ -610,7 +613,7 @@ module Schematic
         end
         code = response.code.to_i
         if code.between?(200, 299)
-          Schematic::Plans::Types::ListBillingProductMatchCompaniesResponse.load(response.body)
+          (response.body.to_s.empty? ? nil : Schematic::Plans::Types::ListBillingProductMatchCompaniesResponse.load(response.body))
         else
           error_class = Schematic::Errors::ResponseError.subclass_for_code(code)
           raise error_class.new(response.body, code: code)
@@ -660,7 +663,7 @@ module Schematic
         end
         code = response.code.to_i
         if code.between?(200, 299)
-          Schematic::Plans::Types::CountBillingProductMatchCompaniesResponse.load(response.body)
+          (response.body.to_s.empty? ? nil : Schematic::Plans::Types::CountBillingProductMatchCompaniesResponse.load(response.body))
         else
           error_class = Schematic::Errors::ResponseError.subclass_for_code(code)
           raise error_class.new(response.body, code: code)
@@ -677,6 +680,7 @@ module Schematic
       # @option params [String, nil] :company_id
       # @option params [Boolean, nil] :company_scoped_only
       # @option params [Boolean, nil] :exclude_company_scoped
+      # @option params [Boolean, nil] :exclude_unused
       # @option params [Boolean, nil] :for_fallback_plan
       # @option params [Boolean, nil] :for_initial_plan
       # @option params [Boolean, nil] :for_trial_expiry_plan
@@ -697,6 +701,7 @@ module Schematic
       #     company_id: "company_id",
       #     company_scoped_only: true,
       #     exclude_company_scoped: true,
+      #     exclude_unused: true,
       #     for_fallback_plan: true,
       #     for_initial_plan: true,
       #     for_trial_expiry_plan: true,
@@ -720,6 +725,7 @@ module Schematic
         query_params["company_id"] = params[:company_id] if params.key?(:company_id)
         query_params["company_scoped_only"] = params[:company_scoped_only] if params.key?(:company_scoped_only)
         query_params["exclude_company_scoped"] = params[:exclude_company_scoped] if params.key?(:exclude_company_scoped)
+        query_params["exclude_unused"] = params[:exclude_unused] if params.key?(:exclude_unused)
         query_params["for_fallback_plan"] = params[:for_fallback_plan] if params.key?(:for_fallback_plan)
         query_params["for_initial_plan"] = params[:for_initial_plan] if params.key?(:for_initial_plan)
         query_params["for_trial_expiry_plan"] = params[:for_trial_expiry_plan] if params.key?(:for_trial_expiry_plan)
@@ -749,7 +755,7 @@ module Schematic
         end
         code = response.code.to_i
         if code.between?(200, 299)
-          Schematic::Plans::Types::CountPlansResponse.load(response.body)
+          (response.body.to_s.empty? ? nil : Schematic::Plans::Types::CountPlansResponse.load(response.body))
         else
           error_class = Schematic::Errors::ResponseError.subclass_for_code(code)
           raise error_class.new(response.body, code: code)
@@ -793,7 +799,7 @@ module Schematic
         end
         code = response.code.to_i
         if code.between?(200, 299)
-          Schematic::Plans::Types::ListPlanIssuesResponse.load(response.body)
+          (response.body.to_s.empty? ? nil : Schematic::Plans::Types::ListPlanIssuesResponse.load(response.body))
         else
           error_class = Schematic::Errors::ResponseError.subclass_for_code(code)
           raise error_class.new(response.body, code: code)
@@ -836,7 +842,7 @@ module Schematic
         end
         code = response.code.to_i
         if code.between?(200, 299)
-          Schematic::Plans::Types::DeletePlanVersionResponse.load(response.body)
+          (response.body.to_s.empty? ? nil : Schematic::Plans::Types::DeletePlanVersionResponse.load(response.body))
         else
           error_class = Schematic::Errors::ResponseError.subclass_for_code(code)
           raise error_class.new(response.body, code: code)
@@ -880,7 +886,7 @@ module Schematic
         end
         code = response.code.to_i
         if code.between?(200, 299)
-          Schematic::Plans::Types::PublishPlanVersionResponse.load(response.body)
+          (response.body.to_s.empty? ? nil : Schematic::Plans::Types::PublishPlanVersionResponse.load(response.body))
         else
           error_class = Schematic::Errors::ResponseError.subclass_for_code(code)
           raise error_class.new(response.body, code: code)

data/lib/schematic/plans/types/count_plans_params.rb

@@ -11,6 +11,8 @@ module Schematic
 
         field :exclude_company_scoped, -> { Internal::Types::Boolean }, optional: true, nullable: false
 
+        field :exclude_unused, -> { Internal::Types::Boolean }, optional: true, nullable: false
+
         field :for_fallback_plan, -> { Internal::Types::Boolean }, optional: true, nullable: false
 
         field :for_initial_plan, -> { Internal::Types::Boolean }, optional: true, nullable: false

data/lib/schematic/plans/types/count_plans_request.rb

@@ -10,6 +10,8 @@ module Schematic
 
         field :exclude_company_scoped, -> { Internal::Types::Boolean }, optional: true, nullable: false
 
+        field :exclude_unused, -> { Internal::Types::Boolean }, optional: true, nullable: false
+
         field :for_fallback_plan, -> { Internal::Types::Boolean }, optional: true, nullable: false
 
         field :for_initial_plan, -> { Internal::Types::Boolean }, optional: true, nullable: false

data/lib/schematic/plans/types/list_plans_params.rb

@@ -11,6 +11,8 @@ module Schematic
 
         field :exclude_company_scoped, -> { Internal::Types::Boolean }, optional: true, nullable: false
 
+        field :exclude_unused, -> { Internal::Types::Boolean }, optional: true, nullable: false
+
         field :for_fallback_plan, -> { Internal::Types::Boolean }, optional: true, nullable: false
 
         field :for_initial_plan, -> { Internal::Types::Boolean }, optional: true, nullable: false

data/lib/schematic/plans/types/list_plans_request.rb

@@ -10,6 +10,8 @@ module Schematic
 
         field :exclude_company_scoped, -> { Internal::Types::Boolean }, optional: true, nullable: false
 
+        field :exclude_unused, -> { Internal::Types::Boolean }, optional: true, nullable: false
+
         field :for_fallback_plan, -> { Internal::Types::Boolean }, optional: true, nullable: false
 
         field :for_initial_plan, -> { Internal::Types::Boolean }, optional: true, nullable: false

data/lib/schematic/scheduledcheckout/client.rb

@@ -53,7 +53,7 @@ module Schematic
         end
         code = response.code.to_i
         if code.between?(200, 299)
-          Schematic::Scheduledcheckout::Types::ListScheduledCheckoutsResponse.load(response.body)
+          (response.body.to_s.empty? ? nil : Schematic::Scheduledcheckout::Types::ListScheduledCheckoutsResponse.load(response.body))
         else
           error_class = Schematic::Errors::ResponseError.subclass_for_code(code)
           raise error_class.new(response.body, code: code)
@@ -93,7 +93,7 @@ module Schematic
         end
         code = response.code.to_i
         if code.between?(200, 299)
-          Schematic::Scheduledcheckout::Types::CreateScheduledCheckoutResponse.load(response.body)
+          (response.body.to_s.empty? ? nil : Schematic::Scheduledcheckout::Types::CreateScheduledCheckoutResponse.load(response.body))
         else
           error_class = Schematic::Errors::ResponseError.subclass_for_code(code)
           raise error_class.new(response.body, code: code)
@@ -128,7 +128,7 @@ module Schematic
         end
         code = response.code.to_i
         if code.between?(200, 299)
-          Schematic::Scheduledcheckout::Types::GetScheduledCheckoutResponse.load(response.body)
+          (response.body.to_s.empty? ? nil : Schematic::Scheduledcheckout::Types::GetScheduledCheckoutResponse.load(response.body))
         else
           error_class = Schematic::Errors::ResponseError.subclass_for_code(code)
           raise error_class.new(response.body, code: code)
@@ -168,7 +168,7 @@ module Schematic
         end
         code = response.code.to_i
         if code.between?(200, 299)
-          Schematic::Scheduledcheckout::Types::UpdateScheduledCheckoutResponse.load(response.body)
+          (response.body.to_s.empty? ? nil : Schematic::Scheduledcheckout::Types::UpdateScheduledCheckoutResponse.load(response.body))
         else
           error_class = Schematic::Errors::ResponseError.subclass_for_code(code)
           raise error_class.new(response.body, code: code)