diff --git a/app/models/quiz.rb b/app/models/quiz.rb index f8d0b23..c1ed37b 100644 --- a/app/models/quiz.rb +++ b/app/models/quiz.rb @@ -2,6 +2,8 @@ class Quiz < ApplicationRecord has_many :questions, -> { order(:sort) } has_many :candidates + has_many :reviewer_to_quizzes + has_many :reviewers, through: :reviewer_to_quizzes, source: :user validates :name, presence: true, uniqueness: true validates :dept, presence: true diff --git a/app/models/reviewer_to_quiz.rb b/app/models/reviewer_to_quiz.rb new file mode 100644 index 0000000..27634ad --- /dev/null +++ b/app/models/reviewer_to_quiz.rb @@ -0,0 +1,5 @@ +# frozen_string_literal: true +class ReviewerToQuiz < ApplicationRecord + belongs_to :user + belongs_to :quiz +end diff --git a/app/models/user.rb b/app/models/user.rb index 00bbdad..f57a07d 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,7 +1,9 @@ # frozen_string_literal: true class User < ApplicationRecord has_secure_password - has_many :candidates, foreign_key: "recruiter_id" + has_many :candidates, foreign_key: :recruiter_id + has_many :reviewer_to_quizzes + has_many :quizzes, through: :reviewer_to_quizzes validates :email, presence: true, uniqueness: true validates :name, presence: true diff --git a/db/migrate/20160915164450_create_reviewer_to_quizzes.rb b/db/migrate/20160915164450_create_reviewer_to_quizzes.rb new file mode 100644 index 0000000..4f29634 --- /dev/null +++ b/db/migrate/20160915164450_create_reviewer_to_quizzes.rb @@ -0,0 +1,12 @@ +# frozen_string_literal: true +class CreateReviewerToQuizzes < ActiveRecord::Migration[5.0] + def change + create_table :reviewer_to_quizzes do |t| + t.integer :user_id, null: false + t.integer :quiz_id, null: false + + t.timestamps + end + add_index :reviewer_to_quizzes, :quiz_id + end +end diff --git a/db/schema.rb b/db/schema.rb index ac3eb57..41a294d 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.define(version: 20160826200610) do +ActiveRecord::Schema.define(version: 20160915164450) do create_table "answers", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t| t.integer "candidate_id" @@ -65,6 +65,14 @@ ActiveRecord::Schema.define(version: 20160826200610) do t.string "name" end + create_table "reviewer_to_quizzes", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t| + t.integer "user_id", null: false + t.integer "quiz_id", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["quiz_id"], name: "index_reviewer_to_quizzes_on_quiz_id", using: :btree + end + create_table "users", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t| t.string "name" t.string "email" diff --git a/erd.pdf b/erd.pdf index 9513737..1d050f2 100644 Binary files a/erd.pdf and b/erd.pdf differ diff --git a/test/fixtures/reviewer_to_quizzes.yml b/test/fixtures/reviewer_to_quizzes.yml new file mode 100644 index 0000000..4e8812f --- /dev/null +++ b/test/fixtures/reviewer_to_quizzes.yml @@ -0,0 +1,9 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + user: reviewer + quiz: fed + +two: + user: reviewer2 + quiz: fed diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml index 6b8ef4d..9c007a3 100644 --- a/test/fixtures/users.yml +++ b/test/fixtures/users.yml @@ -12,6 +12,12 @@ reviewer: password_digest: <%= BCrypt::Password.create("password", cost: 4) %> role: reviewer +reviewer2: + name: David Reviewer + email: david.reviewer@mailinator.com + password_digest: <%= BCrypt::Password.create("password", cost: 4) %> + role: reviewer + admin: name: Alan Admin email: alan.admin@mailinator.com diff --git a/test/models/reviewer_to_quiz_test.rb b/test/models/reviewer_to_quiz_test.rb new file mode 100644 index 0000000..43282af --- /dev/null +++ b/test/models/reviewer_to_quiz_test.rb @@ -0,0 +1,8 @@ +# frozen_string_literal: true +require 'test_helper' + +class ReviewerToQuizTest < ActiveSupport::TestCase + test "the truth" do + assert ReviewerToQuiz + end +end