Update some methods

Author: yzhoubk

…migrate/20250930215317_add_two_facets.rb …/migrate/20250930215317_add_two_terms.rbdb/migrate/20250930215317_add_two_facets.rb renamed to db/migrate/20250930215317_add_two_terms.rb db/migrate/20250930215317_add_two_facets.rb renamed to db/migrate/20250930215317_add_two_terms.rb

@@ -1,12 +1,12 @@
-class AddTwoFacets < ActiveRecord::Migration[7.0]
+class AddTwoTerms < ActiveRecord::Migration[7.0]
   def up
     facet = Facet.find_by!(name: "Medium")
     Term.create!(facet: facet, value: "Digital")
     Term.create!(facet: facet, value: "Drawing")
   end
 
   def down
-    facet = Facet.find_by(name: "Medium")
+    facet = Facet.find_by!(name: "Medium")
     Term.where(facet: facet, value: ["Digital", "Drawing"]).delete_all
   end
 end

db/migrate/20250930220140_add_three_ordered_terms.rb

@@ -16,9 +16,7 @@ def up
   end
 
   def down
-    facet = Facet.find_by(name: "Decade")
-    return unless facet
-
+    facet = Facet.find_by!(name: "Decade")
     Term.where(facet: facet, value: ["2000-2009", "2010-2019", "After 2020"]).delete_all
     term  = Term.find_by!(facet: facet, value: "After 1999")
     term.update!(ord: 11)

db/migrate/20250930220504_update_term_item_relation.rb

@@ -32,9 +32,9 @@ def up
   def down
     facet = Facet.find_by!(name: 'Decade')
     target_term = Term.find_by!(facet: facet, value: 'After 1999')
-    move_term_back_to_item(facet, target_term, '2000-2009')
-    move_term_back_to_item(facet, target_term, '2010-2019')
-    move_term_back_to_item(facet, target_term, 'After 2020')
+    move_term_back_to_item(facet,  '2000-2009', target_term)
+    move_term_back_to_item(facet, '2010-2019', target_term)
+    move_term_back_to_item(facet, 'After 2020', target_term)
   end
 
   private
@@ -52,6 +52,7 @@ def integer_year(val)
           return $1.to_i
         end
       end
+      return nil
     end
   end
 
@@ -62,7 +63,7 @@ def re_assign_term_to_item(item, origin_term, target_term)
   end
 
   # Rolls back term assignment from origin_term_value to target_term for all items.
-  def move_term_back_to_item(facet, target_term, origin_term_value)
+  def move_term_back_to_item(facet, origin_term_value, target_term)
     origin_term = Term.find_by!(facet: facet, value: origin_term_value)
     origin_term.items.find_each do |item|
       re_assign_term_to_item(item, origin_term, target_term)

db/migrate/20250930230620_update_fix_term_item_relation.rb

@@ -7,9 +7,9 @@ def up
     t2020_plus = Term.find_by!(facet: facet, value: 'After 2020')
 
     # Items with nil date
-    insert_and_delete(t_after_1999.id, t2000_2009.id, "i.date is null AND i.title in ('Loading a Cannon', 'Dense Populations')")
+    update_item_term(t_after_1999.id, t2000_2009.id, "i.date is null AND i.title in ('Loading a Cannon', 'Dense Populations')")
     # Items with date = '[2020]'
-    insert_and_delete(t_after_1999.id, t2020_plus.id, "date = '[2020]'")
+    update_item_term(t_after_1999.id, t2020_plus.id, "date = '[2020]'")
   end
 
   def down
@@ -19,18 +19,18 @@ def down
     t2020_plus = Term.find_by!(facet: facet, value: 'After 2020')
 
     # revert items with nil date
-    insert_and_delete(t2000_2009.id,t_after_1999.id, "i.date is null AND i.title in ('Loading a Cannon', 'Dense Populations')")
+    update_item_term(t2000_2009.id,t_after_1999.id, "i.date is null AND i.title in ('Loading a Cannon', 'Dense Populations')")
     # revert items with date = '[2020]'
-    insert_and_delete(t2020_plus.id, t_after_1999.id, "date = '[2020]'")
+    update_item_term(t2020_plus.id, t_after_1999.id, "date = '[2020]'")
   end
 
   private
 
-  def insert_and_delete(old_term_id, new_term_id, condition_sql)
+  def update_item_term(old_term_id, new_term_id, condition_sql)
 
     execute <<~SQL.squish
       WITH target AS (
-        SELECT it.term_id, it.item_id, i.title
+        SELECT it.term_id, it.item_id
         FROM items i
         JOIN items_terms it ON i.id = it.item_id
         JOIN terms t ON it.term_id = t.id