diff options
| -rw-r--r-- | Gemfile.lock | 2 | ||||
| -rw-r--r-- | db/migrate/20170203144307_rename_secondary_companies_column_from_lines.rb | 5 | ||||
| -rw-r--r-- | db/schema.rb | 6 | ||||
| -rw-r--r-- | lib/stif/codif_line_synchronization.rb | 4 |
4 files changed, 13 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 98903e406..3a6068410 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -16,7 +16,7 @@ GIT GIT remote: git@github.com:AF83/stif-codifline-api.git - revision: 72d53d7666736523b5cbef41a2de7e466d58ea1a + revision: 9afe38cce298165765d98936f6d63f8d3cc33bce specs: codifligne (0.0.2) nokogiri (~> 1.6) diff --git a/db/migrate/20170203144307_rename_secondary_companies_column_from_lines.rb b/db/migrate/20170203144307_rename_secondary_companies_column_from_lines.rb new file mode 100644 index 000000000..7b78ace63 --- /dev/null +++ b/db/migrate/20170203144307_rename_secondary_companies_column_from_lines.rb @@ -0,0 +1,5 @@ +class RenameSecondaryCompaniesColumnFromLines < ActiveRecord::Migration + def change + rename_column :lines, :secondary_companies_ids, :secondary_company_ids + end +end diff --git a/db/schema.rb b/db/schema.rb index 6beb862fa..217983cdd 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: 20170203094212) do +ActiveRecord::Schema.define(version: 20170203144307) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -347,13 +347,13 @@ ActiveRecord::Schema.define(version: 20170203094212) do t.boolean "deactivated", default: false t.text "import_xml" t.string "transport_submode" - t.integer "secondary_companies_ids", array: true + t.integer "secondary_company_ids", array: true end add_index "lines", ["line_referential_id"], :name => "index_lines_on_line_referential_id" add_index "lines", ["objectid"], :name => "lines_objectid_key", :unique => true add_index "lines", ["registration_number"], :name => "lines_registration_number_key" - add_index "lines", ["secondary_companies_ids"], :name => "index_lines_on_secondary_companies_ids" + add_index "lines", ["secondary_company_ids"], :name => "index_lines_on_secondary_company_ids" create_table "networks", force: true do |t| t.string "objectid", null: false diff --git a/lib/stif/codif_line_synchronization.rb b/lib/stif/codif_line_synchronization.rb index 318d5427c..1f52fc558 100644 --- a/lib/stif/codif_line_synchronization.rb +++ b/lib/stif/codif_line_synchronization.rb @@ -91,6 +91,10 @@ module Stif } params[:transport_mode] = api_line.transport_mode.to_s params[:transport_submode] = api_line.transport_submode.to_s + api_line.secondary_operator_ref.each do |id| + params[:secondary_companies] ||= [] + params[:secondary_companies] << Chouette::Company.find_by(objectid: id) + end unless api_line.operator_ref.nil? params[:company] = Chouette::Company.find_by(objectid: api_line.operator_ref) end |