Merge pull request #212 from EmmanuelDemey/acceptance

fix: rewrite getcomponent sparql query
InseeFr · Mar 11, 2022 · c5930cb · c5930cb
2 parents 5c0e970 + 34a736d
commit c5930cb
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 2 deletions.
diff --git a/...va/fr/insee/rmes/bauhaus_services/consutation_gestion/ConsultationGestionServiceImpl.java b/...va/fr/insee/rmes/bauhaus_services/consutation_gestion/ConsultationGestionServiceImpl.java
@@ -259,6 +259,7 @@ public String getComponent(String id) throws RmesException {
             JSONObject concept = new JSONObject();
             concept.put("uri", component.getString("uriConcept"));
             concept.put("id", component.getString("idConcept"));
+            this.addCloseMatch(concept);
             component.put("concept", concept);
             component.remove("uriConcept");
             component.remove("idConcept");
@@ -291,6 +292,25 @@ public String getComponent(String id) throws RmesException {
         return component.toString();
     }
 
+    private void addCloseMatch(JSONObject concept) throws RmesException {
+        HashMap<String, Object> params = new HashMap<>();
+        params.put("CONCEPTS_GRAPH", Config.CONCEPTS_GRAPH);
+        params.put("CONCEPT_ID", concept.getString("id"));
+        JSONArray closeMatch = repoGestion.getResponseAsArray(buildRequest("getCloseMatch.ftlh", params));
+        if(closeMatch.length() > 0){
+            JSONArray formattedCloseMatchArray  = new JSONArray();
+            for(int i = 0; i < closeMatch.length(); i++){
+                String iri = ((JSONObject) closeMatch.get(i)).getString("closeMatch").replace("urn:sdmx:org.sdmx.infomodel.conceptscheme.Concept=", "");;
+                JSONObject relation = new JSONObject();
+                relation.put("agence", iri.substring(0, iri.indexOf(":")));
+                relation.put("id", iri.substring(iri.lastIndexOf(".") + 1));
+                formattedCloseMatchArray.put(relation);
+            }
+            concept.put("conceptsSdmx", formattedCloseMatchArray);
+        }
+
+    }
+
     private void getStructureComponents(String id, JSONObject structure) throws RmesException {
         HashMap<String, Object> params = new HashMap<>();
         params.put("STRUCTURES_GRAPH", Config.STRUCTURES_GRAPH);

diff --git a/src/main/resources/request/consultation-gestion/getCloseMatch.ftlh b/src/main/resources/request/consultation-gestion/getCloseMatch.ftlh
@@ -0,0 +1,6 @@
+SELECT ?closeMatch
+FROM <${CONCEPTS_GRAPH}>
+WHERE {
+    ?concept skos:notation "${CONCEPT_ID}" .
+    ?concept skos:closeMatch ?closeMatch .
+}
diff --git a/src/main/resources/request/consultation-gestion/getComponent.ftlh b/src/main/resources/request/consultation-gestion/getComponent.ftlh
@@ -53,11 +53,10 @@ WHERE {
     OPTIONAL {
         ?uriComposant qb:codeList ?uriListeCode .
         ?uriListeCode skos:notation ?idListeCode .
-    }
-    OPTIONAL {
         ?uriListeCode prov:wasDerivedFrom ?uriParentListCode .
         ?uriParentListCode skos:notation ?idParentListCode .
     }
+
     OPTIONAL {
         ?uriComposant pav:version ?version .
     }