diff options
Diffstat (limited to 'db')
7 files changed, 45 insertions, 10 deletions
diff --git a/db/migrate/20180412095756_add_referentials_to_import_resources.rb b/db/migrate/20180412095756_add_referentials_to_import_resources.rb new file mode 100644 index 000000000..8d4ccc095 --- /dev/null +++ b/db/migrate/20180412095756_add_referentials_to_import_resources.rb @@ -0,0 +1,5 @@ +class AddReferentialsToImportResources < ActiveRecord::Migration + def change + add_reference :import_resources, :referential, type: :bigint, index: true, foreign_key: true unless column_exists? :import_resources, :referential_id + end +end diff --git a/db/migrate/20180430122530_add_import_compliance_control_sets_to_workgroups.rb b/db/migrate/20180430122530_add_import_compliance_control_sets_to_workgroups.rb new file mode 100644 index 000000000..2fc7c8e3f --- /dev/null +++ b/db/migrate/20180430122530_add_import_compliance_control_sets_to_workgroups.rb @@ -0,0 +1,5 @@ +class AddImportComplianceControlSetsToWorkgroups < ActiveRecord::Migration + def change + add_column :workgroups, :import_compliance_control_set_ids, :integer, array: true, default: [] + end +end diff --git a/db/migrate/20180507130455_add_owner_to_workgroups.rb b/db/migrate/20180507130455_add_owner_to_workgroups.rb new file mode 100644 index 000000000..2ed601492 --- /dev/null +++ b/db/migrate/20180507130455_add_owner_to_workgroups.rb @@ -0,0 +1,7 @@ +class AddOwnerToWorkgroups < ActiveRecord::Migration + def change + add_column :workgroups, :owner_id, :bigint + add_column :workbenches, :owner_compliance_control_set_ids, :hstore + remove_column :workgroups, :import_compliance_control_set_ids + end +end diff --git a/db/migrate/20180509071833_remove_deprected_fields_from_workbenches.rb b/db/migrate/20180509071833_remove_deprected_fields_from_workbenches.rb new file mode 100644 index 000000000..0ef056914 --- /dev/null +++ b/db/migrate/20180509071833_remove_deprected_fields_from_workbenches.rb @@ -0,0 +1,6 @@ +class RemoveDeprectedFieldsFromWorkbenches < ActiveRecord::Migration + def change + remove_column :workbenches, :import_compliance_control_set_id, :bigint + remove_column :workbenches, :merge_compliance_control_set_id, :bigint + end +end diff --git a/db/migrate/20180517190722_alter_import_resource_referential_id.rb b/db/migrate/20180517190722_alter_import_resource_referential_id.rb new file mode 100644 index 000000000..2570ff640 --- /dev/null +++ b/db/migrate/20180517190722_alter_import_resource_referential_id.rb @@ -0,0 +1,5 @@ +class AlterImportResourceReferentialId < ActiveRecord::Migration + def change + change_column :import_resources, :referential_id, :bigint + end +end diff --git a/db/schema.rb b/db/schema.rb index a39cb1689..c5fe6e0d1 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: 20180425160730) do +ActiveRecord::Schema.define(version: 20180517190722) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -92,9 +92,9 @@ ActiveRecord::Schema.define(version: 20180425160730) do t.integer "organisation_id", limit: 8 t.datetime "created_at" t.datetime "updated_at" - t.integer "workgroup_id", limit: 8 t.integer "int_day_types" t.date "excluded_dates", array: true + t.integer "workgroup_id", limit: 8 t.jsonb "metadata", default: {} end @@ -442,7 +442,7 @@ ActiveRecord::Schema.define(version: 20180425160730) do add_index "import_messages", ["resource_id"], name: "index_import_messages_on_resource_id", using: :btree create_table "import_resources", id: :bigserial, force: :cascade do |t| - t.integer "import_id", limit: 8 + t.integer "import_id", limit: 8 t.string "status" t.datetime "created_at" t.datetime "updated_at" @@ -450,9 +450,11 @@ ActiveRecord::Schema.define(version: 20180425160730) do t.string "reference" t.string "name" t.hstore "metrics" + t.integer "referential_id", limit: 8 end add_index "import_resources", ["import_id"], name: "index_import_resources_on_import_id", using: :btree + add_index "import_resources", ["referential_id"], name: "index_import_resources_on_referential_id", using: :btree create_table "imports", id: :bigserial, force: :cascade do |t| t.string "status" @@ -470,9 +472,9 @@ ActiveRecord::Schema.define(version: 20180425160730) 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 @@ -772,7 +774,7 @@ ActiveRecord::Schema.define(version: 20180425160730) do t.string "objectid", null: false t.integer "object_version", limit: 8 t.integer "route_id", limit: 8 - t.integer "stop_point_ids", array: true + t.integer "stop_point_ids", limit: 8, array: true t.string "checksum" t.text "checksum_source" t.string "data_source_ref" @@ -1073,13 +1075,10 @@ ActiveRecord::Schema.define(version: 20180425160730) do t.integer "output_id", limit: 8 t.string "objectid_format" t.integer "workgroup_id", limit: 8 - t.integer "import_compliance_control_set_id", limit: 8 - t.integer "merge_compliance_control_set_id", limit: 8 + t.hstore "owner_compliance_control_set_ids" end - add_index "workbenches", ["import_compliance_control_set_id"], name: "index_workbenches_on_import_compliance_control_set_id", using: :btree add_index "workbenches", ["line_referential_id"], name: "index_workbenches_on_line_referential_id", using: :btree - add_index "workbenches", ["merge_compliance_control_set_id"], name: "index_workbenches_on_merge_compliance_control_set_id", using: :btree add_index "workbenches", ["organisation_id"], name: "index_workbenches_on_organisation_id", using: :btree add_index "workbenches", ["stop_area_referential_id"], name: "index_workbenches_on_stop_area_referential_id", using: :btree add_index "workbenches", ["workgroup_id"], name: "index_workbenches_on_workgroup_id", using: :btree @@ -1092,6 +1091,7 @@ ActiveRecord::Schema.define(version: 20180425160730) do t.datetime "updated_at", null: false t.string "import_types", default: [], array: true t.string "export_types", default: [], array: true + t.integer "owner_id", limit: 8 end add_foreign_key "access_links", "access_points", name: "aclk_acpt_fkey" @@ -1109,6 +1109,7 @@ ActiveRecord::Schema.define(version: 20180425160730) do add_foreign_key "compliance_controls", "compliance_control_blocks" add_foreign_key "compliance_controls", "compliance_control_sets" add_foreign_key "group_of_lines_lines", "group_of_lines", name: "groupofline_group_fkey", on_delete: :cascade + add_foreign_key "import_resources", "referentials" add_foreign_key "journey_frequencies", "timebands", on_delete: :nullify add_foreign_key "journey_frequencies", "vehicle_journeys", on_delete: :nullify add_foreign_key "journey_patterns", "routes", name: "jp_route_fkey", on_delete: :cascade diff --git a/db/seeds/stif.seeds.rb b/db/seeds/stif.seeds.rb index 98192385f..ec43db6bb 100644 --- a/db/seeds/stif.seeds.rb +++ b/db/seeds/stif.seeds.rb @@ -20,6 +20,12 @@ workgroup = Workgroup.seed_by(name: "Gestion de l'offre théorique IDFm") do |w| w.line_referential = line_referential w.stop_area_referential = stop_area_referential w.export_types = ["Export::Netex"] + w.owner = stif end -Workbench.update_all workgroup_id: workgroup +stif.workbenches.seed_by(name: "Gestion de l'offre") do |w| + w.line_referential = line_referential + w.stop_area_referential = stop_area_referential + w.objectid_format = Workbench.objectid_format.stif_netex + w.workgroup = workgroup +end |