[BE] feat: 유저가 참여중인 방 리스트 조회 기능 구현(#29) (#60)

* feat: 유저가 참여중인 방 리스트 조회 기능 구현 * refactor: 참여중인 방 조회 기능 수정 * refactor: requestMapping을 이용한 중복 제거
woowacourse-teams · Jul 18, 2024 · 0ea150d · 0ea150d
1 parent 4d5e866
commit 0ea150d
Show file tree

Hide file tree

Showing 26 changed files with 546 additions and 461 deletions.
diff --git a/...java/corea/auth/annotation/LoginUser.java → ...va/corea/auth/annotation/LoginMember.java b/...java/corea/auth/annotation/LoginUser.java → ...va/corea/auth/annotation/LoginMember.java
@@ -10,5 +10,5 @@
 @Target(ElementType.PARAMETER)
 @Retention(RetentionPolicy.RUNTIME)
 @Hidden()
-public @interface LoginUser {
+public @interface LoginMember {
 }
diff --git a/backend/src/main/java/corea/auth/domain/AuthInfo.java b/backend/src/main/java/corea/auth/domain/AuthInfo.java
@@ -11,9 +11,7 @@
 public class AuthInfo {
 
     private final Long id;
-
     private final String name;
-
     private final String email;
 
     public static AuthInfo from(Member member){

diff --git a/backend/src/main/java/corea/auth/resolver/LoginMemberArgumentResolver.java b/backend/src/main/java/corea/auth/resolver/LoginMemberArgumentResolver.java
@@ -1,7 +1,7 @@
 package corea.auth.resolver;
 
 import corea.auth.RequestHandler;
-import corea.auth.annotation.LoginUser;
+import corea.auth.annotation.LoginMember;
 import corea.auth.domain.AuthInfo;
 import corea.exception.CoreaException;
 import corea.exception.ExceptionType;
@@ -25,7 +25,7 @@ public class LoginMemberArgumentResolver implements HandlerMethodArgumentResolve
 
     @Override
     public boolean supportsParameter(MethodParameter parameter) {
-        return parameter.hasParameterAnnotation(LoginUser.class);
+        return parameter.hasParameterAnnotation(LoginMember.class);
     }
 
     @Override

diff --git a/backend/src/main/java/corea/exception/CoreaException.java b/backend/src/main/java/corea/exception/CoreaException.java
@@ -1,7 +1,9 @@
 package corea.exception;
 
+import lombok.Getter;
 import org.springframework.http.HttpStatus;
 
+@Getter
 public class CoreaException extends RuntimeException {
 
     private final ExceptionType exceptionType;
@@ -17,7 +19,7 @@ public CoreaException(ExceptionType exceptionType, String message) {
     }
 
     public CoreaException(ExceptionType exceptionType, Throwable cause) {
-        super(cause);
+        super(exceptionType.getMessage(), cause);
         this.exceptionType = exceptionType;
     }
 
@@ -27,6 +29,6 @@ public HttpStatus getHttpStatus() {
 
     @Override
     public String getMessage() {
-        return exceptionType.getMessage();
+        return super.getMessage();
     }
 }
diff --git a/backend/src/main/java/corea/exception/ExceptionType.java b/backend/src/main/java/corea/exception/ExceptionType.java
@@ -4,20 +4,26 @@
 
 public enum ExceptionType {
 
+    SERVER_ERROR(HttpStatus.INTERNAL_SERVER_ERROR,"서버에 문제가 발생했습니다."),
+    MEMBER_NOT_FOUND(HttpStatus.BAD_REQUEST, "해당 멤버를 찾을 수 없습니다."),
+    ROOM_NOT_FOUND(HttpStatus.BAD_REQUEST, "방을 찾을 수 없습니다."),
     NOT_FOUND_ERROR(HttpStatus.NOT_FOUND,"해당하는 값이 없습니다."),
     AUTHORIZATION_ERROR(HttpStatus.UNAUTHORIZED,"인증에 실패했습니다."),
     ALREADY_APPLY(HttpStatus.BAD_REQUEST,"해당 방에 이미 참여했습니다"),
-    SERVER_ERROR(HttpStatus.INTERNAL_SERVER_ERROR,"서버에 문제가 발생했습니다.");
+    ;
+
     private final HttpStatus httpStatus;
     private final String message;
 
     ExceptionType(final HttpStatus httpStatus, final String message) {
         this.httpStatus = httpStatus;
         this.message = message;
     }
+
     public HttpStatus getHttpStatus() {
         return httpStatus;
     }
+
     public String getMessage() {
         return message;
     }

diff --git a/backend/src/main/java/corea/matching/controller/ParticipateController.java b/backend/src/main/java/corea/matching/controller/ParticipateController.java
@@ -1,6 +1,6 @@
 package corea.matching.controller;
 
-import corea.auth.annotation.LoginUser;
+import corea.auth.annotation.LoginMember;
 import corea.auth.domain.AuthInfo;
 import corea.matching.dto.ParticipationRequest;
 import corea.matching.service.ParticipationService;
@@ -19,7 +19,7 @@ public class ParticipateController implements ParticipationControllerSpecificati
     private final ParticipationService participationService;
 
     @PostMapping("/{id}")
-    public ResponseEntity<Void> participate(@PathVariable long id, @LoginUser AuthInfo authInfo) {
+    public ResponseEntity<Void> participate(@PathVariable long id, @LoginMember AuthInfo authInfo) {
         participationService.participate(new ParticipationRequest(id, authInfo.getId()));
         return ResponseEntity.ok()
                 .build();

diff --git a/backend/src/main/java/corea/matching/repository/ParticipationRepository.java b/backend/src/main/java/corea/matching/repository/ParticipationRepository.java
@@ -9,5 +9,7 @@ public interface ParticipationRepository extends JpaRepository<Participation, Lo
 
     List<Participation> findAllByRoomId(long roomId);
 
+    List<Participation> findAllByMemberId(long memberId);
+
     boolean existsByRoomIdAndMemberId(long roomId, long memberId);
 }
diff --git a/backend/src/main/java/corea/room/controller/RoomController.java b/backend/src/main/java/corea/room/controller/RoomController.java
@@ -1,5 +1,7 @@
 package corea.room.controller;
 
+import corea.auth.annotation.LoginMember;
+import corea.auth.domain.AuthInfo;
 import corea.room.dto.RoomResponse;
 import corea.room.dto.RoomResponses;
 import corea.room.service.RoomService;
@@ -18,14 +20,20 @@ public class RoomController {
     private final RoomService roomService;
 
     @GetMapping("/{id}")
-    public ResponseEntity<RoomResponse> room(@PathVariable final long id) {
-        final RoomResponse response = roomService.findOne(id);
+    public ResponseEntity<RoomResponse> room(@PathVariable long id) {
+        RoomResponse response = roomService.findOne(id);
         return ResponseEntity.ok(response);
     }
 
     @GetMapping
     public ResponseEntity<RoomResponses> rooms() {
-        final RoomResponses response = roomService.findAll();
+        RoomResponses response = roomService.findAll();
+        return ResponseEntity.ok(response);
+    }
+
+    @GetMapping("/participated")
+    public ResponseEntity<RoomResponses> participatedRooms(@LoginMember AuthInfo authInfo) {
+        RoomResponses response = roomService.findParticipatedRooms(authInfo.getId());
         return ResponseEntity.ok(response);
     }
 }
diff --git a/backend/src/main/java/corea/room/domain/Room.java b/backend/src/main/java/corea/room/domain/Room.java
@@ -48,7 +48,7 @@ public class Room {
     private LocalDateTime reviewDeadline;
 
     public Room(String title, String content, int matchingSize, String repositoryLink, String thumbnailLink, String keyword, int currentParticipantsSize, int limitedParticipantsSize, Member manager, LocalDateTime recruitmentDeadline, LocalDateTime reviewDeadline) {
-        this(null,title,content,matchingSize,repositoryLink,thumbnailLink,keyword,currentParticipantsSize,limitedParticipantsSize,manager,recruitmentDeadline,reviewDeadline);
+        this(null, title, content, matchingSize, repositoryLink, thumbnailLink, keyword, currentParticipantsSize, limitedParticipantsSize, manager, recruitmentDeadline, reviewDeadline);
     }
 }
 
diff --git a/backend/src/main/java/corea/room/dto/RoomCreateRequest.java b/backend/src/main/java/corea/room/dto/RoomCreateRequest.java
@@ -1,25 +1,28 @@
 package corea.room.dto;
 
+import corea.member.domain.Member;
 import corea.room.domain.Room;
 
 import java.time.LocalDateTime;
 
 public record RoomCreateRequest(
         String title,
         String content,
-        long memberId,
+        Member manager,
         String repositoryLink,
         String thumbnailLink,
         int matchingSize,
         String keyword,
-        long currentParticipantsSize,
-        long limitedParticipantsSize,
-        LocalDateTime submissionDeadline,
+        int currentParticipantsSize,
+        int limitedParticipantsSize,
+        LocalDateTime recruitmentDeadline,
         LocalDateTime reviewDeadline
 ) {
 
-    //TODO 해당 객체를 사용한다면 반영
     public Room toEntity() {
-        return null;
+        return new Room(title, content, matchingSize,
+                repositoryLink, thumbnailLink, keyword,
+                currentParticipantsSize, limitedParticipantsSize, manager,
+                recruitmentDeadline, reviewDeadline);
     }
 }
diff --git a/backend/src/main/java/corea/room/dto/RoomResponse.java b/backend/src/main/java/corea/room/dto/RoomResponse.java
@@ -20,11 +20,20 @@ public record RoomResponse(
         LocalDateTime reviewDeadline
 ) {
 
-    public static RoomResponse of(final Room room) {
+    public static RoomResponse from(Room room) {
         return new RoomResponse(
-                room.getId(), room.getTitle(), room.getContent(), room.getManager().getEmail(),
-                room.getRepositoryLink(), room.getThumbnailLink(), room.getMatchingSize(), List.of(room.getKeyword()),
-                room.getCurrentParticipantsSize(), room.getLimitedParticipantsSize(), room.getRecruitmentDeadline(), room.getReviewDeadline()
+                room.getId(),
+                room.getTitle(),
+                room.getContent(),
+                room.getManager().getName(),
+                room.getRepositoryLink(),
+                room.getThumbnailLink(),
+                room.getMatchingSize(),
+                List.of(room.getKeyword()),
+                room.getCurrentParticipantsSize(),
+                room.getLimitedParticipantsSize(),
+                room.getRecruitmentDeadline(),
+                room.getReviewDeadline()
         );
     }
 }
diff --git a/backend/src/main/java/corea/room/dto/RoomResponses.java b/backend/src/main/java/corea/room/dto/RoomResponses.java
@@ -1,6 +1,17 @@
 package corea.room.dto;
 
+import corea.room.domain.Room;
+
 import java.util.List;
 
+import static java.util.stream.Collectors.collectingAndThen;
+import static java.util.stream.Collectors.toList;
+
 public record RoomResponses(List<RoomResponse> rooms) {
+
+    public static RoomResponses from(List<Room> rooms) {
+        return rooms.stream()
+                .map(RoomResponse::from)
+                .collect(collectingAndThen(toList(), RoomResponses::new));
+    }
 }
diff --git a/backend/src/main/java/corea/room/service/RoomService.java b/backend/src/main/java/corea/room/service/RoomService.java
@@ -1,10 +1,14 @@
 package corea.room.service;
 
+import corea.exception.CoreaException;
+import corea.exception.ExceptionType;
+import corea.matching.domain.Participation;
+import corea.matching.repository.ParticipationRepository;
+import corea.member.domain.Member;
 import corea.room.domain.Room;
 import corea.room.dto.RoomCreateRequest;
 import corea.room.dto.RoomResponse;
 import corea.room.dto.RoomResponses;
-import corea.member.repository.MemberRepository;
 import corea.room.repository.RoomRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -21,32 +25,34 @@
 public class RoomService {
 
     private final RoomRepository roomRepository;
-    private final MemberRepository memberRepository;
+    private final ParticipationRepository participationRepository;
 
-    public RoomResponse create(final RoomCreateRequest request) {
-        final Room room = roomRepository.save(request.toEntity());
-        return toRoomResponse(room);
+    public RoomResponse create(RoomCreateRequest request) {
+        Room room = roomRepository.save(request.toEntity());
+        return RoomResponse.from(room);
     }
 
-    public RoomResponse findOne(final long id) {
-        final Room room = getRoom(id);
-        return toRoomResponse(room);
+    public RoomResponse findOne(long id) {
+        Room room = getRoom(id);
+        return RoomResponse.from(room);
     }
 
-    public RoomResponses findAll() {
-        final List<Room> rooms = roomRepository.findAll();
+    public RoomResponses findParticipatedRooms(long memberId) {
+        List<Participation> participations = participationRepository.findAllByMemberId(memberId);
 
-        return rooms.stream()
-                .map(this::toRoomResponse)
-                .collect(collectingAndThen(toList(), RoomResponses::new));
+        return participations.stream()
+                .map(Participation::getRoomId)
+                .map(this::getRoom)
+                .collect(collectingAndThen(toList(), RoomResponses::from));
     }
 
-    private RoomResponse toRoomResponse(final Room room) {
-        return RoomResponse.of(room);
+    public RoomResponses findAll() {
+        final List<Room> rooms = roomRepository.findAll();
+        return RoomResponses.from(rooms);
     }
 
-    private Room getRoom(final long roomId) {
+    private Room getRoom(long roomId) {
         return roomRepository.findById(roomId)
-                .orElseThrow(() -> new IllegalArgumentException(String.format("해당 Id의 방이 없습니다. 입력된 Id=%d", roomId)));
+                .orElseThrow(() -> new CoreaException(ExceptionType.ROOM_NOT_FOUND, String.format("해당 Id의 방이 없습니다. 입력된 Id=%d", roomId)));
     }
 }
diff --git a/backend/src/test/java/corea/room/acceptance/RoomAcceptanceTest.java b/backend/src/test/java/corea/room/acceptance/RoomAcceptanceTest.java
@@ -0,0 +1,63 @@
+package corea.room.acceptance;
+
+import corea.matching.dto.ParticipationRequest;
+import corea.matching.service.ParticipationService;
+import corea.member.domain.Member;
+import corea.member.repository.MemberRepository;
+import corea.room.dto.RoomResponse;
+import corea.room.dto.RoomResponses;
+import corea.room.fixture.MemberFixture;
+import corea.room.fixture.RoomFixture;
+import corea.room.service.RoomService;
+import io.restassured.RestAssured;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.web.server.LocalServerPort;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+class RoomAcceptanceTest {
+
+    @LocalServerPort
+    int port;
+
+    @Autowired
+    RoomService roomService;
+
+    @Autowired
+    MemberRepository memberRepository;
+
+    @Autowired
+    ParticipationService participationService;
+
+    @BeforeEach
+    void setUp() {
+        RestAssured.port = port;
+    }
+
+    @Test
+    @DisplayName("현재 로그인한 멤버가 참여 중인 방을 보여준다.")
+    void participatedRooms() {
+        Member pororo = memberRepository.save(MemberFixture.MEMBER_PORORO());
+        Member ash = memberRepository.save(MemberFixture.MEMBER_ASH());
+        RoomResponse roomResponse = roomService.create(RoomFixture.ROOM_CREATE_REQUEST(ash));
+        participationService.participate(new ParticipationRequest(roomResponse.id(), pororo.getId()));
+
+        RoomResponses response = RestAssured.given().log().all()
+                .header("Authorization", "[email protected]")
+                .when().get("/rooms/participated")
+                .then().log().all()
+                .statusCode(200)
+                .extract().as(RoomResponses.class);
+
+        List<RoomResponse> rooms = response.rooms();
+        assertThat(rooms).hasSize(1);
+        assertThat(rooms.get(0).author()).isEqualTo("박민아");
+    }
+}
diff --git a/backend/src/test/java/corea/room/fixture/MemberFixture.java b/backend/src/test/java/corea/room/fixture/MemberFixture.java
@@ -0,0 +1,14 @@
+package corea.room.fixture;
+
+import corea.member.domain.Member;
+
+public class MemberFixture {
+
+    public static Member MEMBER_PORORO() {
+        return new Member("jcoding-play", null, "조경찬", "[email protected]", true, 5f);
+    }
+
+    public static Member MEMBER_ASH() {
+        return new Member("ashsty", null, "박민아", null, false, 1.5f);
+    }
+}