Injecte données type justificatif dans réponse

numerique-gouv · Jan 3, 2025 · bf523ae · bf523ae
1 parent 68b3749
commit bf523ae
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 33 deletions.
diff --git a/src/ebms/reponseVerificationSysteme.js b/src/ebms/reponseVerificationSysteme.js
@@ -69,19 +69,12 @@ class ReponseVerificationSysteme extends Message {
         <rim:SlotValue xsi:type="rim:AnyValueType">
           <sdg:Evidence>
             <sdg:Identifier>${this.adaptateurUUID?.genereUUID()}</sdg:Identifier>
-            <sdg:IsAbout>
-              ${this.beneficiaire.enXMLPourReponse()}
-            </sdg:IsAbout>
+            <sdg:IsAbout>${this.beneficiaire.enXMLPourReponse()}</sdg:IsAbout>
             <sdg:IssuingAuthority>
               <sdg:Identifier schemeID="urn:oasis:names:tc:ebcore:partyid-type:unregistered:FR"></sdg:Identifier>
               <sdg:Name></sdg:Name>
             </sdg:IssuingAuthority>
-            <sdg:IsConformantTo>
-              <sdg:EvidenceTypeClassification>
-                https://sr.oots.tech.ec.europa.eu/evidencetypeclassifications/FR/12345678-1234-1234-1234-1234567890ab
-              </sdg:EvidenceTypeClassification>
-              <sdg:Title lang="EN"></sdg:Title>
-            </sdg:IsConformantTo>
+            <sdg:IsConformantTo>${this.typeJustificatif.enXMLPourReponse()}</sdg:IsConformantTo>
             <sdg:IssuingDate>1970-03-03</sdg:IssuingDate>
             <sdg:Distribution>
               <sdg:Format>application/pdf</sdg:Format>

diff --git a/src/ebms/requeteJustificatif.js b/src/ebms/requeteJustificatif.js
@@ -91,7 +91,7 @@ class RequeteJustificatif extends Message {
   <query:ResponseOption returnType="LeafClassWithRepositoryItem"/>
   <query:Query queryDefinition="DocumentQuery">
     ${this.beneficiaire.enXMLPourRequete()}
-    ${this.typeJustificatif.enXML()}
+    ${this.typeJustificatif.enXMLPourRequete()}
   </query:Query>
 </query:QueryRequest>`;
   }

diff --git a/src/ebms/typeJustificatif.js b/src/ebms/typeJustificatif.js
@@ -6,18 +6,28 @@ class TypeJustificatif {
   constructor(donnees = {}) {
     const { id, descriptions, formatDistribution } = donnees;
     this.id = id || 'https://sr.oots.tech.ec.europa.eu/evidencetypeclassifications/oots/00000000-0000-0000-0000-000000000000';
-    this.descriptions = descriptions;
+    this.descriptions = descriptions || {};
     this.formatDistribution = formatDistribution || FORMATS_DISTRIBUTION.FORMAT_PDF;
   }
 
-  enXML() {
+  identifiantEtDescriptionsEnXML() {
+    const descriptionsEnXML = () => Object
+      .entries(this.descriptions)
+      .map(([langue, description]) => `<sdg:Title lang="${langue}">${description}</sdg:Title>`);
+
+    return `
+<sdg:EvidenceTypeClassification>${this.id}</sdg:EvidenceTypeClassification>
+${descriptionsEnXML()}
+    `;
+  }
+
+  enXMLPourRequete() {
     return `
 <rim:Slot name="EvidenceRequest">
   <rim:SlotValue xsi:type="rim:AnyValueType">
     <sdg:DataServiceEvidenceType xmlns="urn:oasis:names:tc:ebxml-regrep:xsd:rim:4.0">
       <sdg:Identifier>00000000-0000-0000-0000-000000000000</sdg:Identifier>
-      <sdg:EvidenceTypeClassification>${this.id}</sdg:EvidenceTypeClassification>
-      <sdg:Title lang="EN">${this.descriptions?.EN}</sdg:Title>
+      ${this.identifiantEtDescriptionsEnXML()}
       <sdg:DistributedAs>
         <sdg:Format>${this.formatDistribution}</sdg:Format>
       </sdg:DistributedAs>
@@ -26,6 +36,10 @@ class TypeJustificatif {
 </rim:Slot>
     `;
   }
+
+  enXMLPourReponse() {
+    return this.identifiantEtDescriptionsEnXML();
+  }
 }
 
 Object.assign(TypeJustificatif, FORMATS_DISTRIBUTION);

diff --git a/src/routes/routesEbms.js b/src/routes/routesEbms.js
@@ -9,6 +9,7 @@ const ReponseErreur = require('../ebms/reponseErreur');
 const ReponseVerificationSysteme = require('../ebms/reponseVerificationSysteme');
 const RequeteJustificatif = require('../ebms/requeteJustificatif');
 const Requeteur = require('../ebms/requeteur');
+const TypeJustificatif = require('../ebms/typeJustificatif');
 
 const routesEbms = (config) => {
   const { adaptateurUUID, horodateur } = config;
@@ -68,12 +69,17 @@ const routesEbms = (config) => {
   routes.get('/messages/reponseJustificatif', (requete, reponse) => {
     const beneficiaire = new PersonnePhysique({ dateNaissance: '1992-10-22', nom: 'Dupont', prenom: 'Jean' });
     const requeteur = new Requeteur({ id: '12345', nom: 'Un requêteur' });
+    const typeJustificatif = new TypeJustificatif({
+      id: 'https://sr.oots.tech.ec.europa.eu/evidencetypeclassifications/FR/12345678-1234-1234-1234-1234567890ab',
+      descriptions: { EN: 'Some Evidence Type' },
+    });
     const reponseJustificatif = new ReponseVerificationSysteme({ adaptateurUUID, horodateur }, {
       beneficiaire,
       destinataire: new PointAcces('unTypeIdentifiant', 'unIdentifiant'),
       idRequete: '12345678-1234-1234-1234-1234567890ab',
       idConversation: '12345',
       requeteur,
+      typeJustificatif,
     });
     reponse.set('Content-Type', 'text/xml');
     reponse.send(reponseJustificatif.corpsMessageEnXML());

diff --git a/test/constructeurs/constructeurEnveloppeSOAPRequete.js b/test/constructeurs/constructeurEnveloppeSOAPRequete.js
@@ -37,10 +37,6 @@ class ConstructeurEnveloppeSOAPRequete {
   }
 
   construis() {
-    const descriptionsTypeJustificatif = () => Object
-      .entries(this.typeJustificatif.descriptions || {})
-      .map(([langue, description]) => `<sdg:Title lang="${langue}">${description}</sdg:Title>`);
-
     const message = `
 <?xml version="1.0" encoding="UTF-8"?>
 <query:QueryRequest xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -98,18 +94,7 @@ class ConstructeurEnveloppeSOAPRequete {
         </sdg:Person>
       </rim:SlotValue>
     </rim:Slot>
-    <rim:Slot name="EvidenceRequest">
-      <rim:SlotValue xsi:type="rim:AnyValueType">
-        <sdg:DataServiceEvidenceType>
-          <sdg:Identifier>00000000-0000-0000-0000-000000000000</sdg:Identifier>
-          <sdg:EvidenceTypeClassification>${this.typeJustificatif.id}</sdg:EvidenceTypeClassification>
-          ${descriptionsTypeJustificatif()}
-          <sdg:DistributedAs>
-            <sdg:Format>${this.typeJustificatif.formatDistribution}</sdg:Format>
-          </sdg:DistributedAs>
-        </sdg:DataServiceEvidenceType>
-      </rim:SlotValue>
-    </rim:Slot>
+    ${this.typeJustificatif.enXMLPourRequete()}
   </query:Query>
 </query:QueryRequest>
 `;

diff --git a/test/ebms/reponseVerificationSysteme.spec.js b/test/ebms/reponseVerificationSysteme.spec.js
@@ -2,6 +2,7 @@ const PersonnePhysique = require('../../src/ebms/personnePhysique');
 const PointAcces = require('../../src/ebms/pointAcces');
 const ReponseVerificationSysteme = require('../../src/ebms/reponseVerificationSysteme');
 const Requeteur = require('../../src/ebms/requeteur');
+const TypeJustificatif = require('../../src/ebms/typeJustificatif');
 const { parseXML, valeurSlot, verifiePresenceSlot } = require('../../src/ebms/utils');
 
 describe('Reponse Verification Systeme', () => {
@@ -17,6 +18,7 @@ describe('Reponse Verification Systeme', () => {
       beneficiaire: new PersonnePhysique(),
       destinataire: new PointAcces('unTypeIdentifiant', 'unIdentifiant'),
       requeteur: { enXMLPourReponse: () => '' },
+      typeJustificatif: new TypeJustificatif({ descriptions: { EN: 'Some Evidence Type' } }),
     };
     horodateur.maintenant = () => '';
   });
@@ -109,6 +111,18 @@ describe('Reponse Verification Systeme', () => {
     expect(idPiece).toEqual('11111111-1111-1111-1111-111111111111');
   });
 
+  it('injecte le type de pièce justificative', () => {
+    donnees.typeJustificatif = new TypeJustificatif({ id: 'abcdef' });
+    const reponse = new ReponseVerificationSysteme(config, donnees);
+    const xml = parseXML(reponse.corpsMessageEnXML());
+    const scopeRecherche = xml.QueryResponse.RegistryObjectList.RegistryObject;
+
+    const idTypeJustificatif = valeurSlot('EvidenceMetadata', scopeRecherche).Evidence
+      .IsConformantTo
+      .EvidenceTypeClassification;
+    expect(idTypeJustificatif).toBe('abcdef');
+  });
+
   it('contient une pièce jointe', () => {
     adaptateurUUID.genereUUID = () => '12345678-abcd-abcd-abcd-123456789012';
     const reponse = new ReponseVerificationSysteme(config, donnees);

diff --git a/test/ebms/typeJustificatif.spec.js b/test/ebms/typeJustificatif.spec.js
@@ -8,13 +8,15 @@ describe('Le type de justificatif', () => {
       formatDistribution: TypeJustificatif.FORMAT_PDF,
     });
 
-    expect(typeJustificatif.enXML()).toBe(`
+    expect(typeJustificatif.enXMLPourRequete()).toBe(`
 <rim:Slot name="EvidenceRequest">
   <rim:SlotValue xsi:type="rim:AnyValueType">
     <sdg:DataServiceEvidenceType xmlns="urn:oasis:names:tc:ebxml-regrep:xsd:rim:4.0">
       <sdg:Identifier>00000000-0000-0000-0000-000000000000</sdg:Identifier>
-      <sdg:EvidenceTypeClassification>unIdentifiant</sdg:EvidenceTypeClassification>
-      <sdg:Title lang="EN">someType</sdg:Title>
+      
+<sdg:EvidenceTypeClassification>unIdentifiant</sdg:EvidenceTypeClassification>
+<sdg:Title lang="EN">someType</sdg:Title>
+    
       <sdg:DistributedAs>
         <sdg:Format>application/pdf</sdg:Format>
       </sdg:DistributedAs>