refactor: 코멘트 반영

COW-dev · Dec 4, 2024 · 871d761 · 871d761
1 parent 3816d89
commit 871d761
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 6 deletions.
diff --git a/.../java/ddingdong/ddingdongBE/domain/banner/controller/dto/request/CreateBannerRequest.java b/.../java/ddingdong/ddingdongBE/domain/banner/controller/dto/request/CreateBannerRequest.java
@@ -4,16 +4,18 @@
 import ddingdong.ddingdongBE.domain.user.entity.User;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotNull;
+import org.hibernate.validator.constraints.URL;
 
 @Schema(
         name = "CreateBannerRequest",
         description = "어드민 - 배너 생성 요청"
 )
 public record CreateBannerRequest(
         @Schema(description = "연결 링크", example = "https://test-link.com")
+        @URL
         String link,
         @Schema(description = "웹 이미지 식별자", example = "0192c828-ffce-7ee8-94a8-d9d4c8cdec00")
-        @NotNull(message = "webImageKey는 필수입니다.")
+        @NotNull(message = "webImageId는 필수입니다.")
         String webImageId,
         @Schema(description = "모바일 이미지 식별자", example = "0192c828-ffce-7ee8-94a8-d9d4c8cdec00")
         @NotNull(message = "mobileImageId 필수입니다.")

diff --git a/src/main/java/ddingdong/ddingdongBE/domain/banner/service/FacadeAdminBannerServiceImpl.java b/src/main/java/ddingdong/ddingdongBE/domain/banner/service/FacadeAdminBannerServiceImpl.java
@@ -58,10 +58,11 @@ public void delete(Long bannerId) {
 
     private AdminBannerListQuery createBannerListQuery(Banner banner, List<FileMetaData> bannerImages) {
         Map<DomainType, FileMetaData> fileMetaDataMap = bannerImages.stream()
-                .filter(fileMetaData -> fileMetaData.getEntityId().equals(banner.getId()))
+                .filter(fileMetaData -> fileMetaData.isOwn(banner.getId()))
                 .collect(Collectors.toMap(
                         FileMetaData::getDomainType,
-                        fileMetaData -> fileMetaData
+                        fileMetaData -> fileMetaData,
+                        (existing, replacement) -> existing
                 ));
 
         UploadedFileUrlQuery webImageUrlQuery = s3FileService.getUploadedFileUrl(

diff --git a/src/main/java/ddingdong/ddingdongBE/domain/banner/service/FacadeUserBannerServiceImpl.java b/src/main/java/ddingdong/ddingdongBE/domain/banner/service/FacadeUserBannerServiceImpl.java
@@ -30,22 +30,28 @@ public List<UserBannerListQuery> findAll() {
         if (banners.isEmpty()) {
             return Collections.emptyList();
         }
+
         List<FileMetaData> bannerImages = fileMetaDataService.getCoupledAllByEntityIds(
-                banners.stream().map(Banner::getId).toList());
+                banners.stream()
+                        .map(Banner::getId)
+                        .toList()
+        );
+
         return banners.stream()
                 .map(banner -> createBannerListQuery(banner, bannerImages))
                 .toList();
     }
 
     private UserBannerListQuery createBannerListQuery(Banner banner, List<FileMetaData> bannerImages) {
-        if(bannerImages.isEmpty()) {
+        if (bannerImages.isEmpty()) {
             return UserBannerListQuery.of(banner, null, null);
         }
         Map<DomainType, FileMetaData> fileMetaDataMap = bannerImages.stream()
                 .filter(fileMetaData -> fileMetaData.getEntityId().equals(banner.getId()))
                 .collect(Collectors.toMap(
                         FileMetaData::getDomainType,
-                        fileMetaData -> fileMetaData
+                        fileMetaData -> fileMetaData,
+                        (existing, replacement) -> existing
                 ));
 
         UploadedFileUrlQuery webImageUrlQuery = s3FileService.getUploadedFileUrl(

diff --git a/src/main/java/ddingdong/ddingdongBE/domain/filemetadata/entity/FileMetaData.java b/src/main/java/ddingdong/ddingdongBE/domain/filemetadata/entity/FileMetaData.java
@@ -75,4 +75,8 @@ public boolean isCoupled() {
     public boolean isPending() {
         return this.fileStatus == FileStatus.PENDING;
     }
+
+    public boolean isOwn(Long entityId) {
+        return this.entityId.equals(entityId);
+    }
 }