From eda677700c24573b2b8e1e128a861c09e91709ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tandeau=20De=20Marsac=20Guyl=C3=A8ne?= Date: Wed, 5 Nov 2025 15:43:27 +0100 Subject: [PATCH 1/6] refactor: tests --- .../queries/ConceptsQueriesTest.java | 19 +++----- ...eoAireDAttractionDesVillesQueriesTest.java | 2 +- ...GeoArrondissementMunicipalQueriesTest.java | 16 +++---- .../queries/GeoArrondissementQueriesTest.java | 28 +++++++---- .../queries/GeoBassinDeVieQueriesTest.java | 46 +++++++++++-------- .../queries/GeoCantonOuVilleQueriesTest.java | 26 +++++------ .../queries/GeoCantonQueriesTest.java | 12 ++++- ...irconscriptionTerritorialeQueriesTest.java | 2 +- .../GeoCollectiviteDOutreMerQueriesTest.java | 12 ++--- .../queries/GeoCommuneQueriesTest.java | 1 + .../queries/GeoDepartementQueriesTest.java | 21 +++++++-- .../queries/GeoDistrictQueriesTest.java | 11 +++-- .../queries/GeoIrisQueriesTest.java | 9 ++-- .../queries/GeoRegionQueriesTest.java | 4 +- .../queries/GeoUniteUrbaineQueriesTest.java | 9 +++- .../queries/GeoZoneDEmploiQueriesTest.java | 4 +- 16 files changed, 132 insertions(+), 90 deletions(-) diff --git a/magma-diffusion-impl/src/test/java/fr/insee/rmes/magma/diffusion/api/testcontainers/queries/ConceptsQueriesTest.java b/magma-diffusion-impl/src/test/java/fr/insee/rmes/magma/diffusion/api/testcontainers/queries/ConceptsQueriesTest.java index 430fb777..b15c54c6 100644 --- a/magma-diffusion-impl/src/test/java/fr/insee/rmes/magma/diffusion/api/testcontainers/queries/ConceptsQueriesTest.java +++ b/magma-diffusion-impl/src/test/java/fr/insee/rmes/magma/diffusion/api/testcontainers/queries/ConceptsQueriesTest.java @@ -12,8 +12,7 @@ import java.net.URI; import java.time.LocalDate; -import static org.junit.Assert.assertEquals; -import static org.junit.jupiter.api.Assertions.assertAll; +import static org.junit.jupiter.api.Assertions.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @@ -38,11 +37,9 @@ public class ConceptsQueriesTest extends TestcontainerTest { void should_return_conceptc2066_when_ConceptsDefinitionCode_codec2066(){ var response = endpoints.getconcept("c2066"); var result = response.getBody(); + assertNotNull(result); assertAll( - () -> { - Assertions.assertNotNull(result); - assertEquals("c2066", result.getId()); - }, + () -> assertEquals("c2066", result.getId()), () -> assertEquals(URI.create("http://id.insee.fr/concepts/definition/c2066"), result.getUri()), () -> assertEquals("Auto-entrepreneur", result.getIntitule().getFirst().getContenu()), () -> assertEquals("fr", result.getIntitule().getFirst().getLangue()), @@ -67,11 +64,9 @@ void should_return_conceptc2066_when_ConceptsDefinitionCode_codec2066(){ void should_return_conceptc1201_when_ConceptsDefinitionCode_codec1201(){ var response = endpoints.getconcept("c1201"); var result = response.getBody(); + Assertions.assertNotNull(result); assertAll( - () -> { - Assertions.assertNotNull(result); - assertEquals("c1201", result.getId()); - }, + () -> assertEquals("c1201", result.getId()), () -> assertEquals(URI.create("http://id.insee.fr/concepts/definition/c1201"), result.getUri()), () -> assertEquals("Accueils collectifs de mineurs à caractère éducatif", result.getIntitule().getFirst().getContenu()), () -> assertEquals("fr", result.getIntitule().getFirst().getLangue()), @@ -85,7 +80,7 @@ void should_return_conceptc1201_when_ConceptsDefinitionCode_codec1201(){ () -> assertEquals("fr", result.getNoteEditoriale().getFirst().getLangue()), () -> assertEquals("

Source : mission Enquêtes, Données et Études Statistiques (MEDES), service statistique ministériel en charge de la jeunesse et des sports (site : https://injep.fr/mesurer/)

", result.getNoteEditoriale().getLast().getContenu()), () -> assertEquals("en", result.getNoteEditoriale().getLast().getLangue()), - () -> assertEquals(null, result.getDateMiseAJour()), + () -> assertNull(result.getDateMiseAJour()), () -> assertEquals(3, result.getConceptsPrecedents().size()), () -> assertEquals("c1307", result.getConceptsPrecedents().getFirst().getId()), () -> assertEquals(URI.create("http://id.insee.fr/concepts/definition/c1307"), result.getConceptsPrecedents().getFirst().getUri()), @@ -110,7 +105,7 @@ void should_return_404_when_ConceptsDefinitionCode_codec1000() throws Exception{ // geo/concepts/definitions?libelle=elect @Test - void should_return_16_concepts_when_ConceptsDefinitions_libelleÉlect() { + void should_return_16_concepts_when_ConceptsDefinitions_libelleElect() { var response = endpoints.getconceptsliste("Élect"); var result = response.getBody(); Assertions.assertNotNull(result); diff --git a/magma-diffusion-impl/src/test/java/fr/insee/rmes/magma/diffusion/api/testcontainers/queries/GeoAireDAttractionDesVillesQueriesTest.java b/magma-diffusion-impl/src/test/java/fr/insee/rmes/magma/diffusion/api/testcontainers/queries/GeoAireDAttractionDesVillesQueriesTest.java index 67edaa88..50e78d22 100644 --- a/magma-diffusion-impl/src/test/java/fr/insee/rmes/magma/diffusion/api/testcontainers/queries/GeoAireDAttractionDesVillesQueriesTest.java +++ b/magma-diffusion-impl/src/test/java/fr/insee/rmes/magma/diffusion/api/testcontainers/queries/GeoAireDAttractionDesVillesQueriesTest.java @@ -71,7 +71,7 @@ void should_return_92_territoires_when_aireDAttractionDesVilles2020CodeDescendan var result = response.getBody(); assertNotNull(result); var resultItem1= result.getFirst(); - assertEquals(1010, result.size()); + assertEquals(1064, result.size()); assertEquals("69381", resultItem1.getCode()); assertEquals("http://id.insee.fr/geo/arrondissementMunicipal/36940e94-b61c-4565-9ea1-ecbcd812bd7e", resultItem1.getUri()); assertEquals(TerritoireTousAttributs.TypeEnum.ARRONDISSEMENT_MUNICIPAL, resultItem1.getType()); diff --git a/magma-diffusion-impl/src/test/java/fr/insee/rmes/magma/diffusion/api/testcontainers/queries/GeoArrondissementMunicipalQueriesTest.java b/magma-diffusion-impl/src/test/java/fr/insee/rmes/magma/diffusion/api/testcontainers/queries/GeoArrondissementMunicipalQueriesTest.java index e2913be5..ba2bdcee 100644 --- a/magma-diffusion-impl/src/test/java/fr/insee/rmes/magma/diffusion/api/testcontainers/queries/GeoArrondissementMunicipalQueriesTest.java +++ b/magma-diffusion-impl/src/test/java/fr/insee/rmes/magma/diffusion/api/testcontainers/queries/GeoArrondissementMunicipalQueriesTest.java @@ -4,7 +4,6 @@ import fr.insee.rmes.magma.diffusion.api.GeoArrondissementMunipalEndpoints; import fr.insee.rmes.magma.diffusion.model.ArrondissementMunicipal; import fr.insee.rmes.magma.diffusion.model.TerritoireTousAttributs; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -15,6 +14,7 @@ import java.time.LocalDate; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @@ -39,7 +39,7 @@ public class GeoArrondissementMunicipalQueriesTest extends TestcontainerTest { void should_return_11_territoires_when_ArrondissementMunicipalCodeAscendants_code13202_date20250904_typeNull(){ var response = endpoints.getcogarrmuasc("13202", LocalDate.of(2025, 9, 4), null); var result = response.getBody(); - Assertions.assertNotNull(result); + assertNotNull(result); assertEquals(11, result.size()); // Vérifie le premier élément (AireDAttractionDesVilles2020) @@ -71,7 +71,7 @@ void should_return_11_territoires_when_ArrondissementMunicipalCodeAscendants_cod void should_return_ArrondissementMunicipal_When_code69385_date20250904() { var response = endpoints.getcogarrmu("69385", LocalDate.of(2025, 9, 4)); var result = response.getBody(); - Assertions.assertNotNull(result); + assertNotNull(result); assertEquals("69385", result.getCode()); assertEquals("http://id.insee.fr/geo/arrondissementMunicipal/cd9f4663-684c-455d-b62e-39e51c6fad99", result.getUri()); assertEquals(ArrondissementMunicipal.TypeEnum.ARRONDISSEMENT_MUNICIPAL, result.getType()); @@ -100,7 +100,7 @@ void should_return_404_when_ArrondissementMunicipalCode_code69380_date20250904() void should_return_45_arrondissementsMunicipaux_when_ArrondissementsMunicipaux_date20250904(){ var response = endpoints.getcogarrmuliste ("2025-09-04"); var result = response.getBody(); - Assertions.assertNotNull(result); + assertNotNull(result); var resultItem1= result.getFirst(); assertEquals(45, result.size()); assertEquals("13201", resultItem1.getCode()); @@ -126,7 +126,7 @@ void should_return_45_arrondissementsMunicipaux_when_ArrondissementsMunicipaux_d void should_return_45_arrondissementsMunicipaux_when_ArrondissementsMunicipaux_dateEtoile(){ var response = endpoints.getcogarrmuliste ("2025-09-04"); var result = response.getBody(); - Assertions.assertNotNull(result); + assertNotNull(result); var resultItem1= result.getFirst(); assertEquals(45, result.size()); assertEquals("13201", resultItem1.getCode()); @@ -156,7 +156,7 @@ void should_return_45_arrondissementsMunicipaux_when_ArrondissementsMunicipaux_d void should_return_1_arrondissementMunicipal_when_ArrondissementMunicipalCodePrecedents_code69385_date20250904(){ var response = endpoints.getcogarrmuprec ("69385", LocalDate.of(2025, 9, 4)); var result = response.getBody(); - Assertions.assertNotNull(result); + assertNotNull(result); var resultItem1= result.getFirst(); assertEquals(1, result.size()); assertEquals("69385", resultItem1.getCode()); @@ -186,7 +186,7 @@ void should_return_404_when_ArrondissementMunicipalCodePrecedents_code69385_date void should_return_2_arrondissementsMunicipaux_when_ArrondissementMunicipalCodeProjetes_code69385_date19600101_dateProjection20111231(){ var response = endpoints.getcogarrmuproj ("69385", LocalDate.of(2011,12,31), LocalDate.of(1950,1,1)); var result = response.getBody(); - Assertions.assertNotNull(result); + assertNotNull(result); var resultItem1= result.getFirst(); assertEquals(2, result.size()); assertEquals("69385", resultItem1.getCode()); @@ -216,7 +216,7 @@ void should_return_2_arrondissementsMunicipaux_when_ArrondissementMunicipalCodeP void should_return_2_arrondissementsMunicipaux_when_ArrondissementMunicipalCodeSuivants_code69385_date19600101(){ var response = endpoints.getcogarrmusuiv ("69385", LocalDate.of(1960,1,1)); var result = response.getBody(); - Assertions.assertNotNull(result); + assertNotNull(result); var resultItem1= result.getFirst(); assertEquals(2, result.size()); assertEquals("69385", resultItem1.getCode()); diff --git a/magma-diffusion-impl/src/test/java/fr/insee/rmes/magma/diffusion/api/testcontainers/queries/GeoArrondissementQueriesTest.java b/magma-diffusion-impl/src/test/java/fr/insee/rmes/magma/diffusion/api/testcontainers/queries/GeoArrondissementQueriesTest.java index 4bf253eb..0876b637 100644 --- a/magma-diffusion-impl/src/test/java/fr/insee/rmes/magma/diffusion/api/testcontainers/queries/GeoArrondissementQueriesTest.java +++ b/magma-diffusion-impl/src/test/java/fr/insee/rmes/magma/diffusion/api/testcontainers/queries/GeoArrondissementQueriesTest.java @@ -5,6 +5,7 @@ import fr.insee.rmes.magma.diffusion.model.TerritoireTousAttributs; import fr.insee.rmes.magma.diffusion.model.TypeEnumAscendantsArrondissement; import fr.insee.rmes.magma.diffusion.model.TypeEnumDescendantsArrondissement; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -14,7 +15,8 @@ import java.time.LocalDate; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @@ -40,10 +42,11 @@ public class GeoArrondissementQueriesTest extends TestcontainerTest{ void should_return_2_ascendants_when_ArrondissementCodeAscendants_code674_date20250904_typeNull() { var response = endpoints.getcogarrasc("674", LocalDate.of(2025, 9, 4), null); var result = response.getBody(); - assertEquals(2, result.size()); + assertNotNull(result); + Assertions.assertEquals(2, result.size()); // Premier ascendant : Département - var resultItem1 = result.get(0); + var resultItem1 = result.getFirst(); assertEquals("67", resultItem1.getCode()); assertEquals("http://id.insee.fr/geo/departement/e62b35df-f168-4dfa-b60f-ef6cdb3279a0", resultItem1.getUri()); assertEquals(TerritoireTousAttributs.TypeEnum.DEPARTEMENT, resultItem1.getType()); @@ -68,6 +71,7 @@ void should_return_2_ascendants_when_ArrondissementCodeAscendants_code674_date20 void should_return_1_region_when_ArrondissementCodeAscendants_code674_date20250904_typeRegion() { var response = endpoints.getcogarrasc("674", LocalDate.of(2025, 9, 4), TypeEnumAscendantsArrondissement.REGION); var result = response.getBody(); + assertNotNull(result); var resultItem1 = result.getFirst(); assertEquals(1, result.size()); assertEquals("44", resultItem1.getCode()); @@ -89,6 +93,7 @@ void should_return_ArrondissementCode_674_when_code674_date20250904() { var response = endpoints.getcogarr("674", LocalDate.of(2025, 9, 4)); var result = response.getBody(); + assertNotNull(result); assertEquals("674", result.getCode()); assertEquals("http://id.insee.fr/geo/arrondissement/7f59df93-132b-400f-9aa6-b3c6be1018eb", result.getUri()); assertEquals(Arrondissement.TypeEnum.ARRONDISSEMENT, result.getType()); @@ -106,6 +111,7 @@ void should_return_ArrondissementCode_674_when_code674_date20250904() { void should_return_14_CommuneDeleguee_when_ArrondissementCodeDescendants_code674_typeCommuneDeleguee() { var response = endpoints.getcogarrdes("674", null, TypeEnumDescendantsArrondissement.COMMUNE_DELEGUEE); var result = response.getBody(); + assertNotNull(result); var resultItem1 = result.getFirst(); assertEquals(14, result.size()); assertEquals("67004", resultItem1.getCode()); @@ -118,11 +124,12 @@ void should_return_14_CommuneDeleguee_when_ArrondissementCodeDescendants_code674 // geo/arrondissement/674/descendants?date=2025-09-04 @Test - void should_return_195_territoires_when_ArrondissementCodeDescendants_code674_date20250904_typeNull() { + void should_return_196_territoires_when_ArrondissementCodeDescendants_code674_date20250904_typeNull() { var response = endpoints.getcogarrdes("674", LocalDate.of(2025, 9, 4), null); var result = response.getBody(); + assertNotNull(result); var resultItem1 = result.getFirst(); - assertEquals(195, result.size()); + assertEquals(196, result.size()); assertEquals("67002", resultItem1.getCode()); assertEquals("http://id.insee.fr/geo/commune/83e823b1-a485-4441-b003-5ad23e47de5f", resultItem1.getUri()); assertEquals(TerritoireTousAttributs.TypeEnum.COMMUNE, resultItem1.getType()); @@ -139,6 +146,7 @@ void should_return_195_territoires_when_ArrondissementCodeDescendants_code674_da void should_return_333_arrondissements_when_Arrondissements_date20250904() { var response = endpoints.getcogarrliste("2025-09-04"); var result = response.getBody(); + assertNotNull(result); var resultItem1 = result.getFirst(); assertEquals(333, result.size()); // À adapter selon le nombre réel attendu assertEquals("011", resultItem1.getCode()); @@ -156,6 +164,7 @@ void should_return_333_arrondissements_when_Arrondissements_date20250904() { void should_return_748_arrondissements_when_Arrondissements_dateEtoile() { var response = endpoints.getcogarrliste("*"); var result = response.getBody(); + assertNotNull(result); var resultItem1 = result.getFirst(); assertEquals(748, result.size()); assertEquals("011", resultItem1.getCode()); @@ -176,7 +185,8 @@ void should_return_748_arrondissements_when_Arrondissements_dateEtoile() { void should_return_2_arrondissements_when_ArrondissementCodePrecedents_code674_date20250904() { var response = endpoints.getcogarrprec("674", LocalDate.of(2025, 9, 4)); var result = response.getBody(); - var resultItem1 = result.get(0); + assertNotNull(result); + var resultItem1 = result.getFirst(); assertEquals(2, result.size()); assertEquals("672", resultItem1.getCode()); assertEquals("http://id.insee.fr/geo/arrondissement/f1b88b67-f15d-49ad-9bb2-ce221f249f04", resultItem1.getUri()); @@ -235,7 +245,8 @@ public void should_return_400_when_DepartementCodeProjetes_dateProjectionEmpty() void should_return_6_arrondissements_when_ArrondissementCodeProjetes_code674_date20250904_dateProjection19940730() { var response = endpoints.getcogarrproj("674", LocalDate.of(1994, 7, 30), LocalDate.of(2025, 9, 4)); var result = response.getBody(); - var resultItem1 = result.get(0); + assertNotNull(result); + var resultItem1 = result.getFirst(); assertEquals(6, result.size()); assertEquals("672", resultItem1.getCode()); assertEquals("http://id.insee.fr/geo/arrondissement/3e815542-7173-4d26-9e94-ac663bba89f7", resultItem1.getUri()); @@ -278,10 +289,11 @@ void should_return_3_arrondissements_when_ArrondissementCodeSuivants_code042_dat var result = response.getBody(); // Vérification du nombre d'arrondissements suivants + assertNotNull(result); assertEquals(3, result.size()); // Vérification du premier élément - var resultItem1 = result.get(0); + var resultItem1 = result.getFirst(); assertEquals("042", resultItem1.getCode()); assertEquals("http://id.insee.fr/geo/arrondissement/1825eafe-2204-4849-b543-715f87615bb8", resultItem1.getUri()); assertEquals(TerritoireTousAttributs.TypeEnum.ARRONDISSEMENT, resultItem1.getType()); diff --git a/magma-diffusion-impl/src/test/java/fr/insee/rmes/magma/diffusion/api/testcontainers/queries/GeoBassinDeVieQueriesTest.java b/magma-diffusion-impl/src/test/java/fr/insee/rmes/magma/diffusion/api/testcontainers/queries/GeoBassinDeVieQueriesTest.java index d9abbdd3..d83a7ef2 100644 --- a/magma-diffusion-impl/src/test/java/fr/insee/rmes/magma/diffusion/api/testcontainers/queries/GeoBassinDeVieQueriesTest.java +++ b/magma-diffusion-impl/src/test/java/fr/insee/rmes/magma/diffusion/api/testcontainers/queries/GeoBassinDeVieQueriesTest.java @@ -4,6 +4,7 @@ import fr.insee.rmes.magma.diffusion.model.BassinDeVie2022; import fr.insee.rmes.magma.diffusion.model.TerritoireTousAttributs; import fr.insee.rmes.magma.diffusion.model.TypeEnumDescendantsBassinDeVie; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -13,7 +14,7 @@ import java.time.LocalDate; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @@ -39,14 +40,17 @@ public class GeoBassinDeVieQueriesTest extends TestcontainerTest{ void should_return_BassinDeVie2022Code_01004_when_code01004_date20250904() { var response = endpoints.getcogbass("01004", LocalDate.of(2025, 9, 4)); var result = response.getBody(); - - assertEquals("01004", result.getCode()); - assertEquals("http://id.insee.fr/geo/bassinDeVie2022/0e5bcc78-f043-404d-92af-d3d660772675", result.getUri()); - assertEquals(BassinDeVie2022.TypeEnum.BASSIN_DE_VIE2022, result.getType()); - assertEquals(LocalDate.of(2022, 1, 1), result.getDateCreation()); - assertEquals("Ambérieu-en-Bugey", result.getIntituleSansArticle()); - assertEquals(BassinDeVie2022.TypeArticleEnum._1, result.getTypeArticle()); - assertEquals("Ambérieu-en-Bugey", result.getIntitule()); + assertNotNull(result); + assertAll( + () -> assertNotNull(result), + () -> assertEquals("01004", result.getCode()), + () -> assertEquals("http://id.insee.fr/geo/bassinDeVie2022/0e5bcc78-f043-404d-92af-d3d660772675", result.getUri()), + () -> assertEquals(BassinDeVie2022.TypeEnum.BASSIN_DE_VIE2022, result.getType()), + () -> assertEquals(LocalDate.of(2022, 1, 1), result.getDateCreation()), + () ->assertEquals("Ambérieu-en-Bugey", result.getIntituleSansArticle()), + () ->assertEquals(BassinDeVie2022.TypeArticleEnum._1, result.getTypeArticle()), + () ->assertEquals("Ambérieu-en-Bugey", result.getIntitule()) + ); } // geo/bassinDeVie2022/01001?date=2025-09-04 renvoie 404 @@ -67,6 +71,7 @@ void should_return_404_when_BassinDeVie2022Code_code01001_date20250904() throws void should_return_2_communes_when_BassinDeVie2022CodeDescendants_code35176_date20250904_typeCommune(){ var response = endpoints.getcogbassdes("35176", LocalDate.of(2025, 9, 4), TypeEnumDescendantsBassinDeVie.COMMUNE); var result = response.getBody(); + assertNotNull(result); var resultItem1= result.getFirst(); assertEquals(2, result.size()); assertEquals("35155", resultItem1.getCode()); @@ -83,6 +88,7 @@ void should_return_2_communes_when_BassinDeVie2022CodeDescendants_code35176_date void should_return_2_communes_when_BassinDeVie2022CodeDescendants_code35176_date20250904(){ var response = endpoints.getcogbassdes("35176", LocalDate.of(2025, 9, 4), TypeEnumDescendantsBassinDeVie.COMMUNE); var result = response.getBody(); + assertNotNull(result); var resultItem1= result.getFirst(); assertEquals(2, result.size()); assertEquals("35155", resultItem1.getCode()); @@ -105,18 +111,17 @@ void should_return_2_communes_when_BassinDeVie2022CodeDescendants_code35176_date void should_return_1_bassinDeVie2022_when_BassinsDeVie2022_date20250904_filtreNomAmberieuEnBugey() { var response = endpoints.getcogbassliste("2025-09-04","Amberieu-en-Bugey"); var result = response.getBody(); + assertNotNull(result); var resultItem1 = result.getFirst(); - - // Vérification du nombre total de bassins de vie - assertEquals(1, result.size()); - - assertEquals("01004", resultItem1.getCode()); - assertEquals("http://id.insee.fr/geo/bassinDeVie2022/0e5bcc78-f043-404d-92af-d3d660772675", resultItem1.getUri()); - assertEquals(BassinDeVie2022.TypeEnum.BASSIN_DE_VIE2022, resultItem1.getType()); - assertEquals(LocalDate.of(2022, 1, 1), resultItem1.getDateCreation()); - assertEquals("Ambérieu-en-Bugey", resultItem1.getIntituleSansArticle()); - assertEquals(BassinDeVie2022.TypeArticleEnum._1, resultItem1.getTypeArticle()); - assertEquals("Ambérieu-en-Bugey", resultItem1.getIntitule()); + Assertions.assertEquals(1, result.size()); + + Assertions.assertEquals("01004", resultItem1.getCode()); + Assertions.assertEquals("http://id.insee.fr/geo/bassinDeVie2022/0e5bcc78-f043-404d-92af-d3d660772675", resultItem1.getUri()); + Assertions.assertEquals(BassinDeVie2022.TypeEnum.BASSIN_DE_VIE2022, resultItem1.getType()); + Assertions.assertEquals(LocalDate.of(2022, 1, 1), resultItem1.getDateCreation()); + Assertions.assertEquals("Ambérieu-en-Bugey", resultItem1.getIntituleSansArticle()); + Assertions.assertEquals(BassinDeVie2022.TypeArticleEnum._1, resultItem1.getTypeArticle()); + Assertions.assertEquals("Ambérieu-en-Bugey", resultItem1.getIntitule()); } // geo/bassinsDeVie2022?date=* @@ -124,6 +129,7 @@ void should_return_1_bassinDeVie2022_when_BassinsDeVie2022_date20250904_filtreNo void should_return_1735_bassinDeVie2022_when_BassinsDeVie2022_date20250904_filtreNomNull() { var response = endpoints.getcogbassliste("*",null); var result = response.getBody(); + assertNotNull(result); var resultItem1 = result.getFirst(); // Vérification du nombre total de bassins de vie diff --git a/magma-diffusion-impl/src/test/java/fr/insee/rmes/magma/diffusion/api/testcontainers/queries/GeoCantonOuVilleQueriesTest.java b/magma-diffusion-impl/src/test/java/fr/insee/rmes/magma/diffusion/api/testcontainers/queries/GeoCantonOuVilleQueriesTest.java index 8f942b6a..e35acdb0 100644 --- a/magma-diffusion-impl/src/test/java/fr/insee/rmes/magma/diffusion/api/testcontainers/queries/GeoCantonOuVilleQueriesTest.java +++ b/magma-diffusion-impl/src/test/java/fr/insee/rmes/magma/diffusion/api/testcontainers/queries/GeoCantonOuVilleQueriesTest.java @@ -5,7 +5,6 @@ import fr.insee.rmes.magma.diffusion.model.TerritoireTousAttributs; import fr.insee.rmes.magma.diffusion.model.TypeEnumAscendantsCantonOuVille; import fr.insee.rmes.magma.diffusion.model.TypeEnumDescendantsCantonOuVille; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -16,6 +15,7 @@ import java.time.LocalDate; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @@ -39,7 +39,7 @@ public class GeoCantonOuVilleQueriesTest extends TestcontainerTest { void should_return_1_region_1_departement_when_CantonOuVilleCodeAscendants_code0101_date20250904_typeNull(){ var response = endpoints.getcogcanvilasc("0101", LocalDate.of(2025, 9, 4), null); var result = response.getBody(); - Assertions.assertNotNull(result); + assertNotNull(result); var resultItem1= result.getFirst(); assertEquals(2, result.size()); assertEquals("01", resultItem1.getCode()); @@ -57,7 +57,7 @@ void should_return_1_region_1_departement_when_CantonOuVilleCodeAscendants_code0 void should_return_1_region_when_CantonOuVilleCodeAscendants_code0101_date20250904_typeRegion(){ var response = endpoints.getcogcanvilasc("0101", LocalDate.of(2025, 9, 4), TypeEnumAscendantsCantonOuVille.REGION); var result = response.getBody(); - Assertions.assertNotNull(result); + assertNotNull(result); var resultItem1= result.getFirst(); assertEquals(1, result.size()); assertEquals("84", resultItem1.getCode()); @@ -79,7 +79,7 @@ void should_return_1_region_when_CantonOuVilleCodeAscendants_code0101_date202509 void should_return_CantonOuVille_When_code0101_date20250904() throws Exception { var response = endpoints.getcogcanvil("0101", LocalDate.of(2025, 9, 4)); var result = response.getBody(); - Assertions.assertNotNull(result); + assertNotNull(result); assertEquals("0101", result.getCode()); assertEquals("http://id.insee.fr/geo/cantonOuVille/5e75ead7-7564-4480-83b0-7e16a7d8acf7", result.getUri()); assertEquals(CantonOuVille.TypeEnum.CANTON_OU_VILLE, result.getType()); @@ -105,7 +105,7 @@ void should_return_404_when_CantonOuVilleCode_code0100_date20250904() throws Exc void should_return_1_iris_when_CantonOuVilleCodeDescendants_code0101_date20250904_typeIris_filtreNomPerouses(){ var response = endpoints.getcogcanvildes("0101", LocalDate.of(2025, 9, 4), TypeEnumDescendantsCantonOuVille.IRIS,"Perouses"); var result = response.getBody(); - Assertions.assertNotNull(result); + assertNotNull(result); var resultItem1= result.getFirst(); assertEquals(1, result.size()); assertEquals("010040101", resultItem1.getCode()); @@ -118,12 +118,12 @@ void should_return_1_iris_when_CantonOuVilleCodeDescendants_code0101_date2025090 } @Test - void should_return_22_territoires_when_CantonOuVilleCodeDescendants_code0101_date20250904_typeNull_filtreNomNull(){ + void should_return_23_territoires_when_CantonOuVilleCodeDescendants_code0101_date20250904_typeNull_filtreNomNull(){ var response = endpoints.getcogcanvildes("0101", LocalDate.of(2025, 9, 4), null,null); var result = response.getBody(); - Assertions.assertNotNull(result); + assertNotNull(result); var resultItem1= result.getFirst(); - assertEquals(22, result.size()); + assertEquals(23, result.size()); assertEquals("01002", resultItem1.getCode()); assertEquals("http://id.insee.fr/geo/commune/43018c68-c278-433a-b285-3531e8d5347e", resultItem1.getUri()); assertEquals(TerritoireTousAttributs.TypeEnum.COMMUNE, resultItem1.getType()); @@ -142,7 +142,7 @@ void should_return_22_territoires_when_CantonOuVilleCodeDescendants_code0101_dat void should_return_2042_cantonsEtVilles_when_cantonsEtVilles_date20250904(){ var response = endpoints.getcogcanvilliste ("2025-09-04"); var result = response.getBody(); - Assertions.assertNotNull(result); + assertNotNull(result); var resultItem1= result.getFirst(); assertEquals(2042, result.size()); assertEquals("0101", resultItem1.getCode()); @@ -159,7 +159,7 @@ void should_return_2042_cantonsEtVilles_when_cantonsEtVilles_date20250904(){ void should_return_2042_cantonsEtVilles_when_cantonsEtVilles_dateEtoile(){ var response = endpoints.getcogcanvilliste ("2025-09-04"); var result = response.getBody(); - Assertions.assertNotNull(result); + assertNotNull(result); var resultItem1= result.getFirst(); assertEquals(2042, result.size()); assertEquals("0101", resultItem1.getCode()); @@ -180,7 +180,7 @@ void should_return_2042_cantonsEtVilles_when_cantonsEtVilles_dateEtoile(){ void should_return_3_cantonsOuVilles_when_CantonsOuVillesCodePrecedents_code0104_date20250904(){ var response = endpoints.getcogcanvilprec ("0104", LocalDate.of(2025, 9, 4)); var result = response.getBody(); - Assertions.assertNotNull(result); + assertNotNull(result); var resultItem1= result.getFirst(); assertEquals(3, result.size()); assertEquals("0104", resultItem1.getCode()); @@ -210,7 +210,7 @@ void should_return_404_when_CantonOuVilleCodePrecedents_code0104_date19450101() void should_return_3_cantonsOuVilles_when_CantonsOuVillesCodeProjetes_code0104_date20250904_dateProjection20160101(){ var response = endpoints.getcogcanvilproj ("0104", LocalDate.of(2016,1,1),LocalDate.of(2025, 9, 4)); var result = response.getBody(); - Assertions.assertNotNull(result); + assertNotNull(result); var resultItem1= result.getFirst(); assertEquals(3, result.size()); assertEquals("0104", resultItem1.getCode()); @@ -249,7 +249,7 @@ public void should_return_400_when_CantonOuVilleCodeProjetes_dateProjectionEmpty void should_return_1_cantonOuVille_when_CantonOuVIlleCodeSuivants_code0103_date20160101(){ var response = endpoints.getcogcanvilsuiv ("0103", LocalDate.of(2016,1,1)); var result = response.getBody(); - Assertions.assertNotNull(result); + assertNotNull(result); var resultItem1= result.getFirst(); assertEquals(1, result.size()); assertEquals("0103", resultItem1.getCode()); diff --git a/magma-diffusion-impl/src/test/java/fr/insee/rmes/magma/diffusion/api/testcontainers/queries/GeoCantonQueriesTest.java b/magma-diffusion-impl/src/test/java/fr/insee/rmes/magma/diffusion/api/testcontainers/queries/GeoCantonQueriesTest.java index 29d9b04c..9a983217 100644 --- a/magma-diffusion-impl/src/test/java/fr/insee/rmes/magma/diffusion/api/testcontainers/queries/GeoCantonQueriesTest.java +++ b/magma-diffusion-impl/src/test/java/fr/insee/rmes/magma/diffusion/api/testcontainers/queries/GeoCantonQueriesTest.java @@ -13,8 +13,7 @@ import java.time.LocalDate; -import static org.junit.Assert.assertEquals; -import static org.junit.jupiter.api.Assertions.assertAll; +import static org.junit.jupiter.api.Assertions.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @@ -38,6 +37,7 @@ public class GeoCantonQueriesTest extends TestcontainerTest{ void should_return_1_region_and_1_departement_when_CantonCodeAscendants_code0101_date20250904_typeNull(){ var response = endpoints.getcogcanasc("0101", LocalDate.of(2025, 9, 4), null); var result = response.getBody(); + assertNotNull(result); var resultItem1= result.getFirst(); assertEquals(2, result.size()); assertEquals("01", resultItem1.getCode()); @@ -56,6 +56,7 @@ void should_return_1_region_and_1_departement_when_CantonCodeAscendants_code0101 void should_return_1_departement_when_CantonCodeAscendants_code0101_date20250904_typeDepartement(){ var response = endpoints.getcogcanasc("0101", LocalDate.of(2025, 9, 4), TypeEnumAscendantsCanton.DEPARTEMENT); var result = response.getBody(); + assertNotNull(result); var resultItem1= result.getFirst(); assertEquals(1, result.size()); assertEquals("01", resultItem1.getCode()); @@ -76,6 +77,7 @@ void should_return_1_departement_when_CantonCodeAscendants_code0101_date20250904 void should_return_CantonCode_0101_when_code22_date20250904() { var response = endpoints.getcogcan("0101", LocalDate.of(2025, 9, 4)); var result = response.getBody(); + assertNotNull(result); assertEquals(Canton.TypeEnum.CANTON, result.getType()); assertEquals(LocalDate.of(2016, 1, 1), result.getDateCreation()); assertEquals("Ambérieu-en-Bugey", result.getIntituleSansArticle()); @@ -104,6 +106,7 @@ void should_return_404_when_CantonCode_code0102_date20250904() throws Exception{ void should_return_18_communes_when_CantonCodeCommunes_code0101_date20250904() { var response = endpoints.getcogcancom ("0101", LocalDate.of(2025,9,4)); var result = response.getBody(); + assertNotNull(result); var resultItem1= result.getFirst(); assertEquals(18, result.size()); assertAll( @@ -127,6 +130,7 @@ void should_return_18_communes_when_CantonCodeCommunes_code0101_date20250904() { void should_return_2054_cantons_when_Cantons_date20250904(){ var response = endpoints.getcogcanliste ("2025-09-04"); var result = response.getBody(); + assertNotNull(result); var resultItem1= result.getFirst(); assertEquals(2054, result.size()); assertEquals("0101", resultItem1.getCode()); @@ -144,6 +148,7 @@ void should_return_2054_cantons_when_Cantons_date20250904(){ void should_return_2250_cantons_when_Cantons_dateEtoile(){ var response = endpoints.getcogcanliste ("*"); var result = response.getBody(); + assertNotNull(result); var resultItem1= result.getFirst(); assertEquals(2250, result.size()); assertEquals("0101", resultItem1.getCode()); @@ -165,6 +170,7 @@ void should_return_2250_cantons_when_Cantons_dateEtoile(){ void should_return_1_canton_when_CantonCodePrecedents_code0103_date20250904() { var response = endpoints.getcogcanprec ("0103", LocalDate.of(2025, 9, 4)); var result = response.getBody(); + assertNotNull(result); var resultItem1 = result.getFirst(); assertEquals(1, result.size()); assertEquals("0103", resultItem1.getCode()); @@ -194,6 +200,7 @@ void should_return_404_when_CantonCodePrecedents_code0101_date19450101() throws void should_return_1_canton_when_CantonCodeProjetes_code0103_date20250904() { var response = endpoints.getcogcanproj ("0103", LocalDate.of(2020,1,1), LocalDate.of(2025,9,4)); var result = response.getBody(); + assertNotNull(result); var resultItem1= result.getFirst(); assertEquals(1, result.size()); assertAll( @@ -217,6 +224,7 @@ void should_return_1_canton_when_CantonCodeProjetes_code0103_date20250904() { void should_return_1_canton_when_CantonCodeSuivants_code0103_date20250904() { var response = endpoints.getcogcansuiv ("0103", LocalDate.of(2020,1,1)); var result = response.getBody(); + assertNotNull(result); var resultItem1= result.getFirst(); assertEquals(1, result.size()); assertAll( diff --git a/magma-diffusion-impl/src/test/java/fr/insee/rmes/magma/diffusion/api/testcontainers/queries/GeoCirconscriptionTerritorialeQueriesTest.java b/magma-diffusion-impl/src/test/java/fr/insee/rmes/magma/diffusion/api/testcontainers/queries/GeoCirconscriptionTerritorialeQueriesTest.java index 3b6e8d7a..04f1272e 100644 --- a/magma-diffusion-impl/src/test/java/fr/insee/rmes/magma/diffusion/api/testcontainers/queries/GeoCirconscriptionTerritorialeQueriesTest.java +++ b/magma-diffusion-impl/src/test/java/fr/insee/rmes/magma/diffusion/api/testcontainers/queries/GeoCirconscriptionTerritorialeQueriesTest.java @@ -88,7 +88,7 @@ void should_return_404_when_circonscriptionTerritorialeCode_code98611_date198001 mockMvc.perform(get("/geo/circonscriptionTerritoriale/98611") .param("date", "1980-01-01")) .andExpect(status().isNotFound()); -} + } } diff --git a/magma-diffusion-impl/src/test/java/fr/insee/rmes/magma/diffusion/api/testcontainers/queries/GeoCollectiviteDOutreMerQueriesTest.java b/magma-diffusion-impl/src/test/java/fr/insee/rmes/magma/diffusion/api/testcontainers/queries/GeoCollectiviteDOutreMerQueriesTest.java index c56351fd..e3c54be5 100644 --- a/magma-diffusion-impl/src/test/java/fr/insee/rmes/magma/diffusion/api/testcontainers/queries/GeoCollectiviteDOutreMerQueriesTest.java +++ b/magma-diffusion-impl/src/test/java/fr/insee/rmes/magma/diffusion/api/testcontainers/queries/GeoCollectiviteDOutreMerQueriesTest.java @@ -13,8 +13,7 @@ import java.time.LocalDate; -import static org.junit.jupiter.api.Assertions.assertAll; -import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.*; @SpringBootTest @@ -39,7 +38,7 @@ public class GeoCollectiviteDOutreMerQueriesTest extends TestcontainerTest{ void should_return_COMCode_988_when_code988_date20250904() { var response = endpoints.getcogcoll("988", LocalDate.of(2025, 9, 4)); var result = response.getBody(); - Assertions.assertNotNull(result); + assertNotNull(result); //Use assertAll() so that the test does not stop at the first error in the test. assertAll( () -> assertEquals("988", result.getCode()), @@ -62,7 +61,7 @@ void should_return_COMCode_988_when_code988_date20250904() { void should_return_2_communes_2_iris_when_COMCodeDescendants_code975_date20250904_typeNull_filtreNomNull(){ var response = endpoints.getcogcolldes("975", LocalDate.of(2025, 9, 4), null,null); var result = response.getBody(); - Assertions.assertNotNull(result); + assertNotNull(result); var resultItem1= result.getFirst(); assertEquals(4, result.size()); assertEquals("97501", resultItem1.getCode()); @@ -79,6 +78,7 @@ void should_return_2_communes_2_iris_when_COMCodeDescendants_code975_date2025090 void should_return_1_commune_when_COMCodeDescendants_code975_date20250904_typeCommune_filtreNomMiquelon(){ var response = endpoints.getcogcolldes("975", LocalDate.of(2025, 9, 4), TypeEnumDescendantsCollectiviteDOutreMer.COMMUNE,"Miquelon"); var result = response.getBody(); + assertNotNull(result); var resultItem1= result.getFirst(); assertEquals(1, result.size()); assertEquals("97501", resultItem1.getCode()); @@ -99,7 +99,7 @@ void should_return_1_commune_when_COMCodeDescendants_code975_date20250904_typeCo void should_return_9_COM_when_CollectivitesDOutreMer_date20250904(){ var response = endpoints.getcogcollliste ("2025-09-04"); var result = response.getBody(); - Assertions.assertNotNull(result); + assertNotNull(result); var resultItem1= result.getFirst(); assertEquals(9, result.size()); assertEquals("975", resultItem1.getCode()); @@ -116,7 +116,7 @@ void should_return_9_COM_when_CollectivitesDOutreMer_date20250904(){ void should_return_67_COM_when_CollectivitesDOutreMer_dateEtoile(){ var response = endpoints.getcogcollliste ("*"); var result = response.getBody(); - Assertions.assertNotNull(result); + assertNotNull(result); var resultItem1= result.getFirst(); assertEquals(67, result.size()); assertEquals("90bis", resultItem1.getCode()); diff --git a/magma-diffusion-impl/src/test/java/fr/insee/rmes/magma/diffusion/api/testcontainers/queries/GeoCommuneQueriesTest.java b/magma-diffusion-impl/src/test/java/fr/insee/rmes/magma/diffusion/api/testcontainers/queries/GeoCommuneQueriesTest.java index 6888c29b..5ae910cb 100644 --- a/magma-diffusion-impl/src/test/java/fr/insee/rmes/magma/diffusion/api/testcontainers/queries/GeoCommuneQueriesTest.java +++ b/magma-diffusion-impl/src/test/java/fr/insee/rmes/magma/diffusion/api/testcontainers/queries/GeoCommuneQueriesTest.java @@ -313,6 +313,7 @@ public void should_return_400_when_CommuneCodeProjetes_dateProjectionEmpty() thr void should_return_1_commune_when_CommunesCodeSuivants_date19450626(){ var response = endpoints.getcogcomsuiv ("14475", LocalDate.of(1945,6,26)); var result = response.getBody(); + assertNotNull(result); var resultItem1= result.getFirst(); assertAll( diff --git a/magma-diffusion-impl/src/test/java/fr/insee/rmes/magma/diffusion/api/testcontainers/queries/GeoDepartementQueriesTest.java b/magma-diffusion-impl/src/test/java/fr/insee/rmes/magma/diffusion/api/testcontainers/queries/GeoDepartementQueriesTest.java index 26b18753..253f2b56 100644 --- a/magma-diffusion-impl/src/test/java/fr/insee/rmes/magma/diffusion/api/testcontainers/queries/GeoDepartementQueriesTest.java +++ b/magma-diffusion-impl/src/test/java/fr/insee/rmes/magma/diffusion/api/testcontainers/queries/GeoDepartementQueriesTest.java @@ -2,6 +2,7 @@ import fr.insee.rmes.magma.diffusion.api.GeoDepartementEndpoints; import fr.insee.rmes.magma.diffusion.model.*; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -10,8 +11,9 @@ import org.springframework.test.web.servlet.MockMvc; import java.time.LocalDate; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @@ -36,8 +38,9 @@ class GeoDepartementQueriesTest extends TestcontainerTest{ void should_return_1_region_when_DepartementCodeAscendants_code22_date20250904_typeNull(){ var response = endpoints.getcogdepasc("22", LocalDate.of(2025, 9, 4), null); var result = response.getBody(); + assertNotNull(result); var resultItem1= result.getFirst(); - assertEquals(1, result.size()); + Assertions.assertEquals(1, result.size()); assertEquals("53", resultItem1.getCode()); assertEquals("http://id.insee.fr/geo/region/6c83500c-454c-4d69-aec5-b988fb6f6f1c", resultItem1.getUri()); @@ -54,6 +57,7 @@ void should_return_1_region_when_DepartementCodeAscendants_code22_date20250904_t void should_return_1_region_when_DepartementCodeAscendants_code22_date20250904_typeRegion(){ var response = endpoints.getcogdepasc("22", LocalDate.of(2025, 9, 4), TypeEnumAscendantsDepartement.REGION); var result = response.getBody(); + assertNotNull(result); var resultItem1= result.getFirst(); assertEquals(1, result.size()); @@ -76,7 +80,7 @@ void should_return_1_region_when_DepartementCodeAscendants_code22_date20250904_t void should_return_DepartementCode_22_when_code22_date20250904() { var response = endpoints.getcogdep("22", LocalDate.of(2025, 9, 4)); var result = response.getBody(); - + assertNotNull(result); assertEquals("22", result.getCode()); assertEquals("http://id.insee.fr/geo/departement/f07f6a49-9dce-4f2d-a99e-5d61eedf2827", result.getUri()); assertEquals(Departement.TypeEnum.DEPARTEMENT, result.getType()); @@ -98,6 +102,7 @@ void should_return_DepartementCode_22_when_code22_date20250904() { void should_return_1_commune_when_DepartementCodeDescendants_code45_date20250904_typeCommune_filtreNomOrleans(){ var response = endpoints.getcogdepdesc("45", LocalDate.of(2025, 9, 4), TypeEnumDescendantsDepartement.COMMUNE,"Orleans"); var result = response.getBody(); + assertNotNull(result); var resultItem1= result.getFirst(); assertEquals(1, result.size()); assertEquals("45234", resultItem1.getCode()); @@ -112,11 +117,12 @@ void should_return_1_commune_when_DepartementCodeDescendants_code45_date20250904 // geo/departement/22/descendants?date=2025-09-04 @Test - void should_return_523_territoires_when_DepartementCodeDescendants_code45_date20250904_typeNull_filtreNomNull(){ + void should_return_540_territoires_when_DepartementCodeDescendants_code45_date20250904_typeNull_filtreNomNull(){ var response = endpoints.getcogdepdesc("45", LocalDate.of(2025, 9, 4), null,null); var result = response.getBody(); + assertNotNull(result); var resultItem1= result.getFirst(); - assertEquals(523, result.size()); + assertEquals(540, result.size()); assertEquals("451", resultItem1.getCode()); assertEquals("http://id.insee.fr/geo/arrondissement/a9f9ff71-7658-4ef0-98b0-f048c8831be1", resultItem1.getUri()); assertEquals(TerritoireTousAttributs.TypeEnum.ARRONDISSEMENT, resultItem1.getType()); @@ -137,6 +143,7 @@ void should_return_523_territoires_when_DepartementCodeDescendants_code45_date20 void should_return_101_departements_when_Departements_date20250904(){ var response = endpoints.getcogdepts ("2025-09-04"); var result = response.getBody(); + assertNotNull(result); var resultItem1= result.getFirst(); assertEquals(101, result.size()); assertEquals("01", resultItem1.getCode()); @@ -155,6 +162,7 @@ void should_return_101_departements_when_Departements_date20250904(){ void should_return_154_departements_when_Departements_dateEtoile(){ var response = endpoints.getcogdepts ("*"); var result = response.getBody(); + assertNotNull(result); var resultItem1= result.getFirst(); assertEquals(154, result.size()); assertEquals("01", resultItem1.getCode()); @@ -177,6 +185,7 @@ void should_return_154_departements_when_Departements_dateEtoile(){ void should_return_1_departement_when_DepartementCodePrecedents_code22_date20250904(){ var response = endpoints.getcogdepprec ("22", LocalDate.of(2025, 9, 4)); var result = response.getBody(); + assertNotNull(result); var resultItem1= result.getFirst(); assertEquals(1, result.size()); assertEquals("22", resultItem1.getCode()); @@ -225,6 +234,7 @@ public void should_return_400_when_DepartementCodeProjetes_dateProjectionEmpty() void should_return_1_departement_when_DepartementCodeProjetes_code22_date20250904_dateProjection19500101(){ var response = endpoints.getcogdepproj ("22", LocalDate.of(1950,1,1),LocalDate.of(2025, 9, 4)); var result = response.getBody(); + assertNotNull(result); var resultItem1= result.getFirst(); assertEquals(1, result.size()); assertEquals("22", resultItem1.getCode()); @@ -255,6 +265,7 @@ void should_return_404_when_DepartementCodeSuivants_code22_date20250904() throws void should_return_1_departement_when_DepartementCodeSuivants_code22_date19500101(){ var response = endpoints.getcogdepsuiv ("22", LocalDate.of(1950,1,1)); var result = response.getBody(); + assertNotNull(result); var resultItem1= result.getFirst(); assertEquals(1, result.size()); assertEquals("22", resultItem1.getCode()); diff --git a/magma-diffusion-impl/src/test/java/fr/insee/rmes/magma/diffusion/api/testcontainers/queries/GeoDistrictQueriesTest.java b/magma-diffusion-impl/src/test/java/fr/insee/rmes/magma/diffusion/api/testcontainers/queries/GeoDistrictQueriesTest.java index 65688dc8..eceb64c0 100644 --- a/magma-diffusion-impl/src/test/java/fr/insee/rmes/magma/diffusion/api/testcontainers/queries/GeoDistrictQueriesTest.java +++ b/magma-diffusion-impl/src/test/java/fr/insee/rmes/magma/diffusion/api/testcontainers/queries/GeoDistrictQueriesTest.java @@ -1,8 +1,9 @@ package fr.insee.rmes.magma.diffusion.api.testcontainers.queries; import fr.insee.rmes.magma.diffusion.api.GeoDistrictEndpoints; -import fr.insee.rmes.magma.diffusion.model.*; -import org.junit.Assert; +import fr.insee.rmes.magma.diffusion.model.District; +import fr.insee.rmes.magma.diffusion.model.TerritoireTousAttributs; +import fr.insee.rmes.magma.diffusion.model.TypeEnumAscendantsDistrict; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -12,8 +13,7 @@ import java.time.LocalDate; -import static org.junit.Assert.assertEquals; -import static org.junit.jupiter.api.Assertions.assertAll; +import static org.junit.jupiter.api.Assertions.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @@ -37,6 +37,7 @@ public class GeoDistrictQueriesTest extends TestcontainerTest { void should_return_1_COM_when_CommuneDelegueeCodeAscendants_code46248_date20250904(){ var response = endpoints.getcogdisasc("98411", LocalDate.of(2025, 9, 4), null); var result = response.getBody(); + assertNotNull(result); var resultItem1= result.getFirst(); assertAll( () -> assertEquals(1, result.size()), @@ -55,6 +56,7 @@ void should_return_1_COM_when_CommuneDelegueeCodeAscendants_code46248_date202509 void should_return_1_arrondissement_when_CommuneDelegueeCodeAscendants_code46248_date20250904_typeCollectiviteDoutreMer(){ var response = endpoints.getcogdisasc("98411", LocalDate.of(2025, 9, 4), TypeEnumAscendantsDistrict.COLLECTIVITE_D_OUTRE_MER); var result = response.getBody(); + assertNotNull(result); var resultItem1= result.getFirst(); assertAll( () -> assertEquals(1, result.size()), @@ -77,6 +79,7 @@ void should_return_1_arrondissement_when_CommuneDelegueeCodeAscendants_code46248 void should_return_communeCode_98411_when_code98411_date20250904() { var response = endpoints.getcogdis("98411", LocalDate.of(2025, 9, 4)); var result = response.getBody(); + assertNotNull(result); assertAll( () -> assertEquals("98411", result.getCode()), () -> assertEquals("http://id.insee.fr/geo/district/d028b78a-9c4d-4e22-9b60-efffd7085eb0", result.getUri()), diff --git a/magma-diffusion-impl/src/test/java/fr/insee/rmes/magma/diffusion/api/testcontainers/queries/GeoIrisQueriesTest.java b/magma-diffusion-impl/src/test/java/fr/insee/rmes/magma/diffusion/api/testcontainers/queries/GeoIrisQueriesTest.java index c73b3ca1..f25be7ee 100644 --- a/magma-diffusion-impl/src/test/java/fr/insee/rmes/magma/diffusion/api/testcontainers/queries/GeoIrisQueriesTest.java +++ b/magma-diffusion-impl/src/test/java/fr/insee/rmes/magma/diffusion/api/testcontainers/queries/GeoIrisQueriesTest.java @@ -14,8 +14,7 @@ import java.time.LocalDate; -import static org.junit.Assert.assertEquals; -import static org.junit.jupiter.api.Assertions.assertAll; +import static org.junit.jupiter.api.Assertions.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @@ -129,6 +128,7 @@ void should_return_1_arrondissement_when_IrisCodeAscendants_Code010050000_date20 void should_return_irisCode_010040101_when_code010040101_date20250904() { var response = endpoints.getcogiris("010040101", LocalDate.of(2025, 9, 4)); var result = response.getBody(); + assertNotNull(result); assertAll( () -> assertEquals("010040101", result.getCode()), () -> assertEquals("http://id.insee.fr/geo/iris/b8c772de-9551-4f13-81c5-eca5bb0f2f7d", result.getUri()), @@ -146,6 +146,7 @@ void should_return_irisCode_010040101_when_code010040101_date20250904() { void should_return_irisCode_010020000_when_code010020000_date20250904() { var response = endpoints.getcogiris("010020000", LocalDate.of(2025, 9, 4)); var result = response.getBody(); + assertNotNull(result); assertAll( () -> assertEquals("010020000", result.getCode()), () -> assertEquals("http://id.insee.fr/geo/commune/43018c68-c278-433a-b285-3531e8d5347e", result.getUri()), @@ -174,8 +175,8 @@ void should_return_404_when_code010040000_date20250904() throws Exception { void should_return_49343_territoires_when_Iris_date20250904(){ var response = endpoints.getcogirislist (LocalDate.of(2025,9,4), null); var result = response.getBody(); + assertNotNull(result); var resultItem1= result.getFirst(); - assertAll( () -> assertEquals(49343, result.size()), () -> assertEquals("010010000", resultItem1.getCode()), @@ -194,8 +195,8 @@ void should_return_49343_territoires_when_Iris_date20250904(){ void should_return_49444_territoires_when_Iris_date20250904_comTrue(){ var response = endpoints.getcogirislist (LocalDate.of(2025,9,4), true); var result = response.getBody(); + assertNotNull(result); var resultItem1= result.getFirst(); - assertAll( () -> assertEquals(49444, result.size()), () -> assertEquals("010010000", resultItem1.getCode()), diff --git a/magma-diffusion-impl/src/test/java/fr/insee/rmes/magma/diffusion/api/testcontainers/queries/GeoRegionQueriesTest.java b/magma-diffusion-impl/src/test/java/fr/insee/rmes/magma/diffusion/api/testcontainers/queries/GeoRegionQueriesTest.java index b8ac19e2..b423cbfb 100644 --- a/magma-diffusion-impl/src/test/java/fr/insee/rmes/magma/diffusion/api/testcontainers/queries/GeoRegionQueriesTest.java +++ b/magma-diffusion-impl/src/test/java/fr/insee/rmes/magma/diffusion/api/testcontainers/queries/GeoRegionQueriesTest.java @@ -58,13 +58,13 @@ void should_return_region06_when_regionCode06_date20250904() { // geo/region/06/descendants?date=2025-09-04 : renvoie 30 territoires @Test - void should_return_167_territoires_when_RegionCodeDescendants_code06_date20250904_typeNull_filtreNomNull(){ + void should_return_209_territoires_when_RegionCodeDescendants_code06_date20250904_typeNull_filtreNomNull(){ var response = endpoints.getcogregdes("06", LocalDate.of(2025, 9, 4), null, null); var result = response.getBody(); assertNotNull(result); var resultItem1= result.getFirst(); assertAll( - () -> assertEquals(167, result.size()), + () -> assertEquals(209, result.size()), () -> assertEquals("97601", resultItem1.getCode()), () -> assertEquals("http://id.insee.fr/geo/canton/03e01e65-f723-4998-b9e7-2068df3b053a", resultItem1.getUri()), () -> assertEquals(TerritoireTousAttributs.TypeEnum.CANTON, resultItem1.getType()), diff --git a/magma-diffusion-impl/src/test/java/fr/insee/rmes/magma/diffusion/api/testcontainers/queries/GeoUniteUrbaineQueriesTest.java b/magma-diffusion-impl/src/test/java/fr/insee/rmes/magma/diffusion/api/testcontainers/queries/GeoUniteUrbaineQueriesTest.java index 48b7135d..a4bb0aa1 100644 --- a/magma-diffusion-impl/src/test/java/fr/insee/rmes/magma/diffusion/api/testcontainers/queries/GeoUniteUrbaineQueriesTest.java +++ b/magma-diffusion-impl/src/test/java/fr/insee/rmes/magma/diffusion/api/testcontainers/queries/GeoUniteUrbaineQueriesTest.java @@ -12,9 +12,9 @@ import org.springframework.test.web.servlet.MockMvc; import java.time.LocalDate; -import static org.junit.Assert.assertEquals; -import static org.junit.jupiter.api.Assertions.assertAll; + +import static org.junit.jupiter.api.Assertions.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @@ -38,6 +38,7 @@ public class GeoUniteUrbaineQueriesTest extends TestcontainerTest{ void should_return_uniteUrbaine01121_when_UniteUrbaine2020Code01121_date20250904() { var response = endpoints.getcoguu("01121", LocalDate.of(2025, 9, 4)); var result = response.getBody(); + assertNotNull(result); assertAll( () -> assertEquals("01121", result.getCode()), () -> assertEquals("http://id.insee.fr/geo/uniteUrbaine2020/57a37c9b-e426-430e-b8c1-ac0fd640e345", result.getUri()), @@ -59,6 +60,7 @@ void should_return_uniteUrbaine01121_when_UniteUrbaine2020Code01121_date20250904 void should_return_2_communes_when_UniteUrbaine2020CodeDescendants_code01121_date20250904_typeNull(){ var response = endpoints.getcoguudes("01121", LocalDate.of(2025, 9, 4), null); var result = response.getBody(); + assertNotNull(result); var resultItem1= result.getFirst(); assertAll( () -> assertEquals(2, result.size()), @@ -77,6 +79,7 @@ void should_return_2_communes_when_UniteUrbaine2020CodeDescendants_code01121_dat void should_return_2_communes_when_UniteUrbaine2020CodeDescendants_code01121_date20250904_typeCommune(){ var response = endpoints.getcoguudes("01121", LocalDate.of(2025, 9, 4), TypeEnumDescendantsUniteUrbaine.COMMUNE); var result = response.getBody(); + assertNotNull(result); var resultItem1= result.getFirst(); assertAll( () -> assertEquals(2, result.size()), @@ -110,6 +113,7 @@ void should_return_404_when_UniteUrbaine2020CodePrecedents_code01121_date2025090 void should_return_2472_unitesUrbaines_when_UnitesUrbaines2020_date20250904(){ var response = endpoints.getcoguuliste("2025-09-04"); var result = response.getBody(); + assertNotNull(result); var resultItem1= result.getFirst(); assertAll( () -> assertEquals(2472, result.size()), @@ -127,6 +131,7 @@ void should_return_2472_unitesUrbaines_when_UnitesUrbaines2020_date20250904(){ void should_return_2496_unitesUrbaines_when_UnitesUrbaines2020_dateEtoile(){ var response = endpoints.getcoguuliste("*"); var result = response.getBody(); + assertNotNull(result); var resultItem1= result.getFirst(); assertAll( () -> assertEquals(2496, result.size()), diff --git a/magma-diffusion-impl/src/test/java/fr/insee/rmes/magma/diffusion/api/testcontainers/queries/GeoZoneDEmploiQueriesTest.java b/magma-diffusion-impl/src/test/java/fr/insee/rmes/magma/diffusion/api/testcontainers/queries/GeoZoneDEmploiQueriesTest.java index dc196791..d7584df8 100644 --- a/magma-diffusion-impl/src/test/java/fr/insee/rmes/magma/diffusion/api/testcontainers/queries/GeoZoneDEmploiQueriesTest.java +++ b/magma-diffusion-impl/src/test/java/fr/insee/rmes/magma/diffusion/api/testcontainers/queries/GeoZoneDEmploiQueriesTest.java @@ -56,13 +56,13 @@ void should_return_uniteUrbaine2415_when_zoneDEmploi2020Code2415_date20250904() // geo/zoneDEmploi2020/2415/descendants?date=2025-09-04 @Test - void should_return_41_territoires_when_zoneDEmploi2020CodeDescendants_code2415_date20250904_typeNull(){ + void should_return_42_territoires_when_zoneDEmploi2020CodeDescendants_code2415_date20250904_typeNull(){ var response = endpoints.getcogzedesc("2415", LocalDate.of(2025, 9, 4), null); var result = response.getBody(); assertNotNull(result); var resultItem1= result.getFirst(); assertAll( - () -> assertEquals(41, result.size()), + () -> assertEquals(42, result.size()), () -> assertEquals("18036", resultItem1.getCode()), () -> assertEquals("http://id.insee.fr/geo/commune/9d090028-9065-4c75-bb2b-6ea30d430af7", resultItem1.getUri()), () -> assertEquals(TerritoireTousAttributs.TypeEnum.COMMUNE, resultItem1.getType()), From e602bd17207f12718645f3d3787a2389c0cfa04b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tandeau=20De=20Marsac=20Guyl=C3=A8ne?= Date: Wed, 5 Nov 2025 16:05:06 +0100 Subject: [PATCH 2/6] style: comments in english --- .../magma/diffusion/api/GeoArrondissementEndpoints.java | 6 +++--- .../diffusion/api/GeoArrondissementMunipalEndpoints.java | 6 +++--- .../insee/rmes/magma/diffusion/api/GeoCantonEndpoints.java | 6 +++--- .../rmes/magma/diffusion/api/GeoCantonOuVilleEndpoints.java | 6 +++--- .../insee/rmes/magma/diffusion/api/GeoCommuneEndpoints.java | 6 +++--- .../rmes/magma/diffusion/api/GeoDepartementEndpoints.java | 6 +++--- .../magma/diffusion/api/GeoIntercommunaliteEndpoints.java | 6 +++--- .../insee/rmes/magma/diffusion/api/GeoRegionEndpoints.java | 6 +++--- 8 files changed, 24 insertions(+), 24 deletions(-) diff --git a/magma-diffusion-impl/src/main/java/fr/insee/rmes/magma/diffusion/api/GeoArrondissementEndpoints.java b/magma-diffusion-impl/src/main/java/fr/insee/rmes/magma/diffusion/api/GeoArrondissementEndpoints.java index 93ecb2c5..cd66e669 100644 --- a/magma-diffusion-impl/src/main/java/fr/insee/rmes/magma/diffusion/api/GeoArrondissementEndpoints.java +++ b/magma-diffusion-impl/src/main/java/fr/insee/rmes/magma/diffusion/api/GeoArrondissementEndpoints.java @@ -73,9 +73,9 @@ public ResponseEntity> getcogarrprec(String code, @Override public ResponseEntity> getcogarrproj(String code, LocalDate dateProjection, LocalDate date) { - //le booléen previous est calculé en fonction du paramètre dateProjection (paramètre obligatoire) et du paramètre date valorisé à la date du jour si absent - // (facultatif). La valorisation de date à la date du jour dans ParameterValueDecoder n'est pas conservée en dehors de la méthode - // => obligé de valoriser date ici aussi + //The Boolean previous is based on the dateProjection parameter (required parameter) and on the date parameter set to today's date if absent + // (optional). Setting the date to today's date in ParameterValueDecoder is not retained outside the method + // => must set the date here as well if (date == null) { date = LocalDate.now(); } diff --git a/magma-diffusion-impl/src/main/java/fr/insee/rmes/magma/diffusion/api/GeoArrondissementMunipalEndpoints.java b/magma-diffusion-impl/src/main/java/fr/insee/rmes/magma/diffusion/api/GeoArrondissementMunipalEndpoints.java index d30dc147..79d9194e 100644 --- a/magma-diffusion-impl/src/main/java/fr/insee/rmes/magma/diffusion/api/GeoArrondissementMunipalEndpoints.java +++ b/magma-diffusion-impl/src/main/java/fr/insee/rmes/magma/diffusion/api/GeoArrondissementMunipalEndpoints.java @@ -63,9 +63,9 @@ public ResponseEntity> getcogarrmuprec(String code @Override public ResponseEntity> getcogarrmuproj(String code, LocalDate dateProjection, LocalDate date) { - //le booléen previous est calculé en fonction du paramètre dateProjection (paramètre obligatoire) et du paramètre date valorisé à la date du jour si absent - // (facultatif). La valorisation de date à la date du jour dans ParameterValueDecoder n'est pas conservée en dehors de la méthode - // => obligé de valoriser date ici aussi + //The Boolean previous is based on the dateProjection parameter (required parameter) and on the date parameter set to today's date if absent + // (optional). Setting the date to today's date in ParameterValueDecoder is not retained outside the method + // => must set the date here as well if (date == null) { date = LocalDate.now(); } diff --git a/magma-diffusion-impl/src/main/java/fr/insee/rmes/magma/diffusion/api/GeoCantonEndpoints.java b/magma-diffusion-impl/src/main/java/fr/insee/rmes/magma/diffusion/api/GeoCantonEndpoints.java index 10aa49f9..1becf5ca 100644 --- a/magma-diffusion-impl/src/main/java/fr/insee/rmes/magma/diffusion/api/GeoCantonEndpoints.java +++ b/magma-diffusion-impl/src/main/java/fr/insee/rmes/magma/diffusion/api/GeoCantonEndpoints.java @@ -71,9 +71,9 @@ public ResponseEntity> getcogcanprec(String code, @Override public ResponseEntity> getcogcanproj(String code, LocalDate dateProjection, LocalDate date) { - //le booléen previous est calculé en fonction du paramètre dateProjection (paramètre obligatoire) et du paramètre date valorisé à la date du jour si absent - // (facultatif). La valorisation de date à la date du jour dans ParameterValueDecoder n'est pas conservée en dehors de la méthode - // => obligé de valoriser date ici aussi + //The Boolean previous is based on the dateProjection parameter (required parameter) and on the date parameter set to today's date if absent + // (optional). Setting the date to today's date in ParameterValueDecoder is not retained outside the method + // => must set the date here as well if (date == null) { date = LocalDate.now(); } diff --git a/magma-diffusion-impl/src/main/java/fr/insee/rmes/magma/diffusion/api/GeoCantonOuVilleEndpoints.java b/magma-diffusion-impl/src/main/java/fr/insee/rmes/magma/diffusion/api/GeoCantonOuVilleEndpoints.java index 6844806d..0efef88e 100644 --- a/magma-diffusion-impl/src/main/java/fr/insee/rmes/magma/diffusion/api/GeoCantonOuVilleEndpoints.java +++ b/magma-diffusion-impl/src/main/java/fr/insee/rmes/magma/diffusion/api/GeoCantonOuVilleEndpoints.java @@ -75,9 +75,9 @@ public ResponseEntity> getcogcanvilprec(String cod @Override public ResponseEntity> getcogcanvilproj(String code, LocalDate dateProjection, LocalDate date) { - //le booléen previous est calculé en fonction du paramètre dateProjection (paramètre obligatoire) et du paramètre date valorisé à la date du jour si absent - // (facultatif). La valorisation de date à la date du jour dans ParameterValueDecoder n'est pas conservée en dehors de la méthode - // => obligé de valoriser date ici aussi + //The Boolean previous is based on the dateProjection parameter (required parameter) and on the date parameter set to today's date if absent + // (optional). Setting the date to today's date in ParameterValueDecoder is not retained outside the method + // => must set the date here as well if (date == null) { date = LocalDate.now(); } diff --git a/magma-diffusion-impl/src/main/java/fr/insee/rmes/magma/diffusion/api/GeoCommuneEndpoints.java b/magma-diffusion-impl/src/main/java/fr/insee/rmes/magma/diffusion/api/GeoCommuneEndpoints.java index 36e7c0d7..f04dfb5b 100644 --- a/magma-diffusion-impl/src/main/java/fr/insee/rmes/magma/diffusion/api/GeoCommuneEndpoints.java +++ b/magma-diffusion-impl/src/main/java/fr/insee/rmes/magma/diffusion/api/GeoCommuneEndpoints.java @@ -80,9 +80,9 @@ public ResponseEntity> getcogcomprec( String code, LocalDat @Override public ResponseEntity> getcogcomproj( String code, LocalDate dateProjection, LocalDate date) { - //le booléen previous est calculé en fonction du paramètre dateProjection (paramètre obligatoire) et du paramètre date valorisé à la date du jour si absent - // (facultatif). La valorisation de date à la date du jour dans ParameterValueDecoder n'est pas conservée en dehors de la méthode - // => obligé de valoriser date ici aussi + //The Boolean previous is based on the dateProjection parameter (required parameter) and on the date parameter set to today's date if absent + // (optional). Setting the date to today's date in ParameterValueDecoder is not retained outside the method + // => must set the date here as well// if (date == null) { date = LocalDate.now(); } diff --git a/magma-diffusion-impl/src/main/java/fr/insee/rmes/magma/diffusion/api/GeoDepartementEndpoints.java b/magma-diffusion-impl/src/main/java/fr/insee/rmes/magma/diffusion/api/GeoDepartementEndpoints.java index ab25564b..ccb8108d 100644 --- a/magma-diffusion-impl/src/main/java/fr/insee/rmes/magma/diffusion/api/GeoDepartementEndpoints.java +++ b/magma-diffusion-impl/src/main/java/fr/insee/rmes/magma/diffusion/api/GeoDepartementEndpoints.java @@ -50,9 +50,9 @@ public ResponseEntity> getcogdepprec(String code, @Override public ResponseEntity> getcogdepproj(String code, LocalDate dateProjection, LocalDate date) { - //le booléen previous est calculé en fonction du paramètre dateProjection (paramètre obligatoire) et du paramètre date valorisé à la date du jour si absent - // (facultatif). La valorisation de date à la date du jour dans ParameterValueDecoder n'est pas conservée en dehors de la méthode - // => obligé de valoriser date ici aussi + //The Boolean previous is based on the dateProjection parameter (required parameter) and on the date parameter set to today's date if absent + // (optional). Setting the date to today's date in ParameterValueDecoder is not retained outside the method + // => must set the date here as well if (date == null) { date = LocalDate.now(); } diff --git a/magma-diffusion-impl/src/main/java/fr/insee/rmes/magma/diffusion/api/GeoIntercommunaliteEndpoints.java b/magma-diffusion-impl/src/main/java/fr/insee/rmes/magma/diffusion/api/GeoIntercommunaliteEndpoints.java index c1035451..b57546e0 100644 --- a/magma-diffusion-impl/src/main/java/fr/insee/rmes/magma/diffusion/api/GeoIntercommunaliteEndpoints.java +++ b/magma-diffusion-impl/src/main/java/fr/insee/rmes/magma/diffusion/api/GeoIntercommunaliteEndpoints.java @@ -66,9 +66,9 @@ public ResponseEntity> getcogintercoprec(String co @Override public ResponseEntity> getcogintercoproj(String code, LocalDate dateProjection, LocalDate date) { - //le booléen previous est calculé en fonction du paramètre dateProjection (paramètre obligatoire) et du paramètre date valorisé à la date du jour si absent - // (facultatif). La valorisation de date à la date du jour dans ParameterValueDecoder n'est pas conservée en dehors de la méthode - // => obligé de valoriser date ici aussi + //The Boolean previous is based on the dateProjection parameter (required parameter) and on the date parameter set to today's date if absent + // (optional). Setting the date to today's date in ParameterValueDecoder is not retained outside the method + // => must set the date here as well if (date == null) { date = LocalDate.now(); } diff --git a/magma-diffusion-impl/src/main/java/fr/insee/rmes/magma/diffusion/api/GeoRegionEndpoints.java b/magma-diffusion-impl/src/main/java/fr/insee/rmes/magma/diffusion/api/GeoRegionEndpoints.java index 72d22701..c924d96c 100644 --- a/magma-diffusion-impl/src/main/java/fr/insee/rmes/magma/diffusion/api/GeoRegionEndpoints.java +++ b/magma-diffusion-impl/src/main/java/fr/insee/rmes/magma/diffusion/api/GeoRegionEndpoints.java @@ -63,9 +63,9 @@ public ResponseEntity> getcogregprec(String code, @Override public ResponseEntity> getcogregproj(String code, LocalDate dateProjection, LocalDate date) { - //le booléen previous est calculé en fonction du paramètre dateProjection (paramètre obligatoire) et du paramètre date valorisé à la date du jour si absent - // (facultatif). La valorisation de date à la date du jour dans ParameterValueDecoder n'est pas conservée en dehors de la méthode - // => obligé de valoriser date ici aussi + //The Boolean previous is based on the dateProjection parameter (required parameter) and on the date parameter set to today's date if absent + // (optional). Setting the date to today's date in ParameterValueDecoder is not retained outside the method + // => must set the date here as well if (date == null) { date = LocalDate.now(); } From 2690a1c312cff736c78f5aeca7cbbbaa0e12208b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tandeau=20De=20Marsac=20Guyl=C3=A8ne?= Date: Wed, 5 Nov 2025 16:17:48 +0100 Subject: [PATCH 3/6] refactor: openapi-diffusion.yaml correction of syntax approximations --- .../src/main/resources/openapi-diffusion.yaml | 63 +++++-------------- 1 file changed, 17 insertions(+), 46 deletions(-) diff --git a/magma-oas/src/main/resources/openapi-diffusion.yaml b/magma-oas/src/main/resources/openapi-diffusion.yaml index 8d4f3515..31b85573 100644 --- a/magma-oas/src/main/resources/openapi-diffusion.yaml +++ b/magma-oas/src/main/resources/openapi-diffusion.yaml @@ -2003,14 +2003,6 @@ components: parameters: - codeTerritoireInPath: - name: 'code' - in: path - description: 'Code identifiant un territoire' - required: true - schema: - type: string - dateActive: in: query description: |- @@ -2038,13 +2030,6 @@ components: schema: $ref: '#/components/schemas/Date1950ParDefaut' - typeTerritoire: - name: 'type' - in: query - description: 'Filtre sur le type de territoire renvoyé' - schema: - $ref: '#/components/schemas/TypeEnum' - filtreNomDescendant: name: 'filtreNom' in: query @@ -3021,13 +3006,6 @@ components: schema: $ref: '#/components/schemas/TypeEnumDescendantsCantonOuVille' - filtreNomDescendantSansExemple: - name: 'filtreNom' - in: query - description: 'Filtre sur le nom des territoires renvoyés' - schema: - type: string - dateCantonsEtVillesActifs: in: query description: |- @@ -6049,6 +6027,7 @@ components: Departement: allOf: - $ref: '#/components/schemas/TerritoireBase_ChefLieu' + - type: object xml: name: Departement properties: @@ -6076,7 +6055,6 @@ components: xml: attribute: true type: - type: string $ref: '#/components/schemas/TypeEnum' dateCreation: type: string @@ -6249,21 +6227,6 @@ components: items: $ref: '#/components/schemas/TerritoireBase_ChefLieu' - TerritoireRef: - xml: - name: TerritoireRef - type: object - required: - - code - - territoireType - description: 'Références vers un territoire de n''importe quel type' - properties: - code: - type: string - description: 'Code identifiant un teritoire quelqconque' - territoireType: - $ref: '#/components/schemas/TypeEnum' - CodeCom: pattern: '[0-9][0-9AB][0-9]{3}' type: 'string' @@ -6627,14 +6590,6 @@ components: langue: type: string - ConceptRef: - type: object - properties: - id: - type: string - uri: - type: string - ListeConcepts: description: 'Liste des concepts' type: array @@ -6647,6 +6602,7 @@ components: AireDAttractionDesVilles2020: allOf: - $ref: '#/components/schemas/TerritoireBase_ChefLieu' + - type: object xml: name: Aire d'attraction properties: @@ -6691,6 +6647,7 @@ components: Arrondissement: allOf: - $ref: '#/components/schemas/TerritoireBase_ChefLieu' + - type: object xml: name: Arrondissement properties: @@ -6770,6 +6727,7 @@ components: ArrondissementMunicipal: allOf: - $ref: '#/components/schemas/TerritoireBase_ChefLieu' + - type: object xml: name: Arrondissement municipal properties: @@ -6832,6 +6790,7 @@ components: CommuneAssociee: allOf: - $ref: '#/components/schemas/Territoire_TousAttributs' + - type: object xml: name: CommuneAssociee properties: @@ -6859,6 +6818,7 @@ components: CommuneDeleguee: allOf: - $ref: '#/components/schemas/Territoire_TousAttributs' + - type: object xml: name: CommuneDeleguee properties: @@ -6902,6 +6862,7 @@ components: District: allOf: - $ref: '#/components/schemas/Territoire_TousAttributs' + - type: object xml: name: District properties: @@ -6919,6 +6880,7 @@ components: Intercommunalite: allOf: - $ref: '#/components/schemas/Territoire_TousAttributs' + - type: object xml: name: Intercommunalite properties: @@ -7028,6 +6990,7 @@ components: Iris: allOf: - $ref: '#/components/schemas/Territoire_TousAttributs' + - type: object xml: name: Iris properties: @@ -7137,6 +7100,7 @@ components: Region: allOf: - $ref: '#/components/schemas/TerritoireBase_ChefLieu' + - type: object xml: name: Region properties: @@ -7215,6 +7179,7 @@ components: UniteUrbaine2020: allOf: - $ref: '#/components/schemas/TerritoireBase_ChefLieu' + - type: object xml: name: UniteUrbaine properties: @@ -7263,6 +7228,7 @@ components: BassinDeVie2022: allOf: - $ref: '#/components/schemas/Territoire_TousAttributs' + - type: object xml: name: Canton properties: @@ -7319,6 +7285,7 @@ components: Canton: allOf: - $ref: '#/components/schemas/TerritoireBase_ChefLieu' + - type: object xml: name: Canton properties: @@ -7407,6 +7374,7 @@ components: CantonOuVille: allOf: - $ref: '#/components/schemas/TerritoireBase_ChefLieu' + - type: object xml: name: Canton properties: @@ -7494,6 +7462,7 @@ components: CirconscriptionTerritoriale: allOf: - $ref: '#/components/schemas/Territoire_TousAttributs' + - type: object xml: name: Circonscription territoriale properties: @@ -7511,6 +7480,7 @@ components: CollectiviteDOutreMer: allOf: - $ref: '#/components/schemas/Territoire_TousAttributs' + - type: object xml: name: CollectiviteDOutreMer properties: @@ -7582,6 +7552,7 @@ components: ZoneDEmploi2020: allOf: - $ref: '#/components/schemas/TerritoireBase_ChefLieu' + - type: object xml: name: ZoneDEmploi properties: From 9a2645879055386703a32a52466e18bea9e598db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tandeau=20De=20Marsac=20Guyl=C3=A8ne?= Date: Wed, 19 Nov 2025 12:22:21 +0100 Subject: [PATCH 4/6] fix: spaces instead of tab --- magma-oas/src/main/resources/openapi-diffusion.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/magma-oas/src/main/resources/openapi-diffusion.yaml b/magma-oas/src/main/resources/openapi-diffusion.yaml index 00c0b952..17cc3a2e 100644 --- a/magma-oas/src/main/resources/openapi-diffusion.yaml +++ b/magma-oas/src/main/resources/openapi-diffusion.yaml @@ -3666,9 +3666,9 @@ components: uri: 'http://localhost:8080/geo/canton/0101/intersections' type: 'Commune' dateCreation: '1943-01-01' - intituleSansArticle : 'Abergement-de-Varey' + intituleSansArticle: 'Abergement-de-Varey' typeArticle: '5' - intitule: 'L''Abergement-de-Varey' + intitule: 'L''Abergement-de-Varey' relation: 'contient' CantonOuVilleListeAscendants: @@ -3887,7 +3887,7 @@ components: - code: '0105' uri: 'http://id.insee.fr/geo/canton/622ce50c-2ff4-470d-a0f3-f85baa8813a7' type: 'Canton' - dateCreation: '2016-01-01' + dateCreation: '2016-01-01' intituleSansArticle: 'Bourg-en-Bresse-1' typeArticle: '0' intitule: 'Bourg-en-Bresse-1' From ca032e3c3312b916678ba4770f26bb776f7429dd Mon Sep 17 00:00:00 2001 From: Fabrice Bibonne Date: Thu, 20 Nov 2025 12:06:26 +0100 Subject: [PATCH 5/6] fix (instersections) generated parameters in intersections methods endpoints are of wrong type --- magma-oas/src/main/resources/openapi-diffusion.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/magma-oas/src/main/resources/openapi-diffusion.yaml b/magma-oas/src/main/resources/openapi-diffusion.yaml index 17cc3a2e..8dcb0bf7 100644 --- a/magma-oas/src/main/resources/openapi-diffusion.yaml +++ b/magma-oas/src/main/resources/openapi-diffusion.yaml @@ -6328,6 +6328,7 @@ components: xml: attribute: true type: + type: string $ref: '#/components/schemas/TypeEnum' dateCreation: type: string From eaff1480153eb9a5de7d327ae6de14c3d74862df Mon Sep 17 00:00:00 2001 From: Fabrice Bibonne Date: Thu, 20 Nov 2025 12:07:45 +0100 Subject: [PATCH 6/6] pom(upgrade openapi generator version) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a0047143..a6390b06 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ 5.12.0 2.3.34 2.10.0 - 7.11.0 + 7.17.0 0.2.6 10.0.0 UTF-8