fix(subscription): raise error in BillSubscription

getlago · Sep 12, 2024 · 6deec93 · 6deec93
1 parent 8908742
commit 6deec93
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 9 deletions.
diff --git a/app/jobs/bill_subscription_job.rb b/app/jobs/bill_subscription_job.rb
@@ -41,6 +41,6 @@ def perform(subscriptions, timestamp, invoicing_reason:, invoice: nil, skip_char
   def tax_error?(result)
     return false unless result.error.is_a?(BaseService::ValidationFailure)
 
-    result.error&.messages&.dig(:tax_error)
+    result.error&.messages&.dig(:tax_error)&.present?
   end
 end
diff --git a/app/jobs/fees/create_pay_in_advance_job.rb b/app/jobs/fees/create_pay_in_advance_job.rb
@@ -19,7 +19,7 @@ def perform(charge:, event:, billing_at: nil)
     def tax_error?(result)
       return false unless result.error.is_a?(BaseService::ValidationFailure)
 
-      result.error&.messages&.dig(:tax_error)
+      result.error&.messages&.dig(:tax_error).present?
     end
   end
 end
diff --git a/app/jobs/invoices/create_pay_in_advance_charge_job.rb b/app/jobs/invoices/create_pay_in_advance_charge_job.rb
@@ -31,7 +31,7 @@ def perform(charge:, event:, timestamp:, invoice: nil)
     def tax_error?(result)
       return false unless result.error.is_a?(BaseService::ValidationFailure)
 
-      result.error&.messages&.dig(:tax_error)
+      result.error&.messages&.dig(:tax_error).present?
     end
   end
 end
diff --git a/app/jobs/invoices/finalize_all_job.rb b/app/jobs/invoices/finalize_all_job.rb
@@ -14,7 +14,7 @@ def perform(organization:, invoice_ids:)
     def tax_error?(result)
       return false unless result.error.is_a?(BaseService::ValidationFailure)
 
-      result.error&.messages&.dig(:tax_error)
+      result.error&.messages&.dig(:tax_error).present?
     end
   end
 end
diff --git a/app/services/invoices/create_pay_in_advance_charge_service.rb b/app/services/invoices/create_pay_in_advance_charge_service.rb
@@ -140,8 +140,10 @@ def refresh_amounts(credit_amount_cents:)
       invoice.total_amount_cents -= credit_amount_cents
     end
 
-    def tax_error?(fee_result)
-      !fee_result.success? && fee_result.error.messages.dig(:tax_error)
+    def tax_error?(result)
+      return false unless result.error.is_a?(BaseService::ValidationFailure)
+
+      result.error&.messages&.dig(:tax_error).present?
     end
 
     def create_error_detail(code)

diff --git a/app/services/invoices/refresh_draft_and_finalize_service.rb b/app/services/invoices/refresh_draft_and_finalize_service.rb
@@ -77,7 +77,9 @@ def should_deliver_email?
     end
 
     def tax_error?(error)
-      error&.messages&.dig(:tax_error)
+      return false unless error.is_a?(BaseService::ValidationFailure)
+
+      error&.messages&.dig(:tax_error).present?
     end
   end
 end
diff --git a/app/services/invoices/refresh_draft_service.rb b/app/services/invoices/refresh_draft_service.rb
@@ -101,6 +101,8 @@ def flag_lifetime_usage_for_refresh
     end
 
     def tax_error?(error)
+      return false unless error.is_a?(BaseService::ValidationFailure)
+
       error&.code == 'tax_error'
     end
 

diff --git a/app/services/lifetime_usages/recalculate_and_check_service.rb b/app/services/lifetime_usages/recalculate_and_check_service.rb
@@ -34,8 +34,10 @@ def progressive_billed_amount
       result.progressive_billed_amount
     end
 
-    def tax_error?(fee_result)
-      !fee_result.success? && fee_result&.error&.code == 'tax_error'
+    def tax_error?(result)
+      return false unless result.error.is_a?(BaseService::ValidationFailure)
+
+      result.error&.messages&.dig(:tax_error).present?
     end
   end
 end