diff options
| author | Robert | 2018-01-08 14:28:39 +0100 | 
|---|---|---|
| committer | Alban Peignier | 2018-01-10 17:43:03 +0100 | 
| commit | 3c4648646458f5109fb95a295aff0c42024fdf50 (patch) | |
| tree | 969a95690c63e03b7ebc993deefc09f1df56f370 | |
| parent | e9f9757ea558f90ed125c0284b9cb98539764b75 (diff) | |
| download | chouette-core-3c4648646458f5109fb95a295aff0c42024fdf50.tar.bz2 | |
Refs: #5499@0.5h; Scaffolded Workgroup
  Next:
  - spec associations and name
  - spec initialisation
  - implement
| -rw-r--r-- | app/models/workgroup.rb | 5 | ||||
| -rw-r--r-- | config/initializers/apartment.rb | 1 | ||||
| -rw-r--r-- | db/migrate/20180108132310_create_workgroups.rb | 11 | ||||
| -rw-r--r-- | db/schema.rb | 60 | ||||
| -rw-r--r-- | spec/factories/workgroups.rb | 7 | ||||
| -rw-r--r-- | spec/models/workgroup_spec.rb | 5 | 
6 files changed, 77 insertions, 12 deletions
| diff --git a/app/models/workgroup.rb b/app/models/workgroup.rb new file mode 100644 index 000000000..725add5a3 --- /dev/null +++ b/app/models/workgroup.rb @@ -0,0 +1,5 @@ +class Workgroup < ActiveRecord::Base +  belongs_to :stop_area_referential +  belongs_to :line_referential + +end diff --git a/config/initializers/apartment.rb b/config/initializers/apartment.rb index 8becd23c2..2031d9918 100644 --- a/config/initializers/apartment.rb +++ b/config/initializers/apartment.rb @@ -39,6 +39,7 @@ Apartment.configure do |config|      'Chouette::Network',      'ReferentialCloning',      'Workbench', +    'Workgroup',      'CleanUp',      'CleanUpResult',      'Calendar', diff --git a/db/migrate/20180108132310_create_workgroups.rb b/db/migrate/20180108132310_create_workgroups.rb new file mode 100644 index 000000000..575a69691 --- /dev/null +++ b/db/migrate/20180108132310_create_workgroups.rb @@ -0,0 +1,11 @@ +class CreateWorkgroups < ActiveRecord::Migration +  def change +    create_table :workgroups do |t| +      t.string :name +      t.references :line_referential, index: true, foreign_key: true +      t.references :stop_area_referential, index: true, foreign_key: true + +      t.timestamps null: false +    end +  end +end diff --git a/db/schema.rb b/db/schema.rb index df8243cfd..a34ff0e54 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: 20180103084612) do +ActiveRecord::Schema.define(version: 20180108132310) do    # These are extensions that must be enabled in order to support this database    enable_extension "plpgsql" @@ -281,6 +281,22 @@ ActiveRecord::Schema.define(version: 20180103084612) 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" @@ -400,12 +416,12 @@ ActiveRecord::Schema.define(version: 20180103084612) do      t.datetime "started_at"      t.datetime "ended_at"      t.string   "token_download" -    t.string   "type" +    t.string   "type",                  limit: 255      t.integer  "parent_id",             limit: 8      t.string   "parent_type" +    t.integer  "current_step",                      default: 0 +    t.integer  "total_steps",                       default: 0      t.datetime "notified_parent_at" -    t.integer  "current_step",                    default: 0 -    t.integer  "total_steps",                     default: 0      t.string   "creator"    end @@ -557,6 +573,11 @@ ActiveRecord::Schema.define(version: 20180103084612) 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" @@ -743,7 +764,7 @@ ActiveRecord::Schema.define(version: 20180103084612) 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   "name"      t.string   "comment" @@ -751,8 +772,8 @@ ActiveRecord::Schema.define(version: 20180103084612) 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" @@ -770,7 +791,7 @@ ActiveRecord::Schema.define(version: 20180103084612) do      t.datetime "deleted_at"      t.datetime "created_at"      t.datetime "updated_at" -    t.string   "stif_type" +    t.string   "stif_type",                       limit: 255      t.integer  "waiting_time"    end @@ -841,17 +862,17 @@ ActiveRecord::Schema.define(version: 20180103084612) 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   "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" +    t.string   "color",           limit: 255      t.integer  "created_from_id", limit: 8      t.string   "checksum"      t.text     "checksum_source" @@ -991,6 +1012,17 @@ ActiveRecord::Schema.define(version: 20180103084612) do    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 +  create_table "workgroups", id: :bigserial, force: :cascade do |t| +    t.string   "name" +    t.integer  "line_referential_id" +    t.integer  "stop_area_referential_id" +    t.datetime "created_at",               null: false +    t.datetime "updated_at",               null: false +  end + +  add_index "workgroups", ["line_referential_id"], name: "index_workgroups_on_line_referential_id", using: :btree +  add_index "workgroups", ["stop_area_referential_id"], name: "index_workgroups_on_stop_area_referential_id", using: :btree +    add_foreign_key "access_links", "access_points", name: "aclk_acpt_fkey"    add_foreign_key "api_keys", "organisations"    add_foreign_key "compliance_check_blocks", "compliance_check_sets" @@ -1006,7 +1038,9 @@ ActiveRecord::Schema.define(version: 20180103084612) 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_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 @@ -1026,4 +1060,6 @@ ActiveRecord::Schema.define(version: 20180103084612) do    add_foreign_key "vehicle_journey_at_stops", "vehicle_journeys", name: "vjas_vj_fkey", on_delete: :cascade    add_foreign_key "vehicle_journeys", "journey_patterns", name: "vj_jp_fkey", on_delete: :cascade    add_foreign_key "vehicle_journeys", "routes", name: "vj_route_fkey", on_delete: :cascade +  add_foreign_key "workgroups", "line_referentials" +  add_foreign_key "workgroups", "stop_area_referentials"  end diff --git a/spec/factories/workgroups.rb b/spec/factories/workgroups.rb new file mode 100644 index 000000000..d9647ae1a --- /dev/null +++ b/spec/factories/workgroups.rb @@ -0,0 +1,7 @@ +FactoryGirl.define do +  factory :workgroup do +    name "MyString" +    stop_area_referential nil +    line_referential nil +  end +end diff --git a/spec/models/workgroup_spec.rb b/spec/models/workgroup_spec.rb new file mode 100644 index 000000000..9d18dbc4a --- /dev/null +++ b/spec/models/workgroup_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe Workgroup, type: :model do +  pending "add some examples to (or delete) #{__FILE__}" +end | 
