Merge pull request #370 from noesya/357-cloisonnement-extranets

Cloisonnement Extranets

app/controllers/extranet/academic_years_controller.rb

 class Extranet::AcademicYearsController < Extranet::ApplicationController
   load_and_authorize_resource class: Education::AcademicYear,
-                              through: :current_university,
-                              through_association: :academic_years
+                              through: :about,
+                              through_association: :education_academic_years
 
   def index
-    @academic_years = about&.academic_years
+    @academic_years = about&.education_academic_years
                             .ordered
                             .page(params[:page])
                             .per(20)

app/controllers/extranet/cohorts_controller.rb

 class Extranet::CohortsController < Extranet::ApplicationController
   load_and_authorize_resource class: Education::Cohort,
-                              through: :current_university,
+                              through: :about,
                               through_association: :education_cohorts
 
   def index
     @facets = Education::Cohort::Facets.new params[:facets], {
-      model: about.cohorts,
+      model: about.education_cohorts,
       about: about
     }
     @cohorts = @facets.results

app/controllers/extranet/home_controller.rb

 class Extranet::HomeController < Extranet::ApplicationController
   def index
     return redirect_to admin_root_path unless current_extranet
-    @cohorts = about&.cohorts.ordered.limit(5)
-    @experiences = about&.experiences.ordered.limit(10)
+    @cohorts = about&.education_cohorts.ordered.limit(5)
+    @experiences = about&.university_person_experiences.ordered.limit(10)
   end
 end

app/controllers/extranet/organizations_controller.rb

 class Extranet::OrganizationsController < Extranet::ApplicationController
   load_and_authorize_resource class: University::Organization,
-                              through: :current_university,
-                              through_association: :organizations
+                              through: :about,
+                              through_association: :university_person_alumni_organizations
 
   def index
     @facets = University::Organization::Facets.new params[:facets], {
-      model: about&.alumni_organizations,
+      model: about&.university_person_alumni_organizations,
       about: about
     }
     @organizations = @facets.results

app/controllers/extranet/persons_controller.rb

 class Extranet::PersonsController < Extranet::ApplicationController
   load_and_authorize_resource class: University::Person::Alumnus,
-                              through: :current_university,
-                              through_association: :people
+                              through: :about,
+                              through_association: :university_person_alumni
 
   def index
     @facets = University::Person::Alumnus::Facets.new params[:facets], {
-      model: about&.alumni,
-      about: current_extranet.about
+      model: about&.university_person_alumni,
+      about: about
     }
     @people = @facets.results
                      .ordered

app/models/education/program.rb

@@ -114,32 +114,33 @@ 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
 
   has_many   :alumni_experiences,
              -> { distinct },
              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 },
              class_name: 'University::Organization',
              through: :alumni_experiences,
              source: :organization
+  alias_attribute :university_person_alumni_organizations, :alumni_organizations
 
   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
 

app/models/education/school.rb

@@ -70,27 +70,29 @@ class Education::School < ApplicationRecord
 
   has_many    :alumni, -> { distinct },
               through: :programs
+  alias_attribute :university_person_alumni, :alumni
+
   has_many    :alumni_experiences, -> { distinct },
               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 },
               class_name: 'University::Organization',
               through: :alumni_experiences,
               source: :organization
+  alias_attribute :university_person_alumni_organizations, :alumni_organizations
 
   has_many    :education_academic_years, -> { distinct },
               class_name: 'Education::AcademicYear',
               through: :programs
-              alias_attribute :academic_years, :education_academic_years
+  alias_attribute :academic_years, :education_academic_years
 
   has_many    :education_cohorts, -> { distinct },
               class_name: 'Education::Cohort',
-              through: :programs,
-              source: :cohorts
-              alias_attribute :cohorts, :education_cohorts
+              through: :programs
+  alias_attribute :cohorts, :education_cohorts
 
   validates :name, :address, :city, :zipcode, :country, presence: true
 

app/models/university/person/alumnus/import.rb

@@ -157,6 +157,12 @@ class University::Person::Alumnus::Import < ApplicationRecord
         # 'f4d4a92f-8b8f-4778-a127-9293684666be' => 'fab9b86c-8872-4df5-9a97-0e30b104a837', # DU_BILINGUE
         # '6df53074-195c-4299-8b49-bbc9d7cad41a' => 'cb1a26b9-fe5c-4ad1-9715-71cec4642910', # DU_JRI
         # '0d81d3a2-a12c-4326-a395-fd0df4a3ea4f' => '91c44fd2-f0a4-4189-a3f5-311322b7b472' # DUT_JOURNALISME
+        # Sebou
+        # 'c6b78fac-0a5f-4c44-ad22-4ee68ed382bb' => 'ea5d32be-b86a-4257-984a-4d84717dd1d6', # DUT MMI
+        # 'ae3e067a-63b4-4c3f-ba9c-468ade0e4182' => '701c3a4f-3585-4152-b866-da17f4e80e77', # MASTER IJBA
+        # 'f4d4a92f-8b8f-4778-a127-9293684666be' => '0c05b690-ebd1-4efa-862c-81ea0978fb0b', # DU_BILINGUE
+        # '6df53074-195c-4299-8b49-bbc9d7cad41a' => '4ded6dfa-2fab-4e77-b58d-0d97344a04d1', # DU_JRI
+        # '0d81d3a2-a12c-4326-a395-fd0df4a3ea4f' => '4edac5cd-6564-4e47-a18c-960d3e5de54e' # DUT_JOURNALISME
       }
       id = substitutes[id] if substitutes.has_key? id
     end

config/routes/extranet.rb

 get 'cohorts'           => 'extranet/cohorts#index', as: :education_cohorts
 get 'cohorts/:id'       => 'extranet/cohorts#show', as: :education_cohort
 get 'organizations'     => 'extranet/organizations#index', as: :university_organizations
-get 'organization/:id'  => 'extranet/organizations#show', as: :university_organization
+get 'organizations/:id'  => 'extranet/organizations#show', as: :university_organization
 get 'persons'           => 'extranet/persons#index', as: :university_persons
 get 'persons/:id'       => 'extranet/persons#show', as: :university_person
 get 'years'             => 'extranet/academic_years#index', as: :education_academic_years