diff --git a/src/main/java/ru/soune/nocopy/handler/ImageFoundRequestHandler.java b/src/main/java/ru/soune/nocopy/handler/ImageFoundRequestHandler.java index 2ae5e16..236b457 100644 --- a/src/main/java/ru/soune/nocopy/handler/ImageFoundRequestHandler.java +++ b/src/main/java/ru/soune/nocopy/handler/ImageFoundRequestHandler.java @@ -21,6 +21,7 @@ import ru.soune.nocopy.service.tariff.TariffInfoService; import java.io.IOException; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import java.util.Map; import java.util.concurrent.TimeoutException; @@ -96,11 +97,17 @@ public class ImageFoundRequestHandler implements RequestHandler { YandexSearchResponse googleSearchResponse = mapper.mapToYandexResponse(searchResponseGoogle, page, 5, "exact_matches"); - List results = new ArrayList<>(); - results.addAll(googleSearchResponse.getImages()); + int totalSize = yandexSearchResponse.getImages().size() + googleSearchResponse.getImages().size(); + List results = new ArrayList<>(totalSize); results.addAll(yandexSearchResponse.getImages()); - yandexSearchResponse.setImages(results); + results.addAll(googleSearchResponse.getImages()); + yandexSearchResponse.setImages(results); + yandexSearchResponse.setTotalResults(totalSize); + log.info("COMBINED RESPONSE" + yandexSearchResponse.toString()); + log.info("COMBINED RESPONSE" + yandexSearchResponse.toString()); + log.info("COMBINED RESPONSE" + yandexSearchResponse.toString()); + log.info("COMBINED RESPONSE" + yandexSearchResponse.toString()); return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(), MessageCode.SUCCESS.getDescription(), yandexSearchResponse); }