10 files changed, 55 insertions, 6 deletions
diff --git a/app/models/chouette/route.rb b/app/models/chouette/route.rb
index 47c18af09..5cc5d8b0d 100644
--- a/app/models/chouette/route.rb
+++ b/app/models/chouette/route.rb
@@ -133,7 +133,7 @@ module Chouette
     def checksum_attributes
       values = self.slice(*['name', 'published_name', 'wayback']).values
       values.tap do |attrs|
-        attrs << self.stop_points.sort_by(&:position).map{|sp| "#{sp.stop_area.user_objectid}#{sp.for_boarding}#{sp.for_alighting}" }.join
+        attrs << self.stop_points.sort_by(&:position).map{|sp| [sp.stop_area.user_objectid, sp.for_boarding, sp.for_alighting]}
         attrs << self.routing_constraint_zones.map(&:checksum)
       end
     end
diff --git a/app/models/chouette/routing_constraint_zone.rb b/app/models/chouette/routing_constraint_zone.rb
index 903922241..58703598e 100644
--- a/app/models/chouette/routing_constraint_zone.rb
+++ b/app/models/chouette/routing_constraint_zone.rb
@@ -25,7 +25,9 @@ module Chouette
     end
 
     def checksum_attributes
-      self.stop_points.map(&:stop_area).map(&:user_objectid)
+      [
+        self.stop_points.map(&:stop_area).map(&:user_objectid)
+      ]
     end
 
     def stop_points_belong_to_route
diff --git a/app/models/compliance_check_set.rb b/app/models/compliance_check_set.rb
index f4c44d26d..289fc134f 100644
--- a/app/models/compliance_check_set.rb
+++ b/app/models/compliance_check_set.rb
@@ -19,6 +19,20 @@ class ComplianceCheckSet < ActiveRecord::Base
     where('created_at BETWEEN :begin AND :end', begin: period_range.begin, end: period_range.end)
   end
 
+  scope :blocked, -> { where('created_at < ? AND status = ?', 4.hours.ago, 'running') }
+
+  def self.finished_statuses
+    %w(successful failed warning aborted canceled)
+  end
+
+  def self.abort_old
+    where(
+      'created_at < ? AND status NOT IN (?)',
+      4.hours.ago,
+      finished_statuses
+    ).update_all(status: 'aborted')
+  end
+
   def notify_parent
     if parent
       # parent.child_change
diff --git a/app/models/concerns/checksum_support.rb b/app/models/concerns/checksum_support.rb
index a76995b0f..92103798e 100644
--- a/app/models/concerns/checksum_support.rb
+++ b/app/models/concerns/checksum_support.rb
@@ -24,10 +24,29 @@ module ChecksumSupport
     self.attributes.values
   end
 
+  def checksum_replace_nil_or_empty_values values
+    # Replace empty array by nil & nil by VALUE_FOR_NIL_ATTRIBUTE
+    values
+      .map { |x| x.present? && x || VALUE_FOR_NIL_ATTRIBUTE }
+      .map do |item|
+        item =
+          if item.kind_of?(Array)
+            checksum_replace_nil_or_empty_values(item)
+          else
+            item
+          end
+      end
+  end
+
   def current_checksum_source
-    source = self.checksum_attributes.map{ |x| x unless x.try(:empty?) }
-    source = source.map{ |x| x || VALUE_FOR_NIL_ATTRIBUTE }
-    source.map(&:to_s).join(SEPARATOR)
+    source = checksum_replace_nil_or_empty_values(self.checksum_attributes)
+    source.map{ |item|
+      if item.kind_of?(Array)
+        item.map{ |x| x.kind_of?(Array) ? "(#{x.join(',')})" : x }.join(',')
+      else
+        item
+      end
+    }.join(SEPARATOR)
   end
 
   def set_current_checksum_source
diff --git a/app/models/concerns/min_max_values_validation.rb b/app/models/concerns/min_max_values_validation.rb
index 9b2e0d548..eff779d81 100644
--- a/app/models/concerns/min_max_values_validation.rb
+++ b/app/models/concerns/min_max_values_validation.rb
@@ -2,6 +2,7 @@ module MinMaxValuesValidation
   extend ActiveSupport::Concern
 
   included do
+    validates_presence_of :minimum, :maximum
     validate :min_max_values_validation
   end
 
diff --git a/app/models/concerns/timetable_support.rb b/app/models/concerns/timetable_support.rb
index 8c49723fe..5242abc33 100644
--- a/app/models/concerns/timetable_support.rb
+++ b/app/models/concerns/timetable_support.rb
@@ -101,7 +101,7 @@ module TimetableSupport
       period.period_start = Date.parse(item['period_start'])
       period.period_end   = Date.parse(item['period_end'])
 
-      period.save if period === ActiveRecord::Base && period.changed?
+      period.save if period.is_a?(ActiveRecord::Base) && period.changed?
 
       item['id'] = period.id
     end
diff --git a/app/models/import.rb b/app/models/import.rb
index 049a65f40..29aadcd56 100644
--- a/app/models/import.rb
+++ b/app/models/import.rb
@@ -13,6 +13,8 @@ class Import < ActiveRecord::Base
     where('started_at BETWEEN :begin AND :end', begin: period_range.begin, end: period_range.end)
    end
 
+  scope :blocked, -> { where('created_at < ? AND status = ?', 4.hours.ago, 'running') }
+
   extend Enumerize
   enumerize :status, in: %w(new pending successful warning failed running aborted canceled), scope: true, default: :new
 
@@ -42,6 +44,14 @@ class Import < ActiveRecord::Base
     %w(successful failed warning aborted canceled)
   end
 
+  def self.abort_old
+    where(
+      'created_at < ? AND status NOT IN (?)',
+      4.hours.ago,
+      finished_statuses
+    ).update_all(status: 'aborted')
+  end
+
   def notify_parent
     parent.child_change
     update(notified_parent_at: DateTime.now)
diff --git a/app/models/referential.rb b/app/models/referential.rb
index f64db4ebf..509e0412f 100644
--- a/app/models/referential.rb
+++ b/app/models/referential.rb
@@ -62,6 +62,7 @@ class Referential < ActiveRecord::Base
   scope :order_by_validity_period, ->(dir) { joins(:metadatas).order("unnest(periodes) #{dir}") }
   scope :order_by_lines, ->(dir) { joins(:metadatas).group("referentials.id").order("sum(array_length(referential_metadata.line_ids,1)) #{dir}") }
   scope :not_in_referential_suite, -> { where referential_suite_id: nil }
+  scope :blocked, -> { where('ready = ? AND created_at < ?', false, 4.hours.ago) }
 
   def save_with_table_lock_timeout(options = {})
     save_without_table_lock_timeout(options)
diff --git a/app/models/vehicle_journey_control/delta.rb b/app/models/vehicle_journey_control/delta.rb
index f061b9fdd..737b7d78c 100644
--- a/app/models/vehicle_journey_control/delta.rb
+++ b/app/models/vehicle_journey_control/delta.rb
@@ -4,6 +4,7 @@ module VehicleJourneyControl
     store_accessor :control_attributes, :maximum
 
     validates_numericality_of :maximum, allow_nil: true, greater_than_or_equal_to: 0
+    validates_presence_of :maximum
 
     def self.default_code; "3-VehicleJourney-3" end
   end
diff --git a/app/models/vehicle_journey_control/waiting_time.rb b/app/models/vehicle_journey_control/waiting_time.rb
index f2666cb72..89a18a5d9 100644
--- a/app/models/vehicle_journey_control/waiting_time.rb
+++ b/app/models/vehicle_journey_control/waiting_time.rb
@@ -3,6 +3,7 @@ module VehicleJourneyControl
     store_accessor :control_attributes, :maximum
 
     validates_numericality_of :maximum, allow_nil: true, greater_than_or_equal_to: 0
+    validates_presence_of :maximum
 
     def self.default_code; "3-VehicleJourney-1" end
   end