feat: return validation status for a distribution (#670)

InseeFr · Jun 27, 2024 · 0a73ebe · 0a73ebe
1 parent 601c10d
commit 0a73ebe
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/main/java/fr/insee/rmes/bauhaus_services/distribution/DistributionServiceImpl.java b/src/main/java/fr/insee/rmes/bauhaus_services/distribution/DistributionServiceImpl.java
@@ -65,12 +65,13 @@ public String getDistributions() throws RmesException {
 
     @Override
     public String getDistributionByID(String id) throws RmesException {
-        JSONObject distrib=repoGestion.getResponseAsObject(DistributionQueries.getDistribution(id, getDistributionGraph()));
-        if (distrib.has("id")){
-        return this.repoGestion.getResponseAsObject(DistributionQueries.getDistribution(id, getDistributionGraph())).toString();
-        } else {
+        JSONObject distribution = repoGestion.getResponseAsObject(DistributionQueries.getDistribution(id, getDistributionGraph()));
+
+        if (distribution.isEmpty()){
             throw new RmesNotFoundException("This distribution does not exist");
         }
+
+        return distribution.toString();
     }
 
     @Override

diff --git a/src/main/resources/request/distribution/getDistribution.ftlh b/src/main/resources/request/distribution/getDistribution.ftlh
@@ -1,4 +1,4 @@
-SELECT ?id ?idDataset ?labelLg1 ?labelLg2 ?descriptionLg1 ?descriptionLg2 ?created ?updated
+SELECT ?id ?idDataset ?labelLg1 ?labelLg2 ?descriptionLg1 ?descriptionLg2 ?created ?updated ?validationState
 ?format ?byteSize ?url
 FROM <${DATASET_GRAPH}>
 WHERE {