🚀 Feature image enhancement

mysql/schema.sql

@@ -57,3 +57,12 @@ CREATE TABLE likes
     FOREIGN KEY (user_id) REFERENCES users (id),
     FOREIGN KEY (post_id) REFERENCES posts (id) ON DELETE CASCADE
 );
+
+
+CREATE TABLE images
+(
+    id         BIGINT AUTO_INCREMENT,
+    image_url  varchar(500) NOT NULL,
+    filename   varchar(255) NOT NULL,
+    CONSTRAINT images_pk PRIMARY KEY (id)
+);

src/main/java/com/backendoori/ootw/OotwApplication.java

@@ -5,7 +5,9 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.properties.ConfigurationPropertiesScan;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
+@EnableScheduling
 @SpringBootApplication
 @ConfigurationPropertiesScan
 public class OotwApplication {

src/main/java/com/backendoori/ootw/avatar/controller/AvatarItemController.java

@@ -4,7 +4,7 @@
 import com.backendoori.ootw.avatar.dto.AvatarItemRequest;
 import com.backendoori.ootw.avatar.dto.AvatarItemResponse;
 import com.backendoori.ootw.avatar.service.AvatarItemService;
-import com.backendoori.ootw.common.validation.Image;
+import com.backendoori.ootw.image.validation.Image;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;

src/main/java/com/backendoori/ootw/avatar/dto/AvatarItemRequest.java

@@ -3,7 +3,6 @@
 import com.backendoori.ootw.avatar.domain.ItemType;
 import com.backendoori.ootw.avatar.domain.Sex;
 import com.backendoori.ootw.common.validation.Enum;
-import jakarta.validation.constraints.NotNull;
 
 public record AvatarItemRequest(
     @Enum(enumClass = ItemType.class)

src/main/java/com/backendoori/ootw/avatar/service/AvatarItemService.java

@@ -5,9 +5,9 @@
 import com.backendoori.ootw.avatar.dto.AvatarItemRequest;
 import com.backendoori.ootw.avatar.dto.AvatarItemResponse;
 import com.backendoori.ootw.avatar.repository.AvatarItemRepository;
-import com.backendoori.ootw.common.image.ImageFile;
-import com.backendoori.ootw.common.image.ImageService;
-import com.backendoori.ootw.common.image.exception.SaveException;
+import com.backendoori.ootw.image.dto.ImageFile;
+import com.backendoori.ootw.image.service.ImageService;
+import com.backendoori.ootw.image.exception.SaveException;
 import jakarta.transaction.Transactional;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;

src/main/java/com/backendoori/ootw/image/domain/Image.java

@@ -0,0 +1,33 @@
+package com.backendoori.ootw.image.domain;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Table(name = "images")
+@Getter
+@Entity
+@Builder
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+public class Image {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @Column(name = "image_url", unique = true)
+    private String ImageUrl;
+
+    @Column(name = "filename")
+    private String fileName;
+
+}

src/main/java/com/backendoori/ootw/image/dto/ImageFile.java

@@ -0,0 +1,12 @@
+package com.backendoori.ootw.image.dto;
+
+import com.backendoori.ootw.image.domain.Image;
+
+public record ImageFile(
+    String url,
+    String fileName
+) {
+    public static ImageFile from(Image image){
+        return new ImageFile(image.getImageUrl(), image.getFileName());
+    }
+}

src/main/java/com/backendoori/ootw/common/image/exception/ImageControllerAdvice.java → src/main/java/com/backendoori/ootw/image/exception/ImageControllerAdvice.java

@@ -1,14 +1,17 @@
-package com.backendoori.ootw.common.image.exception;
+package com.backendoori.ootw.image.exception;
 
 import com.backendoori.ootw.exception.ErrorResponse;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.core.Ordered;
+import org.springframework.core.annotation.Order;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 
 @Slf4j
 @RestControllerAdvice
+@Order(Ordered.HIGHEST_PRECEDENCE)
 public class ImageControllerAdvice {
 
     private static final String IMAGE_RELATED_EXCEPTION = "업로드 요청 중 문제가 발생했습니다.";
@@ -30,4 +33,5 @@ public ResponseEntity<ErrorResponse> handleSaveException(SaveException e) {
         return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY)
             .body(errorResponse);
     }
+
 }

src/main/java/com/backendoori/ootw/common/image/exception/ImageException.java → src/main/java/com/backendoori/ootw/image/exception/ImageException.java

@@ -1,4 +1,4 @@
-package com.backendoori.ootw.common.image.exception;
+package com.backendoori.ootw.image.exception;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;

src/main/java/com/backendoori/ootw/common/image/exception/SaveException.java → src/main/java/com/backendoori/ootw/image/exception/SaveException.java

@@ -1,4 +1,4 @@
-package com.backendoori.ootw.common.image.exception;
+package com.backendoori.ootw.image.exception;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;

src/main/java/com/backendoori/ootw/image/repository/ImageRepository.java

@@ -0,0 +1,8 @@
+package com.backendoori.ootw.image.repository;
+
+import com.backendoori.ootw.image.domain.Image;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface ImageRepository extends JpaRepository<Image, Long> {
+
+}

src/main/java/com/backendoori/ootw/common/image/ImageService.java → src/main/java/com/backendoori/ootw/image/service/ImageService.java

@@ -1,5 +1,6 @@
-package com.backendoori.ootw.common.image;
+package com.backendoori.ootw.image.service;
 
+import com.backendoori.ootw.image.dto.ImageFile;
 import org.springframework.web.multipart.MultipartFile;
 
 public interface ImageService {

src/main/java/com/backendoori/ootw/image/service/ImageUpdateService.java

@@ -0,0 +1,55 @@
+package com.backendoori.ootw.image.service;
+
+import java.util.ArrayList;
+import java.util.List;
+import com.backendoori.ootw.avatar.domain.AvatarItem;
+import com.backendoori.ootw.avatar.repository.AvatarItemRepository;
+import com.backendoori.ootw.image.domain.Image;
+import com.backendoori.ootw.image.repository.ImageRepository;
+import com.backendoori.ootw.post.domain.Post;
+import com.backendoori.ootw.post.repository.PostRepository;
+import jakarta.transaction.Transactional;
+import lombok.RequiredArgsConstructor;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+public class ImageUpdateService {
+
+    private final PostRepository postRepository;
+    private final AvatarItemRepository avatarItemRepository;
+    private final ImageRepository imageRepository;
+    private final ImageService imageService;
+    public static final String TIMEZONE = "Asia/Seoul";
+    public static final String CRON = "0 20 00 10 * ?";
+
+    @Scheduled(cron = CRON, zone = TIMEZONE) // 매월 20일 오전 00시 10분에 실행
+    @Async
+    @Transactional
+    public void deleteUnused(){
+
+        List<String> urls = new ArrayList<>();
+
+        postRepository.findAll()
+            .stream()
+            .map(Post::getImageUrl)
+            .forEach(urls::add);
+
+        avatarItemRepository.findAll()
+            .stream()
+            .map(AvatarItem::getImageUrl)
+            .forEach(urls::add);
+
+        List<Image> images = imageRepository.findAll();
+
+        for(Image image : images){
+            if(!urls.contains(image.getImageUrl())){
+                imageService.delete(image.getFileName());
+            }
+        }
+
+    }
+
+}

src/main/java/com/backendoori/ootw/common/image/MiniOImageServiceImpl.java → src/main/java/com/backendoori/ootw/image/service/MiniOImageServiceImpl.java

@@ -1,21 +1,26 @@
-package com.backendoori.ootw.common.image;
+package com.backendoori.ootw.image.service;
 
-import static com.backendoori.ootw.common.image.exception.ImageException.IMAGE_ROLLBACK_FAIL_MESSAGE;
-import static com.backendoori.ootw.common.image.exception.ImageException.IMAGE_UPLOAD_FAIL_MESSAGE;
-import static com.backendoori.ootw.common.validation.ImageValidator.validateImage;
+import static com.backendoori.ootw.image.validation.ImageValidator.validateImage;
 
 import java.io.InputStream;
-import java.nio.file.Path;
+import java.util.UUID;
 import java.util.concurrent.TimeUnit;
-import com.backendoori.ootw.common.image.exception.ImageException;
+import com.backendoori.ootw.image.domain.Image;
+import com.backendoori.ootw.image.dto.ImageFile;
+import com.backendoori.ootw.image.exception.ImageException;
 import com.backendoori.ootw.config.MiniOConfig;
+import com.backendoori.ootw.image.repository.ImageRepository;
 import io.minio.GetPresignedObjectUrlArgs;
 import io.minio.MinioClient;
 import io.minio.PutObjectArgs;
 import io.minio.RemoveObjectArgs;
 import io.minio.http.Method;
+import jakarta.transaction.Transactional;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.jetbrains.annotations.NotNull;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -29,28 +34,46 @@ public class MiniOImageServiceImpl implements ImageService {
 
     private final MinioClient minioClient;
     private final MiniOConfig miniOConfig;
-    private Path path;
+    private final ImageRepository imageRepository;
 
     @Override
     public ImageFile upload(MultipartFile file) {
         validateImage(file);
+        String randomFileName = getUniqueFileName(file);
         try {
-            path = Path.of(file.getOriginalFilename());
             InputStream inputStream = file.getInputStream();
             String contentType = file.getContentType();
             PutObjectArgs args = PutObjectArgs.builder()
                 .bucket(miniOConfig.getBucket())
-                .object(path.toString())
+                .object(randomFileName)
                 .stream(inputStream, inputStream.available(), -1)
                 .contentType(contentType)
                 .build();
             minioClient.putObject(args);
-            return new ImageFile(getUrl(), path.toString());
+            String url = getUrl(randomFileName);
+            Image image = saveImage(url, randomFileName);
+            imageRepository.save(image);
+            return ImageFile.from(image);
         } catch (Exception e) {
-            throw new ImageException(IMAGE_UPLOAD_FAIL_MESSAGE);
+            throw new ImageException(ImageException.IMAGE_UPLOAD_FAIL_MESSAGE);
         }
     }
 
+    private static Image saveImage(String url, String randomFileName) {
+        return Image.builder()
+            .ImageUrl(url)
+            .fileName(randomFileName)
+            .build();
+    }
+
+    @NotNull
+    private static String getUniqueFileName(MultipartFile file) {
+        String randomUUID = UUID.randomUUID().toString();
+        String originalFileName = file.getOriginalFilename();
+
+        return randomUUID + originalFileName;
+    }
+
     @Override
     public void delete(String fileName) {
         try {
@@ -59,21 +82,21 @@ public void delete(String fileName) {
                 .object(fileName)
                 .build());
         } catch (Exception e) {
-            throw new ImageException(IMAGE_ROLLBACK_FAIL_MESSAGE);
+            throw new ImageException(ImageException.IMAGE_ROLLBACK_FAIL_MESSAGE);
         }
     }
 
-    private String getUrl() {
+    private String getUrl(String fileName) {
         try {
             return minioClient.getPresignedObjectUrl(
                 GetPresignedObjectUrlArgs.builder()
                     .method(Method.GET)
                     .bucket(miniOConfig.getBucket())
-                    .object(path.toString())
+                    .object(fileName)
                     .expiry(DURATION, TimeUnit.HOURS)
                     .build());
         } catch (Exception e) {
-            throw new ImageException(IMAGE_UPLOAD_FAIL_MESSAGE);
+            throw new ImageException(ImageException.IMAGE_UPLOAD_FAIL_MESSAGE);
         }
     }
 

src/main/java/com/backendoori/ootw/image/validation/Enum.java

@@ -0,0 +1,20 @@
+package com.backendoori.ootw.image.validation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
+
+@Target(value = {ElementType.PARAMETER, ElementType.FIELD})
+@Retention(value = RetentionPolicy.RUNTIME)
+@Constraint(validatedBy = EnumValidator.class)
+public @interface Enum {
+
+    String message() default "유효하지 않은 값입니다 다시 입력해주세요";
+    Class<?>[] groups() default {};
+    Class<? extends Payload>[] payload() default {};
+    Class<? extends java.lang.Enum<?>> enumClass();
+
+}

src/main/java/com/backendoori/ootw/image/validation/EnumValidator.java

@@ -0,0 +1,26 @@
+package com.backendoori.ootw.image.validation;
+
+import java.util.Arrays;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
+
+public class EnumValidator implements ConstraintValidator<Enum, String> {
+
+    private Enum annotation;
+
+    @Override
+    public void initialize(Enum constraintAnnotation) {
+        this.annotation = constraintAnnotation;
+    }
+
+    @Override
+    public boolean isValid(String type, ConstraintValidatorContext context) {
+        if (type == null) {
+            return false;
+        }
+
+        return Arrays.stream(this.annotation.enumClass().getEnumConstants())
+            .anyMatch(e -> e.name().equals(type));
+    }
+
+}

src/main/java/com/backendoori/ootw/common/validation/Image.java → src/main/java/com/backendoori/ootw/image/validation/Image.java

@@ -1,4 +1,4 @@
-package com.backendoori.ootw.common.validation;
+package com.backendoori.ootw.image.validation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

src/main/java/com/backendoori/ootw/common/validation/ImageAnnotationValidator.java → src/main/java/com/backendoori/ootw/image/validation/ImageAnnotationValidator.java

@@ -1,4 +1,4 @@
-package com.backendoori.ootw.common.validation;
+package com.backendoori.ootw.image.validation;
 
 import jakarta.validation.ConstraintValidator;
 import jakarta.validation.ConstraintValidatorContext;

src/main/java/com/backendoori/ootw/common/validation/ImageValidator.java → src/main/java/com/backendoori/ootw/image/validation/ImageValidator.java

@@ -1,4 +1,4 @@
-package com.backendoori.ootw.common.validation;
+package com.backendoori.ootw.image.validation;
 
 import io.jsonwebtoken.lang.Assert;
 import lombok.AccessLevel;