The invoice number is not available for use after an invoice is delete bug fix (#1965)

* The invoice number is not available for use after an invoice is deleted bug fix

* Added rspec for discard number update

* Fixed security warning GHSA-mrxw-mxhj-p664

* Add test case for invoice to reuse existing invoince number

Author: minakshin

Gemfile.lock

@@ -351,6 +351,7 @@ GEM
     memoist (0.16.2)
     mini_magick (4.12.0)
     mini_mime (1.1.5)
+    mini_portile2 (2.8.8)
     minitest (5.25.4)
     mission_control-jobs (0.2.1)
       importmap-rails
@@ -375,6 +376,9 @@ GEM
       net-protocol
     newrelic_rpm (9.8.0)
     nio4r (2.7.3)
+    nokogiri (1.18.7)
+      mini_portile2 (~> 2.8.2)
+      racc (~> 1.4)
     nokogiri (1.18.7-arm64-darwin)
       racc (~> 1.4)
     nokogiri (1.18.7-x86_64-darwin)
@@ -669,6 +673,7 @@ PLATFORMS
   arm64-darwin-21
   arm64-darwin-22
   arm64-darwin-23
+  ruby
   x86_64-darwin-21
   x86_64-darwin-22
   x86_64-darwin-23

app/models/invoice.rb

@@ -78,6 +78,7 @@ class Invoice < ApplicationRecord
   after_commit :refresh_invoice_index
   after_save :lock_timesheet_entries, if: :draft?
   after_discard :unlock_timesheet_entries, if: :draft?
+  after_discard :update_invoice_number
 
   validates :issue_date, :due_date, :invoice_number, presence: true
   validates :due_date, comparison: { greater_than_or_equal_to: :issue_date }, if: :not_waived
@@ -95,6 +96,7 @@ class Invoice < ApplicationRecord
   scope :during, -> (duration) {
     where(issue_date: duration) if duration.present?
   }
+  scope :active, -> { where(discarded_at: nil) }
 
   delegate :name, to: :client, prefix: :client
   delegate :email, to: :client, prefix: :client
@@ -103,6 +105,8 @@ class Invoice < ApplicationRecord
   searchkick filterable: [:issue_date, :created_at, :updated_at, :client_name, :status, :invoice_number ],
     word_middle: [:invoice_number, :client_name]
 
+  ARCHIVED_PREFIX = "ARC"
+
   def search_data
     {
       id: id.to_i,
@@ -215,4 +219,8 @@ def unlock_timesheet_entries
     def same_currency?
       client&.currency == company&.base_currency
     end
+
+    def update_invoice_number
+      self.update(invoice_number: "#{ARCHIVED_PREFIX}-#{id}-#{invoice_number}")
+    end
 end

app/views/internal_api/v1/partial/_client_list.json.jbuilder

@@ -6,6 +6,6 @@ json.email client.email
 json.phone client.phone
 json.address client.current_address
 json.currency client.currency
-json.previousInvoiceNumber client.invoices&.last&.invoice_number || 0
+json.previousInvoiceNumber client.invoices.active.last&.invoice_number || 0
 json.client_members client.send_invoice_emails(@virtual_verified_invitations_allowed)
 json.logo client[:logo] ? polymorphic_url(client[:logo]) : ""

spec/models/invoice_spec.rb

@@ -71,6 +71,20 @@
       @current_invoice.discard!
       expect { @current_invoice.discard! }.to raise_error(Discard::RecordNotDiscarded)
     end
+
+    it "update invoice number" do
+      @current_invoice.discard!
+      expect(@current_invoice.invoice_number).to start_with(
+        "#{Invoice::ARCHIVED_PREFIX}-#{@current_invoice.id}-"
+      )
+    end
+
+    it "reuses invoice number after discard for new invoice" do
+      invoice_number = @current_invoice.invoice_number
+      @current_invoice.discard!
+      new_invoice = create(:invoice, client: @current_invoice.client, company:, invoice_number:)
+      expect(new_invoice.invoice_number).to eq(invoice_number)
+    end
   end
 
   describe "Scopes" do