From 65abada8b2b9c1d74842351c56744fea41ec984b Mon Sep 17 00:00:00 2001 From: Thor77 Date: Sun, 18 Nov 2018 14:12:43 +0100 Subject: [PATCH] Modify model associations to map to new schema --- app/models/group.rb | 5 +++-- app/models/group_score.rb | 1 + app/models/match.rb | 3 +++ app/models/team.rb | 4 ++-- app/models/tournament.rb | 7 ++++--- 5 files changed, 13 insertions(+), 7 deletions(-) diff --git a/app/models/group.rb b/app/models/group.rb index 3738e97..39cba55 100644 --- a/app/models/group.rb +++ b/app/models/group.rb @@ -1,6 +1,7 @@ # frozen_string_literal: true class Group < ApplicationRecord - belongs_to :matches - belongs_to :teams + belongs_to :stage + has_many :matches, dependent: :destroy + has_many :group_scores, dependent: :destroy end diff --git a/app/models/group_score.rb b/app/models/group_score.rb index f6618cc..d7686d3 100644 --- a/app/models/group_score.rb +++ b/app/models/group_score.rb @@ -2,4 +2,5 @@ class GroupScore < ApplicationRecord belongs_to :team + belongs_to :group end diff --git a/app/models/match.rb b/app/models/match.rb index 5d8cb6e..9b97a3d 100644 --- a/app/models/match.rb +++ b/app/models/match.rb @@ -1,4 +1,7 @@ # frozen_string_literal: true class Match < ApplicationRecord + belongs_to :stage + belongs_to :group + has_many :scores, dependent: :destroy end diff --git a/app/models/team.rb b/app/models/team.rb index 2934c91..6df303e 100644 --- a/app/models/team.rb +++ b/app/models/team.rb @@ -2,6 +2,6 @@ class Team < ApplicationRecord belongs_to :tournament - - has_one :group_score, dependent: :destroy + has_many :group_scores, dependent: :destroy + has_many :scores, dependent: :destroy end diff --git a/app/models/tournament.rb b/app/models/tournament.rb index 5d51741..68b8495 100644 --- a/app/models/tournament.rb +++ b/app/models/tournament.rb @@ -3,12 +3,13 @@ require 'securerandom' class Tournament < ApplicationRecord + belongs_to :user + has_many :teams, dependent: :destroy + has_many :stages, dependent: :destroy + validates :name, presence: true validates :code, presence: true, uniqueness: true - has_many :teams, dependent: :destroy - belongs_to :user - alias_attribute :owner, :user after_initialize do |tournament|