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.

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

feat: 커플 연결 해제 API #34

Merged
merged 5 commits into from
Jun 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import com.lovemarker.global.dto.ApiResponseDto;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
Expand Down Expand Up @@ -38,4 +39,12 @@ public ApiResponseDto joinCouple(
coupleService.joinCouple(userId, joinCoupleRequest.invitationCode());
return ApiResponseDto.success(SuccessCode.JOIN_COUPLE_SUCCESS);
}

@DeleteMapping
public ApiResponseDto disconnectCouple(
@UserId Long userId
) {
coupleService.disconnectCouple(userId);
return ApiResponseDto.success(SuccessCode.DISCONNECT_COUPLE_SUCCESS);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import com.lovemarker.domain.user.User;
import com.lovemarker.domain.user.exception.UserNotFoundException;
import com.lovemarker.domain.user.repository.UserRepository;
import com.lovemarker.global.aspect.CouplePermissionCheck;
import com.lovemarker.global.constant.ErrorCode;
import com.lovemarker.global.exception.BadRequestException;
import com.lovemarker.global.exception.NotFoundException;
Expand Down Expand Up @@ -40,6 +41,13 @@ public void joinCouple(Long userId, String invitationCode) {
user.connectCouple(couple);
}

@Transactional
@CouplePermissionCheck
public void disconnectCouple(Long userId) {
User user = getUserByUserId(userId);
user.disconnectCouple();
}

private User getUserByUserId(Long userId) {
return userRepository.findById(userId)
.orElseThrow(() -> new UserNotFoundException(ErrorCode.NOT_FOUND_EXCEPTION, "존재하지 않는 유저입니다."));
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/com/lovemarker/domain/user/User.java
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,10 @@ public void connectCouple(Couple couple) {
this.couple = couple;
}

public void disconnectCouple() {
this.couple = null;
}

public void updateUserNickname(String nickname) {
this.nickname = new UserNickname(nickname);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ public enum SuccessCode {
FIND_MEMORY_DETAIL_SUCCESS(HttpStatus.OK, "추억 상세 조회에 성공했습니다."),
FIND_MEMORY_LIST_SUCCESS(HttpStatus.OK, "추억 리스트뷰 조회에 성공했습니다."),
FIND_MY_MEMORY_LIST_SUCCESS(HttpStatus.OK, "내가 올린 추억 조회에 성공했습니다."),
DISCONNECT_COUPLE_SUCCESS(HttpStatus.OK, "커플 연결 해제에 성공했습니다."),

// 201
CREATE_INVITATION_CODE_SUCCESS(HttpStatus.CREATED, "초대 코드 생성을 성공했습니다."),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath;
import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields;
import static org.springframework.restdocs.payload.PayloadDocumentation.responseFields;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;

import com.lovemarker.base.BaseControllerTest;
Expand Down Expand Up @@ -89,4 +90,29 @@ void joinCouple() throws Exception {
)
));
}

@Test
@DisplayName("성공: 커플 연결 해제 api 호출 시")
void disconnectCouple() throws Exception {
//given
Long userId = 1L;

//when
ResultActions resultActions = mockMvc.perform(delete("/api/couple")
.header("userId", userId));

//then
resultActions
.andDo(restDocs.document(
requestHeaders(
headerWithName("userId").description("유저 아이디")
),
responseFields(
fieldWithPath("status").type(NUMBER).description("상태 코드"),
fieldWithPath("success").type(BOOLEAN).description("성공 여부"),
fieldWithPath("message").type(STRING).description("메시지"),
fieldWithPath("data").ignored()
)
));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import com.lovemarker.domain.couple.fixture.CoupleFixture;
import com.lovemarker.domain.couple.repository.CoupleRepository;
import com.lovemarker.domain.user.User;
import com.lovemarker.domain.user.exception.UserNotFoundException;
import com.lovemarker.domain.user.fixture.UserFixture;
import com.lovemarker.domain.user.repository.UserRepository;
import com.lovemarker.global.exception.BadRequestException;
Expand Down Expand Up @@ -134,4 +135,38 @@ void exceptionWhenCoupleAlreadyConnected() {
assertThat(exception).isInstanceOf(BadRequestException.class);
}
}

@Nested
@DisplayName("disconnectCouple 메서드 실행 시")
class DisconnectCoupleTest {

User user = UserFixture.user();
Couple couple = CoupleFixture.couple();

@Test
@DisplayName("성공")
void disconnectCouple() {
//given
user.connectCouple(couple);

given(userRepository.findById(anyLong())).willReturn(Optional.ofNullable(user));

//when
coupleService.disconnectCouple(1L);

//then
assertThat(user.getCouple()).isEqualTo(null);
}

@Test
@DisplayName("예외(UserNotFoundException): 존재하지 않는 유저")
void exceptionWhenUserNotFound() {
//given
//when
Exception exception = catchException(() -> coupleService.disconnectCouple(1L));

//then
assertThat(exception).isInstanceOf(UserNotFoundException.class);
}
}
}
21 changes: 21 additions & 0 deletions src/test/java/com/lovemarker/domain/user/UserTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -79,4 +79,25 @@ void exceptionWhenCoupleIsNotNull() {
assertThat(exception).isInstanceOf(BadRequestException.class);
}
}

@Nested
@DisplayName("커플 연결 해제 시")
class DisconnectCoupleTest {

User user = UserFixture.user();
Couple couple = CoupleFixture.couple();

@Test
@DisplayName("성공")
void disconnectCouple() {
//given
user.connectCouple(couple);

//when
user.disconnectCouple();

//then
assertThat(user.getCouple()).isNull();
}
}
}
Loading