Skip to content

Commit

Permalink
refactor: 참여중인 방 조회 기능 수정
Browse files Browse the repository at this point in the history
  • Loading branch information
gyungchan-jo committed Jul 18, 2024
1 parent 3df0f7d commit b1c6588
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 8 deletions.
2 changes: 1 addition & 1 deletion backend/src/main/java/corea/WebConfig.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package corea;

import corea.room.config.LoginMemberArgumentResolver;
import corea.auth.resolver.LoginMemberArgumentResolver;
import lombok.RequiredArgsConstructor;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.method.support.HandlerMethodArgumentResolver;
Expand Down
12 changes: 11 additions & 1 deletion backend/src/main/java/corea/exception/CoreaException.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package corea.exception;

import lombok.Getter;
import org.springframework.http.HttpStatus;

@Getter
public class CoreaException extends RuntimeException {
Expand All @@ -18,7 +19,16 @@ public CoreaException(ExceptionType exceptionType, String message) {
}

public CoreaException(ExceptionType exceptionType, Throwable cause) {
super(cause);
super(exceptionType.getMessage(), cause);
this.exceptionType = exceptionType;
}

public HttpStatus getHttpStatus() {
return exceptionType.getHttpStatus();
}

@Override
public String getMessage() {
return super.getMessage();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,6 @@ public interface ParticipationRepository extends JpaRepository<Participation, Lo
List<Participation> findAllByRoomId(long roomId);

List<Participation> findAllByMemberId(long memberId);

boolean existsByRoomIdAndMemberId(long roomId, long memberId);
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
package corea.room.controller;

import corea.auth.annotation.LoginMember;
import corea.auth.domain.AuthInfo;
import corea.member.domain.Member;
import corea.room.config.LoginMember;
import corea.room.dto.RoomResponse;
import corea.room.dto.RoomResponses;
import corea.room.service.RoomService;
Expand Down Expand Up @@ -30,8 +31,8 @@ public ResponseEntity<RoomResponses> rooms() {
}

@GetMapping("/rooms/participated")
public ResponseEntity<RoomResponses> participatedRooms(@LoginMember Member member) {
RoomResponses response = roomService.findParticipatedRooms(member);
public ResponseEntity<RoomResponses> participatedRooms(@LoginMember AuthInfo authInfo) {
RoomResponses response = roomService.findParticipatedRooms(authInfo.getId());
return ResponseEntity.ok(response);
}
}
4 changes: 2 additions & 2 deletions backend/src/main/java/corea/room/service/RoomService.java
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ public RoomResponse findOne(long id) {
return RoomResponse.from(room);
}

public RoomResponses findParticipatedRooms(Member member) {
List<Participation> participations = participationRepository.findAllByMemberId(member.getId());
public RoomResponses findParticipatedRooms(long memberId) {
List<Participation> participations = participationRepository.findAllByMemberId(memberId);

return participations.stream()
.map(Participation::getRoomId)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ void findParticipatedRooms() {
RoomResponse roomResponse = roomService.create(RoomFixture.ROOM_CREATE_REQUEST(ash));
participationService.participate(new ParticipationRequest(roomResponse.id(), pororo.getId()));

RoomResponses response = roomService.findParticipatedRooms(pororo);
RoomResponses response = roomService.findParticipatedRooms(pororo.getId());

List<RoomResponse> rooms = response.rooms();
assertThat(rooms).hasSize(1);
Expand Down

0 comments on commit b1c6588

Please sign in to comment.