dev add config for nginx

2026-03-10 22:47:43 +07:00
parent 590d42690b
commit c591ab40df
17 changed files with 495 additions and 306 deletions
@@ -3,32 +3,28 @@ package ru.soune.nocopy.service.monitoring;
 import jakarta.mail.MessagingException;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import ru.soune.nocopy.dto.file.YandexSearchResponse;
 import ru.soune.nocopy.dto.tarriff.TariffDTO;
-import ru.soune.nocopy.entity.file.*;
 import ru.soune.nocopy.entity.monitoring.FileMonitoringEntity;
-import ru.soune.nocopy.entity.monitoring.FoundViolationEntity;
 import ru.soune.nocopy.entity.monitoring.MonitoringType;
-import ru.soune.nocopy.entity.monitoring.SearchEngine;
+import ru.soune.nocopy.entity.search.GlobalSearchResult;
 import ru.soune.nocopy.entity.tarif.TariffInfo;
 import ru.soune.nocopy.entity.tarif.TariffType;
 import ru.soune.nocopy.entity.user.User;
 import ru.soune.nocopy.exception.TariffNotFoundException;
 import ru.soune.nocopy.repository.FileMonitoringRepository;
-import ru.soune.nocopy.repository.FoundViolationRepository;
 import ru.soune.nocopy.repository.UserRepository;
 import ru.soune.nocopy.service.mail.EmailService;
 import ru.soune.nocopy.service.search.SearchImageService;
 import ru.soune.nocopy.service.tariff.TariffInfoService;
 import ru.soune.nocopy.service.tariff.TariffService;
+import ru.soune.nocopy.service.violation.ViolationService;

 import java.io.IOException;
 import java.time.LocalDateTime;
 import java.util.List;
-import java.util.UUID;
 import java.util.concurrent.TimeoutException;

@Slf4j
@@ -37,8 +33,6 @@ import java.util.concurrent.TimeoutException;
 public class MonitoringSearchService {
    private final SearchImageService searchImageService;

-    private final FoundViolationRepository violationRepository;
-
    private final FileMonitoringRepository monitoringRepository;

    private final TariffInfoService tariffInfoService;
@@ -49,18 +43,16 @@ public class MonitoringSearchService {

    private final UserRepository userRepository;

+    private final ViolationService violationService;
+
    @Transactional
    public void processFileSearch(FileMonitoringEntity monitoring) throws MessagingException, IOException {
-        String searchSessionId = UUID.randomUUID().toString();
-        log.info("Starting search session: {} for file: {}", searchSessionId, monitoring.getFile().getId());
-
        monitoring.setLastRun(LocalDateTime.now());
        monitoring.setLastRunStatus("IN_PROGRESS");
        monitoringRepository.save(monitoring);

        MonitoringType monitoringType = monitoring.getMonitoringType();
        TariffDTO tariffMonitoring = tariffService.getTariffByType(TariffType.valueOf(monitoringType.name()));
-
        try {
            tariffInfoService.writeOffTokens(monitoring.getUserId(), tariffMonitoring.getTokens());

@@ -70,7 +62,9 @@ public class MonitoringSearchService {
            List<YandexSearchResponse.ImageResult> yandexImages =
                    searchImageService.getAllImagesWithoutPagination(yandexResponse, "visual_matches");

-            int savedCount = saveFoundImages(monitoring, yandexImages, SearchEngine.YANDEX, searchSessionId);
+            for (YandexSearchResponse.ImageResult imageResult : yandexImages) {
+                violationService.processViolation(imageResult, monitoring.getFile(), null);
+            }

            try {
                String googleResponse = searchImageService.searchReverseByPublicUrl(
@@ -79,13 +73,16 @@ public class MonitoringSearchService {
                List<YandexSearchResponse.ImageResult> googleImages =
                        searchImageService.getAllImagesWithoutPagination(googleResponse, "exact_matches");

-                savedCount += saveFoundImages(monitoring, googleImages, SearchEngine.GOOGLE, searchSessionId);
+
+                for (YandexSearchResponse.ImageResult imageResult : googleImages) {
+                    violationService.processViolation(imageResult, monitoring.getFile(), null);
+                }

            } catch (TimeoutException | IOException e) {
-                log.warn("Google search failed for session: {}", searchSessionId, e);
+                log.warn("Google search failed");
            }

-            monitoring.setLastRunStatus("SUCCESS - Found " + savedCount + " violations");
+            monitoring.setLastRunStatus("SUCCESS");
        } catch (TariffNotFoundException e) {
            User user = userRepository.findById(monitoring.getUserId()).orElseThrow();
            TariffInfo activeTariffInfo = user.getActiveTariffInfo();
@@ -97,7 +94,6 @@ public class MonitoringSearchService {

            monitoringRepository.save(monitoring);
        } catch (Exception e) {
-            log.error("Search failed for session: {}", searchSessionId, e);
            monitoring.setLastRunStatus("ERROR: " + e.getMessage());
        } finally {
            updateNextRun(monitoring);
@@ -105,42 +101,6 @@ public class MonitoringSearchService {
        }
    }

-    private int saveFoundImages(FileMonitoringEntity monitoring,
-                                List<YandexSearchResponse.ImageResult> images,
-                                SearchEngine engine,
-                                String sessionId) {
-        int savedCount = 0;
-
-        for (YandexSearchResponse.ImageResult image : images) {
-            List<FoundViolationEntity> existing = violationRepository.findDuplicate(
-                    monitoring.getFile().getId(), image.getUrl());
-
-            if (existing.isEmpty()) {
-                FoundViolationEntity violation = FoundViolationEntity.builder()
-                        .file(monitoring.getFile())
-                        .fileId(monitoring.getFile().getId())
-                        .fileName(monitoring.getFile().getOriginalFileName())
-                        .userId(monitoring.getUserId())
-                        .foundUrl(image.getUrl())
-                        .pageUrl(image.getPageUrl())
-                        .pageTitle(image.getPageTitle())
-                        .host(image.getHost())
-                        .imageWidth(image.getWidth())
-                        .imageHeight(image.getHeight())
-                        .searchEngine(engine)
-                        .searchSessionId(sessionId)
-                        .isNew(true)
-                        .isNotified(false)
-                        .build();
-
-                violationRepository.save(violation);
-                savedCount++;
-            }
-        }
-
-        return savedCount;
-    }
-
    private void updateNextRun(FileMonitoringEntity monitoring) {
        LocalDateTime nextRun = calculateNextRun(monitoring.getMonitoringType());
        monitoring.setNextRun(nextRun);
@@ -1,6 +1,7 @@
 package ru.soune.nocopy.service.search;

 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.vrt.fileprotection.image.ImageCheckResult;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.scheduling.annotation.Async;
@@ -11,10 +12,13 @@ import ru.soune.nocopy.entity.file.FileEntity;
 import ru.soune.nocopy.entity.search.GlobalSearchResult;
 import ru.soune.nocopy.entity.search.GlobalSearchTask;
 import ru.soune.nocopy.entity.search.SearchStatus;
+import ru.soune.nocopy.entity.violation.Violation;
 import ru.soune.nocopy.repository.GlobalSearchResultRepository;
 import ru.soune.nocopy.repository.GlobalSearchTaskRepository;
+import ru.soune.nocopy.repository.ViolationRepository;
 import ru.soune.nocopy.service.tariff.TariffConstants;
 import ru.soune.nocopy.service.tariff.TariffInfoService;
+import ru.soune.nocopy.service.violation.ViolationService;

 import java.io.IOException;
 import java.time.LocalDateTime;
@@ -38,6 +42,10 @@ public class GlobalSearchAsyncProcessor {

    private final GlobalSearchTaskRepository globalSearchTaskRepository;

+    private final ViolationRepository violationRepository;
+
+    private final ViolationService violationService;
+
    @Async
    @Transactional
    public void processFilesAsync(String taskId, List<FileEntity> filesToProcess, Long userId) {
@@ -74,7 +82,6 @@ public class GlobalSearchAsyncProcessor {
        result.setTaskId(taskId);
        result.setFileId(file.getId());
        result.setFileName(file.getOriginalFileName());
-        result.setThumbnail(file.getThumbnailPath());

        List<YandexSearchResponse.ImageResult> allUniqueImages = new ArrayList<>();
        boolean hasTimeout = false;
@@ -117,21 +124,10 @@ public class GlobalSearchAsyncProcessor {
                allUniqueImages.stream()
                        .filter(img -> img.getUrl() != null)
                        .collect(Collectors.toList()),
-                new ArrayList<>()
-        );
+                new ArrayList<>());

-        YandexSearchResponse searchResponse = new YandexSearchResponse();
-        searchResponse.setImages(allUniqueImages);
-        searchResponse.setPage(1);
-        searchResponse.setPageSize(allUniqueImages.size());
-        searchResponse.setTotalResults(allUniqueImages.size());
-        searchResponse.setTotalPages(1);
-
-        try {
-            result.setSearchResults(objectMapper.writeValueAsString(searchResponse));
-        } catch (Exception e) {
-            log.error("Failed to serialize search results", e);
-            result.setSearchResults("{}");
+        for (YandexSearchResponse.ImageResult imageResult : allUniqueImages) {
+            violationService.processViolation(imageResult, file, result);
        }

        if (allUniqueImages.isEmpty() && hasTimeout) {
@@ -0,0 +1,113 @@
+package ru.soune.nocopy.service.violation;
+
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+import org.springframework.stereotype.Service;
+import ru.soune.nocopy.dto.file.YandexSearchResponse;
+import ru.soune.nocopy.entity.file.FileEntity;
+import ru.soune.nocopy.entity.search.GlobalSearchResult;
+import ru.soune.nocopy.entity.violation.Violation;
+import ru.soune.nocopy.exception.ViolationNotFoundException;
+import ru.soune.nocopy.repository.ViolationRepository;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Service
+@AllArgsConstructor
+public class ViolationService {
+
+    private final ViolationRepository violationRepository;
+
+    public void processViolation(YandexSearchResponse.ImageResult imageResult, FileEntity file,
+                                 GlobalSearchResult result) {
+        String url = imageResult.getUrl();
+
+        if (!violationRepository.existsByUrl(url)) {
+            Violation violation = new Violation();
+
+            if (result != null) {
+                violation.setGlobalSearchResult(result);
+            }
+
+            violation.setHost(imageResult.getHost());
+            violation.setUrl(url);
+            violation.setPageUrl(imageResult.getPageUrl());
+            violation.setPageTitle(imageResult.getPageTitle());
+            violation.setFileEntity(file);
+            violation.setStatus("CREATED");
+
+            violationRepository.save(violation);
+        }
+    }
+
+    public List<Violation> violationsByFileId(FileEntity file) {
+        return violationRepository.findByFileEntity(file);
+    }
+
+    public void changeStatusViolation(Long violationId, String status) {
+        Violation violation = violationRepository.findById(violationId)
+                .orElseThrow(() -> new ViolationNotFoundException("Violation not found with id: " + violationId));
+        violation.setStatus(status);
+        violationRepository.save(violation);
+    }
+
+    public Page<Violation> getViolationsByFile(FileEntity file, int page, int size, String sortDirection) {
+        Sort sort = Sort.by(sortDirection.equalsIgnoreCase("desc") ? Sort.Direction.DESC : Sort.Direction.ASC, "createdDate");
+        Pageable pageable = PageRequest.of(page, size, sort);
+        return violationRepository.findByFileEntity(file, pageable);
+    }
+
+    public Page<Violation> getViolationsByFileAndStatus(FileEntity file, String status, int page, int size, String sortDirection) {
+        Sort sort = Sort.by(sortDirection.equalsIgnoreCase("desc") ? Sort.Direction.DESC : Sort.Direction.ASC, "createdDate");
+        Pageable pageable = PageRequest.of(page, size, sort);
+        return violationRepository.findByFileEntityAndStatus(file, status, pageable);
+    }
+
+    public Page<Violation> getViolationsByFileAndDateRange(FileEntity file, LocalDateTime startDate, LocalDateTime endDate,
+                                                           int page, int size, String sortDirection) {
+        Sort sort = Sort.by(sortDirection.equalsIgnoreCase("desc") ? Sort.Direction.DESC : Sort.Direction.ASC, "createdDate");
+        Pageable pageable = PageRequest.of(page, size, sort);
+        return violationRepository.findByFileEntityAndCreatedDateBetween(file, startDate, endDate, pageable);
+    }
+
+    public Map<String, Long> getGroupedViolations(FileEntity file, String groupBy, String status,
+                                                  LocalDateTime startDate, LocalDateTime endDate) {
+
+        List<Violation> violations;
+
+        if (status != null && !status.isEmpty() && startDate != null && endDate != null) {
+            violations = violationRepository.findByFileEntityAndStatusAndCreatedDateBetween(file, status, startDate, endDate);
+        } else if (status != null && !status.isEmpty()) {
+            violations = violationRepository.findByFileEntityAndStatus(file, status);
+        } else if (startDate != null && endDate != null) {
+            violations = violationRepository.findByFileEntityAndCreatedDateBetween(file, startDate, endDate);
+        } else {
+            violations = violationRepository.findByFileEntity(file);
+        }
+
+        return violations.stream()
+                .collect(Collectors.groupingBy(
+                        v -> extractGroupKey(v.getUrl(), groupBy),
+                        Collectors.counting()
+                ));
+    }
+
+    private String extractGroupKey(String url, String groupBy) {
+        try {
+            String domain = url.replaceAll("https?://(www\\.)?", "").split("/")[0];
+            if ("tld".equalsIgnoreCase(groupBy)) {
+                int lastDot = domain.lastIndexOf('.');
+                return lastDot > 0 ? domain.substring(lastDot + 1) : domain;
+            }
+            return domain;
+        } catch (Exception e) {
+            return "unknown";
+        }
+    }
+}