Merge pull request #58 from FlouD-2024/mypage

Fix: 친구 관련 알람 생성
FlouD-2024 · Mar 27, 2024 · a8cab1c · a8cab1c
2 parents 97e45f1 + d27f017
commit a8cab1c
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/main/java/floud/demo/service/FriendshipService.java b/src/main/java/floud/demo/service/FriendshipService.java
@@ -104,7 +104,7 @@ public ApiResponse<?> addFriend(String authorizationHeader, FriendshipCreateRequ
         friendshipRepository.save(newFriendship);
 
         //Create Alarm
-        createAlarm(users, friend);
+        createAlarm(users, friend,"새로운 친구 신청이 왔습니다.");
 
         return ApiResponse.success(Success.REQUEST_FRIEND_SUCCESS, Map.of("friendship_id", newFriendship.getId()));
     }
@@ -151,7 +151,8 @@ public ApiResponse<?> updateFriend(String authorizationHeader, FriendUpdateReque
         friendship.updateStatus(requestDto.getFriendshipStatus());
 
         //Create Alarm
-        createAlarm(friendship.getFrom_user(), users);
+        if(requestDto.getFriendshipStatus().equals(FriendshipStatus.ACCEPT))
+            createAlarm(users, friendship.getFrom_user(), "친구 신청이 수락 되었습니다. ");
 
         return ApiResponse.success(Success.UPDATE_FRIEND_SUCCESS, Map.of("nowStatus", friendship.getFriendshipStatus()));
     }
@@ -185,8 +186,7 @@ public ApiResponse<?> deleteFriend(String authorizationHeader, Long friendship_i
 
     }
 
-    private void createAlarm(Users from_user, Users to_user){
-        String message = "친구 신청이 왔습니다.";
+    private void createAlarm(Users from_user, Users to_user, String message){
         alarmRepository.save(new Alarm(to_user, from_user.getNickname(), AlarmType.FRIEND, message));
     }