From b33f80c12a1225f19ee40330139ff5e016fcb786 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Gaya?= <sebastien.gaya@gmail.com>
Date: Mon, 9 May 2022 09:50:11 +0200
Subject: [PATCH] clean & iso
---
app/models/education/program.rb | 8 +++-----
app/models/education/school.rb | 4 +---
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/app/models/education/program.rb b/app/models/education/program.rb
index b1d2b7e91..2ed2c2351 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 9335b42b1..c7399a66d 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
--
GitLab