[Refactor] 사진 도메인을 리팩토링하고 테스트를 작성한다 (#89)

* refactor: Image를 도메인 패키지로 변경한다

* refactor: Images의 upload 메서드가 Image 도메인 객체를 반환하도록 리팩토링한다

* refactor: ImageIdentifierGenerator를 인터페이스로 추상화하여 분리한다

* refactor: Image의 imageIdentifier 네이밍을 identifier로 변경한다

* feature: Image에 검증 로직을 추가한다

* fix: ImageIdentifier 수정으로 인한 버그를 수정한다

* test: Image 테스트를 작성한다

src/main/java/daybyquest/badge/application/SaveBadgeService.java

@@ -3,9 +3,9 @@
 import daybyquest.badge.domain.Badge;
 import daybyquest.badge.domain.Badges;
 import daybyquest.global.utils.MultipartFileUtils;
-import daybyquest.image.vo.Image;
-import daybyquest.image.vo.ImageIdentifierGenerator;
-import daybyquest.image.vo.Images;
+import daybyquest.image.domain.Image;
+import daybyquest.image.domain.ImageIdentifierGenerator;
+import daybyquest.image.domain.Images;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
@@ -30,9 +30,9 @@ public SaveBadgeService(final Badges badges, final Images images,
 
     @Transactional
     public void invoke(final String name, final MultipartFile file) {
-        final String identifier = generator.generateIdentifier(CATEGORY, file.getOriginalFilename());
-        images.upload(identifier, MultipartFileUtils.getInputStream(file));
-        final Badge badge = new Badge(name, new Image(identifier));
+        final String identifier = generator.generate(CATEGORY, file.getOriginalFilename());
+        final Image image = images.upload(identifier, MultipartFileUtils.getInputStream(file));
+        final Badge badge = new Badge(name, image);
         badges.save(badge);
     }
 }

src/main/java/daybyquest/badge/domain/Badge.java

@@ -3,7 +3,7 @@
 import static jakarta.persistence.GenerationType.IDENTITY;
 
 import daybyquest.global.error.exception.InvalidDomainException;
-import daybyquest.image.vo.Image;
+import daybyquest.image.domain.Image;
 import jakarta.persistence.Column;
 import jakarta.persistence.Embedded;
 import jakarta.persistence.Entity;

src/main/java/daybyquest/badge/query/BadgeData.java

@@ -1,6 +1,6 @@
 package daybyquest.badge.query;
 
-import daybyquest.image.vo.Image;
+import daybyquest.image.domain.Image;
 import java.time.LocalDateTime;
 import lombok.Getter;
 
@@ -23,6 +23,6 @@ public BadgeData(final Long id, final String name, final Image image, final Loca
     }
 
     public String getImageIdentifier() {
-        return image.getImageIdentifier();
+        return image.getIdentifier();
     }
 }

src/main/java/daybyquest/global/config/PropertiesConfig.java

@@ -1,6 +1,6 @@
 package daybyquest.global.config;
 
-import daybyquest.image.vo.BaseImageProperties;
+import daybyquest.image.domain.BaseImageProperties;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Configuration;
 

src/main/java/daybyquest/group/application/SaveGroupService.java

@@ -4,9 +4,9 @@
 import daybyquest.group.domain.Group;
 import daybyquest.group.domain.Groups;
 import daybyquest.group.dto.request.SaveGroupRequest;
-import daybyquest.image.vo.Image;
-import daybyquest.image.vo.ImageIdentifierGenerator;
-import daybyquest.image.vo.Images;
+import daybyquest.image.domain.Image;
+import daybyquest.image.domain.ImageIdentifierGenerator;
+import daybyquest.image.domain.Images;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
@@ -31,14 +31,14 @@ public SaveGroupService(final Groups groups, final Images images,
 
     @Transactional
     public Long invoke(final Long loginId, final SaveGroupRequest request, final MultipartFile file) {
-        final String identifier = generator.generateIdentifier(CATEGORY, file.getOriginalFilename());
-        images.upload(identifier, MultipartFileUtils.getInputStream(file));
-        final Group group = toEntity(request, identifier);
+        final String identifier = generator.generate(CATEGORY, file.getOriginalFilename());
+        final Image image = images.upload(identifier, MultipartFileUtils.getInputStream(file));
+        final Group group = toEntity(request, image);
         return groups.save(loginId, group);
     }
 
-    public Group toEntity(final SaveGroupRequest request, final String imageIdentifier) {
+    public Group toEntity(final SaveGroupRequest request, final Image image) {
         return new Group(request.getInterest(), request.getName(), request.getDescription(),
-                new Image(imageIdentifier));
+                image);
     }
 }

src/main/java/daybyquest/group/domain/Group.java

@@ -4,7 +4,7 @@
 import static lombok.AccessLevel.PROTECTED;
 
 import daybyquest.global.error.exception.InvalidDomainException;
-import daybyquest.image.vo.Image;
+import daybyquest.image.domain.Image;
 import jakarta.persistence.AttributeOverride;
 import jakarta.persistence.Column;
 import jakarta.persistence.Embedded;

src/main/java/daybyquest/group/query/GroupData.java

@@ -1,6 +1,6 @@
 package daybyquest.group.query;
 
-import daybyquest.image.vo.Image;
+import daybyquest.image.domain.Image;
 import lombok.Getter;
 
 @Getter
@@ -32,6 +32,6 @@ public GroupData(final Long id, final String name, final String description, fin
     }
 
     public String getImageIdentifier() {
-        return image.getImageIdentifier();
+        return image.getIdentifier();
     }
 }

src/main/java/daybyquest/image/vo/BaseImageProperties.java → src/main/java/daybyquest/image/domain/BaseImageProperties.java

@@ -1,4 +1,4 @@
-package daybyquest.image.vo;
+package daybyquest.image.domain;
 
 import lombok.Getter;
 import org.springframework.boot.context.properties.ConfigurationProperties;

src/main/java/daybyquest/image/domain/Image.java

@@ -0,0 +1,45 @@
+package daybyquest.image.domain;
+
+import static lombok.AccessLevel.PROTECTED;
+
+import daybyquest.global.error.exception.InvalidDomainException;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embeddable;
+import java.util.Objects;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@Embeddable
+@NoArgsConstructor(access = PROTECTED)
+public class Image {
+
+    private static final int MAX_IDENTIFIER_LENGTH = 255;
+
+    @Column(nullable = false)
+    private String identifier;
+
+    public Image(String identifier) {
+        this.identifier = identifier;
+        validateIdentifier();
+    }
+
+    private void validateIdentifier() {
+        if (identifier == null || identifier.isEmpty() || identifier.length() > MAX_IDENTIFIER_LENGTH) {
+            throw new InvalidDomainException();
+        }
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (!(o instanceof Image image)) {
+            return false;
+        }
+        return this.identifier.equals(image.identifier);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(identifier);
+    }
+}

src/main/java/daybyquest/image/domain/ImageIdentifierGenerator.java

@@ -0,0 +1,6 @@
+package daybyquest.image.domain;
+
+public interface ImageIdentifierGenerator {
+
+    String generate(final String category, final String originalName);
+}

src/main/java/daybyquest/image/domain/Images.java

@@ -0,0 +1,10 @@
+package daybyquest.image.domain;
+
+import java.io.InputStream;
+
+public interface Images {
+
+    Image upload(final String identifier, final InputStream imageStream);
+
+    void remove(final String identifier);
+}

src/main/java/daybyquest/image/infra/S3Images.java

@@ -5,7 +5,8 @@
 import com.amazonaws.services.s3.model.ObjectMetadata;
 import com.amazonaws.services.s3.model.PutObjectRequest;
 import daybyquest.global.error.exception.InvalidFileException;
-import daybyquest.image.vo.Images;
+import daybyquest.image.domain.Image;
+import daybyquest.image.domain.Images;
 import java.io.IOException;
 import java.io.InputStream;
 import org.springframework.beans.factory.annotation.Value;
@@ -24,14 +25,15 @@ public S3Images(final AmazonS3 amazonS3, @Value("${aws.bucket}") final String bu
     }
 
     @Override
-    public void upload(final String identifier, final InputStream imageStream) {
+    public Image upload(final String identifier, final InputStream imageStream) {
         try {
             final ObjectMetadata metadata = new ObjectMetadata();
             metadata.setContentLength(imageStream.available());
             final PutObjectRequest putObjectRequest = new PutObjectRequest(
                     bucket, identifier, imageStream, metadata
             );
             amazonS3.putObject(putObjectRequest);
+            return new Image(identifier);
         } catch (IOException e) {
             throw new InvalidFileException();
         }

src/main/java/daybyquest/image/infra/UUIDImageIdentifierGenerator.java

@@ -0,0 +1,19 @@
+package daybyquest.image.infra;
+
+import daybyquest.image.domain.ImageIdentifierGenerator;
+import java.util.UUID;
+import org.springframework.stereotype.Component;
+
+@Component
+public class UUIDImageIdentifierGenerator implements ImageIdentifierGenerator {
+
+    private static final String CATEGORY_DELIMITER = "/";
+
+    private static final String UUID_DELIMITER = "-";
+
+    @Override
+    public String generate(final String category, final String originalName) {
+        final String uuid = UUID.randomUUID().toString();
+        return category + CATEGORY_DELIMITER + uuid + UUID_DELIMITER + originalName;
+    }
+}

src/main/java/daybyquest/interest/application/SaveInterestService.java

@@ -1,9 +1,9 @@
 package daybyquest.interest.application;
 
 import daybyquest.global.utils.MultipartFileUtils;
-import daybyquest.image.vo.Image;
-import daybyquest.image.vo.ImageIdentifierGenerator;
-import daybyquest.image.vo.Images;
+import daybyquest.image.domain.Image;
+import daybyquest.image.domain.ImageIdentifierGenerator;
+import daybyquest.image.domain.Images;
 import daybyquest.interest.domain.Interest;
 import daybyquest.interest.domain.Interests;
 import daybyquest.interest.dto.request.SaveInterestRequest;
@@ -31,9 +31,9 @@ public SaveInterestService(final Interests interests, final Images images,
 
     @Transactional
     public void invoke(final SaveInterestRequest request, final MultipartFile file) {
-        final String identifier = generator.generateIdentifier(CATEGORY, file.getOriginalFilename());
-        images.upload(identifier, MultipartFileUtils.getInputStream(file));
-        final Interest interest = new Interest(request.getName(), new Image(identifier));
+        final String identifier = generator.generate(CATEGORY, file.getOriginalFilename());
+        final Image image = images.upload(identifier, MultipartFileUtils.getInputStream(file));
+        final Interest interest = new Interest(request.getName(), image);
         interests.save(interest);
     }
 }

src/main/java/daybyquest/interest/domain/Interest.java

@@ -1,7 +1,7 @@
 package daybyquest.interest.domain;
 
 import daybyquest.global.error.exception.InvalidDomainException;
-import daybyquest.image.vo.Image;
+import daybyquest.image.domain.Image;
 import jakarta.persistence.Column;
 import jakarta.persistence.Embedded;
 import jakarta.persistence.Entity;
@@ -31,7 +31,7 @@ public Interest(final String name, final Image image) {
     }
 
     public String getImageIdentifier() {
-        return image.getImageIdentifier();
+        return image.getIdentifier();
     }
 
     private void validateName() {

src/main/java/daybyquest/post/application/SavePostService.java

@@ -1,9 +1,9 @@
 package daybyquest.post.application;
 
 import daybyquest.global.utils.MultipartFileUtils;
-import daybyquest.image.vo.Image;
-import daybyquest.image.vo.ImageIdentifierGenerator;
-import daybyquest.image.vo.Images;
+import daybyquest.image.domain.Image;
+import daybyquest.image.domain.ImageIdentifierGenerator;
+import daybyquest.image.domain.Images;
 import daybyquest.post.domain.Post;
 import daybyquest.post.domain.Posts;
 import daybyquest.post.dto.request.SavePostRequest;
@@ -39,9 +39,8 @@ public Long invoke(final Long loginId, final SavePostRequest request,
 
     private List<Image> toImageList(final List<MultipartFile> files) {
         return files.stream().map((file) -> {
-            final String identifier = generator.generateIdentifier(CATEGORY, file.getOriginalFilename());
-            images.upload(identifier, MultipartFileUtils.getInputStream(file));
-            return new Image(identifier);
+            final String identifier = generator.generate(CATEGORY, file.getOriginalFilename());
+            return images.upload(identifier, MultipartFileUtils.getInputStream(file));
         }).toList();
     }
 

src/main/java/daybyquest/post/domain/Post.java

@@ -6,7 +6,7 @@
 import static jakarta.persistence.GenerationType.IDENTITY;
 
 import daybyquest.global.error.exception.InvalidDomainException;
-import daybyquest.image.vo.Image;
+import daybyquest.image.domain.Image;
 import jakarta.persistence.CollectionTable;
 import jakarta.persistence.Column;
 import jakarta.persistence.ElementCollection;

src/main/java/daybyquest/post/dto/response/PostResponse.java

@@ -2,7 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat.Shape;
-import daybyquest.image.vo.Image;
+import daybyquest.image.domain.Image;
 import daybyquest.post.query.PostData;
 import daybyquest.user.dto.response.ProfileResponse;
 import daybyquest.user.query.Profile;
@@ -42,7 +42,7 @@ public PostResponse(final ProfileResponse author, final Long id, final String co
     public static PostResponse of(final PostData postData, final Profile profile) {
         return new PostResponse(ProfileResponse.of(profile), postData.getId(), postData.getContent(),
                 postData.getUpdatedAt(), postData.isLiked(),
-                postData.getImages().stream().map(Image::getImageIdentifier).toList()
+                postData.getImages().stream().map(Image::getIdentifier).toList()
         );
     }
 }