Skip to content
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

[UBS user] Fix bug location #1178

Merged
merged 6 commits into from
Jul 11, 2023
Merged

[UBS user] Fix bug location #1178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
20af5f1
Added remover for word область
ospodaryk Jul 11, 2023
f693a1f
Added remover for word область and region
ospodaryk Jul 11, 2023
5307738
Refactored
ospodaryk Jul 11, 2023
8dafc48
Refactored
ospodaryk Jul 11, 2023
1fc730a
Refactored
ospodaryk Jul 11, 2023
3fcb205
Removed code smell
ospodaryk Jul 11, 2023
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
9 changes: 8 additions & 1 deletion service/src/main/java/greencity/service/locations/LocationApiService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ public LocationApiService(RestTemplate restTemplate) {
*/
public List<LocationDto> getAllDistrictsInCityByNames(String regionName, String cityName) {
checkIfNotNull(regionName, cityName);
regionName = removeLastWord(regionName);
if (cityName.equals(KYIV.getLocationNameMap().get(NAME))
|| cityName.equals(KYIV.getLocationNameMap().get(NAME_EN))) {
return getAllDistrictsInCityByCityID(KYIV.getId());
Expand Down Expand Up @@ -257,6 +258,12 @@ private LocationDto getLocationDataByCode(int level, String code) {
return resultFromUrl.get(0);
}

private static String removeLastWord(String sentence) {
String withoutSpaces = sentence.replace(" ", "");
String withoutRegion = withoutSpaces.replaceAll("(?iu)region", "");
return withoutRegion.replaceAll("(?iu)область", "");
}

/**
* Fetches a list of location data by level.
*
Expand All @@ -268,7 +275,7 @@ private List<LocationDto> getLocationDataByLevel(int level) {
return getResultFromUrl(builder.build().encode().toUri());
}

private boolean checkIfNotNull(String... names) {
private static boolean checkIfNotNull(String... names) {
if (Arrays.stream(names).anyMatch(StringUtils::isBlank)) {
throw new IllegalArgumentException(ErrorMessage.VALUE_CAN_NOT_BE_NULL_OR_EMPTY);
}
Expand Down
30 changes: 15 additions & 15 deletions service/src/test/java/greencity/service/locations/LocationApiServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ void testGetDisctrictByName_whenNameEn() {
UriComponentsBuilder lvivskaBuilder = buildName("Lvivska", LocationDivision.REGION.getLevelId());
respond(lvivBuilder, new ArrayList<>());
respond(lvivskaBuilder, new ArrayList<>());
List<LocationDto> districts = locationApiService.getAllDistrictsInCityByNames("Lvivska", "Lviv");
List<LocationDto> districts = locationApiService.getAllDistrictsInCityByNames("Lvivska область", "Lviv");
assertEquals(2, districts.size());
assertLocationDto(districts.get(0), "UA46060250010121390", "UA46060250010015970", "Галицький", "Halytskyi");
assertLocationDto(districts.get(1), "UA46060250010259421", "UA46060250010015970", "Залізничний",
Expand All @@ -192,7 +192,7 @@ void testGetDisctrictByName_whenNameEn() {
@Test
void testGetAllDistrictsInCityByNames_whenKyiv() {
initKyiv();
List<LocationDto> districts = locationApiService.getAllDistrictsInCityByNames("Київська", "Київ");
List<LocationDto> districts = locationApiService.getAllDistrictsInCityByNames("Київська область", "Київ");
assertEquals(2, districts.size());
assertLocationDto(districts.get(0), "UA80000000000126643", "UA80000000000093317", "Голосіївський",
"Holosiivskyi");
Expand All @@ -203,7 +203,7 @@ void testGetAllDistrictsInCityByNames_whenKyiv() {
@Test
void testGetAllDistrictsInCityByNames_whenKyivEn() {
initKyiv();
List<LocationDto> districts = locationApiService.getAllDistrictsInCityByNames("Київська", "Kyiv");
List<LocationDto> districts = locationApiService.getAllDistrictsInCityByNames("Київська область", "Kyiv");
assertEquals(2, districts.size());
assertLocationDto(districts.get(0), "UA80000000000126643", "UA80000000000093317", "Голосіївський",
"Holosiivskyi");
Expand All @@ -215,14 +215,14 @@ void testGetAllDistrictsInCityByNames_whenKyivEn() {
void testGetAllDistrictsInCityByNames_whenCityNotExist() {
initLviv();
assertThrows(NotFoundException.class, () -> {
locationApiService.getAllDistrictsInCityByNames("Вінницька", "Львів");
locationApiService.getAllDistrictsInCityByNames("Вінницька область", "Львів");
});
}

@Test
void testGetAllDistrictsInCityByNames() {
initLviv();
List<LocationDto> districts = locationApiService.getAllDistrictsInCityByNames("Львівська", "Львів");
List<LocationDto> districts = locationApiService.getAllDistrictsInCityByNames("Львівська область", "Львів");
assertEquals(2, districts.size());
assertLocationDto(districts.get(0), "UA46060250010121390", "UA46060250010015970", "Галицький", "Halytskyi");
assertLocationDto(districts.get(1), "UA46060250010259421", "UA46060250010015970", "Залізничний",
Expand All @@ -233,7 +233,7 @@ void testGetAllDistrictsInCityByNames() {
@Test
void testGetAllDistrictsInCityByNames_whenCityNotFound() {
assertThrows(NotFoundException.class, () -> {
locationApiService.getAllDistrictsInCityByNames("Львівська", "UNREAL");
locationApiService.getAllDistrictsInCityByNames("Львівська область", "UNREAL");
});
}

Expand Down Expand Up @@ -283,7 +283,7 @@ void testGetAllDistrictsInCityByNames_whenNoDistricts() {
respond(level4BuilderVillage, Arrays.asList(kulykivResult, vidnivResult));
respond(level4BuilderParentLvivCity, Arrays.asList(kulykivResult, vidnivResult));
respond(level5BuilderVillage, new ArrayList<>());
List<LocationDto> allDistricts = locationApiService.getAllDistrictsInCityByNames("Львівська", "Віднів");
List<LocationDto> allDistricts = locationApiService.getAllDistrictsInCityByNames("Львівська область", "Віднів");
assertNotNull(allDistricts);
assertFalse(allDistricts.isEmpty());
assertEquals(1, allDistricts.size());
Expand All @@ -293,17 +293,17 @@ void testGetAllDistrictsInCityByNames_whenNoDistricts() {
@Test
void testGetAllDistrictsInCityByNames_whenNameEn() {
initLviv();
List<LocationDto> result = locationApiService.getAllDistrictsInCityByNames("Lvivska", "Львів");
List<LocationDto> result = locationApiService.getAllDistrictsInCityByNames("Lvivska область", "Львів");
assertEquals(2, result.size());
}

@Test
void testGetGetAllDistrictsInCityByNames_whenCityValueNulOrEmpty() {
assertThrows(IllegalArgumentException.class, () -> {
locationApiService.getAllDistrictsInCityByNames("Lvivska", null);
locationApiService.getAllDistrictsInCityByNames("Lvivska область", null);
});
assertThrows(IllegalArgumentException.class, () -> {
locationApiService.getAllDistrictsInCityByNames("Lvivska", "");
locationApiService.getAllDistrictsInCityByNames("Lvivska область", "");
});
}

Expand Down Expand Up @@ -331,7 +331,7 @@ void testGetGetAllDistrictsInCityByNames_whenValuesNullOrEmpty() {
void testGetGetAllDistrictsInCityByNames_whenResultEmpty() {
initLviv();
assertThrows(NotFoundException.class, () -> {
locationApiService.getAllDistrictsInCityByNames("Львівська", "Тест");
locationApiService.getAllDistrictsInCityByNames("Львівська область", "Тест");
});
}

Expand Down Expand Up @@ -367,7 +367,7 @@ void testGetGetAllDistrictsInCityByNames_noCities() {
respond(builder2, Arrays.asList(nizhynskyiResult));

assertThrows(NotFoundException.class, () -> {
locationApiService.getAllDistrictsInCityByNames("Миколаївська", "Миколаїв");
locationApiService.getAllDistrictsInCityByNames("Миколаївська область", "Миколаїв");
});
}

Expand Down Expand Up @@ -405,7 +405,7 @@ void testGetGetAllDistrictsInCityByNames_noCitiesEmptyList() {
respond(builder4_2, new ArrayList<>());

assertThrows(NotFoundException.class, () -> {
locationApiService.getAllDistrictsInCityByNames("Миколаївська", "Миколаїв");
locationApiService.getAllDistrictsInCityByNames("Миколаївська область", "Миколаїв");
});
}

Expand Down Expand Up @@ -446,7 +446,7 @@ void testGetCityByNameFromRegionSide_ResultFromUrlEmpty() {
respond(builder4_2, Arrays.asList(mykolaiv2Result));

assertThrows(NotFoundException.class, () -> {
locationApiService.getAllDistrictsInCityByNames("Миколаївська", "Миколаїв");
locationApiService.getAllDistrictsInCityByNames("Миколаївська область", "Миколаїв");
});
}

Expand Down Expand Up @@ -490,7 +490,7 @@ void testGetCityByNameFromRegionSide_RegionListEmpty() {
respond(builder4_2, Arrays.asList(mykolaiv2Result));

assertThrows(NotFoundException.class, () -> {
locationApiService.getAllDistrictsInCityByNames("Миколаївська", "Миколаїв");
locationApiService.getAllDistrictsInCityByNames("Миколаївська область", "Миколаїв");
});
}

Expand Down