diff --git a/app/models/conference.rb b/app/models/conference.rb index 6a6d08ec48b38a07abbacc14554c970e08171b46..6da9c446003ff03d641dcc4162f9c382dbe1398b 100644 --- a/app/models/conference.rb +++ b/app/models/conference.rb @@ -8,6 +8,9 @@ class Conference < ApplicationRecord validates :time_zone, presence: true, inclusion: { in: ActiveSupport::TimeZone.all.map(&:name) } + has_many :relevant_stage_links, class_name: 'RelevantStage' + has_many :relevant_stages, through: :relevant_stage_links, source: :stage + def days (starts_at.to_date..ends_at.to_date) end diff --git a/app/models/relevant_stage.rb b/app/models/relevant_stage.rb new file mode 100644 index 0000000000000000000000000000000000000000..b5914f7cea3a73a36f0fb1dfc694792fa714e44d --- /dev/null +++ b/app/models/relevant_stage.rb @@ -0,0 +1,6 @@ +class RelevantStage < ApplicationRecord + belongs_to :conference + belongs_to :stage + + validates :conference_id, uniqueness: { scope: :stage_id } +end diff --git a/app/models/stage.rb b/app/models/stage.rb index 0cc3b52862282da7b0c44066b1a129dcda6057f5..6470dc2a136086633699684b409b35d3cad6c2a9 100644 --- a/app/models/stage.rb +++ b/app/models/stage.rb @@ -3,4 +3,7 @@ class Stage < ApplicationRecord has_many :sessions validates :ref_id, uniqueness: { scope: :conference_id } + + has_many :relevant_stage_links, class_name: 'RelevantStage' + has_many :relevant_conferences, through: :relevant_stage_links, source: :conference end diff --git a/db/migrate/20240527191332_create_relevant_stages.rb b/db/migrate/20240527191332_create_relevant_stages.rb new file mode 100644 index 0000000000000000000000000000000000000000..fba4b217bf12cf918f8639f4e57c89708dcea03f --- /dev/null +++ b/db/migrate/20240527191332_create_relevant_stages.rb @@ -0,0 +1,12 @@ +class CreateRelevantStages < ActiveRecord::Migration[7.1] + def change + create_table :relevant_stages do |t| + t.references :conference, null: false, foreign_key: true + t.references :stage, null: false, foreign_key: true + + t.timestamps + end + + add_index :relevant_stages, [:conference_id, :stage_id], unique: true + end +end diff --git a/db/schema.rb b/db/schema.rb index ed4b0080d0e1d6b6407d9bdb594ac4ca23041985..801a3e85cef60567962eb992fb73a36fcb49f166 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema[7.1].define(version: 2024_05_26_165259) do +ActiveRecord::Schema[7.1].define(version: 2024_05_27_191332) do create_table "assignments", force: :cascade do |t| t.integer "user_id", null: false t.integer "session_id", null: false @@ -72,6 +72,16 @@ ActiveRecord::Schema[7.1].define(version: 2024_05_26_165259) do t.datetime "updated_at", null: false end + create_table "relevant_stages", force: :cascade do |t| + t.integer "conference_id", null: false + t.integer "stage_id", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["conference_id", "stage_id"], name: "index_relevant_stages_on_conference_id_and_stage_id", unique: true + t.index ["conference_id"], name: "index_relevant_stages_on_conference_id" + t.index ["stage_id"], name: "index_relevant_stages_on_stage_id" + end + create_table "revision_sets", force: :cascade do |t| t.integer "conference_id", null: false t.datetime "created_at", null: false @@ -260,6 +270,8 @@ ActiveRecord::Schema[7.1].define(version: 2024_05_26_165259) do add_foreign_key "assignments", "sessions" add_foreign_key "assignments", "users" + add_foreign_key "relevant_stages", "conferences" + add_foreign_key "relevant_stages", "stages" add_foreign_key "revision_sets", "conferences" add_foreign_key "revisions", "conferences" add_foreign_key "session_speakers", "sessions" diff --git a/test/fixtures/relevant_stages.yml b/test/fixtures/relevant_stages.yml new file mode 100644 index 0000000000000000000000000000000000000000..684efd12c42c2fe5e38343e3aa4705d45e80268b --- /dev/null +++ b/test/fixtures/relevant_stages.yml @@ -0,0 +1,9 @@ +# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + conference: one + stage: one + +two: + conference: two + stage: two diff --git a/test/models/relevant_stage_test.rb b/test/models/relevant_stage_test.rb new file mode 100644 index 0000000000000000000000000000000000000000..e9e09d88e4e6da0ae2849eccd8bf2db5d012210e --- /dev/null +++ b/test/models/relevant_stage_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +class RelevantStageTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end