diff --git a/src/main/java/com/investment/findfriend/domain/feed/service/GetFeedService.java b/src/main/java/com/investment/findfriend/domain/feed/service/GetFeedService.java index b7c9798..8567d3d 100644 --- a/src/main/java/com/investment/findfriend/domain/feed/service/GetFeedService.java +++ b/src/main/java/com/investment/findfriend/domain/feed/service/GetFeedService.java @@ -24,7 +24,7 @@ public ResponseEntity execute(Long feedId) { .name(feed.getFriend().getName()) .content(feed.getContent()) .tags(feed.getTags()) - .url(serverProperties.getUrl() + "/file?fileId=" + feed.getFriend().getFile().getId()) + .url(feed.getFriend().getFile() != null ? serverProperties.getUrl() + "/file?fileId=" + feed.getFriend().getFile().getId() : null) .build() ); } diff --git a/src/main/java/com/investment/findfriend/domain/friend/presentation/FriendController.java b/src/main/java/com/investment/findfriend/domain/friend/presentation/FriendController.java index 507ae2e..0196c6a 100644 --- a/src/main/java/com/investment/findfriend/domain/friend/presentation/FriendController.java +++ b/src/main/java/com/investment/findfriend/domain/friend/presentation/FriendController.java @@ -22,6 +22,7 @@ public class FriendController { private final GetFriendListService getFriendListService; private final UpdateAuthorityService updateAuthorityService; private final GetFreeFriendListService getFreeFriendListService; + private final DeleteFriendService deleteFriendService; @PostMapping(value = "/meet", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) @@ -44,4 +45,9 @@ public ResponseEntity> getFreeFriendList() { return getFreeFriendListService.execute(); } + @DeleteMapping + public ResponseEntity leftFriend(@RequestParam Long friendId) { + return deleteFriendService.execute(friendId); + } + } diff --git a/src/main/java/com/investment/findfriend/domain/friend/service/DeleteFriendService.java b/src/main/java/com/investment/findfriend/domain/friend/service/DeleteFriendService.java new file mode 100644 index 0000000..0f2faf9 --- /dev/null +++ b/src/main/java/com/investment/findfriend/domain/friend/service/DeleteFriendService.java @@ -0,0 +1,20 @@ +package com.investment.findfriend.domain.friend.service; + +import com.investment.findfriend.domain.friend.repository.FriendRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +@RequiredArgsConstructor +@Transactional +public class DeleteFriendService { + + private final FriendRepository friendRepository; + + public ResponseEntity execute(Long friendId) { + friendRepository.deleteById(friendId); + return ResponseEntity.ok("success"); + } +}