[refactor] 방 생성, 투표 생성 api 수정

src/main/java/konkuk/thip/record/application/service/RecordCreateService.java

@@ -13,12 +13,11 @@
 import konkuk.thip.room.application.service.validator.RoomParticipantValidator;
 import konkuk.thip.room.domain.Room;
 import konkuk.thip.room.domain.RoomParticipant;
+import konkuk.thip.roompost.application.service.helper.RoomProgressHelper;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.List;
-
 import static konkuk.thip.common.exception.code.ErrorCode.RECORD_CANNOT_BE_OVERVIEW;
 
 @Service
@@ -31,6 +30,7 @@ public class RecordCreateService implements RecordCreateUseCase {
     private final RoomParticipantCommandPort roomParticipantCommandPort;
 
     private final RoomParticipantValidator roomParticipantValidator;
+    private final RoomProgressHelper roomProgressHelper;
 
     @Override
     @Transactional
@@ -57,32 +57,15 @@ public RecordCreateResult createRecord(RecordCreateCommand command) {
         validateRoomParticipant(roomParticipant, command.isOverview());
         validateRecord(record, book);
 
-        // 4. RoomParticipant의 currentPage, userPercentage 업데이트
-        updateRoomProgress(roomParticipant, record, book, room);
-
-        // 5. Record 저장
+        // 4. 문제없는 경우 Record 저장
         Long newRecordId = recordCommandPort.saveRecord(record);
 
-        // 6. Room, RoomParticipant 업데이트
-        roomCommandPort.update(room);
-        roomParticipantCommandPort.update(roomParticipant);
+        // 5. RoomParticipant, Room progress 정보 update
+        roomProgressHelper.updateUserAndRoomProgress(record.getCreatorId(), record.getRoomId(), record.getPage());
 
         return RecordCreateResult.of(newRecordId, command.roomId());
     }
 
-    private void updateRoomProgress(RoomParticipant roomParticipant, Record record, Book book, Room room) {
-        if(roomParticipant.updateUserProgress(record.getPage(), book.getPageCount())) {
-            // userPercentage가 업데이트되었으면 Room의 roomPercentage 업데이트
-            List<RoomParticipant> roomParticipantList = roomParticipantCommandPort.findAllByRoomId(record.getRoomId());
-            Double totalUserPercentage = roomParticipantList.stream()
-                    .filter(participant -> !roomParticipant.getId().equals(participant.getId())) // 현재 업데이트 중인 사용자 제외
-                    .map(RoomParticipant::getUserPercentage)
-                    .reduce(0.0, Double::sum);
-            totalUserPercentage += roomParticipant.getUserPercentage();
-            room.updateRoomPercentage(totalUserPercentage / roomParticipantList.size());
-        }
-    }
-
     private void validateRoomParticipant(RoomParticipant roomParticipant, boolean isOverview) {
         // UserRoom의 총평 작성 가능 여부 검증
         if (!roomParticipant.canWriteOverview() && isOverview) {

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

@@ -3,12 +3,14 @@
 import konkuk.thip.book.application.port.out.BookApiQueryPort;
 import konkuk.thip.book.application.port.out.BookCommandPort;
 import konkuk.thip.book.domain.Book;
-import konkuk.thip.common.exception.EntityNotFoundException;
+import konkuk.thip.room.adapter.out.jpa.RoomParticipantRole;
 import konkuk.thip.room.application.port.in.RoomCreateUseCase;
 import konkuk.thip.room.application.port.in.dto.RoomCreateCommand;
 import konkuk.thip.room.application.port.out.RoomCommandPort;
+import konkuk.thip.room.application.port.out.RoomParticipantCommandPort;
 import konkuk.thip.room.domain.Category;
 import konkuk.thip.room.domain.Room;
+import konkuk.thip.room.domain.RoomParticipant;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -18,6 +20,7 @@
 public class RoomCreateService implements RoomCreateUseCase {
 
     private final RoomCommandPort roomCommandPort;
+    private final RoomParticipantCommandPort roomParticipantCommandPort;
     private final BookCommandPort bookCommandPort;
     private final BookApiQueryPort bookApiQueryPort;
 
@@ -42,11 +45,13 @@ public Long createRoom(RoomCreateCommand command, Long userId) {
                 bookId,
                 category
         );
+        Long savedRoomId = roomCommandPort.save(room);
 
-        // TODO : 방 생성한 사람 (= api 호출 토큰에 포함된 userId) 이 해당 방에 속한 멤버라는 사실을 DB에 영속화 해야함
-        // UserRoom 도메인이 정리되면 개발 ㄱㄱ
+        // 4. 방장 RoomParticipant 생성 및 DB save
+        RoomParticipant roomParticipant = RoomParticipant.hostWithoutId(userId, savedRoomId);
+        roomParticipantCommandPort.save(roomParticipant);
 
-        return roomCommandPort.save(room);
+        return savedRoomId;
     }
 
     private Long resolveBookAndEnsurePage(String isbn) {

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

@@ -75,7 +75,7 @@ private void handleJoin(RoomJoinCommand roomJoinCommand, Optional<RoomParticipan
             throw new BusinessException(ErrorCode.USER_ALREADY_PARTICIPATE);
         });
 
-        RoomParticipant roomParticipant = RoomParticipant.withoutId(roomJoinCommand.userId(), roomJoinCommand.roomId(), MEMBER.getType());
+        RoomParticipant roomParticipant = RoomParticipant.memberWithoutId(roomJoinCommand.userId(), roomJoinCommand.roomId());
         roomParticipantCommandPort.save(roomParticipant);
 
         //Room의 memberCount 업데이트

src/main/java/konkuk/thip/room/domain/RoomParticipant.java

@@ -21,13 +21,23 @@ public class RoomParticipant extends BaseDomainEntity {
 
     private Long roomId;
 
-    public static RoomParticipant withoutId(Long userId, Long roomId, String roomParticipantRole) {
+    public static RoomParticipant memberWithoutId(Long userId, Long roomId) {
         return RoomParticipant.builder()
                 .currentPage(0)
                 .userPercentage(0.0)
                 .userId(userId)
                 .roomId(roomId)
-                .roomParticipantRole(roomParticipantRole)
+                .roomParticipantRole(RoomParticipantRole.MEMBER.getType())
+                .build();
+    }
+
+    public static RoomParticipant hostWithoutId(Long userId, Long roomId) {
+        return RoomParticipant.builder()
+                .currentPage(0)
+                .userPercentage(0.0)
+                .userId(userId)
+                .roomId(roomId)
+                .roomParticipantRole(RoomParticipantRole.HOST.getType())
                 .build();
     }
 

src/main/java/konkuk/thip/roompost/application/service/helper/RoomProgressHelper.java

@@ -0,0 +1,46 @@
+package konkuk.thip.roompost.application.service.helper;
+
+import konkuk.thip.book.application.port.out.BookCommandPort;
+import konkuk.thip.book.domain.Book;
+import konkuk.thip.common.annotation.HelperService;
+import konkuk.thip.room.application.port.out.RoomCommandPort;
+import konkuk.thip.room.application.port.out.RoomParticipantCommandPort;
+import konkuk.thip.room.domain.Room;
+import konkuk.thip.room.domain.RoomParticipant;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+@HelperService
+@RequiredArgsConstructor
+public class RoomProgressHelper {
+
+    private final RoomParticipantCommandPort roomParticipantCommandPort;
+    private final RoomCommandPort roomCommandPort;
+    private final BookCommandPort bookCommandPort;
+
+    public void updateUserAndRoomProgress(Long userId, Long roomId, int currentPage) {
+        RoomParticipant roomParticipant = roomParticipantCommandPort.getByUserIdAndRoomIdOrThrow(userId, roomId);
+        Room room = roomCommandPort.getByIdOrThrow(roomId);
+        Book book = bookCommandPort.findById(room.getBookId());
+
+        // 1. 유저 진행률 update
+        boolean updated = roomParticipant.updateUserProgress(currentPage, book.getPageCount());
+        if (!updated) return;     // update 되지 않았으면 종료
+
+        // 2. 방 평균 진행률 update
+        List<RoomParticipant> all = roomParticipantCommandPort.findAllByRoomId(roomId);
+        double total = all.stream()
+                .filter(p -> !roomParticipant.getId().equals(p.getId()))    // 현재 유저 제외
+                .mapToDouble(RoomParticipant::getUserPercentage)
+                .sum();
+        total += roomParticipant.getUserPercentage();
+        room.updateRoomPercentage(total / all.size());
+
+        // 3. 영속화
+        roomCommandPort.update(room);
+        roomParticipantCommandPort.update(roomParticipant);
+    }
+}

src/main/java/konkuk/thip/vote/application/service/VoteCreateService.java

@@ -3,7 +3,10 @@
 import konkuk.thip.book.application.port.out.BookCommandPort;
 import konkuk.thip.book.domain.Book;
 import konkuk.thip.room.application.port.out.RoomCommandPort;
+import konkuk.thip.room.application.port.out.RoomParticipantCommandPort;
+import konkuk.thip.room.application.service.validator.RoomParticipantValidator;
 import konkuk.thip.room.domain.Room;
+import konkuk.thip.roompost.application.service.helper.RoomProgressHelper;
 import konkuk.thip.vote.application.port.in.VoteCreateUseCase;
 import konkuk.thip.vote.application.port.in.dto.VoteCreateCommand;
 import konkuk.thip.vote.application.port.in.dto.VoteCreateResult;
@@ -22,14 +25,19 @@
 @Slf4j
 public class VoteCreateService implements VoteCreateUseCase {
 
+    private final RoomParticipantValidator roomParticipantValidator;
+    private final RoomParticipantCommandPort roomParticipantCommandPort;
     private final VoteCommandPort voteCommandPort;
     private final RoomCommandPort roomCommandPort;
     private final BookCommandPort bookCommandPort;
 
+    private final RoomProgressHelper roomProgressHelper;
+
     @Transactional
     @Override
-    //todo UserRoom 업데이트 로직 추가 필요!!
     public VoteCreateResult createVote(VoteCreateCommand command) {
+        roomParticipantValidator.validateUserIsRoomMember(command.roomId(), command.userId());
+
         // 1. validate
         Vote vote = Vote.withoutId(
                 command.content(),
@@ -39,7 +47,9 @@ public VoteCreateResult createVote(VoteCreateCommand command) {
                 command.roomId()
         );
 
-        validateVote(vote);
+        Room room = roomCommandPort.getByIdOrThrow(vote.getRoomId());
+        Book book = bookCommandPort.findById(room.getBookId());
+        validateVote(vote, book);
 
         // 2. vote 저장
         Long savedVoteId = voteCommandPort.saveVote(vote);
@@ -48,19 +58,18 @@ public VoteCreateResult createVote(VoteCreateCommand command) {
         List<VoteItem> voteItems = command.voteItemCreateCommands().stream()
                 .map(itemCmd -> VoteItem.withoutId(
                         itemCmd.itemName(),
-                        0,
                         savedVoteId
                 ))
                 .toList();
         voteCommandPort.saveAllVoteItems(voteItems);
 
+        // 4. RoomParticipant, Room progress 정보 update
+        roomProgressHelper.updateUserAndRoomProgress(vote.getCreatorId(), vote.getRoomId(), vote.getPage());
+
         return VoteCreateResult.of(savedVoteId, command.roomId());
     }
 
-    private void validateVote(Vote vote) {
-        Room room = roomCommandPort.getByIdOrThrow(vote.getRoomId());
-        Book book = bookCommandPort.findById(room.getBookId());
-
+    private void validateVote(Vote vote, Book book) {
         // 페이지 유효성 검증
         vote.validatePage(book.getPageCount());
 

src/main/java/konkuk/thip/vote/domain/VoteItem.java

@@ -22,11 +22,11 @@ public class VoteItem extends BaseDomainEntity {
 
     private Long voteId;
 
-    public static VoteItem withoutId(String itemName, int count, Long voteId) {
+    public static VoteItem withoutId(String itemName, Long voteId) {
         return VoteItem.builder()
                 .id(null)
                 .itemName(itemName)
-                .count(count)
+                .count(0)
                 .voteId(voteId)
                 .build();
     }

src/test/java/konkuk/thip/common/util/TestEntityFactory.java

@@ -103,6 +103,22 @@ public static BookJpaEntity createBook() {
                 .build();
     }
 
+    /**
+     * page 값을 지정할 수 있는 custom 생성자
+     */
+    public static BookJpaEntity createBook(int page) {
+        return BookJpaEntity.builder()
+                .title("책제목")
+                .authorName("저자")
+                .isbn(UUID.randomUUID().toString().replace("-", "").substring(0, 13))
+                .bestSeller(false)
+                .publisher("출판사")
+                .imageUrl("img")
+                .pageCount(page)
+                .description("설명")
+                .build();
+    }
+
     public static BookJpaEntity createBookWithISBN(String isbn) {
         return BookJpaEntity.builder()
                 .title("책제목")

src/test/java/konkuk/thip/room/adapter/in/web/RoomCreateAPITest.java

@@ -7,8 +7,10 @@
 import konkuk.thip.common.util.TestEntityFactory;
 import konkuk.thip.room.adapter.out.jpa.CategoryJpaEntity;
 import konkuk.thip.room.adapter.out.jpa.RoomJpaEntity;
+import konkuk.thip.room.adapter.out.jpa.RoomParticipantJpaEntity;
 import konkuk.thip.room.adapter.out.persistence.repository.category.CategoryJpaRepository;
 import konkuk.thip.room.adapter.out.persistence.repository.RoomJpaRepository;
+import konkuk.thip.room.adapter.out.persistence.repository.roomparticipant.RoomParticipantJpaRepository;
 import konkuk.thip.user.adapter.out.jpa.AliasJpaEntity;
 import konkuk.thip.user.adapter.out.jpa.UserJpaEntity;
 import konkuk.thip.user.adapter.out.jpa.UserRole;
@@ -24,6 +26,7 @@
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.ResultActions;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
@@ -63,13 +66,17 @@ class RoomCreateAPITest {
     @Autowired
     private RoomJpaRepository roomJpaRepository;
 
+    @Autowired
+    private RoomParticipantJpaRepository roomParticipantJpaRepository;
+
     @AfterEach
     void tearDown() {
-        roomJpaRepository.deleteAll();
-        bookJpaRepository.deleteAll();
-        userJpaRepository.deleteAll();
-        categoryJpaRepository.deleteAll();
-        aliasJpaRepository.deleteAll();
+        roomParticipantJpaRepository.deleteAllInBatch();
+        roomJpaRepository.deleteAllInBatch();
+        bookJpaRepository.deleteAllInBatch();
+        userJpaRepository.deleteAllInBatch();
+        categoryJpaRepository.deleteAllInBatch();
+        aliasJpaRepository.deleteAllInBatch();
     }
 
     private void saveUserAndCategory() {
@@ -273,4 +280,35 @@ void room_create_book_not_exist() throws Exception {
                 );
     }
 
+    @Test
+    @DisplayName("방 생성에 성공하면, 방장의 정보가 DB에 저장된다.")
+    @Transactional      // RoomParticipant -> Room, User 의 manyToOne 지연로딩을 위해 추가
+    void room_create_room_participant_save_success() throws Exception {
+        //given : user, category, pageCount값이 있는 book 생성, request 생성
+        saveUserAndCategory();
+        saveBookWithPageCount();
+
+        Long userId = userJpaRepository.findAll().get(0).getUserId();
+        Long bookId = bookJpaRepository.findAll().get(0).getBookId();
+        Long categoryId = categoryJpaRepository.findAll().get(0).getCategoryId();
+
+        Map<String, Object> request = buildRoomCreateRequest();
+
+        //when
+        ResultActions result = mockMvc.perform(post("/rooms")
+                .requestAttr("userId", userId)
+                .contentType(MediaType.APPLICATION_JSON)
+                .content(objectMapper.writeValueAsString(request)
+                ));
+
+        //then
+        result.andExpect(status().isOk())
+                .andExpect(jsonPath("$.data.roomId").exists());
+
+        RoomParticipantJpaEntity roomParticipantJpaEntity = roomParticipantJpaRepository.findAll().get(0);
+        assertThat(roomParticipantJpaEntity.getUserJpaEntity().getUserId()).isEqualTo(userId);
+
+        RoomJpaEntity savedRoomJpaEntity = roomJpaRepository.findAll().get(0);
+        assertThat(roomParticipantJpaEntity.getRoomJpaEntity().getRoomId()).isEqualTo(savedRoomJpaEntity.getRoomId());
+    }
 }

src/test/java/konkuk/thip/room/application/service/RoomJoinServiceTest.java

@@ -55,7 +55,7 @@ void alreadyParticipated() {
 
             given(roomCommandPort.findById(ROOM_ID)).willReturn(Optional.of(room));
             given(roomParticipantCommandPort.findByUserIdAndRoomIdOptional(USER_ID, ROOM_ID))
-                    .willReturn(Optional.of(RoomParticipant.withoutId(USER_ID, ROOM_ID, MEMBER.getType())));
+                    .willReturn(Optional.of(RoomParticipant.memberWithoutId(USER_ID, ROOM_ID)));
 
             assertThatThrownBy(() -> roomJoinService.changeJoinState(command))
                     .isInstanceOf(BusinessException.class)
@@ -100,7 +100,7 @@ void notParticipated() {
         @DisplayName("정상적으로 취소 시 참여자 제거 및 인원수 감소")
         void successCancel() {
             RoomJoinCommand command = new RoomJoinCommand(USER_ID, ROOM_ID, "cancel");
-            RoomParticipant participant = RoomParticipant.withoutId(USER_ID, ROOM_ID, MEMBER.getType());
+            RoomParticipant participant = RoomParticipant.memberWithoutId(USER_ID, ROOM_ID);
 
             given(roomCommandPort.findById(ROOM_ID)).willReturn(Optional.of(room));
             given(roomParticipantCommandPort.findByUserIdAndRoomIdOptional(USER_ID, ROOM_ID))