-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #8 from Hackathon0704/feat/3
[feat/3] 친구 추가, 친구 삭제, 친구 목록 조회
- Loading branch information
Showing
7 changed files
with
177 additions
and
0 deletions.
There are no files selected for viewing
39 changes: 39 additions & 0 deletions
39
src/main/java/com/umc/dream/controller/FollowController.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
package com.umc.dream.controller; | ||
|
||
import com.umc.dream.apiPayload.ApiResponse; | ||
import com.umc.dream.converter.FollowConverter; | ||
import com.umc.dream.domain.Follow; | ||
import com.umc.dream.dto.FollowRequestDto; | ||
import com.umc.dream.dto.FollowResponseDto; | ||
import com.umc.dream.dto.ViewFollowResponseDto; | ||
import com.umc.dream.service.FollowService; | ||
import lombok.AllArgsConstructor; | ||
import org.springframework.web.bind.annotation.*; | ||
|
||
import java.util.List; | ||
|
||
@RestController | ||
@AllArgsConstructor | ||
public class FollowController { | ||
|
||
private final FollowService followService; | ||
|
||
@PostMapping("/user/follow") | ||
public ApiResponse<FollowResponseDto> follow(@RequestBody FollowRequestDto followRequestDto) { | ||
Follow f = followService.follow(followRequestDto); | ||
FollowResponseDto followResponseDto = FollowConverter.toFollowResponse(f); | ||
return ApiResponse.onSuccess(followResponseDto); | ||
} | ||
|
||
@DeleteMapping("/user/followCancel") | ||
public ApiResponse<?> followCancel(@RequestBody FollowRequestDto followRequestDto) { | ||
followService.followCancel(followRequestDto); | ||
return ApiResponse.onSuccess("팔로우 취소됨"); | ||
} | ||
|
||
@GetMapping("/user/{user_id}/following") | ||
public ApiResponse<List<ViewFollowResponseDto>> viewFollowings(@PathVariable Long user_id) { | ||
List<ViewFollowResponseDto> viewFollowResponseDtos = followService.viewFollowings(user_id); | ||
return ApiResponse.onSuccess(viewFollowResponseDtos); | ||
} | ||
} |
13 changes: 13 additions & 0 deletions
13
src/main/java/com/umc/dream/converter/FollowConverter.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
package com.umc.dream.converter; | ||
|
||
import com.umc.dream.domain.Follow; | ||
import com.umc.dream.dto.FollowResponseDto; | ||
|
||
public class FollowConverter { | ||
|
||
public static FollowResponseDto toFollowResponse(Follow follow) { | ||
return FollowResponseDto.builder() | ||
.updatedAt(follow.getFollower().getLastModifiedDate()) | ||
.build(); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
package com.umc.dream.dto; | ||
|
||
import com.umc.dream.domain.Follow; | ||
import lombok.Builder; | ||
import lombok.Getter; | ||
import lombok.NoArgsConstructor; | ||
|
||
@Getter | ||
@NoArgsConstructor | ||
public class FollowRequestDto { | ||
private Long followerId; | ||
private Long acceptorId; | ||
|
||
@Builder | ||
public FollowRequestDto(Follow follow) { | ||
this.followerId = follow.getFollower().getId(); | ||
this.acceptorId = follow.getAcceptor().getId(); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
package com.umc.dream.dto; | ||
|
||
import lombok.AllArgsConstructor; | ||
import lombok.Builder; | ||
import lombok.Getter; | ||
import lombok.NoArgsConstructor; | ||
|
||
import java.time.LocalDateTime; | ||
|
||
@Builder | ||
@Getter | ||
@NoArgsConstructor | ||
@AllArgsConstructor | ||
public class FollowResponseDto { | ||
private LocalDateTime updatedAt; | ||
} |
15 changes: 15 additions & 0 deletions
15
src/main/java/com/umc/dream/dto/ViewFollowResponseDto.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
package com.umc.dream.dto; | ||
|
||
import lombok.AllArgsConstructor; | ||
import lombok.Builder; | ||
import lombok.Getter; | ||
import lombok.NoArgsConstructor; | ||
|
||
@Builder | ||
@Getter | ||
@NoArgsConstructor | ||
@AllArgsConstructor | ||
public class ViewFollowResponseDto { | ||
private Long userId; | ||
private String name; | ||
} |
13 changes: 13 additions & 0 deletions
13
src/main/java/com/umc/dream/repository/FollowRepository.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
package com.umc.dream.repository; | ||
|
||
import com.umc.dream.domain.Follow; | ||
import com.umc.dream.domain.User; | ||
import org.springframework.data.jpa.repository.JpaRepository; | ||
|
||
import java.util.List; | ||
|
||
public interface FollowRepository extends JpaRepository<Follow, Long> { | ||
List<Follow> findAllByFollower_Id(Long memberId); | ||
|
||
Follow findByFollowerAndAcceptor(User follower, User acceptor); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,62 @@ | ||
package com.umc.dream.service; | ||
|
||
import com.umc.dream.apiPayload.code.status.ErrorStatus; | ||
import com.umc.dream.apiPayload.exception.GeneralException; | ||
import com.umc.dream.domain.Follow; | ||
import com.umc.dream.domain.User; | ||
import com.umc.dream.dto.FollowRequestDto; | ||
import com.umc.dream.dto.ViewFollowResponseDto; | ||
import com.umc.dream.repository.FollowRepository; | ||
import com.umc.dream.repository.UserRepository; | ||
import jakarta.transaction.Transactional; | ||
import lombok.RequiredArgsConstructor; | ||
import org.springframework.stereotype.Service; | ||
|
||
import java.util.ArrayList; | ||
import java.util.List; | ||
|
||
@Service | ||
@RequiredArgsConstructor | ||
public class FollowService { | ||
|
||
private final FollowRepository followRepository; | ||
private final UserRepository userRepository; | ||
@Transactional | ||
public Follow follow(FollowRequestDto followRequestDto) { | ||
User follower = userRepository.findById(followRequestDto.getFollowerId()) | ||
.orElseThrow(() -> new GeneralException(ErrorStatus._BAD_REQUEST)); | ||
User acceptor = userRepository.findById(followRequestDto.getAcceptorId()) | ||
.orElseThrow(() -> new GeneralException(ErrorStatus._BAD_REQUEST)); | ||
Follow f = Follow.builder() | ||
.follower(follower) | ||
.acceptor(acceptor) | ||
.build(); | ||
followRepository.save(f); | ||
return f; | ||
} | ||
|
||
@Transactional | ||
public void followCancel(FollowRequestDto followRequestDto) { | ||
User follower = userRepository.findById(followRequestDto.getFollowerId()) | ||
.orElseThrow(() -> new GeneralException(ErrorStatus._BAD_REQUEST)); | ||
User acceptor = userRepository.findById(followRequestDto.getAcceptorId()) | ||
.orElseThrow(() -> new GeneralException(ErrorStatus._BAD_REQUEST)); | ||
Follow f = followRepository.findByFollowerAndAcceptor(follower,acceptor); | ||
followRepository.delete(f); | ||
} | ||
|
||
@Transactional | ||
public List<ViewFollowResponseDto> viewFollowings(Long memberId) { | ||
List<Follow> follows = followRepository.findAllByFollower_Id(memberId); | ||
List<ViewFollowResponseDto> viewFollowResponseDtos = new ArrayList<>(); | ||
for(Follow follow : follows) { | ||
User user = follow.getAcceptor(); | ||
ViewFollowResponseDto viewFollowResponseDto = ViewFollowResponseDto.builder() | ||
.userId(user.getId()) | ||
.name(user.getName()) | ||
.build(); | ||
viewFollowResponseDtos.add(viewFollowResponseDto); | ||
} | ||
return viewFollowResponseDtos; | ||
} | ||
} |