Merge pull request #8461 from tchak/fix-graphql-description-with-pj

fix(graphql): demarche with pj should return schema
This commit is contained in:
Paul Chavard 2023-01-18 18:21:56 +01:00 committed by GitHub
commit 3f735de520
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 8 deletions

View file

@ -284,6 +284,9 @@ class API::V2::StoredQuery
dateDerniereModification
dateDepublication
dateFermeture
notice { url }
deliberation { url }
cadreJuridiqueUrl
service @include(if: $includeService) {
...ServiceFragment
}

View file

@ -24,10 +24,11 @@ module Extensions
# This method resolves (as it states) the field itself
# (it's the same as defining a method within a type)
def resolve(object:, **_rest)
root_instance = object.public_send(root)
Loaders::Association.for(
object.public_send(root).class,
root_instance.class,
attachment_assoc => :blob
).load(object.object)
).load(root_instance)
end
# This method is called if the result of the `resolve`

View file

@ -108,8 +108,6 @@ module Types
end
end
private
def type_de_champ
object.type_de_champ
end

View file

@ -2,7 +2,8 @@ describe API::V2::GraphqlController do
let(:admin) { create(:administrateur) }
let(:token) { APIToken.generate(admin)[1] }
let(:legacy_token) { APIToken.send(:unpack, token)[:plain_token] }
let(:procedure) { create(:procedure, :published, :for_individual, :with_service, administrateurs: [admin]) }
let(:procedure) { create(:procedure, :published, :for_individual, :with_service, administrateurs: [admin], types_de_champ_public:) }
let(:types_de_champ_public) { [] }
let(:dossier) { create(:dossier, :en_construction, :with_individual, procedure: procedure) }
let(:dossier1) { create(:dossier, :en_construction, :with_individual, procedure: procedure, en_construction_at: 1.day.ago) }
let(:dossier2) { create(:dossier, :en_construction, :with_individual, :archived, procedure: procedure, en_construction_at: 3.days.ago) }
@ -28,7 +29,6 @@ describe API::V2::GraphqlController do
end
describe 'ds-query-v2' do
let(:procedure) { create(:procedure, :published, :for_individual, administrateurs: [admin]) }
let(:dossier) { create(:dossier, :en_construction, :with_individual, procedure: procedure) }
let(:query_id) { 'ds-query-v2' }
@ -115,11 +115,12 @@ describe API::V2::GraphqlController do
end
end
context 'getDemarcheDescriptor' do
context 'getDemarcheDescriptor', vcr: { cassette_name: 'api_geo_regions' } do
let(:operation_name) { 'getDemarcheDescriptor' }
let(:types_de_champ_public) { [{ type: :text }, { type: :piece_justificative }, { type: :regions }] }
context 'find by number' do
let(:variables) { { demarche: { number: procedure.id } } }
let(:variables) { { demarche: { number: procedure.id }, includeRevision: true } }
it {
expect(gql_errors).to be_nil