diff --git a/out/production/classes/com/flag/flag_back/Controller/FriendController.class b/out/production/classes/com/flag/flag_back/Controller/FriendController.class index bf01286..2d8a864 100644 Binary files a/out/production/classes/com/flag/flag_back/Controller/FriendController.class and b/out/production/classes/com/flag/flag_back/Controller/FriendController.class differ diff --git a/out/production/classes/com/flag/flag_back/config/BaseResponseStatus.class b/out/production/classes/com/flag/flag_back/config/BaseResponseStatus.class index 06eec70..5e935df 100644 Binary files a/out/production/classes/com/flag/flag_back/config/BaseResponseStatus.class and b/out/production/classes/com/flag/flag_back/config/BaseResponseStatus.class differ diff --git a/out/production/classes/com/flag/flag_back/service/FriendService.class b/out/production/classes/com/flag/flag_back/service/FriendService.class index c72879f..1d3b92a 100644 Binary files a/out/production/classes/com/flag/flag_back/service/FriendService.class and b/out/production/classes/com/flag/flag_back/service/FriendService.class differ diff --git a/src/main/java/com/flag/flag_back/Controller/FriendController.java b/src/main/java/com/flag/flag_back/Controller/FriendController.java index 6c1a3de..b25eac8 100644 --- a/src/main/java/com/flag/flag_back/Controller/FriendController.java +++ b/src/main/java/com/flag/flag_back/Controller/FriendController.java @@ -165,7 +165,7 @@ public UserResponse searchFriendsList(@RequestHeader(value = "Authorization", re //친구 삭제 @DeleteMapping("/delete") @Operation(summary = "친구 삭제", description = "친구 삭제 API") - public Map delete(@RequestHeader(value = "Authorization", required = false) String token, @RequestBody @Valid Long fid) { + public Map delete(@RequestHeader(value = "Authorization", required = false) String token, @RequestBody @Valid String name) { if (token == null || !jwtTokenProvider.validateToken(token)) { Map invalidTokenResponse = new HashMap<>(); @@ -178,7 +178,7 @@ public Map delete(@RequestHeader(value = "Authorization", requir User user = userRepository.findUserByEmail(email); Map response = new HashMap<>(); - if (friendService.delete(user.getUserId(), fid) > 0) { + if (friendService.delete(user.getUserId(), name) > 0) { response.put("result", "SUCCESS"); } else { response.put("result", "FAIL"); diff --git a/src/main/java/com/flag/flag_back/service/FriendService.java b/src/main/java/com/flag/flag_back/service/FriendService.java index 6b18330..7ce64a2 100644 --- a/src/main/java/com/flag/flag_back/service/FriendService.java +++ b/src/main/java/com/flag/flag_back/service/FriendService.java @@ -89,8 +89,9 @@ public boolean checkFriendById2(Long id, Long fid) { } // @Transactional - public Integer delete(Long id, Long fid) { - Friend friend = friendJpaRepository.findUserEntityByUserIdAndUserId2(id, fid); + public Integer delete(Long id, String name) { + User user = userRepository.findUserByName(name); + Friend friend = friendJpaRepository.findUserEntityByUserIdAndUserId2(id, user.getUserId()); if(friend != null) { friendJpaRepository.delete(friend); return 1;