[feat] 방 참여하기/취소하기 api 개발

src/main/java/konkuk/thip/common/exception/code/ErrorCode.java

@@ -82,6 +82,8 @@ public enum ErrorCode implements ResponseCode {
     ROOM_PASSWORD_NOT_REQUIRED(HttpStatus.BAD_REQUEST, 100003, "공개방은 비밀번호가 필요하지 않습니다."),
     ROOM_RECRUITMENT_PERIOD_EXPIRED(HttpStatus.BAD_REQUEST, 100004, "모집기간이 만료된 방입니다."),
     INVALID_ROOM_SEARCH_SORT(HttpStatus.BAD_REQUEST, 100005, "방 검색 시 정렬 조건이 잘못되었습니다."),
+    ROOM_MEMBER_COUNT_EXCEEDED(HttpStatus.BAD_REQUEST, 100006, "방의 최대 인원 수를 초과했습니다."),
+    ROOM_MEMBER_COUNT_UNDERFLOW(HttpStatus.BAD_REQUEST, 100007, "방의 인원 수가 1 이하(방장 포함)입니다."),
 
     /**
      * 110000 : vote error
@@ -109,6 +111,11 @@ public enum ErrorCode implements ResponseCode {
     ROOM_PARTICIPANT_NOT_FOUND(HttpStatus.NOT_FOUND, 140000, "존재하지 않는 RoomParticipant (방과 사용자 관계) 입니다."),
     USER_NOT_BELONG_TO_ROOM(HttpStatus.BAD_REQUEST, 140001, "현재 모임방에 속하지 않는 유저입니다."),
     ROOM_PARTICIPANT_ROLE_NOT_MATCH(HttpStatus.BAD_REQUEST, 140002, "일치하는 방에서의 사용자 역할이 없습니다."),
+    ROOM_JOIN_TYPE_NOT_MATCH(HttpStatus.BAD_REQUEST, 140003, "일치하는 방 참여 상태가 없습니다."),
+    USER_CANNOT_JOIN_OR_CANCEL(HttpStatus.BAD_REQUEST, 140004, "존재하지 않는 방은 참여하기 또는 취소하기가 불가능합니다."),
+    USER_ALREADY_PARTICIPATE(HttpStatus.BAD_REQUEST, 140005, "사용자가 이미 방에 참여한 상태입니다."),
+    USER_NOT_PARTICIPATED(HttpStatus.BAD_REQUEST, 140006, "사용자가 방에 참여하지 않은 상태에서 취소하기는 불가합니다."),
+    HOST_CANNOT_CANCEL(HttpStatus.BAD_REQUEST, 140007, "방장은 참여 취소를 할 수 없습니다."),
 
     /**
      * 150000 : Category error

src/main/java/konkuk/thip/room/adapter/in/web/RoomCommandController.java

@@ -4,9 +4,12 @@
 import konkuk.thip.common.dto.BaseResponse;
 import konkuk.thip.common.security.annotation.UserId;
 import konkuk.thip.room.adapter.in.web.request.RoomCreateRequest;
+import konkuk.thip.room.adapter.in.web.request.RoomJoinRequest;
 import konkuk.thip.room.adapter.in.web.response.RoomCreateResponse;
 import konkuk.thip.room.application.port.in.RoomCreateUseCase;
+import konkuk.thip.room.application.port.in.RoomJoinUsecase;
 import lombok.RequiredArgsConstructor;
+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.RestController;
@@ -16,11 +19,27 @@
 public class RoomCommandController {
 
     private final RoomCreateUseCase roomCreateUseCase;
+    private final RoomJoinUsecase roomJoinUsecase;
 
+    /**
+     * 방 생성 요청
+     */
     @PostMapping("/rooms")
     public BaseResponse<RoomCreateResponse> createRoom(@Valid @RequestBody RoomCreateRequest request, @UserId Long userId) {
         return BaseResponse.ok(RoomCreateResponse.of(
                 roomCreateUseCase.createRoom(request.toCommand(), userId)
         ));
     }
+
+    /**
+     * 방 참여하기/취소하기 요청
+     */
+    @PostMapping("/rooms/{roomId}/join")
+    public BaseResponse<Void> joinRoom(@Valid @RequestBody final RoomJoinRequest request,
+                                 @UserId final Long userId,
+                                 @PathVariable final Long roomId) {
+
+        roomJoinUsecase.changeJoinState(request.toCommand(userId, roomId));
+        return BaseResponse.ok(null);
+    }
 }

src/main/java/konkuk/thip/room/adapter/in/web/request/RoomJoinRequest.java

@@ -0,0 +1,13 @@
+package konkuk.thip.room.adapter.in.web.request;
+
+import jakarta.validation.constraints.NotBlank;
+import konkuk.thip.room.application.port.in.dto.RoomJoinCommand;
+
+public record RoomJoinRequest(
+        @NotBlank(message = "방 참여 유형 파라미터는 필수입니다..")
+        String type
+) {
+    public RoomJoinCommand toCommand(Long userId, Long roomId) {
+        return new RoomJoinCommand(userId, roomId, type);
+    }
+}

src/main/java/konkuk/thip/room/adapter/out/jpa/RoomJpaEntity.java

@@ -55,4 +55,8 @@ public class RoomJpaEntity extends BaseJpaEntity {
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "category_id", nullable = false)
     private CategoryJpaEntity categoryJpaEntity;
+
+    public void updateMemberCount(int count) {
+        this.memberCount = count;
+    }
 }

src/main/java/konkuk/thip/room/adapter/out/jpa/RoomParticipantJpaEntity.java

@@ -4,10 +4,12 @@
 import konkuk.thip.common.entity.BaseJpaEntity;
 import konkuk.thip.user.adapter.out.jpa.UserJpaEntity;
 import lombok.*;
+import org.hibernate.annotations.SQLDelete;
 
 @Entity
 @Table(name = "room_participants")
 @Getter
+@SQLDelete(sql = "UPDATE room_participants SET status = 'INACTIVE' WHERE room_participant_id = ?")
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @AllArgsConstructor
 @Builder

src/main/java/konkuk/thip/room/adapter/out/jpa/RoomParticipantRole.java

@@ -11,7 +11,7 @@ public enum RoomParticipantRole {
     HOST("호스트"),
     MEMBER("팀원");
 
-    private String type;
+    private final String type;
 
     RoomParticipantRole(String type) {
         this.type = type;

src/main/java/konkuk/thip/room/adapter/out/persistence/RoomCommandPersistenceAdapter.java

@@ -54,4 +54,15 @@ public Category findCategoryByValue(String value) {
                 () -> new EntityNotFoundException(CATEGORY_NOT_FOUND));
         return Category.from(categoryJpaEntity.getValue());
     }
+
+    @Override
+    public void updateMemberCount(Room room) {
+        RoomJpaEntity roomJpaEntity = roomJpaRepository.findById(room.getId()).orElseThrow(
+                () -> new EntityNotFoundException(ROOM_NOT_FOUND)
+        );
+
+        roomJpaEntity.updateMemberCount(room.getMemberCount());
+
+        roomJpaRepository.save(roomJpaEntity);
+    }
 }

src/main/java/konkuk/thip/room/adapter/out/persistence/RoomParticipantCommandPersistenceAdapter.java

@@ -2,26 +2,36 @@
 
 import konkuk.thip.common.exception.EntityNotFoundException;
 import konkuk.thip.common.exception.code.ErrorCode;
+import konkuk.thip.room.adapter.out.jpa.RoomJpaEntity;
 import konkuk.thip.room.adapter.out.jpa.RoomParticipantJpaEntity;
 import konkuk.thip.room.adapter.out.mapper.RoomParticipantMapper;
+import konkuk.thip.room.adapter.out.persistence.repository.RoomJpaRepository;
 import konkuk.thip.room.adapter.out.persistence.repository.roomparticipant.RoomParticipantJpaRepository;
 import konkuk.thip.room.application.port.out.RoomParticipantCommandPort;
 import konkuk.thip.room.domain.RoomParticipant;
+import konkuk.thip.user.adapter.out.jpa.UserJpaEntity;
+import konkuk.thip.user.adapter.out.persistence.repository.UserJpaRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
+import static konkuk.thip.common.exception.code.ErrorCode.ROOM_NOT_FOUND;
+import static konkuk.thip.common.exception.code.ErrorCode.USER_NOT_FOUND;
+
 @Repository
 @RequiredArgsConstructor
 public class RoomParticipantCommandPersistenceAdapter implements RoomParticipantCommandPort {
 
     private final RoomParticipantJpaRepository roomParticipantJpaRepository;
     private final RoomParticipantMapper roomParticipantMapper;
 
+    private final UserJpaRepository userJpaRepository;
+    private final RoomJpaRepository roomJpaRepository;
+
     @Override
     public RoomParticipant findByUserIdAndRoomId(Long userId, Long roomId) {
-        RoomParticipantJpaEntity roomParticipantJpaEntity = roomParticipantJpaRepository.findByUserJpaEntity_UserIdAndRoomJpaEntity_RoomId(userId, roomId).orElseThrow(
+        RoomParticipantJpaEntity roomParticipantJpaEntity = roomParticipantJpaRepository.findByUserIdAndRoomId(userId, roomId).orElseThrow(
                 () -> new EntityNotFoundException(ErrorCode.ROOM_PARTICIPANT_NOT_FOUND)
         );
 
@@ -30,8 +40,31 @@ public RoomParticipant findByUserIdAndRoomId(Long userId, Long roomId) {
 
     @Override
     public List<RoomParticipant> findAllByRoomId(Long roomId) {
-        return roomParticipantJpaRepository.findAllByRoomJpaEntity_RoomId(roomId).stream()
+        return roomParticipantJpaRepository.findAllByRoomId(roomId).stream()
                 .map(roomParticipantMapper::toDomainEntity)
                 .toList();
     }
+
+    @Override
+    public void save(RoomParticipant roomParticipant) {
+        UserJpaEntity userJpaEntity = userJpaRepository.findById(roomParticipant.getUserId()).orElseThrow(
+                () -> new EntityNotFoundException(USER_NOT_FOUND));
+
+        RoomJpaEntity roomJpaEntity = roomJpaRepository.findById(roomParticipant.getRoomId()).orElseThrow(
+                () -> new EntityNotFoundException(ROOM_NOT_FOUND)
+        );
+
+        roomParticipantJpaRepository.save(roomParticipantMapper.toJpaEntity(
+                roomParticipant, userJpaEntity, roomJpaEntity
+        ));
+    }
+
+    @Override
+    public void deleteByUserIdAndRoomId(Long userId, Long roomId) {
+        RoomParticipantJpaEntity roomParticipantJpaEntity = roomParticipantJpaRepository.findByUserIdAndRoomId(userId, roomId).orElseThrow(
+                () -> new EntityNotFoundException(ErrorCode.ROOM_PARTICIPANT_NOT_FOUND)
+        );
+
+        roomParticipantJpaRepository.delete(roomParticipantJpaEntity);
+    }
 }

src/main/java/konkuk/thip/room/adapter/out/persistence/RoomParticipantQueryPersistenceAdapter.java

@@ -0,0 +1,20 @@
+package konkuk.thip.room.adapter.out.persistence;
+
+import konkuk.thip.room.adapter.out.persistence.repository.roomparticipant.RoomParticipantJpaRepository;
+import konkuk.thip.room.application.port.out.RoomParticipantQueryPort;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Repository;
+
+@Repository
+@RequiredArgsConstructor
+public class RoomParticipantQueryPersistenceAdapter implements RoomParticipantQueryPort {
+
+    private final RoomParticipantJpaRepository roomParticipantJpaRepository;
+
+    @Override
+    public boolean existByUserIdAndRoomId(Long userId, Long roomId) {
+        return roomParticipantJpaRepository.existByUserIdAndRoomId(userId, roomId);
+    }
+
+
+}

src/main/java/konkuk/thip/room/adapter/out/persistence/repository/roomparticipant/RoomParticipantJpaRepository.java

@@ -2,12 +2,24 @@
 
 import konkuk.thip.room.adapter.out.jpa.RoomParticipantJpaEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
 import java.util.List;
 import java.util.Optional;
 
-public interface RoomParticipantJpaRepository extends JpaRepository<RoomParticipantJpaEntity, Long>{
+public interface RoomParticipantJpaRepository extends JpaRepository<RoomParticipantJpaEntity, Long>, RoomParticipantQueryRepository{
+
+    @Query(value = "SELECT * FROM room_participants WHERE user_id = :userId AND room_id = :roomId AND status = 'ACTIVE'", nativeQuery = true)
+    Optional<RoomParticipantJpaEntity> findByUserIdAndRoomId(@Param("userId") Long userId, @Param("roomId") Long roomId);
+
+    @Query(value = "SELECT * FROM room_participants WHERE room_id = :roomId AND status = 'ACTIVE'", nativeQuery = true)
+    List<RoomParticipantJpaEntity> findAllByRoomId(Long roomId);
+
+    @Query(
+            value = "SELECT EXISTS (SELECT 1 FROM room_participants rp WHERE rp.user_id = :userId AND rp.room_id = :roomId AND rp.status = 'ACTIVE')",
+            nativeQuery = true
+    )
+    boolean existByUserIdAndRoomId(@Param("userId") Long userId, @Param("roomId") Long roomId);
 
-    Optional<RoomParticipantJpaEntity> findByUserJpaEntity_UserIdAndRoomJpaEntity_RoomId(Long userId, Long roomId);
-    List<RoomParticipantJpaEntity> findAllByRoomJpaEntity_RoomId(Long roomId);
 }

src/main/java/konkuk/thip/room/adapter/out/persistence/repository/roomparticipant/RoomParticipantQueryRepository.java

@@ -0,0 +1,4 @@
+package konkuk.thip.room.adapter.out.persistence.repository.roomparticipant;
+
+public interface RoomParticipantQueryRepository {
+}

src/main/java/konkuk/thip/room/adapter/out/persistence/repository/roomparticipant/RoomParticipantQueryRepositoryImpl.java

@@ -0,0 +1,10 @@
+package konkuk.thip.room.adapter.out.persistence.repository.roomparticipant;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Repository;
+
+@Repository
+@RequiredArgsConstructor
+public class RoomParticipantQueryRepositoryImpl implements RoomParticipantQueryRepository{
+
+}

src/main/java/konkuk/thip/room/application/port/in/RoomJoinUsecase.java

@@ -0,0 +1,9 @@
+package konkuk.thip.room.application.port.in;
+
+import konkuk.thip.room.application.port.in.dto.RoomJoinCommand;
+
+public interface RoomJoinUsecase {
+
+    void changeJoinState(RoomJoinCommand roomJoinCommand);
+
+}

src/main/java/konkuk/thip/room/application/port/in/dto/RoomJoinCommand.java

@@ -0,0 +1,8 @@
+package konkuk.thip.room.application.port.in.dto;
+
+public record RoomJoinCommand(
+        Long userId,
+        Long roomId,
+        String type
+) {
+}

src/main/java/konkuk/thip/room/application/port/out/RoomCommandPort.java

@@ -10,4 +10,6 @@ public interface RoomCommandPort {
     Long save(Room room);
 
     Category findCategoryByValue(String value);
+
+    void updateMemberCount(Room room);
 }

src/main/java/konkuk/thip/room/application/port/out/RoomParticipantCommandPort.java

@@ -9,4 +9,8 @@ public interface RoomParticipantCommandPort {
     RoomParticipant findByUserIdAndRoomId(Long userId, Long roomId);
     List<RoomParticipant> findAllByRoomId(Long roomId);
 
+    void save(RoomParticipant roomParticipant);
+
+    void deleteByUserIdAndRoomId(Long userId, Long roomId);
+
 }

src/main/java/konkuk/thip/room/application/port/out/RoomParticipantQueryPort.java

@@ -1,4 +1,6 @@
 package konkuk.thip.room.application.port.out;
 
+
 public interface RoomParticipantQueryPort {
+    boolean existByUserIdAndRoomId(Long userId, Long roomId);
 }

src/main/java/konkuk/thip/room/application/service/RoomJoinService.java

@@ -0,0 +1,80 @@
+package konkuk.thip.room.application.service;
+
+import konkuk.thip.common.exception.EntityNotFoundException;
+import konkuk.thip.common.exception.InvalidStateException;
+import konkuk.thip.common.exception.code.ErrorCode;
+import konkuk.thip.room.application.port.in.RoomJoinUsecase;
+import konkuk.thip.room.application.port.in.dto.RoomJoinCommand;
+import konkuk.thip.room.application.port.out.RoomCommandPort;
+import konkuk.thip.room.application.port.out.RoomParticipantCommandPort;
+import konkuk.thip.room.application.port.out.RoomParticipantQueryPort;
+import konkuk.thip.room.domain.Room;
+import konkuk.thip.room.domain.RoomJoinType;
+import konkuk.thip.room.domain.RoomParticipant;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import static konkuk.thip.room.adapter.out.jpa.RoomParticipantRole.MEMBER;
+
+@Service
+@RequiredArgsConstructor
+public class RoomJoinService implements RoomJoinUsecase {
+
+    private final RoomParticipantQueryPort roomParticipantQueryPort;
+    private final RoomCommandPort roomCommandPort;
+    private final RoomParticipantCommandPort roomParticipantCommandPort;
+
+    @Override
+    @Transactional
+    public void changeJoinState(RoomJoinCommand roomJoinCommand) {
+        RoomJoinType type = RoomJoinType.from(roomJoinCommand.type());
+
+        // 방이 존재하지 않거나 만료된 경우
+        Room room;
+        try {
+            room = roomCommandPort.findById(roomJoinCommand.roomId());
+        } catch (EntityNotFoundException e) {
+            throw new InvalidStateException(ErrorCode.USER_CANNOT_JOIN_OR_CANCEL);
+        }
+
+        boolean isParticipate = roomParticipantQueryPort.existByUserIdAndRoomId(roomJoinCommand.userId(), roomJoinCommand.roomId());
+        room.validateRoomExpired();
+
+        // 참여하기 요청
+        if(type.isJoinType()) {
+            // 이미 참여한 상태
+            if(isParticipate) {
+                throw new InvalidStateException(ErrorCode.USER_ALREADY_PARTICIPATE);
+            }
+
+            RoomParticipant roomParticipant = RoomParticipant.withoutId(roomJoinCommand.userId(), roomJoinCommand.roomId(), MEMBER.getType());
+            roomParticipantCommandPort.save(roomParticipant);
+
+            //Room의 memberCount 업데이트
+            room.increaseMemberCount();
+        }
+
+        // 취소하기 요청
+        if(!type.isJoinType()) {
+            // 참여하지 않은 상태
+            if(!isParticipate) {
+                throw new InvalidStateException(ErrorCode.USER_NOT_PARTICIPATED);
+            }
+
+            // 방장이 참여 취소를 요청한 경우
+            RoomParticipant roomParticipant = roomParticipantCommandPort.findByUserIdAndRoomId(roomJoinCommand.userId(), roomJoinCommand.roomId());
+            roomParticipant.validateHostCancelRoom();
+
+            roomParticipantCommandPort.deleteByUserIdAndRoomId(roomJoinCommand.userId(), roomJoinCommand.roomId());
+
+            //Room의 memberCount 업데이트
+            room.decreaseMemberCount();
+        }
+
+        // 방의 상태 업데이트
+        roomCommandPort.updateMemberCount(room);
+    }
+
+
+}