Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

✨ list blocked users and unblock #451

Open
wants to merge 5 commits into
base: be/dev
Choose a base branch
from
Open

✨ list blocked users and unblock #451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6945612
Create PR for #450
github-actions[bot] Jan 19, 2025
d9e2076
:sparkles: unblock user
hyxrxn Jan 19, 2025
1ae05fa
Merge branch 'be/dev' of https://github.com/woowacourse-teams/2024-pe…
hyxrxn Feb 10, 2025
b28e1d2
:sparkles: list blocked users
hyxrxn Feb 10, 2025
117ad76
Merge branch 'be/dev' into be/feat/450
hyxrxn Feb 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 25 additions & 13 deletions backend/src/main/java/net/pengcook/user/controller/UserController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,47 +27,49 @@
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseStatus;
import org.springframework.web.bind.annotation.RestController;

@RestController
@RequiredArgsConstructor
@RequestMapping("/user")
public class UserController {

private final UserService userService;
private final UserFollowService userFollowService;

@GetMapping("/user/me")
@GetMapping("/me")
public ProfileResponse getUserProfile(@LoginUser UserInfo userInfo) {
return userService.getProfile(userInfo.getId(), userInfo.getId());
}

@GetMapping("/user/{userId}")
@GetMapping("/{userId}")
public ProfileResponse getUserProfile(@LoginUser UserInfo userInfo, @PathVariable long userId) {
return userService.getProfile(userInfo.getId(), userId);
}

@PatchMapping("/user/me")
@PatchMapping("/me")
public UpdateProfileResponse updateUserProfile(
@LoginUser UserInfo userInfo,
@RequestBody @Valid UpdateProfileRequest updateProfileRequest
) {
return userService.updateProfile(userInfo.getId(), updateProfileRequest);
}

@DeleteMapping("/user/me")
@DeleteMapping("/me")
@ResponseStatus(HttpStatus.NO_CONTENT)
public void deleteUser(@LoginUser UserInfo userInfo) {
userService.deleteUser(userInfo);
}

@GetMapping("/user/username/check")
@GetMapping("/username/check")
public UsernameCheckResponse checkUsername(@RequestParam @NotBlank String username) {
return userService.checkUsername(username);
}

@PostMapping("/user/report")
@PostMapping("/report")
@ResponseStatus(HttpStatus.CREATED)
public ReportResponse report(
@LoginUser UserInfo userInfo,
Expand All @@ -76,12 +78,12 @@ public ReportResponse report(
return userService.report(userInfo.getId(), reportRequest);
}

@GetMapping("/user/report/reason")
@GetMapping("/report/reason")
public List<ReportReasonResponse> getReportReasons() {
return ReportReasonResponse.REASONS;
}

@PostMapping("/user/block")
@PostMapping("/block")
@ResponseStatus(HttpStatus.CREATED)
public UserBlockResponse blockUser(
@LoginUser UserInfo userInfo,
Expand All @@ -90,7 +92,17 @@ public UserBlockResponse blockUser(
return userService.blockUser(userInfo.getId(), userBlockRequest.blockeeId());
}

@PostMapping("/user/follow")
@DeleteMapping("/block")
@ResponseStatus(HttpStatus.NO_CONTENT)
public void deleteBlock(@LoginUser UserInfo userInfo, @RequestBody @Valid UserBlockRequest userBlockRequest) {
userService.deleteBlock(userInfo.getId(), userBlockRequest.blockeeId());
}

@GetMapping("/block/list")
public List<UserBlockResponse> getBlockees(@LoginUser UserInfo userInfo) {
return userService.getBlockeesOf(userInfo.getId());

@PostMapping("/follow")
@ResponseStatus(HttpStatus.CREATED)
public UserFollowResponse followUser(
@LoginUser UserInfo userInfo,
Expand All @@ -99,7 +111,7 @@ public UserFollowResponse followUser(
return userFollowService.followUser(userInfo.getId(), userFollowRequest.targetId());
}

@DeleteMapping("/user/follow")
@DeleteMapping("/follow")
@ResponseStatus(HttpStatus.NO_CONTENT)
public void unfollowUser(
@LoginUser UserInfo userInfo,
Expand All @@ -108,7 +120,7 @@ public void unfollowUser(
userFollowService.unfollowUser(userInfo.getId(), userFollowRequest.targetId());
}

@DeleteMapping("/user/follower")
@DeleteMapping("/follower")
@ResponseStatus(HttpStatus.NO_CONTENT)
public void removeFollower(
@LoginUser UserInfo userInfo,
Expand All @@ -117,12 +129,12 @@ public void removeFollower(
userFollowService.unfollowUser(userFollowRequest.targetId(), userInfo.getId());
}

@GetMapping("/user/{userId}/follower")
@GetMapping("/{userId}/follower")
public FollowInfoResponse getFollowerInfo(@PathVariable long userId) {
return userFollowService.getFollowerInfo(userId);
}

@GetMapping("/user/{userId}/following")
@GetMapping("/{userId}/following")
public FollowInfoResponse getFollowingInfo(@PathVariable long userId) {
return userFollowService.getFollowingInfo(userId);
}
Expand Down
6 changes: 6 additions & 0 deletions backend/src/main/java/net/pengcook/user/dto/UserBlockResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
package net.pengcook.user.dto;

import net.pengcook.user.domain.UserBlock;

public record UserBlockResponse(UserResponse blocker, UserResponse blockee) {

public UserBlockResponse(UserBlock userBlock) {
this(new UserResponse(userBlock.getBlocker()), new UserResponse(userBlock.getBlockee()));
}
}
3 changes: 3 additions & 0 deletions backend/src/main/java/net/pengcook/user/repository/UserBlockRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package net.pengcook.user.repository;

import java.util.List;
import net.pengcook.user.domain.User;
import net.pengcook.user.domain.UserBlock;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
Expand All @@ -14,4 +15,6 @@ public interface UserBlockRepository extends JpaRepository<UserBlock, Long> {
void deleteByBlockerId(long blockerId);

boolean existsByBlockerIdAndBlockeeId(long blockerId, long blockeeId);

void deleteByBlockerAndBlockee(User blocker, User blockee);
}
23 changes: 20 additions & 3 deletions backend/src/main/java/net/pengcook/user/service/UserService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import net.pengcook.user.dto.UpdateProfileRequest;
import net.pengcook.user.dto.UpdateProfileResponse;
import net.pengcook.user.dto.UserBlockResponse;
import net.pengcook.user.dto.UserResponse;
import net.pengcook.user.dto.UsernameCheckResponse;
import net.pengcook.user.exception.NotFoundException;
import net.pengcook.user.exception.UserNotFoundException;
Expand Down Expand Up @@ -91,8 +90,26 @@ public UserBlockResponse blockUser(long blockerId, long blockeeId) {
userFollowService.blockUserFollow(blockerId, blockeeId);
UserBlock userBlock = userBlockRepository.save(new UserBlock(blocker, blockee));

return new UserBlockResponse(new UserResponse(userBlock.getBlocker()),
new UserResponse(userBlock.getBlockee()));
return new UserBlockResponse(userBlock);
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

}

@Transactional
public void deleteBlock(long blockerId, long blockeeId) {
User blocker = userRepository.findById(blockerId)
.orElseThrow(() -> new UserNotFoundException("정상적으로 로그인되지 않았습니다."));
User blockee = userRepository.findById(blockeeId)
.orElseThrow(() -> new UserNotFoundException("차단한 사용자를 찾을 수 없습니다."));

userBlockRepository.deleteByBlockerAndBlockee(blocker, blockee);
}

@Transactional(readOnly = true)
public List<UserBlockResponse> getBlockeesOf(long blockerId) {
List<UserBlock> userBlocks = userBlockRepository.findAllByBlockerId(blockerId);

return userBlocks.stream()
.map(UserBlockResponse::new)
.toList();
}

@Transactional
Expand Down
85 changes: 83 additions & 2 deletions backend/src/test/java/net/pengcook/user/controller/UserControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import net.pengcook.user.dto.UpdateProfileRequest;
import net.pengcook.user.dto.UpdateProfileResponse;
import net.pengcook.user.dto.UserBlockRequest;
import net.pengcook.user.repository.UserBlockRepository;
import net.pengcook.user.dto.UserFollowRequest;
import net.pengcook.user.repository.UserRepository;
import org.junit.jupiter.api.DisplayName;
Expand All @@ -42,7 +43,8 @@ class UserControllerTest extends RestDocsSetting {

@Autowired
UserRepository userRepository;

@Autowired
UserBlockRepository userBlockRepository;
@Autowired
ImageClientService imageClientService;

Expand Down Expand Up @@ -349,7 +351,86 @@ void blockUser() {
}

@Test
@WithLoginUser
@WithLoginUser(email = "[email protected]")
@DisplayName("사용자 차단을 해제한다.")
void deleteBlock() {
UserBlockRequest userBlockRequest = new UserBlockRequest(3L);

RestAssured.given(spec).log().all()
.filter(document(DEFAULT_RESTDOCS_PATH,
"사용자 차단을 해제합니다.",
"사용자 차단 해제 API",
requestFields(
fieldWithPath("blockeeId").description("차단한 사용자 ID")
)
))
.contentType(ContentType.JSON)
.body(userBlockRequest)
.when().delete("/user/block")
.then().log().all()
.statusCode(204);

boolean exists = userBlockRepository.existsByBlockerIdAndBlockeeId(1L, 3L);

assertThat(exists).isFalse();
}

@Test
@WithLoginUser(email = "[email protected]")
@DisplayName("사용자의 차단 목록을 불러온다.")
void getBlockeesOf() {
RestAssured.given(spec).log().all()
.filter(document(DEFAULT_RESTDOCS_PATH,
"로그인한 사용자의 차단 목록을 조회합니다.",
"차단 목록 조회 API",
responseFields(
fieldWithPath("[]").description("차단 목록"),
fieldWithPath("[].blocker.id").description("차단자 ID"),
fieldWithPath("[].blocker.email").description("차단자 이메일"),
fieldWithPath("[].blocker.username").description("차단자 아이디"),
fieldWithPath("[].blocker.nickname").description("차단자 닉네임"),
fieldWithPath("[].blocker.image").description("차단자 프로필 이미지"),
fieldWithPath("[].blocker.region").description("차단자 국가"),
fieldWithPath("[].blockee.id").description("차단대상 ID"),
fieldWithPath("[].blockee.email").description("차단대상 이메일"),
fieldWithPath("[].blockee.username").description("차단대상 아이디"),
fieldWithPath("[].blockee.nickname").description("차단대상 닉네임"),
fieldWithPath("[].blockee.image").description("차단대상 프로필 이미지"),
fieldWithPath("[].blockee.region").description("차단대상 국가")
)
))
.contentType(ContentType.JSON)
.when().get("/user/block/list")
.then().log().all()
.statusCode(200)
.body("[0].blocker.id", equalTo(1))
.body("[0].blocker.email", equalTo("[email protected]"))
.body("[0].blocker.username", equalTo("loki"))
.body("[0].blocker.nickname", equalTo("로키"))
.body("[0].blocker.image", equalTo("loki.jpg"))
.body("[0].blocker.region", equalTo("KOREA"))
.body("[0].blockee.id", equalTo(3))
.body("[0].blockee.email", equalTo("[email protected]"))
.body("[0].blockee.username", equalTo("crocodile"))
.body("[0].blockee.nickname", equalTo("악어"))
.body("[0].blockee.image", equalTo("crocodile.jpg"))
.body("[0].blockee.region", equalTo("KOREA"))
.body("[1].blocker.id", equalTo(1))
.body("[1].blocker.email", equalTo("[email protected]"))
.body("[1].blocker.username", equalTo("loki"))
.body("[1].blocker.nickname", equalTo("로키"))
.body("[1].blocker.image", equalTo("loki.jpg"))
.body("[1].blocker.region", equalTo("KOREA"))
.body("[1].blockee.id", equalTo(4))
.body("[1].blockee.email", equalTo("[email protected]"))
.body("[1].blockee.username", equalTo("birdsheep"))
.body("[1].blockee.nickname", equalTo("새양"))
.body("[1].blockee.image", equalTo("birdsheep.jpg"))
.body("[1].blockee.region", equalTo("KOREA"));
}

@Test
@WithLoginUser(email = "[email protected]")
@DisplayName("사용자를 삭제한다.")
void deleteUser() {
RestAssured.given(spec).log().all()
Expand Down
63 changes: 60 additions & 3 deletions backend/src/test/java/net/pengcook/user/service/UserServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.junit.jupiter.api.Assertions.assertAll;

import java.util.List;
import net.pengcook.authentication.domain.UserInfo;
import net.pengcook.comment.repository.CommentRepository;
import net.pengcook.image.service.ImageClientService;
Expand Down Expand Up @@ -195,7 +196,11 @@ void blockUser() {

UserBlockResponse actual = userService.blockUser(blockerId, blockeeId);

assertThat(actual).isEqualTo(expected);
assertAll(
() -> assertThat(actual).isEqualTo(expected),
() -> assertThat(userBlockRepository.existsByBlockerIdAndBlockeeId(1L, 2L)).isTrue()

);
Comment on lines +199 to +203
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍👍

}

@Test
Expand Down Expand Up @@ -249,6 +254,58 @@ void blockUserWhenNotExistBlockee() {
.hasMessage("차단할 사용자를 찾을 수 없습니다.");
}

@Test
@DisplayName("사용자 차단을 해제한다.")
void deleteBlock() {
long blockerId = 1L;
long blockeeId = 3L;

userService.deleteBlock(blockerId, blockeeId);

assertThat(userBlockRepository.existsByBlockerIdAndBlockeeId(1L, 3L)).isFalse();
}

@Test
@DisplayName("차단을 해제하는 사용자가 존재하지 않으면 예외가 발생한다.")
void deleteBlockWhenNotExistBlocker() {
long blockerId = 2000L;
long blockeeId = 3L;

assertThatThrownBy(() -> userService.deleteBlock(blockerId, blockeeId))
.isInstanceOf(UserNotFoundException.class)
.hasMessage("정상적으로 로그인되지 않았습니다.");
}

@Test
@DisplayName("차단당한 사용자가 존재하지 않으면 예외가 발생한다.")
void deleteBlockWhenNotExistBlockee() {
long blockerId = 1L;
long blockeeId = 2000L;

assertThatThrownBy(() -> userService.deleteBlock(blockerId, blockeeId))
.isInstanceOf(UserNotFoundException.class)
.hasMessage("차단한 사용자를 찾을 수 없습니다.");
}

@Test
@DisplayName("차단 목록을 불러온다.")
void getBlockeesOf() {
long blockerId = 1L;
List<UserBlockResponse> expected = List.of(
new UserBlockResponse(
new UserResponse(blockerId, "[email protected]", "loki", "로키", "loki.jpg", "KOREA"),
new UserResponse(3L, "[email protected]", "crocodile", "악어", "crocodile.jpg", "KOREA")
),
new UserBlockResponse(
new UserResponse(blockerId, "[email protected]", "loki", "로키", "loki.jpg", "KOREA"),
new UserResponse(4L, "[email protected]", "birdsheep", "새양", "birdsheep.jpg", "KOREA")
));

List<UserBlockResponse> userBlockResponses = userService.getBlockeesOf(blockerId);

assertThat(userBlockResponses).containsExactlyElementsOf(expected);
}

@Test
@DisplayName("차단한 사용자들의 목록을 불러올 수 있다.")
void getBlockedUserGroup() {
Expand All @@ -257,9 +314,9 @@ void getBlockedUserGroup() {
BlockedUserGroup blockedUserGroup = userService.getBlockedUserGroup(blockerId);

assertAll(
() -> assertThat(blockedUserGroup.isBlocked(2L)).isTrue(),
() -> assertThat(blockedUserGroup.isBlocked(2L)).isFalse(),
() -> assertThat(blockedUserGroup.isBlocked(3L)).isTrue(),
() -> assertThat(blockedUserGroup.isBlocked(4L)).isFalse()
() -> assertThat(blockedUserGroup.isBlocked(4L)).isTrue()
);
}

Expand Down
Loading