From 901a7398fa93ea7df4450db1f0d96d5b4da13449 Mon Sep 17 00:00:00 2001
From: Justin Edmund <justin@jedmund.com>
Date: Sun, 12 Jan 2025 19:03:25 -0800
Subject: [PATCH] Updates only require values that will change

When updating a row, fields that don't have a provided value will not be changed
---
 lib/granblue/importers/base_importer.rb | 31 ++++++++++++++-----------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/lib/granblue/importers/base_importer.rb b/lib/granblue/importers/base_importer.rb
index 2c86e34..cb97f22 100644
--- a/lib/granblue/importers/base_importer.rb
+++ b/lib/granblue/importers/base_importer.rb
@@ -25,8 +25,10 @@ module Granblue
 
       def import_row(row)
         attributes = build_attributes(row)
+        # Remove nil values from attributes hash for updates
+        # Keep them for new records to ensure proper defaults
         record = find_or_create_record(attributes)
-        track_record(record, attributes) if record
+        track_record(record) if record
       end
 
       def find_or_create_record(attributes)
@@ -37,39 +39,40 @@ module Granblue
             log_test_update(existing_record, attributes)
             nil
           else
-            update_record(existing_record, attributes)
+            # For updates, only include non-nil attributes
+            update_attributes = attributes.compact
+            was_updated = update_attributes.any? { |key, value| existing_record[key] != value }
+            existing_record.update!(update_attributes) if was_updated
+            [existing_record, was_updated]
           end
         else
           if @test_mode
             log_test_creation(attributes)
             nil
           else
-            model_class.create!(attributes)
+            # For new records, use all attributes including nil values
+            [model_class.create!(attributes), false]
           end
         end
       end
 
-      def update_record(record, attributes)
-        changed = attributes.any? { |key, value| record[key] != value }
-        record.update!(attributes) if changed
-        record
-      end
-
-      def track_record(record, attributes)
+      def track_record(result)
+        record, was_updated = result
         type = model_class.name.demodulize.downcase
 
-        # For existing records, check if any attributes were actually changed
-        if record.persisted? && record.previous_changes.any?
+        if was_updated
           @updated_records[type] << record.granblue_id
           log_updated_record(record) if @verbose
-        elsif !record.persisted?
+        else
           @new_records[type] << record.granblue_id
           log_new_record(record) if @verbose
         end
       end
 
       def log_test_update(record, attributes)
-        @logger&.send(:log_operation, "Update #{model_class.name} #{record.granblue_id}: #{attributes.inspect}")
+        # For test mode, show only the attributes that would be updated
+        update_attributes = attributes.compact
+        @logger&.send(:log_operation, "Update #{model_class.name} #{record.granblue_id}: #{update_attributes.inspect}")
       end
 
       def log_test_creation(attributes)