From c2de73c09dc046a1cfe7855c788a463488791333 Mon Sep 17 00:00:00 2001 From: Lisa Durand Date: Mon, 7 Nov 2022 17:00:31 +0100 Subject: [PATCH] simplify and improve perf by making the feature works only for id search --- app/controllers/recherche_controller.rb | 20 +++++++++++++------ app/views/recherche/index.html.haml | 5 ++--- config/locales/en.yml | 2 +- config/locales/fr.yml | 2 +- spec/controllers/recherche_controller_spec.rb | 4 ++-- 5 files changed, 20 insertions(+), 13 deletions(-) diff --git a/app/controllers/recherche_controller.rb b/app/controllers/recherche_controller.rb index 83586eca6..191b21e36 100644 --- a/app/controllers/recherche_controller.rb +++ b/app/controllers/recherche_controller.rb @@ -29,14 +29,22 @@ class RechercheController < ApplicationController @followed_dossiers_id = current_instructeur&.followed_dossiers&.where(id: @paginated_ids)&.ids || [] @dossier_avis_ids_h = current_expert&.avis&.where(dossier_id: @paginated_ids)&.pluck(:dossier_id, :id).to_h || {} - # we want to retrieve dossiers that are not accessible to the instructor because he is not in the instructor group - # to display an alert in the view - instructeur_procedure_dossiers_ids = DossierSearchService - .matching_dossiers(Dossier.joins(:procedure).where(procedure: {id: current_instructeur&.procedures&.ids}), @search_terms, with_annotation: true) + # if an instructor search for a dossier which is in his procedures but not available to his intructor group + # we want to display an alert in view - not_in_instructor_group_dossiers_ids = instructeur_procedure_dossiers_ids - matching_dossiers_ids + # to make it simpler we only do it if the @search_terms is an id + return if !DossierSearchService.id_compatible?(@search_terms) - @not_in_instructor_group_dossiers = Dossier.where(id: not_in_instructor_group_dossiers_ids) + dossier_instructeur_searched_for = Dossier.find_by(id: @search_terms) + + return if dossier_instructeur_searched_for.nil? + return if current_instructeur&.groupe_instructeur_ids&.include?(dossier_instructeur_searched_for.groupe_instructeur_id) + + if current_instructeur&.procedures&.include?(dossier_instructeur_searched_for.procedure) + @dossier_not_in_instructor_group = dossier_instructeur_searched_for + else + return + end end private diff --git a/app/views/recherche/index.html.haml b/app/views/recherche/index.html.haml index 1432ab7f4..bad95c43d 100644 --- a/app/views/recherche/index.html.haml +++ b/app/views/recherche/index.html.haml @@ -2,10 +2,9 @@ .container - - if @not_in_instructor_group_dossiers.present? + - if @dossier_not_in_instructor_group.present? .fr-alert.fr-alert--info.fr-alert--sm.fr-mt-3w - - @not_in_instructor_group_dossiers.each do |dossier| - = p t('views.instructeurs.search.not_in_instructor_group_dossier', dossier_id: dossier.id, procedure_libelle: dossier.procedure.libelle, groupe_instructeur_label: dossier.groupe_instructeur.label) + = p t('views.instructeurs.search.dossier_not_in_instructor_group', dossier_id: @dossier_not_in_instructor_group.id, procedure_libelle: @dossier_not_in_instructor_group.procedure.libelle, groupe_instructeur_label: @dossier_not_in_instructor_group.groupe_instructeur.label) .page-title Résultat de la recherche : diff --git a/config/locales/en.yml b/config/locales/en.yml index 3fe4af6fd..f91771ac4 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -183,7 +183,7 @@ en: avis: introduction_file_explaination: "File attached to the request for advice" search: - not_in_instructor_group_dossier: "File no. %{dossier_id} of the “%{procedure_libelle}” procedure corresponds to your search, but it is attached to the “%{groupe_instructeur_label}” instructor group." + dossier_not_in_instructor_group: "File no. %{dossier_id} of the “%{procedure_libelle}” procedure corresponds to your search, but it is attached to the “%{groupe_instructeur_label}” instructor group." users: dossiers: archived_dossier: "Your file will be kept %{duree_conservation_dossiers_dans_ds} more months" diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 3461c97f0..bbe5a7e6a 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -179,7 +179,7 @@ fr: avis: introduction_file_explaination: "Fichier joint à la demande d’avis" search: - not_in_instructor_group_dossier: "Le dossier n° %{dossier_id} de la procédure « %{procedure_libelle} » correspond à votre recherche mais il est rattaché au groupe d'instructeurs « %{groupe_instructeur_label} »." + dossier_not_in_instructor_group: "Le dossier n° %{dossier_id} de la procédure « %{procedure_libelle} » correspond à votre recherche mais il est rattaché au groupe d'instructeurs « %{groupe_instructeur_label} »." users: dossiers: archived_dossier: "Votre dossier sera conservé %{duree_conservation_dossiers_dans_ds} mois supplémentaire" diff --git a/spec/controllers/recherche_controller_spec.rb b/spec/controllers/recherche_controller_spec.rb index 597bec755..78a128fda 100644 --- a/spec/controllers/recherche_controller_spec.rb +++ b/spec/controllers/recherche_controller_spec.rb @@ -74,7 +74,7 @@ describe RechercheController, type: :controller do it 'does not return the dossier' do subject expect(assigns(:projected_dossiers).count).to eq(0) - expect(assigns(:not_in_instructor_group_dossiers).count).to eq(0) + expect(assigns(:dossier_not_in_instructor_group)).to eq(nil) end end @@ -92,7 +92,7 @@ describe RechercheController, type: :controller do it 'does not return the dossier but it returns a message' do subject expect(assigns(:projected_dossiers).count).to eq(0) - expect(assigns(:not_in_instructor_group_dossiers)).to eq([dossier3]) + expect(assigns(:dossier_not_in_instructor_group)).to eq(dossier3) end end