Merge remote-tracking branch 'origin/main'

# Conflicts:
#	build.gradle

build.gradle

@@ -66,6 +66,11 @@ dependencies {
 
 	compileOnly 'org.jetbrains:annotations:26.0.1'
 
+    // https://mvnrepository.com/artifact/com.twelvemonkeys.imageio/imageio-webp
+    runtimeOnly 'com.twelvemonkeys.imageio:imageio-webp:3.12.0'
+
+	compileOnly 'org.jetbrains:annotations:24.1.0'
+
 	// Custom testing
 	testRuntimeOnly 'com.h2database:h2'
 	testImplementation 'org.testcontainers:testcontainers:1.20.4'

compose.dev.yaml

@@ -0,0 +1,39 @@
+name: meals-made-easy-api-dev
+services:
+  db:
+    image: mysql:latest
+    ports:
+      - '55001:3306'
+      - '55000:33060'
+    env_file: .env
+    environment:
+      MYSQL_DATABASE: meals_made_easy_api
+      MYSQL_USER: meals-made-easy-api-user
+    healthcheck:
+      test: mysqladmin ping -u $$MYSQL_USER --password=$$MYSQL_PASSWORD
+      interval: 5s
+      timeout: 10s
+      retries: 10
+    volumes:
+      - mysql-data:/var/lib/mysql
+  minio:
+    image: minio/minio:latest
+    ports:
+      - 9000:9000
+      - 9001:9001
+    env_file:
+      - .env
+    environment:
+      MINIO_ROOT_USER: minio-root
+    volumes:
+      - minio-data:/data
+    command:
+      - server
+      - /data
+      - --console-address
+      - :9001
+    profiles:
+      - deps
+volumes:
+  mysql-data:
+  minio-data:

src/main/java/app/mealsmadeeasy/api/MvcConfiguration.java

@@ -16,7 +16,7 @@ public class MvcConfiguration {
             public void addCorsMappings(CorsRegistry registry) {
                 registry.addMapping("/**")
                         .allowedMethods("GET", "POST", "PUT", "DELETE")
-                        .allowedOrigins("http://localhost:5173")
+                        .allowedOrigins("http://localhost:5173", "http://localhost:4200")
                         .allowCredentials(true);
             }
 

src/main/java/app/mealsmadeeasy/api/image/Image.java

@@ -16,5 +16,7 @@ public interface Image {
     @Nullable String getCaption();
     User getOwner();
     boolean isPublic();
+    int getHeight();
+    int getWidth();
     Set<User> getViewers();
 }

src/main/java/app/mealsmadeeasy/api/image/S3ImageEntity.java

@@ -35,6 +35,12 @@ public class S3ImageEntity implements Image {
     @Column(nullable = false)
     private String objectName;
 
+    @Column(nullable = false)
+    private int height;
+
+    @Column(nullable = false)
+    private int width;
+
     @ManyToOne(optional = false)
     @JoinColumn(name = "owner_id", nullable = false)
     private UserEntity owner;
@@ -116,6 +122,24 @@ public class S3ImageEntity implements Image {
         this.objectName = objectName;
     }
 
+    @Override
+    public int getHeight() {
+        return this.height;
+    }
+
+    public void setHeight(int height) {
+        this.height = height;
+    }
+
+    @Override
+    public int getWidth() {
+        return this.width;
+    }
+
+    public void setWidth(int width) {
+        this.width = width;
+    }
+
     @Override
     public User getOwner() {
         return this.owner;

src/main/java/app/mealsmadeeasy/api/image/S3ImageService.java

@@ -7,11 +7,15 @@ import app.mealsmadeeasy.api.s3.S3Manager;
 import app.mealsmadeeasy.api.user.User;
 import app.mealsmadeeasy.api.user.UserEntity;
 import org.jetbrains.annotations.Nullable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.access.prepost.PostAuthorize;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Service;
 
+import javax.imageio.ImageIO;
+import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.io.InputStream;
 import java.time.LocalDateTime;
@@ -23,6 +27,7 @@ import java.util.regex.Pattern;
 public class S3ImageService implements ImageService {
 
     private static final Pattern extensionPattern = Pattern.compile(".+\\.(.+)$");
+    private static final Logger logger = LoggerFactory.getLogger(S3ImageService.class);
 
     private final S3Manager s3Manager;
     private final S3ImageRepository imageRepository;
@@ -112,11 +117,23 @@ public class S3ImageService implements ImageService {
                 this.imageBucketName, filename, mimeType, inputStream, objectSize
         );
 
+        final int height, width;
+        try (final InputStream imageContent = this.s3Manager.load(this.imageBucketName, objectName)) {
+            final BufferedImage bufferedImage = ImageIO.read(imageContent);
+            if (bufferedImage == null) {
+                logger.error("ImageIO could not read image: {} ({})", userFilename, objectName);
+            }
+            height = bufferedImage.getHeight();
+            width = bufferedImage.getWidth();
+        }
+
         final S3ImageEntity draft = new S3ImageEntity();
         draft.setOwner((UserEntity) owner);
         draft.setUserFilename(userFilename);
         draft.setMimeType(mimeType);
         draft.setObjectName(objectName);
+        draft.setHeight(height);
+        draft.setWidth(width);
         this.transferFromSpec(draft, createSpec);
         return this.imageRepository.save(draft);
     }

src/main/java/app/mealsmadeeasy/api/image/view/ImageView.java

@@ -21,6 +21,8 @@ public class ImageView {
         view.setCaption(image.getCaption());
         view.setOwner(UserInfoView.from(image.getOwner()));
         view.setIsPublic(image.isPublic());
+        view.setHeight(image.getHeight());
+        view.setWidth(image.getWidth());
         if (includeViewers) {
             view.setViewers(image.getViewers().stream()
                     .map(UserInfoView::from)
@@ -39,6 +41,8 @@ public class ImageView {
     private @Nullable String caption;
     private UserInfoView owner;
     private boolean isPublic;
+    private int height;
+    private int width;
     private @Nullable Set<UserInfoView> viewers;
 
     public String getUrl() {
@@ -113,6 +117,22 @@ public class ImageView {
         this.isPublic = isPublic;
     }
 
+    public int getHeight() {
+        return this.height;
+    }
+
+    public void setHeight(int height) {
+        this.height = height;
+    }
+
+    public int getWidth() {
+        return this.width;
+    }
+
+    public void setWidth(int width) {
+        this.width = width;
+    }
+
     public @Nullable Set<UserInfoView> getViewers() {
         return this.viewers;
     }