diff --git a/app/models/education/program.rb b/app/models/education/program.rb index b1d2b7e919c62cbc09c3ba32a7b1323e92739a56..2ed2c2351302d09aed180b0e48c1b7fe5bd89a4c 100644 --- a/app/models/education/program.rb +++ b/app/models/education/program.rb @@ -114,13 +114,12 @@ class Education::Program < ApplicationRecord -> { distinct }, through: :schools - has_many :cohorts, - class_name: 'Education::Cohort' has_many :education_cohorts, class_name: 'Education::Cohort' + alias_attribute :cohorts, :education_cohorts has_many :alumni, - through: :cohorts, + through: :education_cohorts, source: :people alias_attribute :university_person_alumni, :alumni @@ -129,7 +128,6 @@ class Education::Program < ApplicationRecord class_name: 'University::Person::Experience', through: :alumni, source: :experiences - alias_attribute :experiences, :alumni_experiences alias_attribute :university_person_experiences, :alumni_experiences has_many :alumni_organizations, @@ -142,7 +140,7 @@ class Education::Program < ApplicationRecord has_many :education_academic_years, -> { distinct }, class_name: 'Education::AcademicYear', - through: :cohorts, + through: :education_cohorts, source: :academic_year alias_attribute :academic_years, :education_academic_years diff --git a/app/models/education/school.rb b/app/models/education/school.rb index 9335b42b179483d1f64be2ecec2c2f3247461b49..c7399a66dca85204b7c5e11b904e37a070144457 100644 --- a/app/models/education/school.rb +++ b/app/models/education/school.rb @@ -76,7 +76,6 @@ class Education::School < ApplicationRecord class_name: 'University::Person::Experience', through: :alumni, source: :experiences - alias_attribute :experiences, :alumni_experiences alias_attribute :university_person_experiences, :alumni_experiences has_many :alumni_organizations, -> { distinct }, @@ -92,8 +91,7 @@ class Education::School < ApplicationRecord has_many :education_cohorts, -> { distinct }, class_name: 'Education::Cohort', - through: :programs, - source: :cohorts + through: :programs alias_attribute :cohorts, :education_cohorts validates :name, :address, :city, :zipcode, :country, presence: true