Merge pull request #277 from tulibraries/IMT-142-migration-status-duplicate-checking

nomadicoder · web-flow · commit de63f251f7f1 · 2026-02-03T12:23:48.000-07:00
IMT-142 migration status duplicate checking
diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss
@@ -107,6 +107,20 @@ a {
   color: #fff;
 }
 
+.duplicates-table {
+  overflow-x: auto;
+}
+
+.duplicates-table table {
+  width: 100%;
+  table-layout: fixed;
+}
+
+.duplicates-table td {
+  word-break: break-word;
+  white-space: normal;
+}
+
 [data-command="filter"].wb-helper-invalid,
 [data-command="filter"].filter-active.wb-helper-invalid {
   color: #2E6F40 !important;
diff --git a/app/controllers/admin/isilon_assets_controller.rb b/app/controllers/admin/isilon_assets_controller.rb
@@ -39,6 +39,11 @@ class IsilonAssetsController < Admin::ApplicationController
     #     permit(dashboard.permitted_attributes(action_name)).
     #     transform_values { |value| value == "" ? nil : value }
     # end
+    def resource_params
+      params.require(resource_class.model_name.param_key)
+        .permit(dashboard.permitted_attributes(action_name))
+        .except(:parent_folder_id)
+    end
 
     # See https://administrate-demo.herokuapp.com/customizing_controller_actions
     # for more information
diff --git a/app/dashboards/isilon_asset_dashboard.rb b/app/dashboards/isilon_asset_dashboard.rb
@@ -15,18 +15,16 @@ class IsilonAssetDashboard < Administrate::BaseDashboard
     assigned_to: Field::String,
     contentdm_collection: Field::BelongsTo,
     date_created_in_isilon: Field::String,
-    duplicate_of: Field::BelongsTo.with_options(
-      class_name: "IsilonAsset",
-      foreign_key: "duplicate_of_id"
-    ),
-    duplicates: Field::HasMany.with_options(
+    duplicates: DuplicatesField.with_options(
       class_name: "IsilonAsset"
     ),
+    has_duplicates: HasDuplicatesField,
     file_checksum: Field::String,
     file_size: Field::String,
     file_type: Field::String,
     isilon_name: Field::String,
     isilon_path: Field::String,
+    full_path_with_volume: Field::String,
     last_modified_in_isilon: Field::String,
     last_updated_by: Field::String,
     migration_status: Field::BelongsTo,
@@ -48,6 +46,7 @@ class IsilonAssetDashboard < Administrate::BaseDashboard
   COLLECTION_ATTRIBUTES = %i[
     isilon_name
     migration_status
+    has_duplicates
     assigned_to
   ].freeze
 
@@ -59,6 +58,7 @@ class IsilonAssetDashboard < Administrate::BaseDashboard
     isilon_name
     isilon_path
     parent_folder
+    full_path_with_volume
     date_created_in_isilon
     last_modified_in_isilon
     file_size
@@ -68,7 +68,6 @@ class IsilonAssetDashboard < Administrate::BaseDashboard
     aspace_linking_status
     contentdm_collection
     preservica_reference_id
-    duplicate_of
     duplicates
     notes
     assigned_to
@@ -84,7 +83,6 @@ class IsilonAssetDashboard < Administrate::BaseDashboard
     migration_status
     isilon_name
     isilon_path
-    parent_folder
     date_created_in_isilon
     last_modified_in_isilon
     file_size
diff --git a/app/fields/duplicates_field.rb b/app/fields/duplicates_field.rb
@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+require "administrate/field/has_many"
+
+class DuplicatesField < Administrate::Field::HasMany
+end
diff --git a/app/fields/has_duplicates_field.rb b/app/fields/has_duplicates_field.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require "administrate/field/base"
+
+class HasDuplicatesField < Administrate::Field::Base
+  def to_s
+    data ? "Yes" : ""
+  end
+end
diff --git a/app/models/duplicate_group.rb b/app/models/duplicate_group.rb
@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+class DuplicateGroup < ApplicationRecord
+  has_many :duplicate_group_memberships, dependent: :delete_all
+  has_many :isilon_assets, through: :duplicate_group_memberships
+end
diff --git a/app/models/duplicate_group_membership.rb b/app/models/duplicate_group_membership.rb
@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+class DuplicateGroupMembership < ApplicationRecord
+  belongs_to :duplicate_group
+  belongs_to :isilon_asset
+end
diff --git a/app/models/isilon_asset.rb b/app/models/isilon_asset.rb
@@ -5,12 +5,22 @@ class IsilonAsset < ApplicationRecord
   belongs_to :contentdm_collection, optional: true
   belongs_to :assigned_to, class_name: "User", foreign_key: "assigned_to", optional: true
 
-  # Self-referencing association for duplicate tracking
-  belongs_to :duplicate_of, class_name: "IsilonAsset", foreign_key: "duplicate_of_id", optional: true
-  has_many :duplicates, class_name: "IsilonAsset", foreign_key: "duplicate_of_id", dependent: :nullify
+  has_many :duplicate_group_memberships, dependent: :delete_all
+  has_many :duplicate_groups, through: :duplicate_group_memberships
+  has_many :duplicates, -> { distinct }, through: :duplicate_groups, source: :isilon_assets
 
   before_validation :set_default_migration_status, on: :create
 
+  def full_path_with_volume
+    volume_name = parent_folder&.volume&.name
+    return isilon_path unless volume_name.present?
+
+    path = isilon_path.to_s
+    path = "/#{path}" unless path.start_with?("/")
+    "/#{volume_name}#{path}".gsub(%r{//+}, "/")
+  end
+
+
   private
 
   def set_default_migration_status
diff --git a/app/views/fields/duplicates_field/_show.html.erb b/app/views/fields/duplicates_field/_show.html.erb
@@ -0,0 +1,18 @@
+<% if field.data.present? %>
+  <div class="duplicates-table">
+    <table>
+      <thead>
+        <tr>
+          <th>Path (with volume)</th>
+        </tr>
+      </thead>
+      <tbody>
+        <% field.data.each do |duplicate| %>
+          <tr>
+            <td><%= link_to duplicate.full_path_with_volume, admin_isilon_asset_path(duplicate) %></td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+  </div>
+<% end %>
diff --git a/app/views/fields/has_duplicates_field/_index.html.erb b/app/views/fields/has_duplicates_field/_index.html.erb
@@ -0,0 +1 @@
+<%= field.to_s %>
diff --git a/app/views/fields/has_duplicates_field/_show.html.erb b/app/views/fields/has_duplicates_field/_show.html.erb
@@ -0,0 +1 @@
+<%= field.to_s %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -28,6 +28,11 @@
 #       enabled: "ON"
 
 en:
+  activerecord:
+    attributes:
+      isilon_asset:
+        has_duplicates: "Has Duplicates"
+        full_path_with_volume: "Path (with volume)"
   errors:
     messages:
       user_not_registered: "User Not registered. Please contact a server administrator for a user account"
diff --git a/db/migrate/20260202174500_create_duplicate_groups.rb b/db/migrate/20260202174500_create_duplicate_groups.rb
@@ -0,0 +1,11 @@
+class CreateDuplicateGroups < ActiveRecord::Migration[7.1]
+  def change
+    create_table :duplicate_groups do |t|
+      t.string :checksum, null: false
+
+      t.timestamps
+    end
+
+    add_index :duplicate_groups, :checksum, unique: true
+  end
+end
diff --git a/db/migrate/20260202174600_create_duplicate_group_memberships.rb b/db/migrate/20260202174600_create_duplicate_group_memberships.rb
@@ -0,0 +1,15 @@
+class CreateDuplicateGroupMemberships < ActiveRecord::Migration[7.1]
+  def change
+    create_table :duplicate_group_memberships do |t|
+      t.references :duplicate_group, null: false, foreign_key: true
+      t.references :isilon_asset, null: false, foreign_key: true
+
+      t.timestamps
+    end
+
+    add_index :duplicate_group_memberships,
+      [ :duplicate_group_id, :isilon_asset_id ],
+      unique: true,
+      name: "index_duplicate_group_memberships_unique"
+  end
+end
diff --git a/db/migrate/20260202174700_remove_duplicate_of_from_isilon_assets.rb b/db/migrate/20260202174700_remove_duplicate_of_from_isilon_assets.rb
@@ -0,0 +1,8 @@
+class RemoveDuplicateOfFromIsilonAssets < ActiveRecord::Migration[7.1]
+  def change
+    remove_reference :isilon_assets,
+      :duplicate_of,
+      foreign_key: { to_table: :isilon_assets },
+      index: true
+  end
+end
diff --git a/db/migrate/20260202181000_add_has_duplicates_to_isilon_assets.rb b/db/migrate/20260202181000_add_has_duplicates_to_isilon_assets.rb
@@ -0,0 +1,6 @@
+class AddHasDuplicatesToIsilonAssets < ActiveRecord::Migration[7.1]
+  def change
+    add_column :isilon_assets, :has_duplicates, :boolean, null: false, default: false
+    add_index :isilon_assets, :has_duplicates
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
diff --git a/lib/tasks/detect_duplicates.rake b/lib/tasks/detect_duplicates.rake
diff --git a/spec/models/isilon_asset_duplicate_spec.rb b/spec/models/isilon_asset_duplicate_spec.rb
diff --git a/spec/models/isilon_asset_spec.rb b/spec/models/isilon_asset_spec.rb
diff --git a/spec/tasks/duplicates_rake_spec.rb b/spec/tasks/duplicates_rake_spec.rb
