geoblacklight_admin 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d79715a53de267b1c6610d96834bafc9564fa1f1ffd1cc42040ede65c3b3e831
-  data.tar.gz: 8ffad49338a30230adc65578911502f2d349474b6c1b6e51fb3f41bf7743cf1e
+  metadata.gz: 48c3924abd0db3999ab1c702c483d8ba8e57ecee0ce692a7dda60b0707b19b39
+  data.tar.gz: be7b643b6306ba2cd44b35e7c32e0161ef9b83b543500dde617535af848bbc1a
 SHA512:
-  metadata.gz: 314eb14972a616c59c5c229defdec096ba5c4300520898f636f23f783c62251aec5dd48dea1d0db519a9a442258c11e83b6159422d1e7457ba234a38c9a10189
-  data.tar.gz: 1f6cd97abecdf5d29e39a7e7088c4db076ceb08e48b49cb0a7fbe0aa0e4a1e4cd37a8a4b42a793f579ca93821ce36da089c48fc923dedbfb2f8dd017ba9d1c3e
+  metadata.gz: dedd35ccc8137c52fc6ce2f9d9e99357fb5683689ca3ad484a72bed021b79d09974746fd13ed4eba6594f3b2f655d821f919f29f00e5936e9572363482c63d3a
+  data.tar.gz: 4f0557655660b144112a7d532b9f99507f01327bfbba572112ede542bc20f6c0e94ba23f30f692b8ac362c66c6dda3e1027861b743983218c02dc98d47f0a122

data/app/controllers/admin/document_distributions_controller.rb

@@ -91,24 +91,37 @@ module Admin
 
     # DELETE /admin/document_distributions/destroy_all
     #
-    # Destroys all document distributions provided in the file parameter. If successful, redirects
-    # with a success notice. Otherwise, redirects with an error notice.
+    # Queues a background job to destroy all document distributions provided in the file parameter.
+    # The job will process the CSV file and send a notification when complete.
     def destroy_all
       return if request.get?
 
-      logger.debug("Destroy Distributions")
+      logger.debug("Queue Destroy Distributions Job")
       unless params.dig(:document_distribution, :distributions, :file)
         raise ArgumentError, "File does not exist or is invalid."
       end
 
+      # Save the uploaded file to a temporary location
+      uploaded_file = params.dig(:document_distribution, :distributions, :file)
+      temp_file_path = Rails.root.join("tmp", "destroy_distributions_#{Time.current.to_i}_#{SecureRandom.hex(8)}.csv")
+
+      File.binwrite(temp_file_path, uploaded_file.read)
+
+      # Queue the background job
+      DestroyDocumentDistributionsJob.perform_later(temp_file_path.to_s, current_user)
+
       respond_to do |format|
-        if DocumentDistribution.destroy_all(params.dig(:document_distribution, :distributions, :file))
-          format.html { redirect_to admin_document_distributions_path, notice: "Distributions were destroyed." }
-        else
-          format.html { redirect_to admin_document_distributions_path, notice: "Distributions could not be destroyed." }
-        end
-      rescue => e
-        format.html { redirect_to admin_document_distributions_path, notice: "Distributions could not be destroyed. #{e}" }
+        format.html {
+          redirect_to admin_document_distributions_path,
+            notice: "Distribution destruction job has been queued. You will receive a notification when it completes."
+        }
+      end
+    rescue => e
+      respond_to do |format|
+        format.html {
+          redirect_to admin_document_distributions_path,
+            notice: "Failed to queue distribution destruction job: #{e.message}"
+        }
       end
     end
 

data/app/jobs/destroy_document_distributions_job.rb

@@ -0,0 +1,80 @@
+# frozen_string_literal: true
+
+require "csv"
+
+# DestroyDocumentDistributionsJob
+#
+# This job processes a CSV file containing document distribution records to be destroyed.
+# It handles large CSV files in the background to prevent timeouts and provides
+# progress updates via notifications.
+class DestroyDocumentDistributionsJob < ApplicationJob
+  queue_as :priority
+
+  def perform(file_path, current_user)
+    logger.debug("DestroyDocumentDistributionsJob: Starting destruction of distributions from #{file_path}")
+
+    destroyed_count = 0
+    error_count = 0
+    errors = []
+
+    begin
+      unless File.exist?(file_path)
+        raise ArgumentError, "File not found: #{file_path}"
+      end
+
+      CSV.foreach(file_path, headers: true) do |row|
+        logger.debug("Processing CSV Row: #{row.to_hash}")
+
+        begin
+          reference_type = ReferenceType.find_by(name: row.to_hash["reference_type"])
+
+          if reference_type.nil?
+            error_count += 1
+            errors << "Reference type not found: #{row.to_hash["reference_type"]}"
+            next
+          end
+
+          destroyed = DocumentDistribution.destroy_by(
+            friendlier_id: row.to_hash["friendlier_id"],
+            reference_type_id: reference_type.id,
+            url: row.to_hash["distribution_url"]
+          )
+
+          if destroyed.any?
+            destroyed_count += destroyed.count
+            logger.debug("Destroyed: #{row.to_hash}")
+          else
+            logger.debug("Not found to destroy: #{row.to_hash}")
+          end
+        rescue => e
+          error_count += 1
+          errors << "Error processing row #{row.to_hash}: #{e.message}"
+          logger.error("Error destroying distribution: #{e}")
+        end
+      end
+
+      # Create success notification
+      message = "DISTRIBUTIONS DESTROYED|#{ActionController::Base.helpers.number_with_delimiter(destroyed_count)} distributions destroyed"
+      if error_count > 0
+        message += " (#{error_count} errors)"
+      end
+
+      notification = ExportNotification.with(message: message)
+      notification.deliver(current_user)
+
+      # Clean up the temporary file
+      File.delete(file_path) if File.exist?(file_path)
+
+      logger.debug("DestroyDocumentDistributionsJob: Completed. Destroyed #{destroyed_count} distributions with #{error_count} errors")
+    rescue => e
+      logger.error("DestroyDocumentDistributionsJob: Fatal error - #{e}")
+
+      # Create error notification
+      notification = ExportNotification.with(message: "DISTRIBUTION DESTROY FAILED|Error: #{e.message}")
+      notification.deliver(current_user)
+
+      # Clean up the temporary file
+      File.delete(file_path) if File.exist?(file_path)
+    end
+  end
+end

data/app/views/admin/document_distributions/destroy_all.html.erb

@@ -18,6 +18,9 @@
     <p class="alert alert-danger" role="alert">
       <strong>Warning:</strong> All matching Distributions will be destroyed. There is <strong>NO UNDO</strong> here.
     </p>
+    <p class="alert alert-info" role="alert">
+      <strong>Note:</strong> Large CSV files will be processed in the background. You will receive a notification when the process completes.
+    </p>
     <h3 class='h4'>Upload a CSV File</h3>
 
     <%= simple_form_for DocumentDistribution.new, url: destroy_all_admin_document_distributions_path, method: :post, multipart: true do |f| %>

data/app/views/admin/documents/admin.html.erb

@@ -193,7 +193,7 @@
                 </tr>
               </thead>
               <tbody>
-                <% @document.document_accesses.each do |da| %>
+                <% @document.document_licensed_accesses.each do |da| %>
                   <tr>
                     <td><%= da.institution_code %></td>
                     <td><a href="<%= da.access_url %>"><%= da.access_url %></a></td>

data/app/views/admin/notifications/index.html.erb

@@ -1,7 +1,7 @@
-<%- @page_title = "GBL♦Admin - Exports" %>
+<%- @page_title = "GBL♦Admin - Notifications" %>
 
 <h1 style="width:100%;">
-  <%= t('dictionary.exports') %>
+  <%= t('dictionary.notifications') %>
 
   <%= link_to('+ Mark All Read', batch_admin_notifications_path(params: {read: 'all'}), {method: 'put', class: "btn btn-primary float-right mr-2"}) %>
 </h1>

data/app/views/admin/shared/_navbar.html.erb

@@ -35,7 +35,7 @@
       <% if user_signed_in? %>
         <li class="nav-item">
           <%= link_to admin_notifications_url, { class: 'nav-link' } do %>
-            <%= "Exports #{notifications_badge}".html_safe %>
+            <%= "Notifications #{notifications_badge}".html_safe %>
           <% end %>
         </li>
       <% end %>

data/lib/geoblacklight_admin/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GeoblacklightAdmin
-  VERSION = "0.9.0"
+  VERSION = "0.10.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geoblacklight_admin
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Eric Larson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-26 00:00:00.000000000 Z
+date: 2025-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_storage_validations
@@ -458,6 +458,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.6'
+- !ruby/object:Gem::Dependency
+  name: rubyzip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -855,6 +869,7 @@ files:
 - app/jobs/bulk_action_revert_job.rb
 - app/jobs/bulk_action_run_document_job.rb
 - app/jobs/bulk_action_run_job.rb
+- app/jobs/destroy_document_distributions_job.rb
 - app/jobs/export_job.rb
 - app/jobs/export_json_bulk_job.rb
 - app/jobs/export_json_job.rb