+
+
diff --git a/app/views/dedupes/index.html.erb b/app/views/dedupes/index.html.erb
index 4606366aa..24dc8f857 100644
--- a/app/views/dedupes/index.html.erb
+++ b/app/views/dedupes/index.html.erb
@@ -71,19 +71,25 @@
<% @possible_duplicates.each do |normalized_name, records| %>
+ <% first_two = records.first(2) %>
-
- "<%= normalized_name %>" (<%= records.count %> <%= @dedupe[:model_label_plural].downcase %>)
+
+ <%= link_to url_for(action: :dedupe_preview,
+ @dedupe[:delete_id_param] => first_two.first.id,
+ @dedupe[:keep_id_param] => first_two.last.id),
+ class: "text-blue-700 hover:text-blue-900 hover:underline" do %>
+ "<%= normalized_name %>" (<%= records.count %> <%= @dedupe[:model_label_plural].downcase %>)
+ <% end %>
<% records.each do |record| %>
-
- <%= record.name %>
+ <%= record.public_send(@dedupe[:name_column]) %>
(ID: <%= record.id %>,
<% if @dedupe[:record_extras] %><%= @dedupe[:record_extras].call(record) %>, <% end %>
<%= record.published? ? 'Published' : 'Unpublished' %>,
- <%= record.public_send(@dedupe[:join_association]).count %> taggings)
+ <%= @tagging_counts[record.id] || 0 %> taggings)
<% end %>
diff --git a/app/views/dedupes/preview.html.erb b/app/views/dedupes/preview.html.erb
index c62f06dd6..51a2bc22b 100644
--- a/app/views/dedupes/preview.html.erb
+++ b/app/views/dedupes/preview.html.erb
@@ -48,7 +48,9 @@
model_label: @dedupe[:model_label],
keep_param_key: @dedupe[:keep_param_key],
form_builder: f,
- belongs_to_options: @dedupe[:belongs_to_options] %>
+ belongs_to_options: @dedupe[:belongs_to_options],
+ name_column: @dedupe[:name_column],
+ extra_association_data: @extra_association_data || [] %>
@@ -56,9 +58,9 @@
Danger: This action cannot be undone.
- "<%= @record_to_delete.name %>" (ID: <%= @record_to_delete.id %>) will be permanently deleted
- and its <%= @delete_items.count %> associations moved to
- "<%= @record_to_keep.name %>" (ID: <%= @record_to_keep.id %>).
+ "<%= @record_to_delete.public_send(@dedupe[:name_column]) %>" (ID: <%= @record_to_delete.id %>) will be permanently deleted
+ and its <%= @delete_items.count + (@extra_association_data || []).sum { |ea| ea[:delete_items].count } %> associations moved to
+ "<%= @record_to_keep.public_send(@dedupe[:name_column]) %>" (ID: <%= @record_to_keep.id %>).
diff --git a/config/routes.rb b/config/routes.rb
index 2c19c6d22..21d05e6e5 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -148,6 +148,10 @@
resources :workshops do
collection do
post :search
+ get :dedupe_index
+ get :dedupe_preview
+ post :dedupe_execute
+ patch :dedupe_update_keep
end
end
diff --git a/spec/requests/dedupable_spec.rb b/spec/requests/dedupable_spec.rb
index 41d21aa24..8122b2d6b 100644
--- a/spec/requests/dedupable_spec.rb
+++ b/spec/requests/dedupable_spec.rb
@@ -22,6 +22,12 @@ def create_sector(name:, **attrs)
record
end
+ def create_workshop(title:, **attrs)
+ record = build(:workshop, title: title, **attrs)
+ record.save!(validate: false)
+ record
+ end
+
# ============================================================
# CATEGORIES — full coverage of all 4 dedupe actions
# ============================================================
@@ -151,12 +157,12 @@ def create_sector(name:, **attrs)
expect(keep.reload.published).to be true
end
- it "returns 422 on failure" do
+ it "ignores blank values and does not overwrite existing data" do
patch dedupe_update_keep_categories_path,
params: { id: keep.id, category_to_keep: { name: "" } }
- expect(response).to have_http_status(:unprocessable_content)
- expect(response.parsed_body).to have_key("error")
+ expect(response).to have_http_status(:ok)
+ expect(keep.reload.name).to eq("Original")
end
end
@@ -329,4 +335,280 @@ def create_sector(name:, **attrs)
end
end
end
+
+ # ============================================================
+ # WORKSHOPS — verify concern works with name_column: :title
+ # ============================================================
+
+ describe "Workshops" do
+ describe "GET dedupe_index" do
+ before { sign_in admin }
+
+ it "renders successfully" do
+ create_workshop(title: "Dup Workshop")
+ create_workshop(title: "dup workshop")
+
+ get dedupe_index_workshops_path
+ expect(response).to have_http_status(:ok)
+ expect(response.body).to include("Dup Workshop")
+ end
+ end
+
+ describe "GET dedupe_preview" do
+ before { sign_in admin }
+
+ let!(:keep) { create(:workshop, title: "Keep Workshop", published: true) }
+ let!(:delete_rec) { create_workshop(title: "Delete Workshop", published: false) }
+
+ it "renders the preview page" do
+ get dedupe_preview_workshops_path(
+ workshop_to_keep_id: keep.id,
+ workshop_to_delete_id: delete_rec.id
+ )
+ expect(response).to have_http_status(:ok)
+ expect(response.body).to include("Keep Workshop")
+ expect(response.body).to include("Delete Workshop")
+ end
+
+ it "redirects when both IDs are the same" do
+ get dedupe_preview_workshops_path(
+ workshop_to_keep_id: keep.id,
+ workshop_to_delete_id: keep.id
+ )
+ expect(response).to redirect_to(dedupe_index_workshops_path)
+ follow_redirect!
+ expect(response.body).to include("two different")
+ end
+ end
+
+ describe "PATCH dedupe_update_keep" do
+ before { sign_in admin }
+
+ let!(:keep) { create(:workshop, title: "Original Workshop", published: false) }
+
+ it "updates the record" do
+ patch dedupe_update_keep_workshops_path,
+ params: { id: keep.id, workshop_to_keep: { title: "Updated Workshop" } }
+
+ expect(response).to have_http_status(:ok)
+ expect(keep.reload.title).to eq("Updated Workshop")
+ end
+
+ it "updates rich text fields" do
+ patch dedupe_update_keep_workshops_path,
+ params: { id: keep.id, workshop_to_keep: { rhino_objective: "Updated rich text" } }
+
+ expect(response).to have_http_status(:ok)
+ expect(keep.reload.rhino_objective.to_plain_text).to eq("Updated rich text")
+ end
+ end
+
+ describe "POST dedupe_execute" do
+ before { sign_in admin }
+
+ let!(:keep) { create(:workshop, title: "Keep Workshop", published: true, objective: "Keep objective") }
+ let!(:delete_rec) { create_workshop(title: "Dup Workshop", published: false, objective: "Delete objective") }
+
+ it "merges and redirects with success notice" do
+ expect {
+ post dedupe_execute_workshops_path, params: {
+ workshop_to_delete_id: delete_rec.id,
+ workshop_to_keep_id: keep.id
+ }
+ }.to change(Workshop, :count).by(-1)
+
+ expect(response).to redirect_to(workshops_path)
+ follow_redirect!
+ expect(response.body).to include("merged successfully")
+ end
+
+ context "record fields" do
+ it "updates keeper fields when keep params provided" do
+ post dedupe_execute_workshops_path, params: {
+ workshop_to_delete_id: delete_rec.id,
+ workshop_to_keep_id: keep.id,
+ workshop_to_keep: { title: "Merged Title", objective: "Merged objective" }
+ }
+
+ keep.reload
+ expect(keep.title).to eq("Merged Title")
+ expect(keep.objective).to eq("Merged objective")
+ end
+
+ it "preserves keeper fields when no keep params provided" do
+ post dedupe_execute_workshops_path, params: {
+ workshop_to_delete_id: delete_rec.id,
+ workshop_to_keep_id: keep.id
+ }
+
+ keep.reload
+ expect(keep.title).to eq("Keep Workshop")
+ expect(keep.objective).to eq("Keep objective")
+ end
+ end
+
+ context "rich text (ActionText) fields" do
+ it "updates keeper rich text when keep params provided" do
+ keep.update!(rhino_objective: "Original rich text")
+
+ post dedupe_execute_workshops_path, params: {
+ workshop_to_delete_id: delete_rec.id,
+ workshop_to_keep_id: keep.id,
+ workshop_to_keep: { rhino_objective: "Merged rich text" }
+ }
+
+ expect(keep.reload.rhino_objective.to_plain_text).to eq("Merged rich text")
+ end
+
+ it "preserves keeper rich text when no keep params provided" do
+ keep.update!(rhino_objective: "Keep rich text")
+ delete_rec.update!(rhino_objective: "Delete rich text")
+
+ post dedupe_execute_workshops_path, params: {
+ workshop_to_delete_id: delete_rec.id,
+ workshop_to_keep_id: keep.id
+ }
+
+ expect(keep.reload.rhino_objective.to_plain_text).to eq("Keep rich text")
+ end
+
+ it "destroys deleted record's rich text on merge" do
+ delete_rec.update!(rhino_objective: "Will be lost")
+
+ post dedupe_execute_workshops_path, params: {
+ workshop_to_delete_id: delete_rec.id,
+ workshop_to_keep_id: keep.id
+ }
+
+ expect(ActionText::RichText.where(record_type: "Workshop", record_id: delete_rec.id)).not_to exist
+ end
+ end
+
+ context "polymorphic join associations" do
+ it "moves categorizable_items to the keeper" do
+ category = create(:category, category_type: category_type)
+ create(:categorizable_item, category: category, categorizable: delete_rec)
+
+ post dedupe_execute_workshops_path, params: {
+ workshop_to_delete_id: delete_rec.id,
+ workshop_to_keep_id: keep.id
+ }
+
+ expect(CategorizableItem.where(categorizable: keep).count).to eq(1)
+ expect(CategorizableItem.where(categorizable: delete_rec).count).to eq(0)
+ end
+
+ it "moves sectorable_items to the keeper" do
+ sector = create(:sector)
+ create(:sectorable_item, sector: sector, sectorable: delete_rec)
+
+ post dedupe_execute_workshops_path, params: {
+ workshop_to_delete_id: delete_rec.id,
+ workshop_to_keep_id: keep.id
+ }
+
+ expect(SectorableItem.where(sectorable: keep).count).to eq(1)
+ expect(SectorableItem.where(sectorable: delete_rec).count).to eq(0)
+ end
+
+ it "moves categorizable_items even when keeper already has a different category" do
+ cat1 = create(:category, category_type: category_type)
+ cat2 = create(:category, category_type: category_type)
+ create(:categorizable_item, category: cat1, categorizable: keep)
+ create(:categorizable_item, category: cat2, categorizable: delete_rec)
+
+ post dedupe_execute_workshops_path, params: {
+ workshop_to_delete_id: delete_rec.id,
+ workshop_to_keep_id: keep.id
+ }
+
+ expect(CategorizableItem.where(categorizable: keep).count).to eq(2)
+ expect(CategorizableItem.where(categorizable: delete_rec).count).to eq(0)
+ end
+ end
+
+ context "extra associations (direct FK)" do
+ it "reassigns workshop_variations to the keeper" do
+ variation = create(:workshop_variation, workshop: delete_rec)
+
+ post dedupe_execute_workshops_path, params: {
+ workshop_to_delete_id: delete_rec.id,
+ workshop_to_keep_id: keep.id
+ }
+
+ expect(variation.reload.workshop_id).to eq(keep.id)
+ end
+
+ it "reassigns workshop_resources to the keeper" do
+ resource = create(:resource)
+ wr = WorkshopResource.create!(workshop: delete_rec, resource: resource)
+
+ post dedupe_execute_workshops_path, params: {
+ workshop_to_delete_id: delete_rec.id,
+ workshop_to_keep_id: keep.id
+ }
+
+ expect(wr.reload.workshop_id).to eq(keep.id)
+ end
+
+ it "reassigns associated_resources to the keeper" do
+ resource = create(:resource, workshop: delete_rec)
+
+ post dedupe_execute_workshops_path, params: {
+ workshop_to_delete_id: delete_rec.id,
+ workshop_to_keep_id: keep.id
+ }
+
+ expect(resource.reload.workshop_id).to eq(keep.id)
+ end
+
+ it "reassigns workshop_series_children to the keeper" do
+ child_workshop = create(:workshop)
+ membership = WorkshopSeriesMembership.create!(
+ workshop_parent: delete_rec,
+ workshop_child: child_workshop,
+ position: 1
+ )
+
+ post dedupe_execute_workshops_path, params: {
+ workshop_to_delete_id: delete_rec.id,
+ workshop_to_keep_id: keep.id
+ }
+
+ expect(membership.reload.workshop_parent_id).to eq(keep.id)
+ end
+
+ it "reassigns workshop_series_parents to the keeper" do
+ parent_workshop = create(:workshop)
+ membership = WorkshopSeriesMembership.create!(
+ workshop_parent: parent_workshop,
+ workshop_child: delete_rec,
+ position: 1
+ )
+
+ post dedupe_execute_workshops_path, params: {
+ workshop_to_delete_id: delete_rec.id,
+ workshop_to_keep_id: keep.id
+ }
+
+ expect(membership.reload.workshop_child_id).to eq(keep.id)
+ end
+
+ it "reassigns multiple workshop_resources to the keeper" do
+ resource1 = create(:resource)
+ resource2 = create(:resource)
+ wr1 = WorkshopResource.create!(workshop: delete_rec, resource: resource1)
+ wr2 = WorkshopResource.create!(workshop: delete_rec, resource: resource2)
+
+ post dedupe_execute_workshops_path, params: {
+ workshop_to_delete_id: delete_rec.id,
+ workshop_to_keep_id: keep.id
+ }
+
+ expect(wr1.reload.workshop_id).to eq(keep.id)
+ expect(wr2.reload.workshop_id).to eq(keep.id)
+ end
+ end
+ end
+ end
end