Fix: closed invoices with generated number

app/models/invoice.rb

@@ -65,6 +65,7 @@ class Invoice < ApplicationRecord
   VISIBLE_STATUS = {draft: 0, finalized: 1, voided: 2, failed: 4}.freeze
   INVISIBLE_STATUS = {generating: 3, open: 5, closed: 6}.freeze
   STATUS = VISIBLE_STATUS.merge(INVISIBLE_STATUS).freeze
+  COMPLETE_INVOICE_STATUSES = %w[finalized closed].freeze
 
   enum invoice_type: INVOICE_TYPES
   enum payment_status: PAYMENT_STATUS, _prefix: :payment

app/services/invoices/calculate_fees_service.rb

@@ -360,7 +360,7 @@ def fetch_taxes_for_invoice
     end
 
     def finalizing_invoice?
-      context == :finalize || invoice.status == 'finalized'
+      context == :finalize || Invoice::COMPLETE_INVOICE_STATUSES.include?(invoice.status)
     end
   end
 end

app/services/invoices/subscription_service.rb

@@ -27,14 +27,14 @@ def call
       result.invoice = invoice
 
       fee_result = ActiveRecord::Base.transaction do
-        invoice.status = invoice_status
+        context = grace_period? ? :draft : :finalize
         fee_result = Invoices::CalculateFeesService.call(
           invoice:,
-          recurring:
+          recurring:,
+          context:
         )
-        if invoice.status == "finalized"
-          Invoices::TransitionToFinalStatusService.call(invoice:)
-        end
+
+        set_invoice_generated_status unless invoice.failed?
         invoice.save!
 
         # NOTE: We don't want to raise error and corrupt DB commit if there is tax error.
@@ -123,8 +123,10 @@ def grace_period?
       @grace_period ||= customer.applicable_invoice_grace_period.positive?
     end
 
-    def invoice_status
-      grace_period? ? :draft : :finalized
+    def set_invoice_generated_status
+      return invoice.status = :draft if grace_period?
+
+      Invoices::TransitionToFinalStatusService.call(invoice:)
     end
 
     def should_deliver_finalized_email?

spec/services/invoices/subscription_service_spec.rb

@@ -340,6 +340,7 @@
         it 'creates an invoice in :finalized status' do
           result = invoice_service.call
           expect(result.invoice.status).to eq('finalized')
+          expect(result.invoice.number).not_to include('DRAFT')
         end
       end
 
@@ -353,6 +354,7 @@
         it 'creates an invoice in :closed status' do
           result = invoice_service.call
           expect(result.invoice.status).to eq('closed')
+          expect(result.invoice.number).to include('DRAFT')
         end
 
         context 'when organization gas grace period' do