refactor(image): implement image processing and upload functionality

Author: m-feliciano

src/main/java/com/dev/servlet/adapter/out/image/ImageProcessor.java

@@ -0,0 +1,68 @@
+package com.dev.servlet.adapter.out.image;
+
+import jakarta.enterprise.context.ApplicationScoped;
+import org.imgscalr.Scalr;
+
+import javax.imageio.ImageIO;
+import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+@ApplicationScoped
+public class ImageProcessor {
+
+    static {
+        ImageIO.scanForPlugins();
+    }
+
+    /**
+     * Convert image to TYPE_INT_RGB (JPG compatible)
+     * TYPE_INT_RGB does not support transparency, so transparent areas
+     * will be filled with white color.
+     *
+     * @param img the source image
+     * @return a BufferedImage of type TYPE_INT_RGB
+     */
+    public BufferedImage normalizeToJpg(BufferedImage img) {
+        if (img.getType() == BufferedImage.TYPE_INT_RGB) {
+            return img;
+        }
+
+        BufferedImage jpg = new BufferedImage(
+                img.getWidth(),
+                img.getHeight(),
+                BufferedImage.TYPE_INT_RGB
+        );
+
+        Graphics2D g = jpg.createGraphics();
+        g.drawImage(img, 0, 0, Color.WHITE, null);
+        g.dispose();
+
+        return jpg;
+    }
+
+    public BufferedImage cropSquare(BufferedImage source) {
+        int min = Math.min(source.getWidth(), source.getHeight());
+        int x = (source.getWidth() - min) / 2;
+        int y = (source.getHeight() - min) / 2;
+
+        return Scalr.crop(source, x, y, min, min);
+    }
+
+    public BufferedImage resize(BufferedImage source, int size) {
+        return Scalr.resize(source, Scalr.Method.ULTRA_QUALITY, size);
+    }
+
+    public InputStream toJpgStream(BufferedImage image) {
+        try {
+            ByteArrayOutputStream out = new ByteArrayOutputStream();
+            ImageIO.write(image, "jpg", out);
+            return new ByteArrayInputStream(out.toByteArray());
+        } catch (IOException e) {
+            throw new RuntimeException("Failed to write image", e);
+        }
+    }
+}

src/main/java/com/dev/servlet/adapter/out/image/ImageService.java

@@ -0,0 +1,34 @@
+package com.dev.servlet.adapter.out.image;
+
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+
+import javax.imageio.ImageIO;
+import java.awt.image.BufferedImage;
+import java.io.InputStream;
+
+@ApplicationScoped
+public class ImageService {
+
+    static {
+        ImageIO.scanForPlugins();
+    }
+
+    @Inject
+    private ImageProcessor processor;
+
+    public InputStream processToSquareJpg(InputStream in, int size) {
+        try {
+            BufferedImage img = ImageIO.read(in);
+            if (img == null) throw new RuntimeException("Invalid image");
+
+            img = processor.normalizeToJpg(img);
+            img = processor.cropSquare(img);
+            img = processor.resize(img, size);
+
+            return processor.toJpgStream(img);
+        } catch (Exception e) {
+            throw new RuntimeException("Image processing failed", e);
+        }
+    }
+}

src/main/java/com/dev/servlet/adapter/out/storage/ImageService.java

@@ -3,7 +3,7 @@
 import com.dev.servlet.adapter.out.external.webscrape.WebScrapeServiceRegistry;
 import com.dev.servlet.adapter.out.external.webscrape.builder.WebScrapeBuilder;
 import com.dev.servlet.adapter.out.external.webscrape.transfer.ProductWebScrapeDTO;
-import com.dev.servlet.adapter.out.storage.ImageService;
+import com.dev.servlet.adapter.out.image.ImageService;
 import com.dev.servlet.application.mapper.ProductMapper;
 import com.dev.servlet.application.port.in.product.ScrapeProductPort;
 import com.dev.servlet.application.port.out.alert.AlertPort;
@@ -15,13 +15,13 @@
 import com.dev.servlet.domain.entity.User;
 import com.dev.servlet.domain.entity.enums.Status;
 import com.dev.servlet.infrastructure.config.Properties;
+import com.dev.servlet.infrastructure.http.FileHttpClient;
 import jakarta.annotation.PreDestroy;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.enterprise.context.control.RequestContextController;
 import jakarta.inject.Inject;
 import lombok.extern.slf4j.Slf4j;
 
-import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;
 import java.time.Duration;
@@ -56,6 +56,8 @@ public class ScrapeProductUseCase implements ScrapeProductPort {
     private StorageService storageService;
     @Inject
     private ImageService imageService;
+    @Inject
+    private FileHttpClient fileHttpClient;
 
     @Override
     public CompletableFuture<List<ProductResponse>> scrapeAsync(String url, String auth) {
@@ -160,20 +162,27 @@ private void uploadImageToStorage(List<Product> products, User user) {
             try {
                 future.get();
             } catch (Exception e) {
-                log.error("Error occurred while uploading product image", e);
+                log.warn("Error occurred while uploading product image", e);
             }
         }
     }
 
-    private String uploadImage(String sourceUrl, User user) throws IOException {
+    private String uploadImage(String sourceUrl, User user) {
         log.info("Processing image for product from URL: {}", sourceUrl);
-        InputStream pic = imageService.writePicture(imageService.getJpgImageFromUrl(sourceUrl), 800);
 
-        final String path = "private/users/" + user.getId() + "/products/" + UUID.randomUUID() + ".jpg";
-        log.info("Generating image URL for product image at path: {}", path);
+        try (InputStream download = fileHttpClient.download(sourceUrl);
+             InputStream pic = imageService.processToSquareJpg(download, 500)) {
+
+            final String path = "private/users/" + user.getId() + "/products/" + UUID.randomUUID() + ".jpg";
+            log.info("Generating image URL for product image at path: {}", path);
+
+            URI uri = storageService.generateUploadUri(path, "image/jpeg", Duration.ofMinutes(5));
+            fileHttpClient.upload(uri, pic, "image/jpeg");
+            return path;
 
-        URI uploadUrl = storageService.generateUploadUri(path, "image/jpeg", Duration.ofMinutes(1));
-        imageService.uploadImageToUrl(uploadUrl, pic, "image/jpeg");
-        return path;
+        } catch (Exception e) {
+            log.error("Failed to upload product image from URL: {}", sourceUrl, e);
+            return null;
+        }
     }
 }