Remove call to route_section related method4944_remove_route_section_code

3 files changed, 2 insertions, 79 deletions

diff --git a/app/models/chouette/journey_pattern.rb b/app/models/chouette/journey_pattern.rb
index 3c61f448b..1104c6035 100644
--- a/app/models/chouette/journey_pattern.rb
+++ b/app/models/chouette/journey_pattern.rb
@@ -9,7 +9,6 @@ class Chouette::JourneyPattern < Chouette::TridentActiveRecord
   has_many :vehicle_journey_at_stops, :through => :vehicle_journeys
   has_and_belongs_to_many :stop_points, -> { order("stop_points.position") }, :before_add => :vjas_add, :before_remove => :vjas_remove, :after_add => :shortcuts_update_for_add, :after_remove => :shortcuts_update_for_remove
   has_many :stop_areas, through: :stop_points
-  has_many :journey_pattern_sections
 
   validates_presence_of :route
   validates_presence_of :name
@@ -18,9 +17,6 @@ class Chouette::JourneyPattern < Chouette::TridentActiveRecord
   enum section_status: { todo: 0, completed: 1, control: 2 }
 
   attr_accessor  :control_checked
-  after_update :control_route_sections, :unless => "control_checked"
-
-
   def local_id
     "IBOO-#{self.referential.id}-#{self.try(:route).try(:line).try(:objectid).try(:local_id)}-#{self.id}"
   end
@@ -145,39 +141,4 @@ class Chouette::JourneyPattern < Chouette::TridentActiveRecord
       vjas.destroy
     end
   end
-
-  def control_route_sections
-    stop_area_ids = self.stop_points.map(&:stop_area_id)
-    control_route_sections_by_stop_areas(stop_area_ids)
-  end
-
-  def control_route_sections_by_stop_areas(stop_area_ids)
-    journey_pattern_section_all
-    i = 0
-    to_control = false
-    stop_area_ids.each_cons(2) do |a|
-      jps = @route_sections_orders[i]
-      i += 1
-      unless jps
-        to_control = true
-        next
-      end
-      unless [jps.route_section.departure.id, jps.route_section.arrival.id] == a
-        jps.destroy
-        to_control = true
-      end
-    end
-    self.control_checked = true
-    to_control ? self.control! : self.completed!
-  end
-
-  protected
-
-  def journey_pattern_section_all
-    @route_sections_orders = {}
-    self.journey_pattern_sections.all.map do |journey_pattern_section|
-      @route_sections_orders[journey_pattern_section.rank] = journey_pattern_section
-    end
-  end
-
 end
diff --git a/app/models/chouette/route.rb b/app/models/chouette/route.rb
index 0bdccb36a..79aa19643 100644
--- a/app/models/chouette/route.rb
+++ b/app/models/chouette/route.rb
@@ -74,8 +74,6 @@ class Chouette::Route < Chouette::TridentActiveRecord
 
   validates :wayback, inclusion: { in: self.wayback.values }
 
-  after_commit :journey_patterns_control_route_sections
-
   def duplicate
     overrides = {
       'opposite_route_id' => nil
@@ -182,12 +180,6 @@ class Chouette::Route < Chouette::TridentActiveRecord
     return true
   end
 
-  def journey_patterns_control_route_sections
-    self.journey_patterns.each do |jp|
-      jp.control_route_sections
-    end
-  end
-
   protected
 
   def self.vehicle_journeys_timeless(stop_point_id)
diff --git a/db/schema.rb b/db/schema.rb
index 050e81ad5..d6823e8b0 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20171106111448) do
+ActiveRecord::Schema.define(version: 20171109101514) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -408,9 +408,9 @@ ActiveRecord::Schema.define(version: 20171106111448) do
     t.string   "type"
     t.integer  "parent_id",             limit: 8
     t.string   "parent_type"
+    t.datetime "notified_parent_at"
     t.integer  "current_step",                    default: 0
     t.integer  "total_steps",                     default: 0
-    t.datetime "notified_parent_at"
     t.string   "creator"
   end
 
@@ -431,18 +431,6 @@ ActiveRecord::Schema.define(version: 20171106111448) do
   add_index "journey_frequencies", ["timeband_id"], name: "index_journey_frequencies_on_timeband_id", using: :btree
   add_index "journey_frequencies", ["vehicle_journey_id"], name: "index_journey_frequencies_on_vehicle_journey_id", using: :btree
 
-  create_table "journey_pattern_sections", id: :bigserial, force: :cascade do |t|
-    t.integer  "journey_pattern_id", limit: 8, null: false
-    t.integer  "route_section_id",   limit: 8, null: false
-    t.integer  "rank",                         null: false
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "journey_pattern_sections", ["journey_pattern_id", "route_section_id", "rank"], name: "index_jps_on_journey_pattern_id_and_route_section_id_and_rank", unique: true, using: :btree
-  add_index "journey_pattern_sections", ["journey_pattern_id"], name: "index_journey_pattern_sections_on_journey_pattern_id", using: :btree
-  add_index "journey_pattern_sections", ["route_section_id"], name: "index_journey_pattern_sections_on_route_section_id", using: :btree
-
   create_table "journey_patterns", id: :bigserial, force: :cascade do |t|
     t.integer  "route_id",                limit: 8
     t.string   "objectid",                                      null: false
@@ -652,20 +640,6 @@ ActiveRecord::Schema.define(version: 20171106111448) do
   add_index "referentials", ["created_from_id"], name: "index_referentials_on_created_from_id", using: :btree
   add_index "referentials", ["referential_suite_id"], name: "index_referentials_on_referential_suite_id", using: :btree
 
-  create_table "route_sections", id: :bigserial, force: :cascade do |t|
-    t.integer  "departure_id",       limit: 8
-    t.integer  "arrival_id",         limit: 8
-    t.geometry "input_geometry",     limit: {:srid=>4326, :type=>"line_string"}
-    t.geometry "processed_geometry", limit: {:srid=>4326, :type=>"line_string"}
-    t.string   "objectid",                                                       null: false
-    t.integer  "object_version",     limit: 8
-    t.string   "creator_id"
-    t.float    "distance"
-    t.boolean  "no_processing"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
   create_table "routes", id: :bigserial, force: :cascade do |t|
     t.integer  "line_id",           limit: 8
     t.string   "objectid",                    null: false
@@ -1009,16 +983,12 @@ ActiveRecord::Schema.define(version: 20171106111448) do
   add_foreign_key "group_of_lines_lines", "group_of_lines", name: "groupofline_group_fkey", on_delete: :cascade
   add_foreign_key "journey_frequencies", "timebands", on_delete: :nullify
   add_foreign_key "journey_frequencies", "vehicle_journeys", on_delete: :nullify
-  add_foreign_key "journey_pattern_sections", "journey_patterns", on_delete: :cascade
-  add_foreign_key "journey_pattern_sections", "route_sections", on_delete: :cascade
   add_foreign_key "journey_patterns", "routes", name: "jp_route_fkey", on_delete: :cascade
   add_foreign_key "journey_patterns", "stop_points", column: "arrival_stop_point_id", name: "arrival_point_fkey", on_delete: :nullify
   add_foreign_key "journey_patterns", "stop_points", column: "departure_stop_point_id", name: "departure_point_fkey", on_delete: :nullify
   add_foreign_key "journey_patterns_stop_points", "journey_patterns", name: "jpsp_jp_fkey", on_delete: :cascade
   add_foreign_key "journey_patterns_stop_points", "stop_points", name: "jpsp_stoppoint_fkey", on_delete: :cascade
   add_foreign_key "referentials", "referential_suites"
-  add_foreign_key "route_sections", "stop_areas", column: "arrival_id"
-  add_foreign_key "route_sections", "stop_areas", column: "departure_id"
   add_foreign_key "routes", "routes", column: "opposite_route_id", name: "route_opposite_route_fkey"
   add_foreign_key "stop_areas", "stop_areas", column: "parent_id", name: "area_parent_fkey", on_delete: :nullify
   add_foreign_key "stop_areas_stop_areas", "stop_areas", column: "child_id", name: "stoparea_child_fkey", on_delete: :cascade