Merge pull request #280 from af83/5417-checksum-relationships

5417 Update parents checksum when children are created or updated

3 files changed, 36 insertions, 4 deletions

diff --git a/app/models/chouette/time_table.rb b/app/models/chouette/time_table.rb
index 8113457ec..15b22b671 100644
--- a/app/models/chouette/time_table.rb
+++ b/app/models/chouette/time_table.rb
@@ -42,11 +42,18 @@ module Chouette
     def checksum_attributes
       [].tap do |attrs|
         attrs << self.int_day_types
-        attrs << self.dates.map(&:checksum).map(&:to_s).sort
-        attrs << self.periods.map(&:checksum).map(&:to_s).sort
+        dates = self.dates
+        dates += TimeTableDate.where(time_table_id: self.id)
+        attrs << dates.map(&:checksum).map(&:to_s).sort
+        periods = self.periods
+        periods += TimeTablePeriod.where(time_table_id: self.id)
+        attrs << periods.map(&:checksum).map(&:to_s).sort
       end
     end
 
+    has_checksum_children TimeTableDate
+    has_checksum_children TimeTablePeriod
+
     def self.object_id_key
       "Timetable"
     end
diff --git a/app/models/chouette/vehicle_journey.rb b/app/models/chouette/vehicle_journey.rb
index 6146d5be8..4a6ba3f75 100644
--- a/app/models/chouette/vehicle_journey.rb
+++ b/app/models/chouette/vehicle_journey.rb
@@ -104,10 +104,14 @@ module Chouette
         attrs << self.published_journey_identifier
         attrs << self.try(:company).try(:get_objectid).try(:local_id)
         attrs << self.footnotes.map(&:checksum).sort
-        attrs << self.vehicle_journey_at_stops.sort_by { |s| s.stop_point&.position }.map(&:checksum).sort
+        vjas =  self.vehicle_journey_at_stops
+        vjas += VehicleJourneyAtStop.where(vehicle_journey_id: self.id)
+        attrs << vjas.uniq.sort_by { |s| s.stop_point&.position }.map(&:checksum).sort
       end
     end
 
+    has_checksum_children VehicleJourneyAtStop
+
     def set_default_values
       if number.nil?
         self.number = 0
diff --git a/app/models/concerns/checksum_support.rb b/app/models/concerns/checksum_support.rb
index ff73c87a3..a76995b0f 100644
--- a/app/models/concerns/checksum_support.rb
+++ b/app/models/concerns/checksum_support.rb
@@ -3,9 +3,21 @@ module ChecksumSupport
   SEPARATOR = '|'
   VALUE_FOR_NIL_ATTRIBUTE = '-'
 
-  included do
+  included do |into|
     before_save :set_current_checksum_source, :update_checksum
     Referential.register_model_with_checksum self
+    into.extend ClassMethods
+  end
+
+  module ClassMethods
+    def has_checksum_children klass, opts={}
+      parent_class = self
+      relation = opts[:relation] || self.model_name.singular
+      klass.after_save do
+        parent = self.send(relation)
+        parent&.update_checksum_without_callbacks!
+      end
+    end
   end
 
   def checksum_attributes
@@ -34,4 +46,13 @@ module ChecksumSupport
       update checksum: Digest::SHA256.new.hexdigest(checksum_source)
     end
   end
+
+  def update_checksum_without_callbacks!
+    set_current_checksum_source
+    _checksum = Digest::SHA256.new.hexdigest(checksum_source)
+    if _checksum != self.checksum
+      self.checksum = _checksum
+      self.class.where(id: self.id).update_all(checksum: _checksum) unless self.new_record?
+    end
+  end
 end