Skip to content

Commit

Permalink
test: "사용자가 참여한 혹은 만든 게스트 모집글 목록 조회" 기능에 대한 문서화 테스트코드 수정
Browse files Browse the repository at this point in the history
  • Loading branch information
kylekim2123 committed Nov 30, 2023
1 parent 517b123 commit 1f01cdc
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 16 deletions.
32 changes: 18 additions & 14 deletions src/main/java/kr/pickple/back/alarm/service/GameAlarmService.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
package kr.pickple.back.alarm.service;

import static kr.pickple.back.alarm.domain.GameAlarmType.*;
import static kr.pickple.back.alarm.exception.AlarmExceptionCode.*;
import static kr.pickple.back.game.exception.GameExceptionCode.*;
import static kr.pickple.back.member.exception.MemberExceptionCode.*;

import java.util.List;
import java.util.Optional;

import org.springframework.data.domain.PageRequest;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import kr.pickple.back.alarm.domain.GameAlarm;
import kr.pickple.back.alarm.dto.request.GameAlarmUpdateStatusRequest;
import kr.pickple.back.alarm.dto.response.GameAlarmResponse;
Expand All @@ -15,18 +27,6 @@
import kr.pickple.back.member.exception.MemberException;
import kr.pickple.back.member.repository.MemberRepository;
import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.PageRequest;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.List;
import java.util.Optional;

import static kr.pickple.back.alarm.domain.GameAlarmType.*;
import static kr.pickple.back.alarm.exception.AlarmExceptionCode.ALARM_NOT_FOUND;
import static kr.pickple.back.game.exception.GameExceptionCode.GAME_IS_NOT_HOST;
import static kr.pickple.back.game.exception.GameExceptionCode.GAME_NOT_FOUND;
import static kr.pickple.back.member.exception.MemberExceptionCode.MEMBER_NOT_FOUND;

@Service
@RequiredArgsConstructor
Expand Down Expand Up @@ -102,7 +102,7 @@ private void validateIsHost(final GameJoinRequestNotificationEvent gameJoinReque
final Game game = gameRepository.findById(gameId).orElseThrow(() -> new GameException(GAME_NOT_FOUND, gameId));

if (!game.isHost(gameJoinRequestNotificationEvent.getMemberId())) {
throw new GameException(GAME_IS_NOT_HOST, gameId, game.getHost());
throw new GameException(GAME_MEMBER_IS_NOT_HOST, gameId, game.getHost());
}
}

Expand All @@ -117,7 +117,11 @@ private Member getMemberInfo(final Long memberId) {
.orElseThrow(() -> new MemberException(MEMBER_NOT_FOUND, memberId));
}

public List<GameAlarmResponse> findByMemberId(final Long loggedInMemberId, final Optional<Long> optionalCursorId, final Integer size) {
public List<GameAlarmResponse> findByMemberId(
final Long loggedInMemberId,
final Optional<Long> optionalCursorId,
final Integer size
) {
final List<GameAlarm> gameAlarms = optionalCursorId
.map(cursorId -> gameAlarmRepository.findByMemberIdAndIdLessThanOrderByCreatedAtDesc(
loggedInMemberId,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ public enum GameExceptionCode implements ExceptionCode {
GAME_MEMBER_CANNOT_REVIEW_SELF(HttpStatus.BAD_REQUEST, "GAM-012", "자기 자신에게 리뷰를 남길 수 없음"),
GAME_CAPACITY_LIMIT_REACHED(HttpStatus.BAD_REQUEST, "GAM-013", "해당 게스트 모집글의 정원을 초과할 수 없음"),
GAME_STATUS_IS_CLOSED(HttpStatus.BAD_REQUEST, "GAM-014", "해당 게스트 모집글은 모집중이 아님"),
GAME_IS_NOT_HOST(HttpStatus.BAD_REQUEST, "GAM-013", "해당 게임의 호스트가 아님"),
GAME_MEMBER_NOT_ALLOWED_TO_REVIEW_AGAIN(HttpStatus.BAD_REQUEST, "GAM-014", "이미 리뷰를 한 사용자는 다시 리뷰할 수 없음"),
GAME_MEMBER_NOT_ALLOWED_TO_REVIEW_AGAIN(HttpStatus.BAD_REQUEST, "GAM-015", "이미 리뷰를 한 사용자는 다시 리뷰할 수 없음"),
;

private final HttpStatus status;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -448,6 +448,7 @@ void findAllMemberGames_ReturnGameResponses() throws Exception {
fieldWithPath("[].latitude").type(JsonFieldType.VARIES).description("위도"),
fieldWithPath("[].longitude").type(JsonFieldType.VARIES).description("경도"),
fieldWithPath("[].status").type(JsonFieldType.STRING).description("게스트 모집 상태"),
fieldWithPath("[].isReviewDone").type(JsonFieldType.BOOLEAN).description("리뷰 완료 여부"),
fieldWithPath("[].viewCount").type(JsonFieldType.NUMBER).description("조회 수"),
fieldWithPath("[].cost").type(JsonFieldType.NUMBER).description("비용"),
fieldWithPath("[].memberCount").type(JsonFieldType.NUMBER).description("인원 수"),
Expand Down Expand Up @@ -558,6 +559,7 @@ void findAllCreatedGames_ReturnGameResponses() throws Exception {
fieldWithPath("[].latitude").type(JsonFieldType.VARIES).description("위도"),
fieldWithPath("[].longitude").type(JsonFieldType.VARIES).description("경도"),
fieldWithPath("[].status").type(JsonFieldType.STRING).description("게스트 모집 상태"),
fieldWithPath("[].isReviewDone").type(JsonFieldType.BOOLEAN).description("리뷰 완료 여부"),
fieldWithPath("[].viewCount").type(JsonFieldType.NUMBER).description("조회 수"),
fieldWithPath("[].cost").type(JsonFieldType.NUMBER).description("비용"),
fieldWithPath("[].memberCount").type(JsonFieldType.NUMBER).description("인원 수"),
Expand Down

0 comments on commit 1f01cdc

Please sign in to comment.