Rework the approach to persist storage used at the board level

So that the system is more robust and it is faster to recalculate storage taken by account

Author: jorgemanrubia

app/models/board.rb

@@ -1,5 +1,5 @@
 class Board < ApplicationRecord
-  include Accessible, AutoPostponing, Broadcastable, Cards, Entropic, Filterable, Publishable, Triageable
+  include Accessible, AutoPostponing, Broadcastable, Cards, Entropic, Filterable, Publishable, StorageTracking, Triageable
 
   belongs_to :creator, class_name: "User", default: -> { Current.user }
   belongs_to :account, default: -> { creator.account }

app/models/board/storage_tracking.rb

@@ -0,0 +1,8 @@
+module Board::StorageTracking
+  extend ActiveSupport::Concern
+
+  def bytes_used_changed(delta)
+    increment!(:bytes_used, delta)
+    account.adjust_storage_later(delta)
+  end
+end

app/models/card/storage_tracking.rb

@@ -0,0 +1,11 @@
+module Card::StorageTracking
+  extend ActiveSupport::Concern
+
+  included do
+    include ::StorageTracking
+  end
+
+  def bytes_used_changed(delta)
+    board.bytes_used_changed(delta)
+  end
+end

app/models/comment/storage_tracking.rb

@@ -0,0 +1,11 @@
+module Comment::StorageTracking
+  extend ActiveSupport::Concern
+
+  included do
+    include ::StorageTracking
+  end
+
+  def bytes_used_changed(delta)
+    card.bytes_used_changed(delta)
+  end
+end

app/models/concerns/storage_tracking.rb

@@ -4,8 +4,6 @@ module StorageTracking
   included do
     after_save :track_storage_updated
     after_destroy :track_storage_removed
-
-    delegate :adjust_storage_later, to: :account
   end
 
   def bytes_used
@@ -14,7 +12,7 @@ def bytes_used
 
   private
     def track_storage_updated
-      adjust_storage_later(calculate_changed_storage_delta)
+      bytes_used_changed(calculate_changed_storage_delta)
     end
 
     def calculate_changed_storage_delta
@@ -27,7 +25,7 @@ def calculate_changed_storage_delta
     end
 
     def track_storage_removed
-      adjust_storage_later(-bytes_used)
+      bytes_used_changed(-bytes_used)
     end
 
     def rich_text_associations

db/migrate/20251205150747_add_bytes_used_to_boards.rb

@@ -0,0 +1,5 @@
+class AddBytesUsedToBoards < ActiveRecord::Migration[8.2]
+  def change
+    add_column :boards, :bytes_used, :bigint, default: 0
+  end
+end

db/schema.rb

@@ -1,6 +1,6 @@
 module ActionTextContentStorageTracking
   def bytes_used
-    attachables.sum { |attachable| attachable.try(:byte_size) || 0 }
+    attachables.sum { |attachable| attachable.try(:attachable_filesize) || 0 }
   end
 end
 

lib/rails_ext/action_text_storage_tracking.rb

@@ -0,0 +1,107 @@
+require "test_helper"
+
+class Card::StorageTrackingTest < ActiveSupport::TestCase
+  setup do
+    Current.session = sessions(:david)
+    @account = Current.account
+    @board = boards(:writebook)
+  end
+
+  test "tracks storage when creating card with rich text attachment" do
+    expected_bytes = active_storage_blobs(:hello_txt).byte_size
+
+    assert_difference -> { @board.reload.bytes_used }, expected_bytes do
+      assert_difference -> { @account.reload.bytes_used }, expected_bytes do
+        perform_enqueued_jobs only: Account::AdjustStorageJob do
+          @board.cards.create!(title: "Test", description: attachment_html(active_storage_blobs(:hello_txt)), status: :published)
+        end
+      end
+    end
+  end
+
+  test "tracks storage delta when updating card with different attachment" do
+    perform_enqueued_jobs only: Account::AdjustStorageJob do
+      card = @board.cards.create!(title: "Test", description: attachment_html(active_storage_blobs(:hello_txt)), status: :published)
+
+      expected_delta = active_storage_blobs(:list_pdf).byte_size - active_storage_blobs(:hello_txt).byte_size
+      assert_difference -> { @board.reload.bytes_used }, expected_delta do
+        assert_difference -> { @account.reload.bytes_used }, expected_delta do
+          card.update!(description: attachment_html(active_storage_blobs(:list_pdf)))
+        end
+      end
+    end
+  end
+
+  test "tracks negative delta when removing attachment from card" do
+    perform_enqueued_jobs only: Account::AdjustStorageJob do
+      card = @board.cards.create!(title: "Test", description: attachment_html(active_storage_blobs(:hello_txt)), status: :published)
+
+      expected_delta = -active_storage_blobs(:hello_txt).byte_size
+      assert_difference -> { @board.reload.bytes_used }, expected_delta do
+        assert_difference -> { @account.reload.bytes_used }, expected_delta do
+          card.update!(description: "No attachments")
+        end
+      end
+    end
+  end
+
+  test "tracks negative storage when destroying card with attachment" do
+    perform_enqueued_jobs only: Account::AdjustStorageJob do
+      card = @board.cards.create!(title: "Test", description: attachment_html(active_storage_blobs(:hello_txt)), status: :published)
+
+      expected_delta = -active_storage_blobs(:hello_txt).byte_size
+      assert_difference -> { @board.reload.bytes_used }, expected_delta do
+        assert_difference -> { @account.reload.bytes_used }, expected_delta do
+          card.destroy!
+        end
+      end
+    end
+  end
+
+  test "does not change storage when no attachments change" do
+    assert_no_difference -> { @board.reload.bytes_used } do
+      assert_no_difference -> { @account.reload.bytes_used } do
+        perform_enqueued_jobs only: Account::AdjustStorageJob do
+          @board.cards.create!(title: "Test", description: "Plain text", status: :published)
+        end
+      end
+    end
+  end
+
+  test "does not change storage when updating title on card with attachment" do
+    perform_enqueued_jobs only: Account::AdjustStorageJob do
+      card = @board.cards.create!(title: "Test", description: attachment_html(active_storage_blobs(:hello_txt)), status: :published)
+
+      assert_no_difference -> { @board.reload.bytes_used } do
+        assert_no_difference -> { @account.reload.bytes_used } do
+          card.update!(title: "New title")
+        end
+      end
+    end
+  end
+
+  test "does not change storage when updating description text but keeping same attachment" do
+    perform_enqueued_jobs only: Account::AdjustStorageJob do
+      card = @board.cards.create!(title: "Test", description: "Some text #{attachment_html(active_storage_blobs(:hello_txt))}", status: :published)
+
+      assert_no_difference -> { @board.reload.bytes_used } do
+        assert_no_difference -> { @account.reload.bytes_used } do
+          card.update!(description: "Different text #{attachment_html(active_storage_blobs(:hello_txt))}")
+        end
+      end
+    end
+  end
+
+  test "tracks storage separately for each board" do
+    other_board = boards(:private)
+
+    perform_enqueued_jobs only: Account::AdjustStorageJob do
+      @board.cards.create!(title: "Card 1", description: attachment_html(active_storage_blobs(:hello_txt)), status: :published)
+      other_board.cards.create!(title: "Card 2", description: attachment_html(active_storage_blobs(:list_pdf)), status: :published)
+
+      assert_equal active_storage_blobs(:hello_txt).byte_size, @board.reload.bytes_used
+      assert_equal active_storage_blobs(:list_pdf).byte_size, other_board.reload.bytes_used
+      assert_equal active_storage_blobs(:hello_txt).byte_size + active_storage_blobs(:list_pdf).byte_size, @account.reload.bytes_used
+    end
+  end
+end

test/models/card/storage_tracking_test.rb

@@ -0,0 +1,63 @@
+require "test_helper"
+
+class Comment::StorageTrackingTest < ActiveSupport::TestCase
+  setup do
+    Current.session = sessions(:david)
+    @account = Current.account
+    @board = boards(:writebook)
+    @card = @board.cards.create!(title: "Test", status: :published)
+  end
+
+  test "tracks storage when creating comment with attachment" do
+    expected_bytes = active_storage_blobs(:hello_txt).byte_size
+
+    assert_difference -> { @board.reload.bytes_used }, expected_bytes do
+      assert_difference -> { @account.reload.bytes_used }, expected_bytes do
+        perform_enqueued_jobs only: Account::AdjustStorageJob do
+          @card.comments.create!(body: attachment_html(active_storage_blobs(:hello_txt)))
+        end
+      end
+    end
+  end
+
+  test "tracks storage delta when updating comment with different attachment" do
+    perform_enqueued_jobs only: Account::AdjustStorageJob do
+      comment = @card.comments.create!(body: attachment_html(active_storage_blobs(:hello_txt)))
+
+      expected_delta = active_storage_blobs(:list_pdf).byte_size - active_storage_blobs(:hello_txt).byte_size
+      assert_difference -> { @board.reload.bytes_used }, expected_delta do
+        assert_difference -> { @account.reload.bytes_used }, expected_delta do
+          comment.reload.update!(body: attachment_html(active_storage_blobs(:list_pdf)))
+        end
+      end
+    end
+  end
+
+  test "tracks negative storage when destroying comment with attachment" do
+    perform_enqueued_jobs only: Account::AdjustStorageJob do
+      comment = @card.comments.create!(body: attachment_html(active_storage_blobs(:hello_txt)))
+
+      expected_delta = -active_storage_blobs(:hello_txt).byte_size
+      assert_difference -> { @board.reload.bytes_used }, expected_delta do
+        assert_difference -> { @account.reload.bytes_used }, expected_delta do
+          comment.destroy!
+        end
+      end
+    end
+  end
+
+  test "tracks negative storage for card and comments when destroying card" do
+    perform_enqueued_jobs only: Account::AdjustStorageJob do
+      card = @board.cards.create!(title: "Test", description: attachment_html(active_storage_blobs(:hello_txt)), status: :published)
+      card.comments.create!(body: attachment_html(active_storage_blobs(:hello_txt)))
+      card.comments.create!(body: attachment_html(active_storage_blobs(:list_pdf)))
+
+      total_bytes = active_storage_blobs(:hello_txt).byte_size * 2 + active_storage_blobs(:list_pdf).byte_size
+      assert_difference -> { @board.reload.bytes_used }, -total_bytes do
+        assert_difference -> { @account.reload.bytes_used }, -total_bytes do
+          card.destroy!
+        end
+      end
+    end
+  end
+end