dev add geo country service
Test Workflow / test (push) Successful in 3s

This commit is contained in:
vladp
2026-04-15 09:34:32 +07:00
parent 40cb53a3b0
commit a7939845c7
5 changed files with 76 additions and 4 deletions
@@ -13,6 +13,7 @@ import ru.soune.nocopy.entity.file.FileEntity;
import ru.soune.nocopy.entity.violation.Violation;
import ru.soune.nocopy.repository.FileEntityRepository;
import ru.soune.nocopy.service.file.FileEntityService;
import ru.soune.nocopy.service.geo.GeoCountryService;
import ru.soune.nocopy.service.register.AuthService;
import ru.soune.nocopy.service.violation.ViolationService;
import ru.soune.nocopy.service.violation.ViolationStatus;
@@ -21,6 +22,7 @@ import java.io.FileNotFoundException;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeParseException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -38,6 +40,8 @@ public class ViolationHandler implements RequestHandler {
private final FileEntityService fileEntityService;
private final GeoCountryService geoCountryService;
private static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
@Override
@@ -112,10 +116,20 @@ public class ViolationHandler implements RequestHandler {
);
}
List<ViolationResponse.ViolationDto> violationDtos = violationPage.getContent()
.stream()
.map(ViolationResponse.ViolationDto::fromEntity)
.toList();
List<Violation> content = violationPage.getContent();
List<ViolationResponse.ViolationDto> violationDtos = new ArrayList<>();
// List<ViolationResponse.ViolationDto> violationDtos = violationPage.getContent()
// .stream()
// .map(ViolationResponse.ViolationDto::fromEntity)
// .toList();
for (Violation violation : content) {
ViolationResponse.ViolationDto violationDto = ViolationResponse.ViolationDto.fromEntity(violation);
violationDto.setCountry(geoCountryService.getCountry(violation.getHost()));
violationDtos.add(violationDto);
}
ViolationResponse response = ViolationResponse.builder()
.violations(violationDtos)