Fix/solve issue validation distribution (#671)

* feat: return validation status for a distribution * fix: solve issue when publishing distribution
InseeFr · Jun 27, 2024 · cffdea9 · cffdea9
1 parent 0a73ebe
commit cffdea9
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 1 deletion.
diff --git a/src/main/java/fr/insee/rmes/bauhaus_services/datasets/DatasetServiceImpl.java b/src/main/java/fr/insee/rmes/bauhaus_services/datasets/DatasetServiceImpl.java
@@ -121,6 +121,9 @@ public String publishDataset(String id) throws RmesException {
         publicationUtils.publishResource(iri, Set.of("processStep", "archiveUnit", "validationState"));
         publicationUtils.publishResource(catalogRecordIri, Set.of(CREATOR, "contributor"));
         model.add(iri, INSEE.VALIDATION_STATE, RdfUtils.setLiteralString(ValidationStatus.VALIDATED), RdfUtils.createIRI(getDatasetsGraph()));
+        model.remove(iri, INSEE.VALIDATION_STATE, RdfUtils.setLiteralString(ValidationStatus.UNPUBLISHED), RdfUtils.createIRI(getDatasetsGraph()));
+        model.remove(iri, INSEE.VALIDATION_STATE, RdfUtils.setLiteralString(ValidationStatus.MODIFIED), RdfUtils.createIRI(getDatasetsGraph()));
+
         repoGestion.objectValidation(iri, model);
 
         return id;

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
@@ -79,6 +79,7 @@ public String create(String body) throws RmesException {
         Distribution distribution = Deserializer.deserializeBody(body, Distribution.class);
         String idnewt = IdGenerator.generateNextId(repoGestion.getResponseAsObject(DistributionQueries.lastDatasetId(getDistributionGraph())), "d");
         distribution.setId(idnewt);
+        distribution.setValidationState(ValidationStatus.UNPUBLISHED.toString());
 
         this.validate(distribution);
 
@@ -92,6 +93,7 @@ public String create(String body) throws RmesException {
     public String update(String id, String body) throws RmesException {
         Distribution distribution = Deserializer.deserializeBody(body, Distribution.class);
         distribution.setId(id);
+        distribution.setValidationState(ValidationStatus.MODIFIED.toString());
 
         this.validate(distribution);
 
@@ -113,6 +115,9 @@ public String publishDistribution(String id) throws RmesException {
 
         publicationUtils.publishResource(iri, Set.of());
         model.add(iri, INSEE.VALIDATION_STATE, RdfUtils.setLiteralString(ValidationStatus.VALIDATED), RdfUtils.createIRI(getDistributionGraph()));
+        model.remove(iri, INSEE.VALIDATION_STATE, RdfUtils.setLiteralString(ValidationStatus.UNPUBLISHED), RdfUtils.createIRI(getDistributionGraph()));
+        model.remove(iri, INSEE.VALIDATION_STATE, RdfUtils.setLiteralString(ValidationStatus.MODIFIED), RdfUtils.createIRI(getDistributionGraph()));
+
         repoGestion.objectValidation(iri, model);
 
         return id;

diff --git a/src/main/java/fr/insee/rmes/model/dataset/Distribution.java b/src/main/java/fr/insee/rmes/model/dataset/Distribution.java
@@ -12,6 +12,7 @@ public class Distribution {
     String format;
     String byteSize;
     String url;
+    String validationState;
 
     public String getId() {
         return id;
@@ -100,4 +101,12 @@ public String getUrl() {
     public void setUrl(String url) {
         this.url = url;
     }
+
+    public String getValidationState() {
+        return validationState;
+    }
+
+    public void setValidationState(String validationState) {
+        this.validationState = validationState;
+    }
 }
diff --git a/src/main/resources/request/distribution/getDistribution.ftlh b/src/main/resources/request/distribution/getDistribution.ftlh
@@ -53,6 +53,6 @@ WHERE {
 	}
 
     OPTIONAL {
-        ?uriDataset insee:validationState ?validationState .
+        ?uri insee:validationState ?validationState .
     }
 }