forked from BLC/sgeUpdated
Make creation of default area nested in city initialization
This commit is contained in:
@@ -121,7 +121,8 @@ public class SgsApplication implements CommandLineRunner {
|
||||
|
||||
@Autowired
|
||||
public SgsApplication(RoleService roleService, PermissionService permissionService, RoleRepo roleRepo,
|
||||
AreaService areaService, NeighborhoodRepo neighborhoodRepo, NeighborhoodService neighborhoodService, CityService cityService,
|
||||
AreaService areaService, NeighborhoodRepo neighborhoodRepo, NeighborhoodService neighborhoodService,
|
||||
CityService cityService,
|
||||
CityRepo cityRepo, DistrictRepo districtRepo, DistrictService districtService, CountryRepo countryRepo,
|
||||
CountryService countryService, OrganizationService organizationService, UserService userService,
|
||||
PasswordEncoder passwordEncoder, SectorService sectorService, SubSectorService subSectorService,
|
||||
@@ -858,6 +859,7 @@ public class SgsApplication implements CommandLineRunner {
|
||||
}
|
||||
if (cityService.findAll().isEmpty()) {
|
||||
createCitiesFromJson();
|
||||
createDefaultArea();
|
||||
}
|
||||
if (districtService.findAll().isEmpty()) {
|
||||
createDistrictFromJson();
|
||||
@@ -865,16 +867,13 @@ public class SgsApplication implements CommandLineRunner {
|
||||
if (neighborhoodService.findAll().isEmpty()) {
|
||||
createNeighborhoodsFromJson();
|
||||
}
|
||||
if (!cityService.findAll().isEmpty()) {
|
||||
createDefaultArea();
|
||||
}
|
||||
}
|
||||
|
||||
void createDefaultArea() {
|
||||
// Check if default area already exists
|
||||
List<Area> existingAreas = areaService.findAll();
|
||||
boolean defaultAreaExists = existingAreas.stream()
|
||||
.anyMatch(area -> "Turkiye".equals(area.getTag()) && area.isDefaultArea());
|
||||
.anyMatch(area -> "Turkiye".equals(area.getTag()) && area.isDefaultArea());
|
||||
|
||||
if (!defaultAreaExists) {
|
||||
Area defaultArea = new Area();
|
||||
|
||||
Reference in New Issue
Block a user