Merge pull request #88 from Favor-Gift-Reminder/eunki/87

[Fix] 유저간 아이디(닉네임) 중복 허용 문제, 고유값 추가
Favor-Gift-Reminder · Nov 26, 2023 · f0cba19 · f0cba19
2 parents e36c107 + 1e77899
commit f0cba19
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 19 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
@@ -176,7 +176,7 @@ public FriendResponseDto returnDto(Friend friend){
             if(reminderFriend != null) {
                 User reminderFriendUser = findUserByUserNo(reminderFriend.getFriendUserNo());
                 UserPhoto photo = reminderFriendUser.getUserProfilePhoto();
-                friendsimpleDto = new FriendSimpleDto(reminderFriend, reminderFriendUser, photo);
+                friendsimpleDto = FriendSimpleDto.from(reminderFriend, photo);
             }
             reminderDtoList.add(new ReminderSimpleDto(r, friendsimpleDto));
         }

diff --git a/favor/src/main/java/com/favor/favor/friend/FriendSimpleDto.java b/favor/src/main/java/com/favor/favor/friend/FriendSimpleDto.java
@@ -1,22 +1,30 @@
 package com.favor.favor.friend;
 
 import com.favor.favor.photo.UserPhoto;
-import com.favor.favor.user.User;
-import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
 
 @Getter
-@AllArgsConstructor
 public class FriendSimpleDto {
     private Long friendNo;
+    private Long friendUserNo;
     private String friendName;
-    private UserPhoto photo;
+    private UserPhoto userPhoto;
 
     @Builder
-    public FriendSimpleDto(Friend friend, User friendUser, UserPhoto photo){
-        this.friendNo = friend.getFriendNo();
-        this.friendName = friendUser.getName();
-        this.photo = photo;
+    private FriendSimpleDto(Long friendNo, Long friendUserNo, String friendName, UserPhoto userPhoto){
+        this.friendNo = friendNo;
+        this.friendUserNo = friendUserNo;
+        this.friendName = friendName;
+        this.userPhoto = userPhoto;
+    }
+
+    public static FriendSimpleDto from(Friend friend, UserPhoto userPhoto){
+        return FriendSimpleDto.builder()
+                .friendNo(friend.getFriendNo())
+                .friendUserNo(friend.getFriendUserNo())
+                .friendName(friend.getFriendName())
+                .userPhoto(userPhoto)
+                .build();
     }
 }
diff --git a/favor/src/main/java/com/favor/favor/gift/GiftService.java b/favor/src/main/java/com/favor/favor/gift/GiftService.java
@@ -184,8 +184,7 @@ public GiftResponseDto returnDto(Gift gift){
             Friend friend = findFriendByFriendNo(friendNo);
             User friendUser = findUserByUserNo(friend.getFriendUserNo());
             UserPhoto photo = friendUser.getUserProfilePhoto();
-            FriendSimpleDto friendResponseDto = new FriendSimpleDto(friend, friendUser, photo);
-            friendResponseDtoList.add(friendResponseDto);
+            friendResponseDtoList.add(FriendSimpleDto.from(friend, photo));
         }
 
         giftRepository.save(gift);

diff --git a/favor/src/main/java/com/favor/favor/reminder/ReminderService.java b/favor/src/main/java/com/favor/favor/reminder/ReminderService.java
@@ -91,7 +91,7 @@ public List<ReminderSimpleDto> readAll(){
             if(friend != null) {
                 User friendUser = findUserByUserNo(friend.getFriendUserNo());
                 UserPhoto photo = friendUser.getUserProfilePhoto();
-                friendsimpleDto = new FriendSimpleDto(friend, friendUser, photo);
+                friendsimpleDto = FriendSimpleDto.from(friend, photo);
             }
             ReminderSimpleDto dto = new ReminderSimpleDto(r, friendsimpleDto);
             r_List.add(dto);
@@ -170,7 +170,7 @@ public ReminderResponseDto returnDto(Reminder reminder){
         if(friend != null) {
             User friendUser = findUserByUserNo(friend.getFriendUserNo());
             UserPhoto photo = friendUser.getUserProfilePhoto();
-            dto = new FriendSimpleDto(friend, friendUser, photo);
+            dto = FriendSimpleDto.from(friend, photo);
         }
         return new ReminderResponseDto(reminder, dto);
     }

diff --git a/favor/src/main/java/com/favor/favor/user/UserController.java b/favor/src/main/java/com/favor/favor/user/UserController.java
@@ -160,9 +160,7 @@ public ResponseEntity<DefaultResponseDto<Object>> updateUser(
             @AuthenticationPrincipal User loginUser,
             @RequestBody @Valid UserUpdateRequestDto userUpdateRequestDto
     ){
-
         Long userNo = loginUser.getUserNo();
-        userService.isExistingUserNo(userNo);
         UserResponseDto dto = userService.updateUser(userNo, userUpdateRequestDto);
 
         return ResponseEntity.status(200)

diff --git a/favor/src/main/java/com/favor/favor/user/UserService.java b/favor/src/main/java/com/favor/favor/user/UserService.java
@@ -99,6 +99,10 @@ public void isRightPassword(String password, User user){
 
     @Transactional
     public UserResponseDto updateUser(Long userNo, UserUpdateRequestDto userUpdateRequestDto){
+
+        isExistingUserNo(userNo);
+        isExistingUserId(userUpdateRequestDto.getUserId());
+
         User user = findUserByUserNo(userNo);
         user.setName(userUpdateRequestDto.getName());
         user.setUserId(userUpdateRequestDto.getUserId());
@@ -243,7 +247,7 @@ public List<ReminderSimpleDto> readReminderListByFMonthAndYear(Long userNo, int
                     if (friend != null) {
                         User friendUser = findUserByUserNo(friend.getFriendUserNo());
                         UserPhoto photo = friendUser != null ? friendUser.getUserProfilePhoto() : null;
-                        friendDto = new FriendSimpleDto(friend, friendUser, photo);
+                        friendDto = FriendSimpleDto.from(friend, photo);
                     }
                     return new ReminderSimpleDto(reminder, friendDto);
                 })
@@ -281,7 +285,7 @@ public List<ReminderSimpleDto> readReminderList(Long userNo) {
                     if (friend != null) {
                         User friendUser = findUserByUserNo(friend.getFriendUserNo());
                         UserPhoto photo = friendUser != null ? friendUser.getUserProfilePhoto() : null;
-                        friendDto = new FriendSimpleDto(friend, friendUser, photo);
+                        friendDto = FriendSimpleDto.from(friend, photo);
                     }
                     return new ReminderSimpleDto(reminder, friendDto);
                 }).collect(Collectors.toList());
@@ -292,8 +296,9 @@ public List<FriendSimpleDto> readFriendList(Long userNo) {
         User user = findUserByUserNo(userNo);
         return user.getFriendList().stream()
                 .map(friend -> {
-                    User friendUser = findUserByUserNo(friend.getFriendUserNo()); // Retrieve the user associated with the friend
-                    return new FriendSimpleDto(friend, friendUser, friendUser.getUserProfilePhoto());
+                    User friendUser = findUserByUserNo(friend.getFriendUserNo());
+                    UserPhoto photo = friendUser != null ? friendUser.getUserProfilePhoto() : null;
+                    return  FriendSimpleDto.from(friend, photo);
                 })
                 .collect(Collectors.toList());
     }