NCBACK-162

src/main/java/ru/soune/nocopy/handler/ViolationHandler.java

@@ -1,6 +1,7 @@
 package ru.soune.nocopy.handler;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.Page;
@@ -17,7 +18,6 @@ import ru.soune.nocopy.service.complaint.ComplaintEntityService;
 import ru.soune.nocopy.service.complaint.LawCaseService;
 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;
 
@@ -40,8 +40,6 @@ public class ViolationHandler implements RequestHandler {
 
     private final FileEntityRepository fileRepository;
 
-    private final AuthService authService;
-
     private final FileEntityService fileEntityService;
 
     private final GeoCountryService geoCountryService;
@@ -50,6 +48,8 @@ public class ViolationHandler implements RequestHandler {
 
     private final ComplaintEntityService complaintEntityService;
 
+    private final HttpServletRequest httpServletRequest;
+
     private static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
 
     @Override
@@ -57,9 +57,7 @@ public class ViolationHandler implements RequestHandler {
         ViolationRequest violationRequest = objectMapper.convertValue(request.getMessageBody(), ViolationRequest.class);
 
         validateRequest(violationRequest);
-
-        String token = violationRequest.getToken();
-        Long userId = authService.useUserAuthToken(token);
+        Long userId = (Long) httpServletRequest.getAttribute("userId");
 
         List<FileEntity> targetFiles;
 
@@ -135,23 +133,6 @@ public class ViolationHandler implements RequestHandler {
                     .messageBody(groupedData)
                     .build();
         } else {
-//            Page<Violation> violationPage;
-//
-//            if (startDate != null && endDate != null) {
-//                violationPage = violationService.getViolationsByFilesAndDateRange(
-//                        targetFiles, startDate, endDate,
-//                        violationRequest.getPage(), violationRequest.getSize(), violationRequest.getSortDirection()
-//                );
-//            } else if (violationRequest.getStatus() != null && !violationRequest.getStatus().isEmpty()) {
-//                violationPage = violationService.getViolationsByFilesAndStatus(
-//                        targetFiles, violationRequest.getStatus(),
-//                        violationRequest.getPage(), violationRequest.getSize(), violationRequest.getSortDirection()
-//                );
-//            } else {
-//                violationPage = violationService.getViolationsByFiles(
-//                        targetFiles, violationRequest.getPage(), violationRequest.getSize(),
-//                        violationRequest.getSortDirection());
-//            }
             Page<Violation> violationPage = violationService.getViolationsByFilesAndFilters(
                     targetFiles,
                     startDate,