dev only unige result

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

@@ -14,7 +14,6 @@ import ru.soune.nocopy.entity.file.FileEntity;
 import ru.soune.nocopy.exception.NotValidFieldException;
 import ru.soune.nocopy.repository.FileEntityRepository;
 import ru.soune.nocopy.service.file.CheckCounterService;
-import ru.soune.nocopy.service.search.SearchApiToYandexResponseMapper;
 import ru.soune.nocopy.service.search.SearchImageService;
 import ru.soune.nocopy.service.search.GoogleVisionSearchService;
 import ru.soune.nocopy.service.tariff.TariffConstants;
@@ -41,8 +40,6 @@ public class ImageFoundRequestHandler implements RequestHandler {
 
     private final TariffInfoService tariffInfoService;
 
-    private final SearchApiToYandexResponseMapper mapper = new SearchApiToYandexResponseMapper();
-
     @Override
     public BaseResponse handle(BaseRequest request) throws Exception {
         ImageSearchRequest imageSearchRequest = objectMapper.convertValue(request.getMessageBody(),
@@ -88,17 +85,18 @@ public class ImageFoundRequestHandler implements RequestHandler {
 
         checkCounterService.incrementCheckCount(fileEntity.getUserId(), fileEntity.getMimeType());
 
-        List<YandexSearchResponse.ImageResult> allYandexImages = mapper.getAllImagesWithoutPagination(searchResponseYandex,
+        List<YandexSearchResponse.ImageResult> allYandexImages = searchImageService.getAllImagesWithoutPagination(
-                "visual_matches");
+                searchResponseYandex, "visual_matches");
-        List<YandexSearchResponse.ImageResult> allGoogleImages = mapper.getAllImagesWithoutPagination(searchResponseGoogle,
+        List<YandexSearchResponse.ImageResult> allGoogleImages = searchImageService.getAllImagesWithoutPagination(
-                "exact_matches");
+                searchResponseGoogle, "exact_matches");
 
-        List<YandexSearchResponse.ImageResult> allUniqueImages = mapper.removeDuplicateUrls(allYandexImages, allGoogleImages);
+        List<YandexSearchResponse.ImageResult> allUniqueImages = searchImageService.removeDuplicateUrls(allYandexImages,
+                allGoogleImages);
 
         int page = imageSearchRequest.getPage() != null ? imageSearchRequest.getPage() : 1;
         int pageSize = 5;
 
-        List<YandexSearchResponse.ImageResult> pagedResults = mapper.paginateResults(allUniqueImages, page,
+        List<YandexSearchResponse.ImageResult> pagedResults = searchImageService.paginateResults(allUniqueImages, page,
                 pageSize * 2);
 
         YandexSearchResponse finalResponse = new YandexSearchResponse();
@@ -110,23 +108,5 @@ public class ImageFoundRequestHandler implements RequestHandler {
 
         return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
                 MessageCode.SUCCESS.getDescription(), finalResponse);
-//        int page = imageSearchRequest.getPage() != null ? imageSearchRequest.getPage() : 1;
-
-//
-//        YandexSearchResponse yandexSearchResponse = mapper.mapToYandexResponse(searchResponseYandex, page, 5,
-//                "visual_matches");
-//        YandexSearchResponse googleSearchResponse = mapper.mapToYandexResponse(searchResponseGoogle, page, 5,
-//                "exact_matches");
-//
-//        int totalSize = yandexSearchResponse.getImages().size() + googleSearchResponse.getImages().size();
-//        List<YandexSearchResponse.ImageResult> results = new ArrayList<>(totalSize);
-//        results.addAll(yandexSearchResponse.getImages());
-//        results.addAll(googleSearchResponse.getImages());
-//
-//        yandexSearchResponse.setImages(results);
-//        yandexSearchResponse.setTotalResults(totalSize);
-//
-//        return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
-//                MessageCode.SUCCESS.getDescription(), yandexSearchResponse);
     }
 }

src/main/java/ru/soune/nocopy/service/search/SearchApiToYandexResponseMapper.java

@@ -1,266 +0,0 @@
-package ru.soune.nocopy.service.search;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import ru.soune.nocopy.dto.file.YandexSearchResponse;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-public class SearchApiToYandexResponseMapper {
-    private final ObjectMapper objectMapper = new ObjectMapper();
-
-    public YandexSearchResponse mapToYandexResponse(String searchApiJson, int page, int pageSize, String findType) throws IOException {
-        JsonNode root = objectMapper.readTree(searchApiJson);
-        JsonNode matches = root.path(findType);
-
-        YandexSearchResponse response = new YandexSearchResponse();
-        List<YandexSearchResponse.ImageResult> images = new ArrayList<>();
-
-        if (!matches.isArray() || matches.isEmpty()) {
-            response.setImages(images);
-            response.setPage(page);
-            response.setPageSize(pageSize);
-            response.setTotalResults(0);
-            response.setTotalPages(0);
-            return response;
-        }
-
-        int totalResults = matches.size();
-        int totalPages = (int) Math.ceil((double) totalResults / pageSize);
-
-        if (page > totalPages) {
-            response.setImages(images);
-            response.setPage(page);
-            response.setPageSize(pageSize);
-            response.setTotalResults(totalResults);
-            response.setTotalPages(totalPages);
-            return response;
-        }
-
-        int startIndex = (page - 1) * pageSize;
-        int endIndex = Math.min(startIndex + pageSize, totalResults);
-
-        for (int i = startIndex; i < endIndex; i++) {
-            JsonNode match = matches.get(i);
-            YandexSearchResponse.ImageResult result = mapImageResult(match);
-
-            if ("exact_matches".equals(findType)) {
-                JsonNode thumbnail = match.path("thumbnail");
-                if (!thumbnail.isMissingNode() && thumbnail.asText().startsWith("data:image")) {
-                    result.setUrl(thumbnail.asText());
-                }
-
-                JsonNode imageNode = match.path("image");
-                if (!imageNode.isMissingNode()) {
-                    String directUrl = imageNode.path("link").asText(null);
-                    if (directUrl != null && !directUrl.isBlank()) {
-                        result.setUrl(directUrl);
-                    }
-                }
-            }
-
-            if (result.getUrl() != null && !result.getUrl().isBlank()) {
-                images.add(result);
-            }
-        }
-
-        response.setImages(images);
-        response.setPage(page);
-        response.setPageSize(pageSize);
-        response.setTotalResults(totalResults);
-        response.setTotalPages(totalPages);
-
-        return response;
-    }
-
-//    public YandexSearchResponse mapToYandexResponse(String searchApiJson, int page, int pageSize, String findType) throws IOException {
-//
-//        JsonNode root = objectMapper.readTree(searchApiJson);
-//        JsonNode visualMatches = root.path(findType);
-//
-//        YandexSearchResponse response = new YandexSearchResponse();
-//        List<YandexSearchResponse.ImageResult> images = new ArrayList<>();
-//
-//        if (!visualMatches.isArray() || visualMatches.isEmpty()) {
-//            response.setImages(images);
-//            response.setPage(page);
-//            response.setPageSize(pageSize);
-//            response.setTotalResults(0);
-//            response.setTotalPages(0);
-//            return response;
-//        }
-//
-//        int totalResults = visualMatches.size();
-//        int totalPages = (int) Math.ceil((double) totalResults / pageSize);
-//
-//        if (page > totalPages) {
-//            response.setImages(images);
-//            response.setPage(page);
-//            response.setPageSize(pageSize);
-//            response.setTotalResults(totalResults);
-//            response.setTotalPages(totalPages);
-//            return response;
-//        }
-//
-//        int startIndex = (page - 1) * pageSize;
-//        int endIndex = Math.min(startIndex + pageSize, totalResults);
-//
-//        for (int i = startIndex; i < endIndex; i++) {
-//            JsonNode match = visualMatches.get(i);
-//            YandexSearchResponse.ImageResult result = mapImageResult(match);
-//
-//            if (result.getUrl() != null && !result.getUrl().isBlank()) {
-//                images.add(result);
-//            }
-//        }
-//
-//        response.setImages(images);
-//        response.setPage(page);
-//        response.setPageSize(pageSize);
-//        response.setTotalResults(totalResults);
-//        response.setTotalPages(totalPages);
-//
-//        return response;
-//    }
-
-    public List<YandexSearchResponse.ImageResult> getAllImagesWithoutPagination(String searchApiJson, String findType)
-            throws IOException {
-        JsonNode root = objectMapper.readTree(searchApiJson);
-        JsonNode matches = root.path(findType);
-
-        List<YandexSearchResponse.ImageResult> allImages = new ArrayList<>();
-
-        if (matches.isArray()) {
-            for (JsonNode match : matches) {
-                YandexSearchResponse.ImageResult result = mapImageResult(match);
-
-                if ("exact_matches".equals(findType)) {
-                    JsonNode thumbnail = match.path("thumbnail");
-                    if (!thumbnail.isMissingNode() && thumbnail.asText().startsWith("data:image")) {
-                        result.setUrl(thumbnail.asText());
-                    }
-
-                    JsonNode imageNode = match.path("image");
-                    if (!imageNode.isMissingNode()) {
-                        String directUrl = imageNode.path("link").asText(null);
-                        if (directUrl != null && !directUrl.isBlank()) {
-                            result.setUrl(directUrl);
-                        }
-                    }
-                }
-
-                if (result.getUrl() != null && !result.getUrl().isBlank()) {
-                    allImages.add(result);
-                }
-            }
-        }
-
-        return allImages;
-    }
-
-    public List<YandexSearchResponse.ImageResult> removeDuplicateUrls(
-            List<YandexSearchResponse.ImageResult> yandexImages,
-            List<YandexSearchResponse.ImageResult> googleImages) {
-
-        Map<String, YandexSearchResponse.ImageResult> uniqueByUrl = new LinkedHashMap<>();
-
-        for (YandexSearchResponse.ImageResult image : googleImages) {
-            String normalizedUrl = normalizeUrl(image.getUrl());
-            uniqueByUrl.putIfAbsent(normalizedUrl, image);
-        }
-
-        for (YandexSearchResponse.ImageResult image : yandexImages) {
-            String normalizedUrl = normalizeUrl(image.getUrl());
-            uniqueByUrl.putIfAbsent(normalizedUrl, image);
-        }
-
-        return new ArrayList<>(uniqueByUrl.values());
-    }
-
-    public List<YandexSearchResponse.ImageResult> paginateResults(
-            List<YandexSearchResponse.ImageResult> allResults,
-            int page,
-            int pageSize) {
-
-        if (allResults.isEmpty()) {
-            return new ArrayList<>();
-        }
-
-        int totalPages = (int) Math.ceil((double) allResults.size() / pageSize);
-
-        if (page > totalPages) {
-            return new ArrayList<>();
-        }
-
-        int startIndex = (page - 1) * pageSize;
-        int endIndex = Math.min(startIndex + pageSize, allResults.size());
-
-        return new ArrayList<>(allResults.subList(startIndex, endIndex));
-    }
-
-    private String normalizeUrl(String url) {
-        if (url == null) return null;
-
-        try {
-            if (url.startsWith("data:image")) {
-                return url.length() > 100 ? url.substring(0, 100) : url;
-            }
-
-            java.net.URI uri = new java.net.URI(url);
-            String host = uri.getHost();
-            if (host != null) {
-                host = host.toLowerCase().replaceFirst("^www\\.", "");
-            }
-
-            String path = uri.getPath();
-            if (path != null && path.length() > 1 && path.endsWith("/")) {
-                path = path.substring(0, path.length() - 1);
-            }
-
-            return (host != null ? host : "") + (path != null ? path : "");
-        } catch (Exception e) {
-            return url.toLowerCase()
-                    .replaceFirst("^(https?://)?(www\\.)?", "")
-                    .replaceFirst("/$", "");
-        }
-    }
-
-    private YandexSearchResponse.ImageResult mapImageResult(JsonNode match) {
-
-        YandexSearchResponse.ImageResult result =
-                new YandexSearchResponse.ImageResult();
-
-        JsonNode imageNode = match.path("image");
-        if (imageNode.isObject()) {
-            result.setUrl(imageNode.path("link").asText(null));
-            result.setWidth(imageNode.path("width").asInt(0));
-            result.setHeight(imageNode.path("height").asInt(0));
-        }
-
-        result.setPageUrl(match.path("link").asText(null));
-        result.setPageTitle(match.path("title").asText(null));
-
-        String source = match.path("source").asText(null);
-        result.setHost(extractHostFromSource(source));
-
-        return result;
-    }
-
-    private String extractHostFromSource(String source) {
-        if (source == null || source.isEmpty()) {
-            return "";
-        }
-        source = source.replaceFirst("^(https?://)?(www\\.)?", "");
-
-        int slashIndex = source.indexOf('/');
-        if (slashIndex > 0) {
-            return source.substring(0, slashIndex);
-        }
-
-        return source;
-    }
-}

src/main/java/ru/soune/nocopy/service/search/SearchImageService.java

@@ -1,5 +1,6 @@
 package ru.soune.nocopy.service.search;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import jakarta.annotation.PostConstruct;
@@ -9,11 +10,15 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import ru.soune.nocopy.dto.BaseResponse;
 import ru.soune.nocopy.dto.MessageCode;
+import ru.soune.nocopy.dto.file.YandexSearchResponse;
 import ru.soune.nocopy.entity.file.FileEntity;
 import ru.soune.nocopy.exception.NotValidFieldException;
 
 import java.io.*;
 import java.net.SocketTimeoutException;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.*;
 
@@ -101,7 +106,6 @@ public class SearchImageService {
                 .addQueryParameter("engine", engine)
                 .addQueryParameter("api_key", searchApiKey)
                 .addQueryParameter("url", imageUrl)
-//                .addQueryParameter("search_type", "visual_matches")
                 .addQueryParameter("search_type", searchType)
                 .addQueryParameter("wait", "true")
                 .build();
@@ -132,120 +136,140 @@ public class SearchImageService {
         }
     }
 
-//    public YandexSearchResponse searchByFileEntity(FileEntity fileEntity) throws IOException {
+    public List<YandexSearchResponse.ImageResult> getAllImagesWithoutPagination(String searchApiJson, String findType)
-//        byte[] fileBytes;
+            throws IOException {
-//
+        JsonNode root = objectMapper.readTree(searchApiJson);
-//        if (!isImageFile(fileEntity)) {
+        JsonNode matches = root.path(findType);
-//            log.error("File not image: {}", fileEntity.getMimeType());
-//            throw new NotValidFieldException("File not image", new BaseResponse(20007,
-//                    MessageCode.INVALID_FIELD.getCode(), MessageCode.INVALID_FIELD.getDescription(),
-//                    Map.of("file_type", fileEntity.getMimeType())));
-//        }
-//
-//        try {
-//            fileBytes = readFileFromDisk(fileEntity);
-//        } catch (IOException e) {
-//            throw new NotValidFieldException("File not found or cannot read file", new BaseResponse(20007,
-//                    MessageCode.FILE_NOT_FOUND.getCode(), MessageCode.FILE_NOT_FOUND.getDescription(),
-//                    Map.of("fileId", fileEntity.getId(),
-//                            "filePath", fileEntity.getFilePath())));
-//        }
-//
-//        return callYandexApi(fileBytes);
-//    }
 
+        List<YandexSearchResponse.ImageResult> allImages = new ArrayList<>();
 
-//    public String searchReverseByPublicUrl(FileEntity fileEntity) throws IOException {
+        if (matches.isArray()) {
-//        if (!isImageFile(fileEntity)) {
+            for (JsonNode match : matches) {
-//            log.error("File not image: {}", fileEntity.getMimeType());
+                YandexSearchResponse.ImageResult result = mapImageResult(match);
-//            throw new NotValidFieldException("File not image", new BaseResponse(20007,
-//                    MessageCode.INVALID_FIELD.getCode(), MessageCode.INVALID_FIELD.getDescription(),
-//                    Map.of("file_type", fileEntity.getMimeType())));
-//        }
-//
-//         String publicUrl = String.format("%s/api/files/public/%s", appBaseUrl, fileEntity.getId());
-//
-//        log.info("Searching reverse for image: {}", publicUrl);
-//
-//        return callReverseImageApiByUrl(publicUrl);
-//    }
 
-//    private byte[] readFileFromDisk(FileEntity fileEntity) throws IOException {
+                if ("exact_matches".equals(findType)) {
-//        Path filePath = Path.of(fileEntity.getFilePath());
+                    JsonNode thumbnail = match.path("thumbnail");
-//
+                    if (!thumbnail.isMissingNode() && thumbnail.asText().startsWith("data:image")) {
-//        if (!Files.exists(filePath)) {
+                        result.setUrl(thumbnail.asText());
-//            throw new IOException("File not found: " + fileEntity.getFilePath());
+                    }
-//        }
-//
-//        if (!Files.isReadable(filePath)) {
-//            throw new IOException("Cannot read file: " + fileEntity.getFilePath());
-//        }
-//
-//        return Files.readAllBytes(filePath);
-//    }
 
-//    private YandexSearchResponse callYandexApi(byte[] imageBytes) throws IOException {
+                    JsonNode imageNode = match.path("image");
-//        String imageBase64 = Base64.getEncoder().encodeToString(imageBytes);
+                    if (!imageNode.isMissingNode()) {
-//        String jsonRequest = String.format("{\"folderId\":\"%s\",\"data\":\"%s\",\"page\":0,\"showSimilarImages\":true}",
+                        String directUrl = imageNode.path("link").asText(null);
-//                folderId, imageBase64);
+                        if (directUrl != null && !directUrl.isBlank()) {
-//
+                            result.setUrl(directUrl);
-//        URL url = new URL(searchUrl);
+                        }
-//        HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+                    }
-//
+                }
-//        try {
+
-//            connection.setRequestMethod("POST");
+                if (result.getUrl() != null && !result.getUrl().isBlank()) {
-//            connection.setRequestProperty("Authorization", "Api-Key " + apiKey);
+                    allImages.add(result);
-//            connection.setRequestProperty("Content-Type", "application/json");
+                }
-//            connection.setRequestProperty("Accept", "application/json");
+            }
-//            connection.setConnectTimeout(30000);
+        }
-//            connection.setReadTimeout(30000);
+
-//            connection.setDoOutput(true);
+        return allImages;
-//
+    }
-//            try (OutputStream os = connection.getOutputStream()) {
+
-//                byte[] input = jsonRequest.getBytes("utf-8");
+    public List<YandexSearchResponse.ImageResult> removeDuplicateUrls(
-//                os.write(input, 0, input.length);
+            List<YandexSearchResponse.ImageResult> yandexImages,
-//                os.flush();
+            List<YandexSearchResponse.ImageResult> googleImages) {
-//            }
+
-//
+        Map<String, YandexSearchResponse.ImageResult> uniqueByUrl = new LinkedHashMap<>();
-//            int responseCode = connection.getResponseCode();
+
-//
+        for (YandexSearchResponse.ImageResult image : googleImages) {
-//            String responseBody;
+            String normalizedUrl = normalizeUrl(image.getUrl());
-//            if (responseCode == HttpURLConnection.HTTP_OK) {
+            uniqueByUrl.putIfAbsent(normalizedUrl, image);
-//                try (BufferedReader br = new BufferedReader(
+        }
-//                        new InputStreamReader(connection.getInputStream(), "utf-8"))) {
+
-//                    responseBody = readAll(br);
+        for (YandexSearchResponse.ImageResult image : yandexImages) {
-//                }
+            String normalizedUrl = normalizeUrl(image.getUrl());
-//            } else {
+            uniqueByUrl.putIfAbsent(normalizedUrl, image);
-//                try (BufferedReader br = new BufferedReader(
+        }
-//                        new InputStreamReader(connection.getErrorStream(), "utf-8"))) {
+
-//                    responseBody = readAll(br);
+        return new ArrayList<>(uniqueByUrl.values());
-//                }
+    }
-//                throw new IOException("Error Yandex API: " + responseCode + " - " + responseBody);
+
-//            }
+    public List<YandexSearchResponse.ImageResult> paginateResults(
-//
+            List<YandexSearchResponse.ImageResult> allResults,
-//            return parseJsonResponse(responseBody);
+            int page,
-//
+            int pageSize) {
-//        } finally {
+
-//            connection.disconnect();
+        if (allResults.isEmpty()) {
-//        }
+            return new ArrayList<>();
-//    }
+        }
-//    private String readAll(BufferedReader reader) throws IOException {
+
-//        StringBuilder sb = new StringBuilder();
+        int totalPages = (int) Math.ceil((double) allResults.size() / pageSize);
-//        String line;
+
-//        while ((line = reader.readLine()) != null) {
+        if (page > totalPages) {
-//            sb.append(line);
+            return new ArrayList<>();
-//        }
+        }
-//        return sb.toString();
+
-//    }
+        int startIndex = (page - 1) * pageSize;
-//
+        int endIndex = Math.min(startIndex + pageSize, allResults.size());
-//    private YandexSearchResponse parseJsonResponse(String json) {
+
-//        YandexSearchResponse response = null;
+        return new ArrayList<>(allResults.subList(startIndex, endIndex));
-//        try {
+    }
-//            response = objectMapper.readValue(json, YandexSearchResponse.class);
+
-//        } catch (JsonProcessingException e) {
+    private String normalizeUrl(String url) {
-//                throw new RuntimeException(e);
+        if (url == null) return null;
-//        }
+
-//
+        try {
-//        return response;
+            if (url.startsWith("data:image")) {
-//    }
+                return url.length() > 100 ? url.substring(0, 100) : url;
+            }
+
+            java.net.URI uri = new java.net.URI(url);
+            String host = uri.getHost();
+            if (host != null) {
+                host = host.toLowerCase().replaceFirst("^www\\.", "");
+            }
+
+            String path = uri.getPath();
+            if (path != null && path.length() > 1 && path.endsWith("/")) {
+                path = path.substring(0, path.length() - 1);
+            }
+
+            return (host != null ? host : "") + (path != null ? path : "");
+        } catch (Exception e) {
+            return url.toLowerCase()
+                    .replaceFirst("^(https?://)?(www\\.)?", "")
+                    .replaceFirst("/$", "");
+        }
+    }
+
+    private YandexSearchResponse.ImageResult mapImageResult(JsonNode match) {
+
+        YandexSearchResponse.ImageResult result =
+                new YandexSearchResponse.ImageResult();
+
+        JsonNode imageNode = match.path("image");
+        if (imageNode.isObject()) {
+            result.setUrl(imageNode.path("link").asText(null));
+            result.setWidth(imageNode.path("width").asInt(0));
+            result.setHeight(imageNode.path("height").asInt(0));
+        }
+
+        result.setPageUrl(match.path("link").asText(null));
+        result.setPageTitle(match.path("title").asText(null));
+
+        String source = match.path("source").asText(null);
+        result.setHost(extractHostFromSource(source));
+
+        return result;
+    }
+
+    private String extractHostFromSource(String source) {
+        if (source == null || source.isEmpty()) {
+            return "";
+        }
+        source = source.replaceFirst("^(https?://)?(www\\.)?", "");
+
+        int slashIndex = source.indexOf('/');
+        if (slashIndex > 0) {
+            return source.substring(0, slashIndex);
+        }
+
+        return source;
+    }
 }