DGNum/demarches-normaliennes
15
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Merge pull request #10171 from tchak/fix-perf-filters

Browse source 
perf(filter): we query by stable_id - no need to check type_de_champ private attribute
This commit is contained in:
Paul Chavard 2024-04-08 09:24:54 +00:00 committed by GitHub
commit 707d3980c0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/models/dossier.rb
View file

@ -247,12 +247,7 @@ class Dossier < ApplicationRecord
scope :with_type_de_champ, -> (stable_id) { scope :with_type_de_champ, -> (stable_id) {
joins('INNER JOIN champs ON champs.dossier_id = dossiers.id INNER JOIN types_de_champ ON types_de_champ.id = champs.type_de_champ_id') joins('INNER JOIN champs ON champs.dossier_id = dossiers.id INNER JOIN types_de_champ ON types_de_champ.id = champs.type_de_champ_id')
.where('types_de_champ.private = FALSE AND types_de_champ.stable_id = ?', stable_id) .where(types_de_champ: { stable_id: })
}
scope :with_type_de_champ_private, -> (stable_id) {
joins('INNER JOIN champs ON champs.dossier_id = dossiers.id INNER JOIN types_de_champ ON types_de_champ.id = champs.type_de_champ_id')
.where('types_de_champ.private = TRUE AND types_de_champ.stable_id = ?', stable_id)
} }
scope :all_state, -> { not_archived.state_not_brouillon } scope :all_state, -> { not_archived.state_not_brouillon }

6
app/models/procedure_presentation.rb
View file

@ -163,7 +163,7 @@ class ProcedurePresentation < ApplicationRecord
end end
when TYPE_DE_CHAMP_PRIVATE when TYPE_DE_CHAMP_PRIVATE
ids = dossiers ids = dossiers
.with_type_de_champ_private(column) .with_type_de_champ(column)
.order("champs.value #{order}") .order("champs.value #{order}")
.pluck(:id) .pluck(:id)
if ids.size != count if ids.size != count
@ -218,8 +218,8 @@ class ProcedurePresentation < ApplicationRecord
dossiers.with_type_de_champ(column) dossiers.with_type_de_champ(column)
.filter_ilike(:champs, value_column, values) .filter_ilike(:champs, value_column, values)
when TYPE_DE_CHAMP_PRIVATE when TYPE_DE_CHAMP_PRIVATE
dossiers.with_type_de_champ_private(column) dossiers.with_type_de_champ(column)
.filter_ilike(:champs_private, value_column, values) .filter_ilike(:champs, value_column, values)
when 'etablissement' when 'etablissement'
if column == 'entreprise_date_creation' if column == 'entreprise_date_creation'
dates = values dates = values