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

Merge pull request #10916 from tchak/graphql-fix-n+1

Browse source 
fix(graphql): n+1 on procedure and france_connect_informations
This commit is contained in:
Paul Chavard 2024-10-11 15:20:53 +00:00 committed by GitHub
commit f0d334ea69
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 6 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/graphql/types/dossier_type.rb
View file

@ -105,22 +105,18 @@ module Types
def connection_usager def connection_usager
if object.user_deleted? if object.user_deleted?
:deleted :deleted
else elsif object.user_from_france_connect?
user_loader.then do |_user|
if object.user_from_france_connect?
:france_connect :france_connect
else else
:password :password
end end
end end
end
end
def usager def usager
if object.user_deleted? if object.user_deleted?
{ email: object.user_email_for(:display), id: '<deleted>' } { email: object.user_email_for(:display), id: '<deleted>' }
else else
user_loader object.user
end end
end end
@ -221,11 +217,5 @@ module Types
def self.authorized?(object, context) def self.authorized?(object, context)
context.authorized_demarche?(object.revision.procedure) context.authorized_demarche?(object.revision.procedure)
end end
private
def user_loader
Loaders::Record.for(User, includes: :france_connect_informations).load(object.user_id)
end
end end
end end

2
app/models/dossier.rb
View file

@ -368,7 +368,7 @@ class Dossier < ApplicationRecord
.where.not(user: users_who_submitted) .where.not(user: users_who_submitted)
end end
scope :for_api_v2, -> { includes(:attestation_template, revision: [procedure: [:administrateurs]], etablissement: [], individual: [], traitement: []) } scope :for_api_v2, -> { includes(:attestation_template, revision: [procedure: [:administrateurs]], etablissement: [], individual: [], traitement: [], procedure: [], user: [:france_connect_informations]) }
scope :with_notifications, -> do scope :with_notifications, -> do
joins(:follows) joins(:follows)

2
app/models/dossier_preloader.rb
View file

@ -39,7 +39,7 @@ class DossierPreloader
def revisions(pj_template: false) def revisions(pj_template: false)
@revisions ||= ProcedureRevision.where(id: @dossiers.pluck(:revision_id).uniq) @revisions ||= ProcedureRevision.where(id: @dossiers.pluck(:revision_id).uniq)
.includes(revision_types_de_champ: { parent: :type_de_champ }, types_de_champ_public: [], types_de_champ_private: [], types_de_champ: pj_template ? { piece_justificative_template_attachment: :blob } : []) .includes(procedure: [], revision_types_de_champ: { parent: :type_de_champ }, types_de_champ_public: [], types_de_champ_private: [], types_de_champ: pj_template ? { piece_justificative_template_attachment: :blob } : [])
.index_by(&:id) .index_by(&:id)
end end