Skip to content

Commit

Permalink
fix: reviw for 4.1.6 (#828)
Browse files Browse the repository at this point in the history
  • Loading branch information
@EmmanuelDemey
EmmanuelDemey authored Dec 6, 2024
1 parent 2fa65b8 commit bb7ec98
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 5 deletions.
3 changes: 2 additions & 1 deletion src/main/java/fr/insee/rmes/bauhaus_services/operations/operations/OperationsUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import org.eclipse.rdf4j.model.vocabulary.DCTERMS;
import org.eclipse.rdf4j.model.vocabulary.RDF;
import org.eclipse.rdf4j.model.vocabulary.SKOS;
import org.eclipse.rdf4j.model.vocabulary.XSD;
import org.json.JSONArray;
import org.json.JSONObject;
import org.slf4j.Logger;
Expand Down Expand Up @@ -179,7 +180,7 @@ private void createRdfOperation(Operation operation, IRI serieUri, ValidationSta
RdfUtils.addTripleDateTime(operationURI, DCTERMS.MODIFIED, operation.getModified(), model, RdfUtils.operationsGraph());

if(operation.getYear() != null){
RdfUtils.addTripleInt(operationURI, DCTERMS.TEMPORAL, operation.getYear().toString(), model, RdfUtils.operationsGraph());
model.add(operationURI, DCTERMS.TEMPORAL, RdfUtils.createLiteral(operation.getYear().toString(), XSD.GYEAR), RdfUtils.operationsGraph());
}

if (serieUri != null) {
Expand Down
8 changes: 6 additions & 2 deletions src/main/java/fr/insee/rmes/bauhaus_services/rdf_utils/RdfUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,11 +187,15 @@ public static Literal setLiteralString(String string, String language) {
public static Literal setLiteralBoolean(Boolean bool) {
return factory.createLiteral(bool);
}


public static Literal createLiteral(String value, IRI datatype){
return factory.createLiteral(value, datatype);
}

public static Literal setLiteralInt(String number) {
return factory.createLiteral(number, XSD.INT);
}

public static Literal setLiteralDateTime(String date) {
String parsedDate = DateTimeFormatter.ISO_DATE_TIME.format(DateUtils.parseDateTime(date));
return factory.createLiteral(parsedDate, XSD.DATETIME);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/fr/insee/rmes/utils/FilesUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,10 @@ private static String reduceFileNameSize(String fileName, int maxLength) {

private static String removeAsciiCharacters(String fileName) {
return Normalizer.normalize(fileName, Normalizer.Form.NFD)
.replaceAll("\\p{M}+", "")
.replace("œ", "oe")
.replace("Œ", "OE")
.replaceAll("[-_]", " ")
.replaceAll("\\p{M}+", " ")
.replaceAll("\\p{Punct}", "")
.replace(":", "");
}
Expand Down
4 changes: 3 additions & 1 deletion src/test/java/fr/insee/rmes/bauhaus_services/operations/operations/OperationsUtilsTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import org.eclipse.rdf4j.model.IRI;
import org.eclipse.rdf4j.model.Model;
import org.eclipse.rdf4j.model.impl.SimpleValueFactory;
import org.eclipse.rdf4j.model.vocabulary.XSD;
import org.json.JSONObject;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
Expand Down Expand Up @@ -65,6 +66,7 @@ void shouldStoreYearProperty() throws RmesException {
mockedFactory.when(() -> RdfUtils.setLiteralString(anyString(), anyString())).thenCallRealMethod();
mockedFactory.when(() -> RdfUtils.setLiteralString(anyString(), anyString())).thenCallRealMethod();
mockedFactory.when(() -> RdfUtils.setLiteralString(anyString())).thenCallRealMethod();
mockedFactory.when(() -> RdfUtils.createLiteral(anyString(), eq(XSD.GYEAR))).thenCallRealMethod();
mockedFactory.when(() -> RdfUtils.operationsGraph()).thenReturn(valueFactory.createIRI("http://operations-graph/"));
mockedFactory.when(() -> RdfUtils.objectIRI(eq(ObjectType.SERIES), eq("2"))).thenReturn(valueFactory.createIRI("http://series/2"));
mockedFactory.when(() -> RdfUtils.objectIRI(eq(ObjectType.OPERATION), eq("1"))).thenReturn(operationIRI);
Expand All @@ -88,7 +90,7 @@ void shouldStoreYearProperty() throws RmesException {

verify(repositoryGestion, times(1)).loadSimpleObject(eq(operationIRI), model.capture());

Assertions.assertEquals("[(http://operation/2, http://www.w3.org/1999/02/22-rdf-syntax-ns#type, http://rdf.insee.fr/def/base#StatisticalOperation, http://operations-graph/) [http://operations-graph/], (http://operation/2, http://www.w3.org/2004/02/skos/core#prefLabel, \"prefLabelLg1\"@fr, http://operations-graph/) [http://operations-graph/], (http://operation/2, http://rdf.insee.fr/def/base#validationState, \"Unpublished\", http://operations-graph/) [http://operations-graph/], (http://operation/2, http://www.w3.org/2004/02/skos/core#prefLabel, \"prefLabelLg2\"@en, http://operations-graph/) [http://operations-graph/], (http://operation/2, http://www.w3.org/2004/02/skos/core#altLabel, \"altLabelLg1\"@fr, http://operations-graph/) [http://operations-graph/], (http://operation/2, http://www.w3.org/2004/02/skos/core#altLabel, \"altLabelLg2\"@en, http://operations-graph/) [http://operations-graph/], (http://operation/2, http://purl.org/dc/terms/temporal, \"2024\"^^<http://www.w3.org/2001/XMLSchema#int>, http://operations-graph/) [http://operations-graph/]]", model.getValue().toString());
Assertions.assertEquals("[(http://operation/2, http://www.w3.org/1999/02/22-rdf-syntax-ns#type, http://rdf.insee.fr/def/base#StatisticalOperation, http://operations-graph/) [http://operations-graph/], (http://operation/2, http://www.w3.org/2004/02/skos/core#prefLabel, \"prefLabelLg1\"@fr, http://operations-graph/) [http://operations-graph/], (http://operation/2, http://rdf.insee.fr/def/base#validationState, \"Unpublished\", http://operations-graph/) [http://operations-graph/], (http://operation/2, http://www.w3.org/2004/02/skos/core#prefLabel, \"prefLabelLg2\"@en, http://operations-graph/) [http://operations-graph/], (http://operation/2, http://www.w3.org/2004/02/skos/core#altLabel, \"altLabelLg1\"@fr, http://operations-graph/) [http://operations-graph/], (http://operation/2, http://www.w3.org/2004/02/skos/core#altLabel, \"altLabelLg2\"@en, http://operations-graph/) [http://operations-graph/], (http://operation/2, http://purl.org/dc/terms/temporal, \"2024\"^^<http://www.w3.org/2001/XMLSchema#gYear>, http://operations-graph/) [http://operations-graph/]]", model.getValue().toString());

}

Expand Down
1 change: 1 addition & 0 deletions src/test/java/fr/insee/rmes/utils/FilesUtilsTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ void testGenerateFinalFileNameWithoutExtension_LongFileName() {

String result = FilesUtils.generateFinalFileNameWithoutExtension(fileName, maxLength);

assertEquals("rapportQualiteEnquet", FilesUtils.generateFinalFileNameWithoutExtension("Rapport qualité : Enquête annuelle de recensement 2022", maxLength), "Le nom de fichier généré sans extension pour un long nom est incorrect");
assertEquals("averylongfilenameexa", result, "Le nom de fichier généré sans extension pour un long nom est incorrect");
}

Expand Down

0 comments on commit bb7ec98

Please sign in to comment.