Gestion unifiée des auteurs et autrices

Gemfile.lock

@@ -770,4 +770,4 @@ RUBY VERSION
    ruby 3.3.5p100
 
 BUNDLED WITH
-   2.5.9
+   2.5.16

app/assets/stylesheets/admin/design-system/layout.sass

@@ -9,6 +9,6 @@ body
         #{--bs-gutter-x}: 4rem
 
 main
-    min-height: 70vh
+    min-height: 50vh
     padding-bottom: pxToRem(100)
     position: relative

app/controllers/admin/communication/authors_controller.rb

@@ -0,0 +1,29 @@
+class Admin::Communication::AuthorsController < Admin::Communication::ApplicationController
+  load_and_authorize_resource class: "University::Person",
+                              through: :current_university,
+                              through_association: :people
+
+  include Admin::Localizable
+
+  def index
+    @authors =  current_university.people
+                                  .authors
+                                  .filter_by(params[:filters], current_language)
+                                  .ordered(current_language)
+                                  .page(params[:page])
+    breadcrumb
+  end
+
+  def show
+    breadcrumb
+    add_breadcrumb @l10n
+  end
+
+  protected
+
+  def breadcrumb
+    super
+    add_breadcrumb University::Person::Localization::Author.model_name.human(count: 2), admin_communication_authors_path
+  end
+
+end

app/controllers/admin/university/people_controller.rb

@@ -99,7 +99,7 @@ def person_params
       :picture, :picture_delete, :picture_infos,
       :habilitation, :tenure,
       :linkedin_visibility, :twitter_visibility, :mastodon_visibility,
-      :is_researcher, :is_teacher, :is_administration, :is_alumnus, :user_id,
+      :is_researcher, :is_teacher, :is_administration, :is_alumnus, :is_author, :user_id,
       research_laboratory_ids: [], category_ids: [],
       localizations_attributes: [
         :id, :slug, :first_name, :last_name,

app/models/communication.rb

@@ -8,6 +8,7 @@ def self.table_name_prefix
 
   def self.parts
     [
+      [University::Person::Localization::Author, :admin_communication_authors_path],
       [Communication::Website, :admin_communication_websites_path],
       [Communication::Extranet, :admin_communication_extranets_path],
     ]

app/models/university/person.rb

@@ -48,25 +48,19 @@ class University::Person < ApplicationRecord
   include Filterable
   include Sanitizable
   include Localizable
+  include WithAlumnus
   include WithBlobs
   include WithCountry
-  # WithRoles included before WithEducation because needed for the latter
-  include WithRoles
-  include WithEducation
-  include WithExperiences
+  include WithFacets
+  include WithInvolvements
   include WithPersonalData
   include WithPicture
-  include WithResearch
+  include WithRealmAdministration
+  include WithRealmCommunication
+  include WithRealmEducation
+  include WithRealmResearch
   include WithUniversity
 
-  LIST_OF_ROLES = [
-    :administration,
-    :teacher,
-    :researcher,
-    :alumnus,
-    :author
-  ].freeze
-
   enum :gender, { male: 0, female: 1, non_binary: 2 }
 
   belongs_to :user, optional: true
@@ -75,37 +69,6 @@ class University::Person < ApplicationRecord
                           class_name: 'University::Person::Category',
                           join_table: :university_people_categories
 
-  has_and_belongs_to_many :research_journal_papers,
-                          class_name: 'Research::Journal::Paper',
-                          join_table: :research_journal_papers_researchers,
-                          foreign_key: :researcher_id
-
-  has_many                :communication_website_posts,
-                          class_name: 'Communication::Website::Post',
-                          foreign_key: :author_id,
-                          dependent: :nullify
-
-  has_many                :involvements,
-                          class_name: 'University::Person::Involvement',
-                          dependent: :destroy
-
-  has_many                :author_websites,
-                          -> { distinct },
-                          through: :communication_website_posts,
-                          source: :website
-
-  has_many                :researcher_websites,
-                          -> { distinct },
-                          through: :research_journal_papers,
-                          source: :websites
-
-  has_many                :teacher_websites,
-                          -> { distinct },
-                          through: :education_programs,
-                          source: :websites
-
-  accepts_nested_attributes_for :involvements
-
   validates :email,
             uniqueness: { scope: :university_id },
             allow_blank: true,
@@ -146,12 +109,6 @@ class University::Person < ApplicationRecord
     .order("localization_last_name ASC, localization_first_name ASC")
   }
 
-  scope :administration,    -> { where(is_administration: true) }
-  scope :teachers,          -> { where(is_teacher: true) }
-  scope :researchers,       -> { where(is_researcher: true) }
-  scope :alumni,            -> { where(is_alumnus: true) }
-  scope :with_habilitation, -> { where(habilitation: true) }
-  scope :for_role, -> (role, language = nil) { where("is_#{role}": true) }
   scope :for_category, -> (category_id, language = nil) { joins(:categories).where(university_person_categories: { id: category_id }).distinct }
   scope :for_program, -> (program_id, language = nil) {
     left_joins(:education_programs_as_administrator, :education_programs_as_teacher)
@@ -188,34 +145,12 @@ class University::Person < ApplicationRecord
       ", term: "%#{sanitize_sql_like(term)}%")
   }
 
-  def roles
-    LIST_OF_ROLES.reject do |role|
-      !public_send("is_#{role}")
-    end
-  end
-
   def dependencies
     localizations +
     categories +
     active_storage_blobs
   end
 
-  def administrator_facets
-    @administrator_facets ||= University::Person::Localization::Administrator.where(id: localization_ids)
-  end
-
-  def author_facets
-    @author_facets ||= University::Person::Localization::Author.where(id: localization_ids)
-  end
-
-  def researcher_facets
-    @researcher_facets ||= University::Person::Localization::Researcher.where(id: localization_ids)
-  end
-
-  def teacher_facets
-    @teacher_facets ||= University::Person::Localization::Teacher.where(id: localization_ids)
-  end
-
   def full_street_address
     return nil if [address, zipcode, city].all?(&:blank?)
     [address, "#{zipcode} #{city} #{country}".strip].join(', ')

app/models/university/person/with_education.rb → app/models/university/person/with_alumnus.rb

@@ -1,31 +1,16 @@
-module University::Person::WithEducation
+module University::Person::WithAlumnus
   extend ActiveSupport::Concern
 
   included do
-    has_many                      :involvements_as_teacher,
-                                  -> { where(kind: 'teacher') },
-                                  class_name: 'University::Person::Involvement',
-                                  dependent: :destroy
-
-    has_many                      :education_programs_as_teacher,
-                                  through: :involvements_as_teacher,
-                                  source: :target,
-                                  source_type: "Education::Program"
-
-    has_many                      :education_programs_as_administrator,
-                                  -> { distinct },
-                                  through: :roles_as_administrator,
-                                  source: :target,
-                                  source_type: "Education::Program"
-
     has_and_belongs_to_many       :cohorts,
                                   class_name: '::Education::Cohort',
                                   foreign_key: :university_person_id,
                                   association_foreign_key: :education_cohort_id
-
     accepts_nested_attributes_for :cohorts,
                                   reject_if: :all_blank,
                                   allow_destroy: true
+    before_validation :find_cohorts
+    validates_associated :cohorts
 
     # Dénormalisation des liens via cohorts, pour la recherche par facettes
     has_and_belongs_to_many       :diploma_years,
@@ -38,8 +23,22 @@ module University::Person::WithEducation
                                   foreign_key: :university_person_id,
                                   association_foreign_key: :education_program_id
 
-    before_validation :find_cohorts
-    validates_associated :cohorts
+    has_many                      :experiences,
+                                  class_name: "University::Person::Experience",
+                                  dependent: :destroy
+
+    accepts_nested_attributes_for :experiences,
+                                  reject_if: :all_blank,
+                                  allow_destroy: true
+
+    validates_associated :experiences
+
+    scope :for_alumni_organization, -> (organization_ids, language = nil) {
+      left_joins(:experiences)
+        .where(university_person_experiences: { organization_id: organization_ids })
+        .select("university_people.*")
+        .distinct
+    }
 
     scope :for_alumni_program, -> (program_ids, language = nil) {
       left_joins(:cohorts)
@@ -55,12 +54,6 @@ module University::Person::WithEducation
     }
   end
 
-  def add_to_cohort(cohort)
-    cohorts << cohort unless cohort.in?(cohorts)
-    diploma_years << cohort.academic_year unless cohort.academic_year.in? diploma_years
-    diploma_programs << cohort.program unless cohort.program.in? diploma_programs
-  end
-
   def find_cohorts
     # based on https://stackoverflow.com/questions/3579924/accepts-nested-attributes-for-with-find-or-create
     cohorts = []
@@ -77,5 +70,4 @@ def find_cohorts
     end
     self.cohorts = cohorts
   end
-
-end
+end

app/models/university/person/with_facets.rb

@@ -0,0 +1,43 @@
+module University::Person::WithFacets
+  extend ActiveSupport::Concern
+
+  included do
+    LIST_OF_FACETS = [
+      :administration,
+      :teacher,
+      :researcher,
+      :alumnus,
+      :author
+    ].freeze
+
+    scope :administration,    -> { where(is_administration: true) }
+    scope :authors,           -> { where(is_author: true) }
+    scope :teachers,          -> { where(is_teacher: true) }
+    scope :researchers,       -> { where(is_researcher: true) }
+    scope :alumni,            -> { where(is_alumnus: true) }
+    scope :with_habilitation, -> { where(habilitation: true) }
+    scope :for_facet, -> (facet, language = nil) { where("is_#{facet}": true) }  
+  end
+
+  def facets
+    LIST_OF_FACETS.reject do |facet|
+      !public_send("is_#{facet}")
+    end
+  end
+
+  def administrator_facets
+    @administrator_facets ||= University::Person::Localization::Administrator.where(id: localization_ids)
+  end
+
+  def author_facets
+    @author_facets ||= University::Person::Localization::Author.where(id: localization_ids)
+  end
+
+  def researcher_facets
+    @researcher_facets ||= University::Person::Localization::Researcher.where(id: localization_ids)
+  end
+
+  def teacher_facets
+    @teacher_facets ||= University::Person::Localization::Teacher.where(id: localization_ids)
+  end
+end

app/models/university/person/with_involvements.rb

@@ -0,0 +1,11 @@
+module University::Person::WithInvolvements
+  extend ActiveSupport::Concern
+
+  included do
+    has_many  :involvements,
+              class_name: 'University::Person::Involvement',
+              dependent: :destroy
+
+    accepts_nested_attributes_for :involvements
+  end
+end

app/models/university/person/with_realm_administration.rb

@@ -0,0 +1,21 @@
+module University::Person::WithRealmAdministration
+  extend ActiveSupport::Concern
+
+  included do
+    has_many  :involvements_as_administrator,
+              -> { where(kind: 'administrator') },
+              class_name: 'University::Person::Involvement',
+              dependent: :destroy
+
+    has_many  :roles_as_administrator,
+              through: :involvements_as_administrator,
+              source: :target,
+              source_type: 'University::Role'
+
+    has_many  :education_programs_as_administrator,
+              -> { distinct },
+              through: :roles_as_administrator,
+              source: :target,
+              source_type: 'Education::Program'
+  end
+end

app/models/university/person/with_realm_communication.rb

@@ -0,0 +1,29 @@
+module University::Person::WithRealmCommunication
+  extend ActiveSupport::Concern
+
+  included do
+    has_many  :communication_website_posts,
+              class_name: 'Communication::Website::Post',
+              foreign_key: :author_id,
+              dependent: :nullify
+
+    has_many  :author_websites,
+              -> { distinct },
+              through: :communication_website_posts,
+              source: :website
+
+    has_many  :communication_extranet_posts,
+              class_name: 'Communication::Extranet::Post',
+              foreign_key: :author_id,
+              dependent: :nullify
+
+    has_many  :author_extranets,
+              -> { distinct },
+              through: :communication_extranet_posts,
+              source: :extranet
+  end
+
+  def posts
+    communication_website_posts + communication_extranet_posts
+  end
+end