Permet d'ajouter des filtres aux institutions #3462

LucienMLD · 2024-05-27T13:07:27Z

closes #3461

app/models/expert_subject.rb

clairezed

Hop, j'ai relevé de possibles subtilités, à discuter éventuellement ensemble

app/models/match_filter.rb

spec/services/create_diagnosis/find_relevant_expert_subjects_spec.rb

app/models/expert_subject.rb

clairezed

des commentaires peu importants en attendant la suite des tests

app/models/match_filter.rb

db/migrate/20240529132601_update_match_filter_relation_to_polymorphic.rb

app/models/match_filter.rb

spec/services/create_diagnosis/find_relevant_expert_subjects_spec.rb

LucienMLD · 2024-06-03T14:28:11Z

@clairezed c'est bon pour les tests je pense, j'ai fait un filtre normal et un filtre avec sujet

clairezed

J'ai juste testé la création de filtres en admin, mais pas une mise en action concrète avec différents filtres et tout (trop complexe de créer un vrai jeu de données).

Je fais confiance aux tests pour les cas concrets avec données !

Aussi, j'ai tenté un truc pour choper les match_filters d'un expert_subject, cf le dernier commit.

Ca permet de passer de :

ExpertSubject Load (2.1ms)  SELECT "experts_subjects".* FROM "experts_subjects" ORDER BY "experts_subjects"."id" DESC LIMIT $1  [["LIMIT", 1]]                
Expert Load (0.7ms)  SELECT "experts".* FROM "experts" WHERE "experts"."id" = $1 LIMIT $2  [["id", 22938], ["LIMIT", 1]]                                      
Antenne Load (1.1ms)  SELECT "antennes".* FROM "antennes" WHERE "antennes"."id" = $1 LIMIT $2  [["id", 952], ["LIMIT", 1]]                                    
MatchFilter Pluck (0.7ms)  SELECT "match_filters"."id" FROM "match_filters" WHERE "match_filters"."filtrable_element_id" = $1 AND "match_filters"."filtrable_element_type" = $2  [["filtrable_element_id", 952], ["filtrable_element_type", "Antenne"]]                                                                       
Institution Load (2.2ms)  SELECT "institutions".* FROM "institutions" INNER JOIN "antennes" ON "institutions"."id" = "antennes"."institution_id" WHERE "antennes"."id" = $1 LIMIT $2  [["id", 952], ["LIMIT", 1]]                             
MatchFilter Pluck (0.4ms)  SELECT "match_filters"."id" FROM "match_filters" WHERE "match_filters"."filtrable_element_id" = $1 AND "match_filters"."filtrable_element_type" = $2  [["filtrable_element_id", 15], ["filtrable_element_type", "Institution"]]

à

ExpertSubject Load (0.4ms)  SELECT "experts_subjects".* FROM "experts_subjects" ORDER BY "experts_subjects"."id" DESC LIMIT $1  [["LIMIT", 1]]
MatchFilter Load (1.0ms)  SELECT "match_filters".* FROM "match_filters" INNER JOIN "antennes" ON "match_filters"."filtrable_element_id" = "antennes"."id" INNER JOIN "experts" ON "antennes"."id" = "experts"."antenne_id" WHERE "experts"."id" = $1 AND "match_filters"."filtrable_element_type" = $2  [["id", 22938], ["filtrable_element_type", "Antenne"]]
MatchFilter Load (1.3ms)  SELECT "match_filters".* FROM "match_filters" INNER JOIN "institutions" ON "match_filters"."filtrable_element_id" = "institutions"."id" INNER JOIN "antennes" ON "institutions"."id" = "antennes"."institution_id" INNER JOIN "experts" ON "antennes"."id" = "experts"."antenne_id" WHERE "experts"."id" = $1 AND "match_filters"."filtrable_element_type" = $2  [["id", 22938], ["filtrable_element_type", "Institution"]]

config/locales/models.fr.yml

clairezed · 2024-06-04T06:03:19Z

spec/factories/match_filter.rb

@@ -2,4 +2,12 @@

 FactoryBot.define do
  factory :match_filter
+
+  trait :for_antenne do


ça marche aussi comme ça pour les polymorphics ? Dans la doc, je vois autre chose (https://thoughtbot.github.io/factory_bot/cookbook/polymorphic-associations.html)

hm, c'est grâce aux getters et setters que tu as mis en place, je présume

J'ai trouvé ça plus pratique d'avoir des setters

spec/models/match_filter_spec.rb

clairezed · 2024-06-04T06:24:00Z

spec/services/create_diagnosis/find_relevant_expert_subjects_spec.rb

      let(:diagnosis) { create :diagnosis, company: company }
      let(:need) { create :need, diagnosis: diagnosis }
      let!(:es_01) { create :expert_subject }

-      context 'min_years_of_existence' do
-        let(:match_filter_01) { create :match_filter, min_years_of_existence: 3 }
+      describe 'min_years_of_existence' do


je les trouve pas lisibles ces tests, car à chaque fois les sample de dates de création de l'entreprise changent, ce qui complique la comparaison des effets de l'application des différents filtres. Y'a moyen de garder les mêmes dates pour chaque context ?

Je vais essayer oui, c'est pas simple je me suis pas mal pris la tête là-dessus pour avoir des trucs cohérents.

spec/services/create_diagnosis/find_relevant_expert_subjects_spec.rb

clairezed · 2024-06-04T07:05:38Z

db/migrate/20240529132601_update_match_filter_relation_to_polymorphic.rb

+    add_reference :match_filters, :filtrable_element, polymorphic: true, index: true
+
+    MatchFilter.find_each do |match_filter|
+      match_filter.update(filtrable_element: match_filter.antenne)


comme tu as créé un getter qui s'appelle "antenne" pour les match_filters, la migration ne fonctionne pas écrite comme ça (tous les filtrables sont à nil). Peut-être en allant plutôt chercher le champs antenne_id ?

j'ai pas retesté depuis le passage en polymorphisme, je regarde ça

LucienMLD · 2024-06-05T09:29:20Z

@clairezed ok pour deuxième revue

clairezed · 2024-06-05T13:35:21Z

db/migrate/20240529132601_update_match_filter_relation_to_polymorphic.rb

@@ -0,0 +1,22 @@
+class UpdateMatchFilterRelationToPolymorphic < ActiveRecord::Migration[7.0]
+  def up
+    add_reference :match_filters, :filtrable_element, polymorphic: true, index: true, null: false


je vois toujours le null: false ici, pourtant @LucienMLD

fix fix migration

LucienMLD marked this pull request as draft May 27, 2024 13:07

LucienMLD marked this pull request as ready for review May 27, 2024 14:43

LucienMLD force-pushed the lucien/filtre-institutions branch from 1cde1ea to be6dd42 Compare May 27, 2024 15:27

LucienMLD changed the title ~~WIP Permet d'ajouter des filtres aux institutions~~ Permet d'ajouter des filtres aux institutions May 28, 2024

LucienMLD force-pushed the lucien/filtre-institutions branch from 9d5cf35 to a7b8845 Compare May 28, 2024 09:31

LucienMLD requested a review from clairezed May 28, 2024 09:56

clairezed force-pushed the lucien/filtre-institutions branch from a7b8845 to 3dcc8ea Compare May 28, 2024 14:15

clairezed reviewed May 28, 2024

View reviewed changes

app/models/expert_subject.rb Outdated Show resolved Hide resolved

clairezed reviewed May 28, 2024

View reviewed changes

app/models/match_filter.rb Outdated Show resolved Hide resolved

spec/services/create_diagnosis/find_relevant_expert_subjects_spec.rb Outdated Show resolved Hide resolved

app/models/expert_subject.rb Outdated Show resolved Hide resolved

LucienMLD force-pushed the lucien/filtre-institutions branch 2 times, most recently from fc17f25 to 87d59b7 Compare May 30, 2024 15:50

clairezed reviewed May 31, 2024

View reviewed changes

app/models/match_filter.rb Outdated Show resolved Hide resolved

db/migrate/20240529132601_update_match_filter_relation_to_polymorphic.rb Outdated Show resolved Hide resolved

app/models/match_filter.rb Show resolved Hide resolved

LucienMLD force-pushed the lucien/filtre-institutions branch from 87d59b7 to f8d7af1 Compare June 3, 2024 14:13

LucienMLD commented Jun 3, 2024

View reviewed changes

spec/services/create_diagnosis/find_relevant_expert_subjects_spec.rb Show resolved Hide resolved

clairezed force-pushed the lucien/filtre-institutions branch from f8d7af1 to 5b21d37 Compare June 3, 2024 14:56

clairezed reviewed Jun 4, 2024

View reviewed changes

LucienMLD force-pushed the lucien/filtre-institutions branch from 94a84f8 to 63b8444 Compare June 4, 2024 14:19

LucienMLD force-pushed the lucien/filtre-institutions branch 2 times, most recently from 16c471b to 3cdc3ea Compare June 5, 2024 13:12

clairezed reviewed Jun 5, 2024

View reviewed changes

LucienMLD force-pushed the lucien/filtre-institutions branch from 3cdc3ea to d8d8263 Compare June 5, 2024 13:37

LucienMLD added 7 commits June 5, 2024 15:48

adds filters model for institutions

61f48b3

apply matches filters for institutions

abcc1fa

improve errors

6195c5d

move match_filter antenne and institution as polymorphic association

6df48b5

fix fix migration

takes antenne filter if institution filter is present

a0709df

improvements

9e7da07

add tests

ae9eb44

clairezed and others added 5 commits June 5, 2024 15:49

Autre méthode pour experts_subjects.match_filters

7270e20

improvements

bf57dfa

tests improvements

82c9267

fix tests

ab2e4cb

fix migration

fcd0c10

LucienMLD force-pushed the lucien/filtre-institutions branch from 0e0d8b7 to fcd0c10 Compare June 5, 2024 13:51

LucienMLD merged commit c7ef995 into main Jun 5, 2024
3 checks passed

LucienMLD deleted the lucien/filtre-institutions branch June 5, 2024 14:13

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Permet d'ajouter des filtres aux institutions #3462

Permet d'ajouter des filtres aux institutions #3462

LucienMLD commented May 27, 2024

clairezed left a comment

clairezed left a comment

LucienMLD commented Jun 3, 2024

clairezed left a comment

clairezed Jun 4, 2024

clairezed Jun 4, 2024

LucienMLD Jun 4, 2024

clairezed Jun 4, 2024

LucienMLD Jun 4, 2024

clairezed Jun 4, 2024

LucienMLD Jun 4, 2024

LucienMLD commented Jun 5, 2024

clairezed Jun 5, 2024

Permet d'ajouter des filtres aux institutions #3462

Permet d'ajouter des filtres aux institutions #3462

Conversation

LucienMLD commented May 27, 2024

clairezed left a comment

Choose a reason for hiding this comment

clairezed left a comment

Choose a reason for hiding this comment

LucienMLD commented Jun 3, 2024

clairezed left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

LucienMLD commented Jun 5, 2024

Choose a reason for hiding this comment