#227 Refactor: WineConverter 삭제 (#228)

Drink-Easy · Dec 2, 2024 · bb0f2fc · bb0f2fc
2 parents b01a004 + 4ecc90a
commit bb0f2fc
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 48 deletions.
diff --git a/src/main/java/com/drinkeg/drinkeg/converter/WineConverter.java b/src/main/java/com/drinkeg/drinkeg/converter/WineConverter.java
diff --git a/src/main/java/com/drinkeg/drinkeg/converter/WineWishlistConverter.java b/src/main/java/com/drinkeg/drinkeg/converter/WineWishlistConverter.java
@@ -4,12 +4,13 @@
 import com.drinkeg.drinkeg.wine.domain.Wine;
 import com.drinkeg.drinkeg.domain.WineWishlist;
 import com.drinkeg.drinkeg.dto.WineWishlistDTO.response.WineWishlistResponseDTO;
+import com.drinkeg.drinkeg.wine.dto.response.SearchWineResponseDTO;
 
 public class WineWishlistConverter {
     public static WineWishlistResponseDTO toWineWishlistResponseDTO(WineWishlist wineWishlist) {
         return WineWishlistResponseDTO.builder()
                 .id(wineWishlist.getId())
-                .wine(WineConverter.toSearchWineResponseDTO(wineWishlist.getWine(), true))
+                .wine(SearchWineResponseDTO.create(wineWishlist.getWine(), true))
                 .build();
     }
 

diff --git a/src/main/java/com/drinkeg/drinkeg/dto/HomeDTO/HomeResponseDTO.java b/src/main/java/com/drinkeg/drinkeg/dto/HomeDTO/HomeResponseDTO.java
@@ -1,5 +1,6 @@
 package com.drinkeg.drinkeg.dto.HomeDTO;
 
+import com.drinkeg.drinkeg.domain.Member;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
@@ -20,4 +21,12 @@ public class HomeResponseDTO {
     private List<RecommendWineDTO> recommendWineDTOs = new ArrayList<>();
 
 
+    public static HomeResponseDTO create(Member member, List<RecommendWineDTO> recommendWineDTOs){
+
+        return HomeResponseDTO.builder()
+                .name(member.getName())
+                .recommendWineDTOs(recommendWineDTOs)
+                .build();
+    }
+
 }
diff --git a/src/main/java/com/drinkeg/drinkeg/wine/dto/response/SearchWineResponseDTO.java b/src/main/java/com/drinkeg/drinkeg/wine/dto/response/SearchWineResponseDTO.java
@@ -1,8 +1,12 @@
 package com.drinkeg.drinkeg.wine.dto.response;
 
+import com.drinkeg.drinkeg.wine.domain.Wine;
+import com.drinkeg.drinkeg.wineNote.domain.WineNote;
 import com.querydsl.core.annotations.QueryProjection;
 import lombok.*;
 
+import java.util.Optional;
+
 @Getter
 @Builder
 @NoArgsConstructor
@@ -34,4 +38,22 @@ public SearchWineResponseDTO(Long wineId, String name, String imageUrl, String s
         this.isLiked = isLiked;
     }
 
+    public static SearchWineResponseDTO create(Wine wine, boolean isLiked) {
+        return SearchWineResponseDTO.builder()
+                .wineId(wine.getId())
+                .name(wine.getName())
+                .imageUrl(wine.getImageUrl())
+
+                .isLiked(isLiked)
+                .sort(wine.getSort())
+                .area(wine.getArea())
+
+                .price(((wine.getPrice() * 1300) / 1000) * 1000)
+
+                // wine 기본 평점과, 사용자 평점 중 높은거로
+                .satisfaction(Math.max(wine.getSatisfaction(),
+                        Optional.ofNullable(wine.getWineNote()).map(WineNote::getAvgSatisfaction).orElse((float) 0)))
+                .build();
+    }
+
 }
diff --git a/src/main/java/com/drinkeg/drinkeg/wine/service/WineServiceImpl.java b/src/main/java/com/drinkeg/drinkeg/wine/service/WineServiceImpl.java
@@ -2,7 +2,6 @@
 
 import com.drinkeg.drinkeg.S3.S3Service;
 import com.drinkeg.drinkeg.apipayLoad.code.status.ErrorStatus;
-import com.drinkeg.drinkeg.converter.WineConverter;
 import com.drinkeg.drinkeg.domain.Member;
 import com.drinkeg.drinkeg.repository.MemberRepository;
 import com.drinkeg.drinkeg.wine.domain.Wine;
@@ -14,8 +13,6 @@
 import com.drinkeg.drinkeg.dto.loginDTO.commonDTO.PrincipalDetail;
 import com.drinkeg.drinkeg.exception.GeneralException;
 import com.drinkeg.drinkeg.wine.repository.WineRepository;
-import com.drinkeg.drinkeg.service.memberService.MemberService;
-import com.drinkeg.drinkeg.service.wineWishlistService.WineWishlistService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -70,7 +67,7 @@ public HomeResponseDTO getHomeResponse(PrincipalDetail principalDetail) {
                 () -> new GeneralException(ErrorStatus.MEMBER_NOT_FOUND));
 
         List<RecommendWineDTO> recommendWines = wineRepository.findRecommendWines(member);
-        return WineConverter.toHomeResponseDTO(member, recommendWines);
+        return HomeResponseDTO.create(member, recommendWines);
     }
 
     @Override