test(fix test about minio errors)

- Object Document with id attribute to be compliant with existing code
InseeFr · Dec 11, 2024 · d1f4d83 · d1f4d83
1 parent 0d38ca7
commit d1f4d83
Show file tree

Hide file tree

Showing 9 changed files with 43 additions and 99 deletions.
diff --git a/...in/java/fr/insee/rmes/bauhaus_services/operations/documentations/DocumentationExport.java b/...in/java/fr/insee/rmes/bauhaus_services/operations/documentations/DocumentationExport.java
@@ -34,12 +34,10 @@
 import java.nio.file.Path;
 import java.nio.file.StandardOpenOption;
 import java.util.*;
-import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
 import static fr.insee.rmes.bauhaus_services.Constants.GOAL_COMITE_LABEL;
 import static fr.insee.rmes.bauhaus_services.Constants.GOAL_RMES;
-import static fr.insee.rmes.utils.StreamUtils.*;
 
 @Component
 public class DocumentationExport {
@@ -154,22 +152,23 @@ public ResponseEntity<Resource> exportAsZip(JSONObject sims, Map<String, String>
         }
     }
 
-    private Set<String> exportRubricsDocuments(JSONObject sims, Path directory) throws RmesException, IOException {
+    private Set<String> exportRubricsDocuments(JSONObject sims, Path directory) throws RmesException {
         JSONArray documents = documentsUtils.getDocumentsUriAndUrlForSims(sims.getString("id"));
         Set<String> missingDocuments = new HashSet<>();
-        Consumer<Void> unsafeStream = v -> JSONUtils.stream(documents)
-                .distinct()
-                .forEach(safeConsumer(document ->  extractDocumentIfExists(directory, missingDocuments, document)));
-        executeAndThrow(unsafeStream);
+        Set<Document> documentsSet = JSONUtils.stream(documents)
+                .map(DocumentsUtils::buildDocumentFromJson)
+                .collect(Collectors.toSet());
+        for (Document document : documentsSet) {
+            extractDocumentIfExists(directory, missingDocuments, document);
+        }
         return missingDocuments;
     }
 
-    private void extractDocumentIfExists(Path directory, Set<String> missingDocuments, JSONObject documentJson) throws RmesException{
-        var document = documentsUtils.buildDocumentFromJson(documentJson);
+    private void extractDocumentIfExists(Path directory, Set<String> missingDocuments, Document document) throws RmesException{
         String url = document.url();
         logger.debug("Extracting document {}", url);
         if (!documentsUtils.existsInStorage(document)) {
-            missingDocuments.add(documentJson.getString("id"));
+            missingDocuments.add(document.getId());
         } else {
             extractExistingDocument(directory, document, url);
         }

diff --git a/.../fr/insee/rmes/bauhaus_services/operations/documentations/DocumentationsRubricsUtils.java b/.../fr/insee/rmes/bauhaus_services/operations/documentations/DocumentationsRubricsUtils.java
@@ -356,7 +356,7 @@ private void addJsonDocumentToObjectRubric(JSONObject rubric, DocumentationRubri
 
 		for (int i = 0; i < documents.length(); i++) {
 			JSONObject doc = documents.getJSONObject(i);
-			currentDoc = docUtils.buildDocumentFromJson(doc);
+			currentDoc = DocumentsUtils.buildDocumentFromJson(doc);
 			docs.add(currentDoc);
 		}	
 		if (documentsWithRubricLang.equals(Constants.DOCUMENTS_LG1)) {

diff --git a/...va/fr/insee/rmes/bauhaus_services/operations/documentations/documents/DocumentsUtils.java b/...va/fr/insee/rmes/bauhaus_services/operations/documentations/documents/DocumentsUtils.java
@@ -615,7 +615,7 @@ public void checkFileNameValidity(String fileName) throws RmesNotAcceptableExcep
         logger.debug("The file name {} is valid", fileName);
     }
 
-    public Document buildDocumentFromJson(JSONObject jsonDoc) {
+    public static Document buildDocumentFromJson(JSONObject jsonDoc) {
         try {
             return Deserializer.deserializeJSONObject(jsonDoc, Document.class);
         } catch (RmesException e) {
@@ -669,11 +669,11 @@ public boolean existsInStorage(Document document) {
 
     private record DocumentBuilder(Document document) {
         public Document withId(String id, boolean isLink) {
-            return new Document(document.labelLg1(), document.labelLg2(), document.descriptionLg1(), document().descriptionLg2(), document.dateMiseAJour(), document.langue(), document.url(), uriFromId(id, isLink));
+            return new Document(document.labelLg1(), document.labelLg2(), document.descriptionLg1(), document().descriptionLg2(), document.dateMiseAJour(), document.langue(), document.url(), uriFromId(id, isLink), id);
         }
 
         public static Document emptyDocument() {
-            return new Document(null, null, null, null, null, null, null, null);
+            return new Document(null, null, null, null, null, null, null, null, null);
         }
 
         private String uriFromId(String id, boolean isLink) {

diff --git a/src/main/java/fr/insee/rmes/model/operations/documentations/Document.java b/src/main/java/fr/insee/rmes/model/operations/documentations/Document.java
@@ -2,7 +2,6 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import fr.insee.rmes.bauhaus_services.Constants;
-import fr.insee.rmes.bauhaus_services.rdf_utils.RdfUtils;
 import org.apache.commons.lang3.StringUtils;
 
 import java.net.URI;
@@ -17,28 +16,21 @@ public record Document(String labelLg1,
                        @JsonProperty("lang")
                        String langue,
                        String url,
-                       String uri) {
+                       String uri,
+                       // TODO remove this attribute
+                       String id) {
 
 
-//    public Document(String id) {
-//        this(id, false);
-//    }
-//
-//    public Document(String id, boolean isLink) {
-//        this(null, null, null, null, null, null, null, uriFromId(id, isLink));
-//    }
-
-    private static String uriFromId(String id, boolean isLink) {
-        return (isLink ? RdfUtils.linkIRI(id) :
-RdfUtils.documentIRI(id)).toString();
-    }
-
     public String getId() {
-        return StringUtils.substringAfter(uri, "/");
+        String idFromUri = StringUtils.substringAfter(uri, "/");
+        if (idFromUri != null) {
+            return idFromUri;
+        }
+        return id;
     }
 
     public Document withUrl(String url) {
-        return new Document(this.labelLg1, this.labelLg2, this.descriptionLg1, this.descriptionLg2, this.dateMiseAJour, this.langue, url, this.uri);
+        return new Document(this.labelLg1, this.labelLg2, this.descriptionLg1, this.descriptionLg2, this.dateMiseAJour, this.langue, url, this.uri, null);
     }
 
     public String documentFileName() {

diff --git a/src/main/java/fr/insee/rmes/utils/Deserializer.java b/src/main/java/fr/insee/rmes/utils/Deserializer.java
@@ -20,7 +20,8 @@ private Deserializer() {
 
     public static <T> T deserializeJsonString(String json, Class<T> target) throws RmesException {
         try {
-            return mapper.readValue(json, target);
+            T t = mapper.readValue(json, target);
+            return t;
         } catch (IOException e) {
             throw new RmesException(HttpStatus.SC_BAD_REQUEST, "while deserializing "+json , e.getMessage());
         }

diff --git a/src/main/java/fr/insee/rmes/utils/StreamUtils.java b/src/main/java/fr/insee/rmes/utils/StreamUtils.java
diff --git a/...ava/fr/insee/rmes/bauhaus_services/operations/documentations/DocumentationExportTest.java b/...ava/fr/insee/rmes/bauhaus_services/operations/documentations/DocumentationExportTest.java
@@ -29,6 +29,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
@@ -71,6 +72,7 @@ void testExportAsZip_success() throws Exception {
         document.put("id", "1");
 
         when(documentsUtils.getDocumentsUriAndUrlForSims("sims123")).thenReturn(new JSONArray().put(document));
+        when(documentsUtils.existsInStorage(any())).thenReturn(false);
         var sims = new JSONObject();
         sims.put("id", "sims123");
         sims.put("labelLg1", "simsLabel");
@@ -93,8 +95,8 @@ void testExportAsZip_success() throws Exception {
 
         assertEquals(HttpStatus.OK, response.getStatusCode());
         assertNotNull(response.getBody());
-        assertEquals(response.getStatusCode(), HttpStatus.OK);
-        assertEquals(response.getHeaders().get("X-Missing-Documents").get(0), "1");
+        assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
+        assertThat(response.getHeaders().get("X-Missing-Documents").getFirst()).isEqualTo("1");
     }
 
     @Test

diff --git a/...r/insee/rmes/bauhaus_services/operations/documentations/documents/DocumentsUtilsTest.java b/...r/insee/rmes/bauhaus_services/operations/documentations/documents/DocumentsUtilsTest.java
@@ -3,7 +3,6 @@
 import fr.insee.rmes.Stubber;
 import fr.insee.rmes.bauhaus_services.FilesOperations;
 import fr.insee.rmes.bauhaus_services.rdf_utils.RdfServicesForRdfUtils;
-import fr.insee.rmes.bauhaus_services.rdf_utils.RdfUtils;
 import fr.insee.rmes.bauhaus_services.rdf_utils.RepositoryGestion;
 import fr.insee.rmes.bauhaus_services.rdf_utils.UriUtils;
 import fr.insee.rmes.config.Config;
@@ -13,9 +12,7 @@
 import fr.insee.rmes.exceptions.RmesNotAcceptableException;
 import fr.insee.rmes.persistance.sparql_queries.GenericQueries;
 import fr.insee.rmes.persistance.sparql_queries.operations.documentations.DocumentsQueries;
-import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.Model;
-import org.eclipse.rdf4j.model.impl.SimpleValueFactory;
 import org.json.JSONArray;
 import org.json.JSONObject;
 import org.junit.jupiter.api.Assertions;
@@ -24,12 +21,19 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
-import org.mockito.*;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.MockedStatic;
+import org.mockito.Mockito;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.testcontainers.shaded.org.apache.commons.io.IOUtils;
 
 import java.nio.file.Path;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.Optional;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
@@ -121,51 +125,37 @@ void testIfDateMiseAJourSavedAsString() throws RmesException {
         when(filesOperations.dirExists(any(Path.class))).thenReturn(true);
 
         var id = "1";
+        String date = LocalDate.now().format(DateTimeFormatter.ISO_DATE);
         var body = new JSONObject()
                 .put("id", "1")
-                .put("updatedDate", "2024-11-20").toString();
+                .put("updatedDate", date).toString();
         var isLink = false;
         var document = IOUtils.toInputStream("stream");
         var name = "documentName";
 
-
-        SimpleValueFactory valueFactory = SimpleValueFactory.getInstance();
-        IRI documentIRI = valueFactory.createIRI(documentIRIString);
-        IRI graph = valueFactory.createIRI(DOCUMENTS_GRAPH);
-
-        try (MockedStatic<RdfUtils> rdfUtilsMockedStatic = Mockito.mockStatic(RdfUtils.class);
+        initRdfUtils();
+        try (
              MockedStatic<DocumentsQueries> documentQueriesMockedStatic = Mockito.mockStatic(DocumentsQueries.class)
         ) {
-
-            initRdfUtils();
-
-//            rdfUtilsMockedStatic.when(() -> RdfUtils.setLiteralString(anyString())).thenCallRealMethod();
-//            rdfUtilsMockedStatic.when(() -> RdfUtils.addTripleString(eq(documentIRI), any(IRI.class), any(), any(Model.class), eq(graph))).thenCallRealMethod();
-//            rdfUtilsMockedStatic.when(() -> RdfUtils.setLiteralDate(any(String.class))).thenCallRealMethod();
-//            rdfUtilsMockedStatic.when(() -> RdfUtils.addTripleDate(eq(documentIRI), any(IRI.class), any(), any(Model.class), eq(graph))).thenCallRealMethod();
-//            rdfUtilsMockedStatic.when(RdfUtils::documentsGraph).thenReturn(graph);
-// ?            rdfUtilsMockedStatic.when(() -> RdfUtils.toURI(any())).thenReturn(documentIRI);
             documentQueriesMockedStatic.when(() -> DocumentsQueries.checkLabelUnicity(eq("1"), anyString(), any())).thenReturn(documentIRIString);
 
 
             documentsUtils.createDocument(id, body, isLink, document, name);
             ArgumentCaptor<Model> model = ArgumentCaptor.forClass(Model.class);
 
             verify(repositoryGestion, times(1)).loadSimpleObject(any(), model.capture());
-            Assertions.assertEquals("[(http://document/1, http://purl.org/pav/lastRefreshedOn, \"2024-11-20\"^^<http://www.w3.org/2001/XMLSchema#date>, http://documents/graph) [http://documents/graph]]", model.getValue().toString());
+            assertThat( model.getValue().toString()).asString().contains(date);
         }
     }
 
     private void initRdfUtils() {
 
-        // ?            rdfUtilsMockedStatic.when(() -> ArgumentMatchers.<IRI>any().toString()).thenReturn(documentIRIString);
-
         RdfServicesForRdfUtils rdfServicesForRdfUtils = new RdfServicesForRdfUtils(new Config(){
             @Override
             public String getDocumentsGraph() {
                 return DOCUMENTS_GRAPH;
             }
-        }, new UriUtils("","http://bauhaus/", null));
+        }, new UriUtils("","http://document/", s-> Optional.empty()));
         rdfServicesForRdfUtils.initRdfUtils();
     }
 }
diff --git a/src/test/java/fr/insee/rmes/integration/TestDocumentsResourcesWithFilesOperation.java b/src/test/java/fr/insee/rmes/integration/TestDocumentsResourcesWithFilesOperation.java
@@ -79,7 +79,7 @@ public DocumentsUtils myDocumentsUtils() {
             return new DocumentsUtils(null, new FilesOperationStub()){
                 @Override
                 protected Document findDocumentById(String id){
-                    return new Document(null, null, null, null, null, null, nomFichier, "http://id.insee.fr/1");
+                    return new Document(null, null, null, null, null, null, nomFichier, "http://id.insee.fr/1", "1");
                 }
             };
         }