refactor: 코드 리뷰 사항 수정

kagong-sillok · Aug 17, 2023 · c6db02d · c6db02d
1 parent d0c9a62
commit c6db02d
Show file tree

Hide file tree

Showing 17 changed files with 125 additions and 67 deletions.
diff --git a/src/main/java/org/prography/kagongsillok/common/utils/CustomListUtils.java b/src/main/java/org/prography/kagongsillok/common/utils/CustomListUtils.java
@@ -9,6 +9,8 @@
 @UtilityClass
 public class CustomListUtils {
 
+    private static final int minimumImageSize = 1;
+
     public static <T, R> List<R> mapTo(final List<T> list, final Function<T, R> mappingFunction) {
         if (isEmpty(list)) {
             return List.of();
@@ -35,8 +37,8 @@ public static <T> boolean isEmpty(final List<T> list) {
     }
 
     public static <T> String joiningToString(final List<T> list, final String delimiter) {
-        if (list.size() < 1) {
-            return null;
+        if (list.size() < minimumImageSize) {
+            return "";
         }
         return list.stream()
                 .map(Object::toString)

diff --git a/src/main/java/org/prography/kagongsillok/image/infrastructure/ImageRepositoryCustom.java b/src/main/java/org/prography/kagongsillok/image/infrastructure/ImageRepositoryCustom.java
@@ -8,6 +8,5 @@ public interface ImageRepositoryCustom {
 
     Map<Long, Image> findByIdInToMap(List<Long> imageIds);
 
-    boolean isExistIdIn(final List<Long> imageIds);
-
+    boolean isNotExistIdIn(final List<Long> imageIds);
 }
diff --git a/src/main/java/org/prography/kagongsillok/image/infrastructure/ImageRepositoryImpl.java b/src/main/java/org/prography/kagongsillok/image/infrastructure/ImageRepositoryImpl.java
@@ -35,7 +35,7 @@ public Map<Long, Image> findByIdInToMap(final List<Long> imageIds) {
     }
 
     @Override
-    public boolean isExistIdIn(final List<Long> imageIds) {
+    public boolean isNotExistIdIn(final List<Long> imageIds) {
         List<Long> existImageIds = queryFactory
                 .selectFrom(image)
                 .where(

diff --git a/src/main/java/org/prography/kagongsillok/member/domain/Member.java b/src/main/java/org/prography/kagongsillok/member/domain/Member.java
@@ -45,6 +45,13 @@ public Member(final String nickname, final String email, final Role role, String
         this.loginHistory = LoginHistory.init();
     }
 
+    public static Member defaultOf() {
+        return Member.builder()
+                .nickname("알 수 없음")
+                .email("[email protected]")
+                .build();
+    }
+
     public String getEmail() {
         return email.getValue();
     }

diff --git a/src/main/java/org/prography/kagongsillok/place/application/PlaceService.java b/src/main/java/org/prography/kagongsillok/place/application/PlaceService.java
@@ -138,7 +138,7 @@ private List<ReviewTag> getReviewTagsRelatedToPlace(final List<Review> reviews)
     }
 
     private void checkExistImage(final List<Long> imageIds) {
-        if (imageRepository.isExistIdIn(imageIds)) {
+        if (imageRepository.isNotExistIdIn(imageIds)) {
             throw new NotFoundImageException(imageIds);
         }
     }

diff --git a/src/main/java/org/prography/kagongsillok/place/application/dto/PlaceDto.java b/src/main/java/org/prography/kagongsillok/place/application/dto/PlaceDto.java
@@ -7,10 +7,12 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import org.prography.kagongsillok.common.utils.CustomListUtils;
+import org.prography.kagongsillok.image.application.dto.ImageDto;
 import org.prography.kagongsillok.image.domain.Image;
 import org.prography.kagongsillok.place.domain.BusinessHour;
 import org.prography.kagongsillok.place.domain.Link;
 import org.prography.kagongsillok.place.domain.Place;
+import org.prography.kagongsillok.review.application.dto.ReviewTagDto;
 import org.prography.kagongsillok.review.domain.ReviewTag;
 
 @Getter
@@ -22,11 +24,11 @@ public class PlaceDto {
     private String address;
     private Double latitude;
     private Double longitude;
-    private List<Image> images;
+    private List<ImageDto> images;
     private String phone;
     private List<LinkDto> links;
     private List<BusinessHourDto> businessHours;
-    private List<ReviewTag> reviewTags;
+    private List<ReviewTagDto> reviewTags;
 
     @Builder
     public PlaceDto(
@@ -35,11 +37,11 @@ public PlaceDto(
             final String address,
             final Double latitude,
             final Double longitude,
-            final List<Image> images,
+            final List<ImageDto> images,
             final String phone,
             final List<LinkDto> links,
             final List<BusinessHourDto> businessHours,
-            final List<ReviewTag> reviewTags
+            final List<ReviewTagDto> reviewTags
     ) {
         this.id = id;
         this.name = name;
@@ -73,7 +75,7 @@ public static PlaceDto of(final Place place, final List<Image> images) {
                 .address(place.getAddress())
                 .latitude(place.getLatitude())
                 .longitude(place.getLongitude())
-                .images(images)
+                .images(CustomListUtils.mapTo(images, ImageDto::from))
                 .phone(place.getPhone())
                 .links(CustomListUtils.mapTo(place.getLinks().getValues(), LinkDto::from))
                 .businessHours(CustomListUtils.mapTo(place.getBusinessHours().getValues(), BusinessHourDto::from))
@@ -87,11 +89,11 @@ public static PlaceDto of(final Place place,final List<Image> images, final List
                 .address(place.getAddress())
                 .latitude(place.getLatitude())
                 .longitude(place.getLongitude())
-                .images(images)
+                .images(CustomListUtils.mapTo(images, ImageDto::from))
                 .phone(place.getPhone())
                 .links(CustomListUtils.mapTo(place.getLinks().getValues(), LinkDto::from))
                 .businessHours(CustomListUtils.mapTo(place.getBusinessHours().getValues(), BusinessHourDto::from))
-                .reviewTags(reviewTags)
+                .reviewTags(CustomListUtils.mapTo(reviewTags, ReviewTagDto::from))
                 .build();
     }
 

diff --git a/src/main/java/org/prography/kagongsillok/place/infrastructure/PlaceRepositoryCustom.java b/src/main/java/org/prography/kagongsillok/place/infrastructure/PlaceRepositoryCustom.java
@@ -1,6 +1,7 @@
 package org.prography.kagongsillok.place.infrastructure;
 
 import java.util.List;
+import java.util.Map;
 import org.prography.kagongsillok.place.domain.Location;
 import org.prography.kagongsillok.place.domain.Place;
 
@@ -15,4 +16,6 @@ List<Place> findByLocationAround(
     List<Place> findByNameContains(final String name);
 
     List<Place> findByIdIn(final List<Long> placeIds);
+
+    Map<Long, Place> findByIdInToMap(final List<Long> placeIds);
 }
diff --git a/src/main/java/org/prography/kagongsillok/place/infrastructure/PlaceRepositoryImpl.java b/src/main/java/org/prography/kagongsillok/place/infrastructure/PlaceRepositoryImpl.java
@@ -5,7 +5,10 @@
 import com.querydsl.core.types.dsl.BooleanExpression;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
 import org.prography.kagongsillok.place.domain.Location;
 import org.prography.kagongsillok.place.domain.Place;
@@ -66,6 +69,18 @@ public List<Place> findByIdIn(final List<Long> placeIds) {
                 .fetch();
     }
 
+    @Override
+    public Map<Long, Place> findByIdInToMap(final List<Long> placeIds) {
+        return queryFactory
+                .selectFrom(place)
+                .where(
+                        idIn(placeIds),
+                        isNotDeleted()
+                )
+                .stream()
+                .collect(Collectors.toMap(Place::getId, Function.identity()));
+    }
+
     private BooleanExpression nameContains(final String name) {
         if (Objects.isNull(name)) {
             return null;

diff --git a/src/main/java/org/prography/kagongsillok/place/ui/dto/PlaceResponse.java b/src/main/java/org/prography/kagongsillok/place/ui/dto/PlaceResponse.java
@@ -8,10 +8,12 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import org.prography.kagongsillok.common.utils.CustomListUtils;
+import org.prography.kagongsillok.image.application.dto.ImageDto;
 import org.prography.kagongsillok.image.domain.Image;
 import org.prography.kagongsillok.place.application.dto.PlaceDto;
 import org.prography.kagongsillok.place.application.dto.PlaceDto.BusinessHourDto;
 import org.prography.kagongsillok.place.application.dto.PlaceDto.LinkDto;
+import org.prography.kagongsillok.review.application.dto.ReviewTagDto;
 import org.prography.kagongsillok.review.domain.ReviewTag;
 
 @Getter
@@ -23,11 +25,11 @@ public class PlaceResponse {
     private String address;
     private Double latitude;
     private Double longitude;
-    private List<Image> images;
+    private List<ImageDto> images;
     private String phone;
     private List<LinkResponse> links;
     private List<BusinessHourResponse> businessHours;
-    private List<ReviewTag> reviewTags;
+    private List<ReviewTagDto> reviewTags;
 
     @Builder
     public PlaceResponse(
@@ -36,11 +38,11 @@ public PlaceResponse(
             final String address,
             final Double latitude,
             final Double longitude,
-            final List<Image> images,
+            final List<ImageDto> images,
             final String phone,
             final List<LinkResponse> links,
             final List<BusinessHourResponse> businessHours,
-            final List<ReviewTag> reviewTags
+            final List<ReviewTagDto> reviewTags
     ) {
         this.id = id;
         this.name = name;

diff --git a/src/main/java/org/prography/kagongsillok/record/application/StudyRecordService.java b/src/main/java/org/prography/kagongsillok/record/application/StudyRecordService.java
@@ -4,7 +4,6 @@
 import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
 import org.prography.kagongsillok.common.utils.CustomListUtils;
-import org.prography.kagongsillok.common.utils.CustomStringUtils;
 import org.prography.kagongsillok.image.application.exception.NotFoundImageException;
 import org.prography.kagongsillok.image.domain.Image;
 import org.prography.kagongsillok.image.domain.ImageRepository;
@@ -17,7 +16,6 @@
 import org.prography.kagongsillok.record.application.exception.NotFoundStudyRecordException;
 import org.prography.kagongsillok.record.domain.StudyRecord;
 import org.prography.kagongsillok.record.domain.StudyRecordRepository;
-import org.prography.kagongsillok.review.domain.Review;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -78,7 +76,7 @@ public void deleteStudyRecord(final Long id) {
     }
 
     private void checkExistImage(final List<Long> imageIds) {
-        if (imageRepository.isExistIdIn(imageIds)) {
+        if (imageRepository.isNotExistIdIn(imageIds)) {
             throw new NotFoundImageException(imageIds);
         }
     }

diff --git a/src/main/java/org/prography/kagongsillok/record/application/dto/StudyRecordDto.java b/src/main/java/org/prography/kagongsillok/record/application/dto/StudyRecordDto.java
@@ -10,6 +10,8 @@
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import org.prography.kagongsillok.common.utils.CustomListUtils;
+import org.prography.kagongsillok.image.application.dto.ImageDto;
 import org.prography.kagongsillok.image.domain.Image;
 import org.prography.kagongsillok.record.domain.StudyRecord;
 
@@ -22,7 +24,7 @@ public class StudyRecordDto {
     private LocalDate studyDate;
     private String description;
     private int duration;
-    private List<Image> images;
+    private List<ImageDto> images;
     private ZonedDateTime writtenAt;
 
     @Builder
@@ -32,7 +34,7 @@ public StudyRecordDto(
             final LocalDate studyDate,
             final String description,
             final int duration,
-            final List<Image> images,
+            final List<ImageDto> images,
             final ZonedDateTime writtenAt
     ) {
         this.id = id;
@@ -51,7 +53,7 @@ public static StudyRecordDto of(final StudyRecord studyRecord, final List<Image>
                 .studyDate(studyRecord.getStudyDate())
                 .duration(studyRecord.getDuration())
                 .description(studyRecord.getDescription())
-                .images(images)
+                .images(CustomListUtils.mapTo(images, ImageDto::from))
                 .writtenAt(studyRecord.getWrittenAt())
                 .build();
     }

diff --git a/src/main/java/org/prography/kagongsillok/record/ui/dto/StudyRecordResponse.java b/src/main/java/org/prography/kagongsillok/record/ui/dto/StudyRecordResponse.java
@@ -7,6 +7,7 @@
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import org.prography.kagongsillok.image.application.dto.ImageDto;
 import org.prography.kagongsillok.image.domain.Image;
 import org.prography.kagongsillok.record.application.dto.StudyRecordDto;
 
@@ -19,7 +20,7 @@ public class StudyRecordResponse {
     private LocalDate studyDate;
     private String description;
     private int duration;
-    private List<Image> images;
+    private List<ImageDto> images;
     private ZonedDateTime writtenAt;
 
     @Builder
@@ -29,7 +30,7 @@ public StudyRecordResponse(
             final LocalDate studyDate,
             final String description,
             final int duration,
-            final List<Image> images,
+            final List<ImageDto> images,
             final ZonedDateTime writtenAt
     ) {
         this.id = id;