apply matches filters for institutions

app/models/expert.rb

@@ -63,7 +63,6 @@ class Expert < ApplicationRecord
   has_many :antenne_communes, through: :antenne, source: :communes, inverse_of: :antenne_experts
   has_many :antenne_territories, -> { distinct }, through: :antenne, source: :territories, inverse_of: :antenne_experts
   has_many :antenne_regions, -> { distinct.regions }, through: :antenne, source: :regions, inverse_of: :antenne_experts
-  has_many :match_filters, through: :antenne, source: :match_filters, inverse_of: :experts
 
   # :received_matches
   has_many :received_needs, through: :received_matches, source: :need, inverse_of: :experts

app/models/expert_subject.rb

@@ -31,7 +31,6 @@ class ExpertSubject < ApplicationRecord
   #
   has_one :subject, through: :institution_subject, inverse_of: :experts_subjects
   has_one :theme, through: :subject, inverse_of: :experts_subjects
-  has_many :match_filters, through: :expert, inverse_of: :experts_subjects
 
   belongs_to :not_deleted_expert, -> { not_deleted }, class_name: 'Expert', foreign_key: 'expert_id', optional: true, inverse_of: :experts_subjects
 
@@ -99,6 +98,12 @@ class ExpertSubject < ApplicationRecord
 
   scope :support, -> { where(institution_subject: InstitutionSubject.support_subjects) }
 
+  ##
+  #
+  def match_filters
+    MatchFilter.where(id: expert.antenne.match_filters.ids + expert.institution.match_filters.ids)
+  end
+
   ## used for serialization in advisors csv
   #
   def csv_description

app/models/match_filter.rb

@@ -35,8 +35,16 @@ class MatchFilter < ApplicationRecord
 
   validate :antenne_or_institution
 
-  has_many :experts, through: :antenne, source: :experts, inverse_of: :match_filters
-  has_many :experts_subjects, through: :experts, inverse_of: :match_filters
+  has_many :antenne_experts, through: :antenne, source: :experts
+  has_many :institution_experts, through: :institution, source: :experts
+
+  def experts
+    antenne.present? ? antenne_experts : institution_experts
+  end
+
+  def experts_subjects
+    ExpertSubject.where(expert_id: experts.ids)
+  end
 
   def antenne_or_institution
     if antenne.nil? && institution.nil?

spec/services/create_diagnosis/find_relevant_expert_subjects_spec.rb

@@ -13,7 +13,7 @@
       let!(:es_01) { create :expert_subject }
 
       context 'min_years_of_existence' do
-        let(:match_filter_01) { create :match_filter, min_years_of_existence: 3 }
+        let(:match_filter_01) { create :match_filter, :for_antenne, min_years_of_existence: 3 }
 
         before { es_01.expert.antenne.match_filters << match_filter_01 }
 
@@ -31,7 +31,7 @@
       end
 
       context 'max_years_of_existence' do
-        let(:match_filter_01) { create :match_filter, max_years_of_existence: 5 }
+        let(:match_filter_01) { create :match_filter, :for_antenne, max_years_of_existence: 5 }
 
         before { es_01.expert.antenne.match_filters << match_filter_01 }
 
@@ -54,7 +54,7 @@
       let(:need) { create :need, diagnosis: diagnosis, subject: need_subject }
 
       let!(:tresorerie_subject) { create :subject }
-      let(:match_filter_01) { create :match_filter, effectif_max: 20, subjects: [tresorerie_subject] }
+      let(:match_filter_01) { create :match_filter, :for_antenne, effectif_max: 20, subjects: [tresorerie_subject] }
       let!(:es_01) { create :expert_subject }
 
       before { es_01.expert.antenne.match_filters << match_filter_01 }
@@ -93,8 +93,8 @@
       let(:need) { create :need, diagnosis: diagnosis, subject: need_subject }
 
       let!(:difficulte_subject) { create :subject }
-      let(:match_filter_01) { create :match_filter, accepted_naf_codes: ['1101Z', '1102A', '1102B'], subjects: [difficulte_subject] }
-      let(:match_filter_excluding_naf) { create :match_filter, excluded_naf_codes: ['9001Z'], subjects: [difficulte_subject] }
+      let(:match_filter_01) { create :match_filter, :for_antenne, accepted_naf_codes: ['1101Z', '1102A', '1102B'], subjects: [difficulte_subject] }
+      let(:match_filter_excluding_naf) { create :match_filter, :for_antenne, excluded_naf_codes: ['9001Z'], subjects: [difficulte_subject] }
 
       let!(:es_including_naf) { create :expert_subject }
       let!(:es_excluding_naf) { create :expert_subject }
@@ -155,8 +155,8 @@
       let(:need) { create :need, diagnosis: diagnosis, subject: need_subject }
 
       let!(:difficulte_subject) { create :subject }
-      let(:match_filter_01) { create :match_filter, accepted_legal_forms: %w[4160 6533 6534], subjects: [difficulte_subject] }
-      let(:match_filter_excluding_legal_forms) { create :match_filter, excluded_legal_forms: %w[5499], subjects: [difficulte_subject] }
+      let(:match_filter_01) { create :match_filter, :for_antenne, accepted_legal_forms: %w[4160 6533 6534], subjects: [difficulte_subject] }
+      let(:match_filter_excluding_legal_forms) { create :match_filter, :for_antenne, excluded_legal_forms: %w[5499], subjects: [difficulte_subject] }
 
       let!(:es_including) { create :expert_subject }
       let!(:es_excluding) { create :expert_subject }
@@ -213,8 +213,8 @@
       let(:diagnosis) { create :diagnosis, facility: facility }
       let(:need) { create :need, diagnosis: diagnosis }
 
-      let(:match_filter_01) { create :match_filter, effectif_min: 10 }
-      let(:match_filter_02) { create :match_filter, min_years_of_existence: 3 }
+      let(:match_filter_01) { create :match_filter, :for_antenne, effectif_min: 10 }
+      let(:match_filter_02) { create :match_filter, :for_antenne, min_years_of_existence: 3 }
       let!(:es_01) { create :expert_subject }
 
       before do
@@ -262,7 +262,7 @@
 
       let!(:difficulte_subject) { create :subject }
       let!(:rh_subject) { create :subject }
-      let(:match_filter_01) { create :match_filter, min_years_of_existence: 3, subjects: [difficulte_subject, rh_subject] }
+      let(:match_filter_01) { create :match_filter, :for_antenne, min_years_of_existence: 3, subjects: [difficulte_subject, rh_subject] }
 
       let!(:es_01) { create :expert_subject }
 
@@ -308,8 +308,8 @@
       let!(:rh_subject) { create :subject }
       let!(:eau_subject) { create :subject }
       let!(:energie_subject) { create :subject }
-      let(:match_filter_01) { create :match_filter, min_years_of_existence: 3, subjects: [rh_subject] }
-      let(:match_filter_02) { create :match_filter, min_years_of_existence: 3, effectif_max: 50, subjects: [eau_subject, energie_subject] }
+      let(:match_filter_01) { create :match_filter, :for_antenne, min_years_of_existence: 3, subjects: [rh_subject] }
+      let(:match_filter_02) { create :match_filter, :for_antenne, min_years_of_existence: 3, effectif_max: 50, subjects: [eau_subject, energie_subject] }
 
       let!(:es_01) { create :expert_subject }