NCBACK-162

src/main/java/ru/soune/nocopy/controller/GlobalSearchController.java

@@ -1,5 +1,6 @@
 package ru.soune.nocopy.controller;
 
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.Page;
@@ -15,7 +16,6 @@ import ru.soune.nocopy.entity.search.GlobalSearchTask;
 import ru.soune.nocopy.entity.search.SearchStatus;
 import ru.soune.nocopy.exception.NotFoundAuthToken;
 import ru.soune.nocopy.repository.GlobalSearchTaskRepository;
-import ru.soune.nocopy.service.register.AuthService;
 import ru.soune.nocopy.service.search.GlobalSearchService;
 import ru.soune.nocopy.service.violation.ViolationService;
 
@@ -27,16 +27,14 @@ import java.util.*;
 @RequiredArgsConstructor
 public class GlobalSearchController {
 
-    private final AuthService authService;
-
     private final GlobalSearchService globalSearchService;
 
-    private final GlobalSearchTaskRepository globalSearchTaskRepository;
-
     private final GlobalSearchTaskRepository searchTaskRepository;
 
     private final ViolationService violationService;
 
+    private final HttpServletRequest httpServletRequest;
+
     @PostMapping("/start")
     public ResponseEntity<?> startSearch(
             @RequestBody GlobalSearchStartRequest request,
@@ -51,7 +49,7 @@ public class GlobalSearchController {
         GlobalSearchStartResponse response = new GlobalSearchStartResponse();
 
         try {
-            Long userId = authService.useUserAuthToken(tokenHeader);
+            Long userId = (Long) httpServletRequest.getAttribute("userId");
 
             List<FileEntity> filesToProcess = globalSearchService.getFilesToProcess(request, userId);
 
@@ -85,7 +83,7 @@ public class GlobalSearchController {
         Optional<GlobalSearchTask> taskOptional;
 
         try {
-            Long userId = authService.useUserAuthToken(tokenHeader);
+            Long userId = (Long) httpServletRequest.getAttribute("userId");
 
             taskOptional = searchTaskRepository.findByUserIdAndStatus(userId,
                     "PROCESSING");
@@ -114,7 +112,7 @@ public class GlobalSearchController {
         List<FileViolationSummaryDTO> fileViolationsSummary;
 
         try {
-            Long userId = authService.useUserAuthToken(tokenHeader);
+            Long userId = (Long) httpServletRequest.getAttribute("userId");
 
             fileViolationsSummary = violationService.getFileViolationsSummary(userId);
 
@@ -132,26 +130,12 @@ public class GlobalSearchController {
 
     @PostMapping("/violation-summary-with-files")
     public ResponseEntity<?> getViolations(@RequestBody ViolationRequest request) {
-        if (request.getToken() == null || request.getToken().isBlank()) {
-            Map<String, Object> errorData = new HashMap<>();
-            errorData.put("token", request.getToken());
-            return ResponseEntity.ok().body(Map.of("error", errorData));
-        }
+        Long userId = (Long) httpServletRequest.getAttribute("userId");
+        Page<FileViolationSummaryDTO> result = violationService.getFileViolationsSummary(
+                userId, request.getFileName(), request.getSortDirection(),
+                request.getPage(), request.getSize(), request.getStartDate(), request.getEndDate());
 
-        try {
-            Long userId = authService.useUserAuthToken(request.getToken());
-
-            Page<FileViolationSummaryDTO> result = violationService.getFileViolationsSummary(
-                    userId, request.getFileName(), request.getSortDirection(),
-                    request.getPage(), request.getSize(), request.getStartDate(), request.getEndDate());
-
-            return ResponseEntity.ok(result);
-        } catch (NotFoundAuthToken e) {
-            Map<String, Object> errorData = new HashMap<>();
-            errorData.put("token", request.getToken());
-
-            return ResponseEntity.ok().body(Map.of("error", errorData));
-        }
+        return ResponseEntity.ok(result);
     }
 
     @GetMapping("/status/{taskId}")
@@ -167,7 +151,7 @@ public class GlobalSearchController {
         GlobalSearchStatusResponse response;
 
         try {
-            Long userId = authService.useUserAuthToken(tokenHeader);
+            Long userId = (Long) httpServletRequest.getAttribute("userId");
 
             Optional<GlobalSearchTask> taskOptional = searchTaskRepository.findByTaskIdAndUserId(taskId, userId);