[FIx] GifSimpleDto 필드 추가

* [FIx] 주석 제거 * [Fix] GiftSimpleDto 필드 추가, 정적 팩토리 메서드 적용 * [Fix] 서비스단 정적 팩토리 메서드 적용 * [Fix] 메서드 레퍼런스 수정
Favor-Gift-Reminder · Dec 1, 2023 · dc455fc · dc455fc
1 parent f0cba19
commit dc455fc
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 26 deletions.
diff --git a/favor/src/main/java/com/favor/favor/friend/FriendService.java b/favor/src/main/java/com/favor/favor/friend/FriendService.java
@@ -135,7 +135,7 @@ public List<GiftSimpleDto> findGiftListByFriendNo(Long friendNo){
         List<Gift> giftList = giftRepository.findGiftsByFriendNoListContains(friendNo);
         List<GiftSimpleDto> giftResponseDtoList = new ArrayList<>();
         for(Gift gift : giftList){
-            GiftSimpleDto dto = new GiftSimpleDto(gift);
+            GiftSimpleDto dto = GiftSimpleDto.from(gift);
             giftResponseDtoList.add(dto);
         }
         return giftResponseDtoList;
@@ -145,7 +145,7 @@ public List<GiftSimpleDto> findGivenGiftList(Long friendNo){
         List<GiftSimpleDto> giftResponseDtoList = new ArrayList<>();
         for(Gift gift : giftList){
             if(gift.getIsGiven()){
-                GiftSimpleDto dto = new GiftSimpleDto(gift);
+                GiftSimpleDto dto = GiftSimpleDto.from(gift);
                 giftResponseDtoList.add(dto);
             }
         }
@@ -156,7 +156,7 @@ public List<GiftSimpleDto> findReceivedGiftList(Long friendNo){
         List<GiftSimpleDto> giftResponseDtoList = new ArrayList<>();
         for(Gift gift : giftList){
             if(!gift.getIsGiven()){
-                GiftSimpleDto dto = new GiftSimpleDto(gift);
+                GiftSimpleDto dto = GiftSimpleDto.from(gift);
                 giftResponseDtoList.add(dto);
             }
         }

diff --git a/favor/src/main/java/com/favor/favor/gift/GiftSimpleDto.java b/favor/src/main/java/com/favor/favor/gift/GiftSimpleDto.java
@@ -1,27 +1,40 @@
 package com.favor.favor.gift;
 
 import com.favor.favor.photo.GiftPhoto;
-import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
 
 import java.time.LocalDate;
 import java.util.List;
 
 @Getter
-@AllArgsConstructor
-@Builder
 public class GiftSimpleDto {
     private Long giftNo;
     private String giftName;
     private LocalDate giftDate;
     private List<GiftPhoto> photoList;
+    private Boolean isPinned;
+    private Boolean isGiven;
 
     @Builder
-    public GiftSimpleDto(Gift gift){
-        this.giftNo = gift.getGiftNo();
-        this.giftName = gift.getGiftName();
-        this.giftDate = gift.getGiftDate();
-        this.photoList = gift.getGiftPhotoList();
+    private GiftSimpleDto(Long giftNo, String giftName, LocalDate giftDate, List<GiftPhoto> photoList, Boolean isPinned, Boolean isGiven){
+        this.giftNo = giftNo;
+        this.giftName = giftName;
+        this.giftDate = giftDate;
+        this.photoList = photoList;
+        this.isPinned = isPinned;
+        this.isGiven = isGiven;
     }
+
+    public static GiftSimpleDto from(Gift gift){
+        return GiftSimpleDto.builder()
+                .giftNo(gift.getGiftNo())
+                .giftName(gift.getGiftName())
+                .giftDate(gift.getGiftDate())
+                .photoList(gift.getGiftPhotoList())
+                .isPinned(gift.getIsPinned())
+                .isGiven(gift.getIsGiven())
+                .build();
+    }
+
 }
diff --git a/favor/src/main/java/com/favor/favor/reminder/ReminderSimpleDto.java b/favor/src/main/java/com/favor/favor/reminder/ReminderSimpleDto.java
@@ -18,15 +18,6 @@ public class ReminderSimpleDto {
     private Long userNo;
     private FriendSimpleDto friendSimpleDto;
 
-//    @Builder
-//    public ReminderSimpleDto(Reminder reminder){
-//        this.reminderNo = reminder.getReminderNo();
-//        this.reminderTitle = reminder.getReminderTitle();
-//        this.reminderDate = reminder.getReminderDate();
-//        this.isAlarmSet = reminder.getIsAlarmSet();
-//        this.userNo = reminder.getUser().getUserNo();
-//        this.friendSimpleDto = null;
-//    }
     @Builder
     public ReminderSimpleDto(Reminder reminder, FriendSimpleDto dto){
         this.reminderNo = reminder.getReminderNo();

diff --git a/favor/src/main/java/com/favor/favor/user/UserService.java b/favor/src/main/java/com/favor/favor/user/UserService.java
@@ -143,22 +143,22 @@ public List<GiftSimpleDto> readGiftList(Long userNo) {
         User user = findUserByUserNo(userNo);
 
         return giftRepository.findGiftsByUser(user).stream()
-                .map(GiftSimpleDto::new).collect(Collectors.toList());
+                .map(GiftSimpleDto::from).collect(Collectors.toList());
     }
 
     public List<GiftSimpleDto> readGiftListByName(Long userNo, String giftName){
         User user = findUserByUserNo(userNo);
 
         return giftRepository.findGiftsByUserAndGiftNameContains(user, giftName).stream()
-                .map(GiftSimpleDto::new).collect(Collectors.toList());
+                .map(GiftSimpleDto::from).collect(Collectors.toList());
     }
 
     public List<GiftSimpleDto> readGiftListByCategory(Long userNo, GiftCategory giftCategory){
         User user = findUserByUserNo(userNo);
         Integer categoryNo = giftCategory.getType();
 
         return giftRepository.findGiftsByUserAndCategory(user, categoryNo).stream()
-                .map(GiftSimpleDto::new)
+                .map(GiftSimpleDto::from)
                 .collect(Collectors.toList());
     }
 
@@ -167,7 +167,7 @@ public List<GiftSimpleDto> readGiftListByEmotion(Long userNo, Emotion emotion){
         Integer emotionNo = emotion.getType();
 
         return giftRepository.findGiftsByUserAndEmotion(user, emotionNo).stream()
-                .map(GiftSimpleDto::new)
+                .map(GiftSimpleDto::from)
                 .collect(Collectors.toList());
     }
 
@@ -265,14 +265,14 @@ public List<Reminder> readReminderListByMonthAndYear(int year, int month){
     public List<GiftSimpleDto> readGivenGiftList(Long userNo){
         User user = findUserByUserNo(userNo);
         return giftRepository.findGiftsByUser(user).stream()
-                .map(GiftSimpleDto::new)
+                .map(GiftSimpleDto::from)
                 .collect(Collectors.toList());
     }
 
     public List<GiftSimpleDto> readReceivedGiftList(Long userNo){
         User user = findUserByUserNo(userNo);
         return giftRepository.findGiftsByUser(user).stream()
-                .map(GiftSimpleDto::new)
+                .map(GiftSimpleDto::from)
                 .collect(Collectors.toList());
     }