Put import deletion into background job (#2045)

* Put import deletion into background job

* Update changelog

CHANGELOG.md

@@ -4,7 +4,18 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
-# [0.36.4] - Unreleased
+# [0.36.5] - Unreleased
+
+## Changed
+
+- Deleting an import will now be processed in the background to prevent request timeouts for large imports.
+
+## Fixed
+
+- Deleting an import will no longer result in negative points count for the user.
+
+
+# [0.36.4] - 2025-12-26
 
 ## Fixed
 
@@ -14,6 +25,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Disable Family::Invitations::CleanupJob no invitations are in the database. #2043
 - User can now enable family layer in Maps v2 and center on family members by clicking their emails. #2036
 
+
 # [0.36.3] - 2025-12-14
 
 ## Added

app/controllers/imports_controller.rb

@@ -78,9 +78,13 @@ class ImportsController < ApplicationController
   end
 
   def destroy
-    Imports::Destroy.new(current_user, @import).call
+    @import.deleting!
+    Imports::DestroyJob.perform_later(@import.id)
 
-    redirect_to imports_url, notice: 'Import was successfully destroyed.', status: :see_other
+    respond_to do |format|
+      format.html { redirect_to imports_url, notice: 'Import is being deleted.', status: :see_other }
+      format.turbo_stream
+    end
   end
 
   private

app/javascript/controllers/imports_controller.js

@@ -26,16 +26,23 @@ export default class extends BaseController {
         received: (data) => {
           const row = this.element.querySelector(`tr[data-import-id="${data.import.id}"]`);
 
-          if (row) {
-            const pointsCell = row.querySelector('[data-points-count]');
-            if (pointsCell) {
-              pointsCell.textContent = new Intl.NumberFormat().format(data.import.points_count);
-            }
+          if (!row) return;
 
-            const statusCell = row.querySelector('[data-status-display]');
-            if (statusCell && data.import.status) {
-              statusCell.textContent = data.import.status;
-            }
+          // Handle deletion complete - remove the row
+          if (data.action === 'delete') {
+            row.remove();
+            return;
+          }
+
+          // Handle status and points updates
+          const pointsCell = row.querySelector('[data-points-count]');
+          if (pointsCell && data.import.points_count !== undefined) {
+            pointsCell.textContent = new Intl.NumberFormat().format(data.import.points_count);
+          }
+
+          const statusCell = row.querySelector('[data-status-display]');
+          if (statusCell && data.import.status) {
+            statusCell.textContent = data.import.status;
           }
         }
       }

app/jobs/imports/destroy_job.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+class Imports::DestroyJob < ApplicationJob
+  queue_as :default
+
+  def perform(import_id)
+    import = Import.find_by(id: import_id)
+    return unless import
+
+    import.deleting!
+    broadcast_status_update(import)
+
+    Imports::Destroy.new(import.user, import).call
+
+    broadcast_deletion_complete(import)
+  rescue ActiveRecord::RecordNotFound
+    Rails.logger.warn "Import #{import_id} not found, may have already been deleted"
+  end
+
+  private
+
+  def broadcast_status_update(import)
+    ImportsChannel.broadcast_to(
+      import.user,
+      {
+        action: 'status_update',
+        import: {
+          id: import.id,
+          status: import.status
+        }
+      }
+    )
+  end
+
+  def broadcast_deletion_complete(import)
+    ImportsChannel.broadcast_to(
+      import.user,
+      {
+        action: 'delete',
+        import: {
+          id: import.id
+        }
+      }
+    )
+  end
+end

app/models/import.rb

@@ -17,7 +17,7 @@ class Import < ApplicationRecord
   validate :file_size_within_limit, if: -> { user.trial? }
   validate :import_count_within_limit, if: -> { user.trial? }
 
-  enum :status, { created: 0, processing: 1, completed: 2, failed: 3 }
+  enum :status, { created: 0, processing: 1, completed: 2, failed: 3, deleting: 4 }
 
   enum :source, {
     google_semantic_history: 0, owntracks: 1, google_records: 2,

app/services/imports/destroy.rb

@@ -9,11 +9,15 @@ class Imports::Destroy
   end
 
   def call
+    points_count = @import.points_count
+
     ActiveRecord::Base.transaction do
-      @import.points.delete_all
+      @import.points.destroy_all
       @import.destroy!
     end
 
+    Rails.logger.info "Import #{@import.id} deleted with #{points_count} points"
+
     Stats::BulkCalculator.new(@user.id).call
   end
 end

app/views/imports/destroy.turbo_stream.erb

@@ -0,0 +1,24 @@
+<%= turbo_stream.replace "import-#{@import.id}" do %>
+  <tr data-import-id="<%= @import.id %>"
+      id="import-<%= @import.id %>"
+      data-points-total="<%= @import.processed %>"
+      class="hover">
+    <td>
+      <%= @import.name %> (<%= @import.source %>)
+      &nbsp;
+      <%= link_to '🗺️', map_path(import_id: @import.id) %>
+      &nbsp;
+      <%= link_to '📋', points_path(import_id: @import.id) %>
+    </td>
+    <td><%= number_to_human_size(@import.file&.byte_size) || 'N/A' %></td>
+    <td data-points-count>
+      <%= number_with_delimiter @import.processed %>
+    </td>
+    <td data-status-display>deleting</td>
+    <td><%= human_datetime(@import.created_at) %></td>
+    <td class="whitespace-nowrap">
+      <span class="loading loading-spinner loading-sm"></span>
+      <span class="text-sm text-gray-500">Deleting...</span>
+    </td>
+  </tr>
+<% end %>

app/views/imports/index.html.erb

@@ -72,10 +72,15 @@
                 <td data-status-display><%= import.status %></td>
                 <td><%= human_datetime(import.created_at) %></td>
                 <td class="whitespace-nowrap">
-                  <% if import.file.present? %>
-                    <%= link_to 'Download', rails_blob_path(import.file, disposition: 'attachment'), class: "btn btn-outline btn-sm btn-info", download: import.name %>
+                  <% if import.deleting? %>
+                    <span class="loading loading-spinner loading-sm"></span>
+                    <span class="text-sm text-gray-500">Deleting...</span>
+                  <% else %>
+                    <% if import.file.present? %>
+                      <%= link_to 'Download', rails_blob_path(import.file, disposition: 'attachment'), class: "btn btn-outline btn-sm btn-info", download: import.name %>
+                    <% end %>
+                    <%= link_to 'Delete', import, data: { turbo_confirm: "Are you sure?", turbo_method: :delete }, method: :delete, class: "btn btn-outline btn-sm btn-error" %>
                   <% end %>
-                  <%= link_to 'Delete', import, data: { turbo_confirm: "Are you sure?", turbo_method: :delete }, method: :delete, class: "btn btn-outline btn-sm btn-error" %>
                 </td>
               </tr>
             <% end %>