Skip to content

feat: for region endpoints : /code, /precedents, /projetes, /precedents #405

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
GtanSndil wants to merge 3 commits into from
Closed

feat: for region endpoints : /code, /precedents, /projetes, /precedents #405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0d0441a
feat: for region endpoints : /code, /precedents, /projetes, /precedents
Nov 28, 2025
28637e4
test
Nov 28, 2025
581306f
test: for region end-points
Dec 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 73 additions & 1 deletion ...t/java/fr/insee/rmes/magma/diffusion/api/testcontainers/queries/GeoRegionQueriesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,25 @@ void should_return_region06_when_regionCode06_date20250904() {
);
}

// geo/region/82?date=1990-01-01 (region 82 does not exist anymore in 2025)
@Test
void should_return_region82_when_regionCode82_date19900101() {
var response = endpoints.getcogreg("82", LocalDate.of(1990, 1, 1));
var result = response.getBody();
assertNotNull(result);
assertAll(
() -> assertEquals("82", result.getCode()),
() -> assertEquals("http://id.insee.fr/geo/region/b332a45b-1a2d-4012-912b-c7b494e51be0", result.getUri()),
() -> assertEquals(Region.TypeEnum.REGION, result.getType()),
() -> assertEquals(LocalDate.of(1982,3,2), result.getDateCreation()),
() -> assertEquals(LocalDate.of(2016,1,1), result.getDateSuppression()),
() -> assertEquals("Rhône-Alpes", result.getIntituleSansArticle()),
() -> assertEquals(Region.TypeArticleEnum._0, result.getTypeArticle()),
() -> assertEquals("69123", result.getChefLieu()),
() -> assertEquals("Rhône-Alpes", result.getIntitule())
);
}


/////////////////////////////////////////////////////////////////////
/// geo/region/{code}/descendants ///
Expand Down Expand Up @@ -95,6 +114,14 @@ void should_return_1_cantonOuVIlle_when_RegionCodeDescendants_code06_date2025090
);
}

// geo/region/82/descendants?date=2025-09-04
@Test
void should_return_404_when_RegionCodeDescendants_code82_date20250904() throws Exception{
mockMvc.perform(get("/geo/region/82/descendants")
.param("date", "2025-09-04"))
.andExpect(status().isNotFound());
}

/////////////////////////////////////////////////////////////////////
/// geo/regions ///
/////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -165,14 +192,22 @@ void should_return_2_regions_when_RegionsCodePrecedents_date20250904(){
);
}

// geo/region/44/precedents?date=201-01-01
// geo/region/44/precedents?date=2010-01-01
@Test
void should_return_404_when_RegionCodePrecedents_code44_date20100101() throws Exception{
mockMvc.perform(get("/geo/region/44/precedents")
.param("date", "2010-01-01"))
.andExpect(status().isNotFound());
}

// geo/region/82/precedents?date=2025-09-04 (region 82 does not in exist in 2025)
@Test
void should_return_404_when_RegionCodePrecedents_code82_date20250904() throws Exception{
mockMvc.perform(get("/geo/region/82/precedents")
.param("date", "2025-01-01"))
.andExpect(status().isNotFound());
}

/////////////////////////////////////////////////////////
/// geo/region/{code}/projetes ///
/////////////////////////////////////////////////////////
Expand Down Expand Up @@ -215,6 +250,26 @@ void should_return_5_regions_when_RegionsCodeProjetes_date20250904_dateProjectio
);
}

// geo/region/82?date=1990-01-01&dateProjection=2000-01-01
@Test
void should_return_1_region_when_RegionsCodeProjetes_date19900101_dateProjection20000101(){
var response = endpoints.getcogregproj("82", LocalDate.of(1990, 1, 1), LocalDate.of(2000,1,1));
var result = response.getBody();
assertNotNull(result);
var resultItem1= result.getFirst();
assertAll(
() -> assertEquals(1, result.size()),
() -> assertEquals("82", resultItem1.getCode()),
() -> assertEquals("http://id.insee.fr/geo/region/b332a45b-1a2d-4012-912b-c7b494e51be0", resultItem1.getUri()),
() -> assertEquals(TerritoireTousAttributs.TypeEnum.REGION, resultItem1.getType()),
() -> assertEquals(LocalDate.of(1982,3,2), resultItem1.getDateCreation()),
() -> assertEquals(LocalDate.of(2016,1,1), resultItem1.getDateSuppression()),
() -> assertEquals("Rhône-Alpes", resultItem1.getIntituleSansArticle()),
() -> assertEquals(TerritoireTousAttributs.TypeArticleEnum._0, resultItem1.getTypeArticle()),
() -> assertEquals("69123", resultItem1.getChefLieu()),
() -> assertEquals("Rhône-Alpes", resultItem1.getIntitule())
);
}

/////////////////////////////////////////////////////////
/// geo/region/{code}/suivants ///
Expand Down Expand Up @@ -247,5 +302,22 @@ void should_return_1_region_when_RegionCodeSuivants_code41_date20000101(){
assertEquals("Alsace-Champagne-Ardenne-Lorraine", resultItem1.getIntitule());
}

// geo/region/82/suivants?date=2000-01-01 (region 82 does not exist in 2025)
@Test
void should_return_1_region_when_RegionCodeSuivants_code82_date20000101(){
var response = endpoints.getcogregsuiv("82", LocalDate.of(2000,1,1));
var result = response.getBody();
assertNotNull(result);
var resultItem1= result.getFirst();
assertEquals(1, result.size());
assertEquals("84", resultItem1.getCode());
assertEquals("http://id.insee.fr/geo/region/c12b23e7-d2e7-4443-ac4b-de8de5ce22f2", resultItem1.getUri());
assertEquals(TerritoireTousAttributs.TypeEnum.REGION, resultItem1.getType());
assertEquals(LocalDate.of(2016,1,1), resultItem1.getDateCreation());
assertEquals("Auvergne-Rhône-Alpes", resultItem1.getIntituleSansArticle());
assertEquals(TerritoireTousAttributs.TypeArticleEnum._1, resultItem1.getTypeArticle());
assertEquals("69123", resultItem1.getChefLieu());
assertEquals("Auvergne-Rhône-Alpes", resultItem1.getIntitule());
}

}
4 changes: 2 additions & 2 deletions magma-oas/src/main/resources/openapi-diffusion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7489,7 +7489,7 @@ components:

CodeReg:
description: 'Code d''une région'
pattern: '^(01|02|03|04|06|11|24|27|28|32|44|52|53|75|76|84|93|94)$'
pattern: '^[0-9]{2}$'
type: string
xml:
attribute: true
Expand All @@ -7515,7 +7515,7 @@ components:

CodeRegPrecProj:
description: 'Code d''une région'
pattern: '^(01|02|03|04|06|11|24|27|28|32|44|52|53|75|76|84|93|94)$'
pattern: '^[0-9]{2}$'
type: string
xml:
attribute: true
Expand Down