diff --git a/app/graphql/api/v2/stored_query.rb b/app/graphql/api/v2/stored_query.rb index a3d236f8b..1e62180da 100644 --- a/app/graphql/api/v2/stored_query.rb +++ b/app/graphql/api/v2/stored_query.rb @@ -294,6 +294,9 @@ class API::V2::StoredQuery usager { email } + prenomMandataire + nomMandataire + deposeParUnTiers connectionUsager groupeInstructeur { ...GroupeInstructeurFragment diff --git a/app/graphql/schema.graphql b/app/graphql/schema.graphql index cdfb5bd00..3b8198a2d 100644 --- a/app/graphql/schema.graphql +++ b/app/graphql/schema.graphql @@ -1416,6 +1416,7 @@ type Dossier { dateTraitementSVASVR: ISO8601DateTime demandeur: Demandeur! demarche: DemarcheDescriptor! + deposeParUnTiers: Boolean """ L’URL du GeoJSON contenant les données cartographiques du dossier. @@ -1427,6 +1428,7 @@ type Dossier { messages(id: ID): [Message!]! motivation: String motivationAttachment: File + nomMandataire: String """ Le numero du dossier. @@ -1438,6 +1440,7 @@ type Dossier { """ pdf: File prefilled: Boolean! + prenomMandataire: String revision: Revision! @deprecated(reason: "Utilisez le champ `demarche.revision` à la place.") """ diff --git a/app/graphql/types/dossier_type.rb b/app/graphql/types/dossier_type.rb index b0a4c7856..ac0d80bce 100644 --- a/app/graphql/types/dossier_type.rb +++ b/app/graphql/types/dossier_type.rb @@ -50,10 +50,14 @@ module Types field :attestation, Types::File, "L’URL de l’attestation au format PDF.", null: true field :usager, Types::ProfileType, "Profile de l'usager déposant le dossier", null: false + field :groupe_instructeur, Types::GroupeInstructeurType, null: false field :revision, Types::RevisionType, null: false, deprecation_reason: 'Utilisez le champ `demarche.revision` à la place.' field :demandeur, Types::DemandeurType, null: false + field :prenom_mandataire, String, null: true, method: :mandataire_first_name + field :nom_mandataire, String, null: true, method: :mandataire_last_name + field :depose_par_un_tiers, Boolean, method: :for_tiers field :instructeurs, [Types::ProfileType], null: false @@ -89,8 +93,8 @@ module Types if object.user_deleted? :deleted else - user_loader.then do |user| - if user.france_connect_information.present? + user_loader.then do |_user| + if object.user_from_france_connect? :france_connect else :password diff --git a/app/models/dossier.rb b/app/models/dossier.rb index ad78757de..76efea1a2 100644 --- a/app/models/dossier.rb +++ b/app/models/dossier.rb @@ -1193,7 +1193,7 @@ class Dossier < ApplicationRecord columns = [ ['ID', id.to_s], ['Email', user_email_for(:display)], - ['FranceConnect ?', user.france_connect_information.present?] + ['FranceConnect ?', user_from_france_connect?] ] if procedure.for_individual? @@ -1386,6 +1386,10 @@ class Dossier < ApplicationRecord "#{mandataire_first_name} #{mandataire_last_name}" end + def user_from_france_connect? + user.france_connect_information.present? + end + private def create_missing_traitemets