Merge branch 'develop' into feat/28

src/main/java/com/telepigeon/server/controller/RoomController.java

@@ -25,7 +25,7 @@ public ResponseEntity<Void> createRoom(
             @UserId Long userId,
             @Valid @RequestBody RoomCreateDto roomCreateDto
             ) {
-        Room createdRoom = roomService.createRoom(roomCreateDto);
+        Room createdRoom = roomService.createRoom(roomCreateDto, userId);
         URI location = URI.create("/rooms/" + createdRoom.getId());
         return ResponseEntity.created(location).build();
     }

src/main/java/com/telepigeon/server/exception/code/NotFoundErrorCode.java

@@ -14,6 +14,7 @@ public enum NotFoundErrorCode implements DefaultErrorCode{
     ROOM_NOT_FOUND(HttpStatus.NOT_FOUND, "error", "존재하지 않는 방입니다."),
     USER_NOT_FOUND(HttpStatus.NOT_FOUND, "error", "존재하지 않는 사용자입니다."),
     QUESTION_NOT_FOUND(HttpStatus.NOT_FOUND, "error", "존재하지 않는 질문 입니다."),
+    PROFILE_NOT_FOUND(HttpStatus.NOT_FOUND, "error", "존재하지 않는 프로필입니다."),
     ;
 
     @JsonIgnore

src/main/java/com/telepigeon/server/repository/ProfileRepository.java

@@ -1,7 +1,13 @@
 package com.telepigeon.server.repository;
 
 import com.telepigeon.server.domain.Profile;
+import com.telepigeon.server.domain.Room;
+import com.telepigeon.server.domain.Users;
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import java.util.Optional;
+
 public interface ProfileRepository extends JpaRepository<Profile, Long> {
+    Optional<Profile> findByUserAndRoom(Users user, Room room);
+    Optional<Profile> findByUserNotAndRoom(Users user, Room room);
 }

src/main/java/com/telepigeon/server/service/profile/ProfileRetriever.java

@@ -0,0 +1,28 @@
+package com.telepigeon.server.service.profile;
+
+import com.telepigeon.server.domain.Profile;
+import com.telepigeon.server.domain.Room;
+import com.telepigeon.server.domain.Users;
+import com.telepigeon.server.exception.NotFoundException;
+import com.telepigeon.server.exception.code.NotFoundErrorCode;
+import com.telepigeon.server.repository.ProfileRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+
+@Component
+@RequiredArgsConstructor
+public class ProfileRetriever {
+
+    private final ProfileRepository profileRepository;
+
+    public Profile findByUserAndRoom(Users user, Room room) {
+        return profileRepository.findByUserAndRoom(user, room)
+                .orElseThrow(() -> new NotFoundException(NotFoundErrorCode.PROFILE_NOT_FOUND));
+    }
+
+    public Profile findByUserNotAndRoom(Users user, Room room) {
+        return profileRepository.findByUserNotAndRoom(user, room)
+                .orElseThrow(() -> new NotFoundException(NotFoundErrorCode.PROFILE_NOT_FOUND));
+    }
+
+}

src/main/java/com/telepigeon/server/service/room/RoomService.java

@@ -25,16 +25,16 @@ public class RoomService {
     private final ProfileSaver profileSaver;
 
     @Transactional
-    public Room createRoom(final RoomCreateDto roomCreateDto){
-//        Users user = userRepository.findByIdOrThrow(userId);
+    public Room createRoom(final RoomCreateDto roomCreateDto, final Long userId){
+        Users user = userRepository.findByIdOrThrow(userId);
 
         String code = createCode();
 
         Room room = Room.create(roomCreateDto, code);
         Room savedRoom = roomSaver.save(room);
 
-//        Profile profile = Profile.create(user, savedRoom);
-//        Profile savedProfile = profileSaver.save(profile);
+        Profile profile = Profile.create(user, savedRoom);
+        Profile savedProfile = profileSaver.save(profile);
 
         return savedRoom;
     }

src/test/java/com/telepigeon/server/roomTest/RoomServiceTest.java

@@ -1,29 +1,76 @@
 package com.telepigeon.server.roomTest;
 
+import com.telepigeon.server.domain.Profile;
 import com.telepigeon.server.domain.Room;
+import com.telepigeon.server.domain.Users;
 import com.telepigeon.server.dto.room.request.RoomCreateDto;
 import com.telepigeon.server.repository.RoomRepository;
+import com.telepigeon.server.repository.UserRepository;
+import com.telepigeon.server.service.profile.ProfileSaver;
 import com.telepigeon.server.service.room.RoomRetriever;
 import com.telepigeon.server.service.room.RoomSaver;
+import com.telepigeon.server.service.room.RoomService;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.Mockito;
+import org.mockito.junit.jupiter.MockitoExtension;
 
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.when;
+
+
+@ExtendWith(MockitoExtension.class)
 public class RoomServiceTest {
 
     @Mock
     private RoomRepository roomRepository = Mockito.mock(RoomRepository.class);
 
+    @Mock
+    private UserRepository userRepository = Mockito.mock(UserRepository.class);
+
+    @InjectMocks
+    private RoomService roomService;
+
+    @Mock
+    private RoomSaver roomSaver;
+
+    @Mock
+    private ProfileSaver profileSaver;
+
     @Test
     @DisplayName("Room DB에 저장 확인")
     public void checkRoomInDB() {
-        RoomSaver roomSaver = new RoomSaver(roomRepository);
-        Room room = Room.create(new RoomCreateDto("name"), "code");
-        Mockito.doAnswer(invocation -> room).when(roomRepository).save(room);
-        Room room1 = roomSaver.save(room);
-        Assertions.assertEquals(room.getName(), room1.getName());
+        RoomCreateDto roomCreateDto = new RoomCreateDto("test");
+        Long userId = 1L;
+        Room room = Room.create(roomCreateDto, "code");
+
+        Users user = Mockito.mock(Users.class);
+        when(userRepository.findByIdOrThrow(userId)).thenReturn(user);
+        when(roomRepository.existsByCode(any(String.class))).thenReturn(false);
+        when(roomSaver.save(any(Room.class))).thenReturn(room);
+
+        Profile savedProfile = Profile.create(user, room);
+        when(profileSaver.save(any(Profile.class))).thenReturn(savedProfile);
+
+        Room createdRoom = roomService.createRoom(roomCreateDto, userId);
+
+        // 방이 올바르게 생성되었는지 확인
+        Assertions.assertEquals(room.getName(), createdRoom.getName());
+
+        // 프로필이 올바르게 생성되었는지 확인
+        Assertions.assertEquals(user, savedProfile.getUser());
+        Assertions.assertEquals(room, savedProfile.getRoom());
+
+        // 정보 출력해 확인
+        System.out.println("Room name : " + createdRoom.getName());
+        System.out.println("Room code : " + createdRoom.getCode());
+        System.out.println("Room created time : " + createdRoom.getCreatedAt());
+        System.out.println("Profile room : " + savedProfile.getRoom());
+        System.out.println("Profile user : " + savedProfile.getUser());
     }
 
     @Test