diff --git a/src/main/java/ru/soune/nocopy/entity/violation/Violation.java b/src/main/java/ru/soune/nocopy/entity/violation/Violation.java index 3b329f2..ad0e4d2 100644 --- a/src/main/java/ru/soune/nocopy/entity/violation/Violation.java +++ b/src/main/java/ru/soune/nocopy/entity/violation/Violation.java @@ -41,7 +41,7 @@ public class Violation { @CreatedDate @Column(name = "created_at", updatable = false) - private LocalDateTime createdDate; + private LocalDateTime createdDate = LocalDateTime.now(); @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "file") diff --git a/src/main/java/ru/soune/nocopy/handler/ViolationHandler.java b/src/main/java/ru/soune/nocopy/handler/ViolationHandler.java index 9989e50..8728e89 100644 --- a/src/main/java/ru/soune/nocopy/handler/ViolationHandler.java +++ b/src/main/java/ru/soune/nocopy/handler/ViolationHandler.java @@ -63,9 +63,7 @@ public class ViolationHandler implements RequestHandler { .msgId(request.getMsgId()) .messageBody(groupedData) .build(); - } - // Пагинация - else { + } else { Page violationPage; if (startDate != null && endDate != null) { diff --git a/src/main/java/ru/soune/nocopy/service/violation/ViolationService.java b/src/main/java/ru/soune/nocopy/service/violation/ViolationService.java index 40aa0c4..ab1aa42 100644 --- a/src/main/java/ru/soune/nocopy/service/violation/ViolationService.java +++ b/src/main/java/ru/soune/nocopy/service/violation/ViolationService.java @@ -96,7 +96,7 @@ public class ViolationService { return violations.stream() .collect(Collectors.groupingBy( - v -> extractGroupKey(v.getUrl(), groupBy), + v -> extractGroupKey(v.getPageUrl(), groupBy), Collectors.counting() )); }