refactor denormalized attribute through and non-through paths

Author: ezekg

app/models/concerns/denormalizable.rb

@@ -81,7 +81,6 @@ def instrument_denormalized_attribute_from_through(attribute_name, from:, throug
         before_update -> { write_denormalized_attribute_from_persisted_record_through(through_association_name, from, attribute_name, prefixed_attribute_name) }, if: association_changed
 
         # make sure validation fails if our denormalized column is modified directly
-
         validate -> { validate_denormalized_attribute_from_record_through(through_association_name, from, attribute_name, prefixed_attribute_name) }, if: :"#{prefixed_attribute_name}_changed?", on: :update
 
         denormalized_attributes << prefixed_attribute_name.to_sym
@@ -352,20 +351,22 @@ def write_denormalized_attribute_from_schrodingers_record_through(through_associ
     def validate_denormalized_attribute_from_persisted_record(source_association_name, source_attribute_name, target_attribute_name)
       record = send(source_association_name)
 
-      unless read_attribute(target_attribute_name) == record&.read_attribute(source_attribute_name)
-        if target_reflection = self.class.reflect_on_all_associations.find { it.foreign_key == target_attribute_name.to_s }
-          errors.add target_reflection.name, :not_allowed, message: 'cannot be modified directly because it is a denormalized association'
-        else
-          errors.add target_attribute_name, :not_allowed, message: 'cannot be modified directly because it is a denormalized attribute'
-        end
-      end
+      validate_denormalized_attribute_from_record(record, source_attribute_name, target_attribute_name)
     end
 
     def validate_denormalized_attribute_from_record_through(through_association_name, source_name, source_attribute_name, target_attribute_name)
       record = send(through_association_name)&.send(source_name)
 
+      validate_denormalized_attribute_from_record(record, source_attribute_name, target_attribute_name)
+    end
+
+    def validate_denormalized_attribute_from_record(record, source_attribute_name, target_attribute_name)
       unless read_attribute(target_attribute_name) == record&.read_attribute(source_attribute_name)
-        errors.add target_attribute_name, :not_allowed, message: 'cannot be modified directly because it is a denormalized attribute'
+        if target_reflection = self.class.reflect_on_all_associations.find { it.foreign_key == target_attribute_name.to_s }
+          errors.add target_reflection.name, :not_allowed, message: 'cannot be modified directly because it is a denormalized association'
+        else
+          errors.add target_attribute_name, :not_allowed, message: 'cannot be modified directly because it is a denormalized attribute'
+        end
       end
     end
   end