diff options
| -rw-r--r-- | app/models/import_message.rb | 3 | ||||
| -rw-r--r-- | db/migrate/20171106111448_update_import_message_criticity_type_to_string.rb | 16 | ||||
| -rw-r--r-- | db/schema.rb | 51 |
3 files changed, 31 insertions, 39 deletions
diff --git a/app/models/import_message.rb b/app/models/import_message.rb index 5d0f5c862..b5b4a8f46 100644 --- a/app/models/import_message.rb +++ b/app/models/import_message.rb @@ -1,7 +1,8 @@ class ImportMessage < ActiveRecord::Base + extend Enumerize belongs_to :import belongs_to :resource, class_name: ImportResource - enum criticity: [:info, :warning, :error] + enumerize :criticity, in: %i(info, warning, error) validates :criticity, presence: true end diff --git a/db/migrate/20171106111448_update_import_message_criticity_type_to_string.rb b/db/migrate/20171106111448_update_import_message_criticity_type_to_string.rb new file mode 100644 index 000000000..c14450387 --- /dev/null +++ b/db/migrate/20171106111448_update_import_message_criticity_type_to_string.rb @@ -0,0 +1,16 @@ +class UpdateImportMessageCriticityTypeToString < ActiveRecord::Migration + def change + change_column :import_messages, :criticity, :string + + def change_criticity_value criticity + case criticity + when 0 then "info" + when 1 then "warning" + when 2 then "error" + else + "info" + end + end + ImportMessage.all.each { |im| im.update_attribute(:criticity, change_criticity_value(im.criticity)) } + end +end diff --git a/db/schema.rb b/db/schema.rb index dd9461c78..050e81ad5 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: 20171016074044) do +ActiveRecord::Schema.define(version: 20171106111448) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -284,22 +284,6 @@ ActiveRecord::Schema.define(version: 20171016074044) do add_index "connection_links", ["objectid"], name: "connection_links_objectid_key", unique: true, using: :btree - create_table "delayed_jobs", id: :bigserial, force: :cascade do |t| - t.integer "priority", default: 0 - t.integer "attempts", default: 0 - t.text "handler" - t.text "last_error" - t.datetime "run_at" - t.datetime "locked_at" - t.datetime "failed_at" - t.string "locked_by", limit: 255 - t.string "queue", limit: 255 - t.datetime "created_at" - t.datetime "updated_at" - end - - add_index "delayed_jobs", ["priority", "run_at"], name: "delayed_jobs_priority", using: :btree - create_table "exports", id: :bigserial, force: :cascade do |t| t.integer "referential_id", limit: 8 t.string "status" @@ -382,7 +366,7 @@ ActiveRecord::Schema.define(version: 20171016074044) do end create_table "import_messages", id: :bigserial, force: :cascade do |t| - t.integer "criticity" + t.string "criticity" t.string "message_key" t.hstore "message_attributes" t.integer "import_id", limit: 8 @@ -421,11 +405,11 @@ ActiveRecord::Schema.define(version: 20171016074044) do t.datetime "started_at" t.datetime "ended_at" t.string "token_download" - t.string "type", limit: 255 + t.string "type" t.integer "parent_id", limit: 8 t.string "parent_type" - t.integer "current_step", default: 0 - t.integer "total_steps", default: 0 + t.integer "current_step", default: 0 + t.integer "total_steps", default: 0 t.datetime "notified_parent_at" t.string "creator" end @@ -578,11 +562,6 @@ ActiveRecord::Schema.define(version: 20171016074044) do add_index "networks", ["objectid"], name: "networks_objectid_key", unique: true, using: :btree add_index "networks", ["registration_number"], name: "networks_registration_number_key", using: :btree - create_table "object_id_factories", id: :bigserial, force: :cascade do |t| - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - end - create_table "organisations", id: :bigserial, force: :cascade do |t| t.string "name" t.datetime "created_at" @@ -771,7 +750,7 @@ ActiveRecord::Schema.define(version: 20171016074044) do create_table "stop_areas", id: :bigserial, force: :cascade do |t| t.integer "parent_id", limit: 8 - t.string "objectid", null: false + t.string "objectid", null: false t.integer "object_version", limit: 8 t.string "creator_id" t.string "name" @@ -780,8 +759,8 @@ ActiveRecord::Schema.define(version: 20171016074044) do t.string "registration_number" t.string "nearest_topic_name" t.integer "fare_code" - t.decimal "longitude", precision: 19, scale: 16 - t.decimal "latitude", precision: 19, scale: 16 + t.decimal "longitude", precision: 19, scale: 16 + t.decimal "latitude", precision: 19, scale: 16 t.string "long_lat_type" t.string "country_code" t.string "street_name" @@ -799,7 +778,7 @@ ActiveRecord::Schema.define(version: 20171016074044) do t.datetime "deleted_at" t.datetime "created_at" t.datetime "updated_at" - t.string "stif_type", limit: 255 + t.string "stif_type" end add_index "stop_areas", ["name"], name: "index_stop_areas_on_name", using: :btree @@ -870,18 +849,18 @@ ActiveRecord::Schema.define(version: 20171016074044) do add_index "time_table_periods", ["time_table_id"], name: "index_time_table_periods_on_time_table_id", using: :btree create_table "time_tables", id: :bigserial, force: :cascade do |t| - t.string "objectid", null: false - t.integer "object_version", limit: 8, default: 1 + t.string "objectid", null: false + t.integer "object_version", limit: 8, default: 1 t.string "creator_id" t.string "version" t.string "comment" - t.integer "int_day_types", default: 0 + t.integer "int_day_types", default: 0 t.date "start_date" t.date "end_date" t.integer "calendar_id", limit: 8 t.datetime "created_at" t.datetime "updated_at" - t.string "color", limit: 255 + t.string "color" t.integer "created_from_id" t.string "checksum" t.text "checksum_source" @@ -1028,13 +1007,9 @@ ActiveRecord::Schema.define(version: 20171016074044) 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 "journey_frequencies", "timebands", name: "journey_frequencies_timeband_id_fk", on_delete: :nullify add_foreign_key "journey_frequencies", "timebands", on_delete: :nullify - add_foreign_key "journey_frequencies", "vehicle_journeys", name: "journey_frequencies_vehicle_journey_id_fk", on_delete: :nullify add_foreign_key "journey_frequencies", "vehicle_journeys", on_delete: :nullify - add_foreign_key "journey_pattern_sections", "journey_patterns", name: "journey_pattern_sections_journey_pattern_id_fk", on_delete: :cascade add_foreign_key "journey_pattern_sections", "journey_patterns", on_delete: :cascade - add_foreign_key "journey_pattern_sections", "route_sections", name: "journey_pattern_sections_route_section_id_fk", 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 |