Revert "[Fix] 생성친구 request DTO 수정, 기념일 필드 생성 #36"

This reverts commit 34f65c1.
Favor-Gift-Reminder · Jun 7, 2023 · 7f7f0ac · 7f7f0ac
1 parent 34f65c1
commit 7f7f0ac
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 14 deletions.
diff --git a/favor/src/main/java/com/favor/favor/friend/Friend.java b/favor/src/main/java/com/favor/favor/friend/Friend.java
@@ -1,7 +1,6 @@
 package com.favor.favor.friend;
 
 
-import com.favor.favor.common.enums.Favor;
 import lombok.*;
 
 import com.favor.favor.common.TimeStamped;
@@ -49,13 +48,6 @@ public void setFriendMemo(String friendMemo) {
     @Builder.Default
     @ElementCollection
     private List<Integer> favorList = new ArrayList<>();
-    public void setFavorList(List<Favor> favorList){
-        ArrayList<Integer> favorTypeList = new ArrayList<>();
-        for(Favor favor : favorList){
-            favorTypeList.add(favor.getType());
-        }
-        this.favorList = favorTypeList;
-    }
     private Boolean isUser;
 
     private Long friendUserNo;

diff --git a/favor/src/main/java/com/favor/favor/friend/FriendService.java b/favor/src/main/java/com/favor/favor/friend/FriendService.java
@@ -68,7 +68,6 @@ public void updateFriend(Friend friend, FriendUpdateRequestDto friendUpdateReque
 
         friend.setFriendName(friendUpdateRequestDto.getFriendName());
         friend.setFriendMemo(friendUpdateRequestDto.getFriendMemo());
-        friend.setFavorList(friendUpdateRequestDto.getFavorList());
         save(friend);
     }
 

diff --git a/favor/src/main/java/com/favor/favor/friend/noAccount/FriendRequestDto.java b/favor/src/main/java/com/favor/favor/friend/noAccount/FriendRequestDto.java
@@ -15,12 +15,16 @@
 public class FriendRequestDto {
     @ApiModelProperty(position = 1, required = true, value = "친구이름", example = "이름")
     private String friendName;
+
+    @ApiModelProperty(position = 2, required = false, value = "친구메모", example = "메모")
+    private String friendMemo;
+
     @Transactional
     public Friend toEntity(User user){
         return Friend.builder()
                 .isUser(false)
                 .friendName(friendName)
-                .friendMemo("")
+                .friendMemo(friendMemo)
                 .user(user)
                 .build();
     }

diff --git a/favor/src/main/java/com/favor/favor/friend/noAccount/FriendUpdateRequestDto.java b/favor/src/main/java/com/favor/favor/friend/noAccount/FriendUpdateRequestDto.java
@@ -1,12 +1,12 @@
 package com.favor.favor.friend.noAccount;
 
-import com.favor.favor.common.enums.Favor;
+import com.favor.favor.friend.Friend;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
-import java.util.List;
+import javax.transaction.Transactional;
 
 @Getter
 @NoArgsConstructor
@@ -18,6 +18,11 @@ public class FriendUpdateRequestDto {
     @ApiModelProperty(position = 2, required = false, dataType = "String", value = "친구메모", example = "메모")
     private String friendMemo;
 
-    @ApiModelProperty(position = 3, required = false, dataType = "", value = "취향목록", example = "[\n\"심플한\",\n\"귀여운\"\n]")
-    private List<Favor> favorList;
+    @Transactional
+    public Friend toEntity(){
+        return Friend.builder()
+                .friendName(friendName)
+                .friendMemo(friendMemo)
+                .build();
+    }
 }
diff --git a/favor/src/main/java/com/favor/favor/user/UserService.java b/favor/src/main/java/com/favor/favor/user/UserService.java
@@ -25,6 +25,7 @@
 import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Random;
 
 import static com.favor.favor.exception.ExceptionCode.*;