style: config 최신화 및 Merge

src/main/java/com/moabam/api/application/bug/BugService.java

@@ -11,8 +11,8 @@
 import com.moabam.api.application.member.MemberService;
 import com.moabam.api.domain.bug.BugHistory;
 import com.moabam.api.domain.bug.BugType;
+import com.moabam.api.domain.bug.repository.BugHistorySearchRepository;
 import com.moabam.api.domain.member.Member;
-import com.moabam.api.domain.repository.BugHistorySearchRepository;
 import com.moabam.api.dto.TodayBugResponse;
 import com.moabam.api.dto.bug.BugResponse;
 import com.moabam.global.common.util.ClockHolder;

src/main/java/com/moabam/api/application/room/RoomSearchService.java

@@ -64,7 +64,7 @@ public RoomDetailsResponse getRoomDetails(Long memberId, Long roomId) {
 	}
 
 	private List<RoutineResponse> getRoutineResponses(Long roomId) {
-		List<Routine> roomRoutines = routineSearchRepository.findByRoomId(roomId);
+		List<Routine> roomRoutines = routineSearchRepository.findAllByRoomId(roomId);
 
 		return RoutineMapper.toRoutineResponses(roomRoutines);
 	}

src/main/java/com/moabam/api/application/room/RoomService.java

@@ -78,7 +78,7 @@ public void modifyRoom(Long memberId, Long roomId, ModifyRoomRequest modifyRoomR
 		room.changeCertifyTime(modifyRoomRequest.certifyTime());
 		room.changeMaxCount(modifyRoomRequest.maxUserCount());
 
-		List<Routine> routines = routineSearchRepository.findByRoomId(roomId);
+		List<Routine> routines = routineSearchRepository.findAllByRoomId(roomId);
 		routineRepository.deleteAll(routines);
 
 		List<Routine> newRoutines = RoutineMapper.toRoutineEntities(room, modifyRoomRequest.routines());

src/main/java/com/moabam/api/domain/repository/BugHistorySearchRepository.java → src/main/java/com/moabam/api/domain/bug/repository/BugHistorySearchRepository.java

@@ -1,4 +1,4 @@
-package com.moabam.api.domain.repository;
+package com.moabam.api.domain.bug.repository;
 
 import static com.moabam.api.domain.bug.QBugHistory.*;
 

src/main/java/com/moabam/api/domain/room/repository/RoutineSearchRepository.java

@@ -17,7 +17,7 @@ public class RoutineSearchRepository {
 
 	private final JPAQueryFactory jpaQueryFactory;
 
-	public List<Routine> findByRoomId(Long roomId) {
+	public List<Routine> findAllByRoomId(Long roomId) {
 		return jpaQueryFactory
 			.selectFrom(routine)
 			.where(

src/main/java/com/moabam/api/presentation/RoomController.java

@@ -22,6 +22,8 @@
 import com.moabam.api.dto.room.EnterRoomRequest;
 import com.moabam.api.dto.room.ModifyRoomRequest;
 import com.moabam.api.dto.room.RoomDetailsResponse;
+import com.moabam.global.auth.annotation.CurrentMember;
+import com.moabam.global.auth.model.AuthorizationMember;
 
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
@@ -37,50 +39,63 @@ public class RoomController {
 
 	@PostMapping
 	@ResponseStatus(HttpStatus.CREATED)
-	public Long createRoom(@Valid @RequestBody CreateRoomRequest createRoomRequest) {
-		return roomService.createRoom(1L, createRoomRequest);
+	public Long createRoom(@CurrentMember AuthorizationMember authorizationMember,
+		@Valid @RequestBody CreateRoomRequest createRoomRequest) {
+
+		return roomService.createRoom(authorizationMember.id(), createRoomRequest);
 	}
 
 	@PutMapping("/{roomId}")
 	@ResponseStatus(HttpStatus.OK)
-	public void modifyRoom(@Valid @RequestBody ModifyRoomRequest modifyRoomRequest,
-		@PathVariable("roomId") Long roomId) {
-		roomService.modifyRoom(1L, roomId, modifyRoomRequest);
+	public void modifyRoom(@CurrentMember AuthorizationMember authorizationMember,
+		@Valid @RequestBody ModifyRoomRequest modifyRoomRequest, @PathVariable("roomId") Long roomId) {
+
+		roomService.modifyRoom(authorizationMember.id(), roomId, modifyRoomRequest);
 	}
 
 	@PostMapping("/{roomId}")
 	@ResponseStatus(HttpStatus.OK)
-	public void enterRoom(@PathVariable("roomId") Long roomId, @Valid @RequestBody EnterRoomRequest enterRoomRequest) {
-		roomService.enterRoom(1L, roomId, enterRoomRequest);
+	public void enterRoom(@CurrentMember AuthorizationMember authorizationMember, @PathVariable("roomId") Long roomId,
+		@Valid @RequestBody EnterRoomRequest enterRoomRequest) {
+
+		roomService.enterRoom(authorizationMember.id(), roomId, enterRoomRequest);
 	}
 
 	@DeleteMapping("/{roomId}")
 	@ResponseStatus(HttpStatus.OK)
-	public void exitRoom(@PathVariable("roomId") Long roomId) {
-		roomService.exitRoom(1L, roomId);
+	public void exitRoom(@CurrentMember AuthorizationMember authorizationMember, @PathVariable("roomId") Long roomId) {
+		roomService.exitRoom(authorizationMember.id(), roomId);
 	}
 
 	@GetMapping("/{roomId}")
 	@ResponseStatus(HttpStatus.OK)
-	public RoomDetailsResponse getRoomDetails(@PathVariable("roomId") Long roomId) {
-		return roomSearchService.getRoomDetails(1L, roomId);
+	public RoomDetailsResponse getRoomDetails(@CurrentMember AuthorizationMember authorizationMember,
+		@PathVariable("roomId") Long roomId) {
+
+		return roomSearchService.getRoomDetails(authorizationMember.id(), roomId);
 	}
 
 	@PostMapping("/{roomId}/certification")
 	@ResponseStatus(HttpStatus.CREATED)
-	public void certifyRoom(@PathVariable("roomId") Long roomId, @RequestPart List<MultipartFile> multipartFiles) {
-		roomCertificationService.certifyRoom(1L, roomId, multipartFiles);
+	public void certifyRoom(@CurrentMember AuthorizationMember authorizationMember, @PathVariable("roomId") Long roomId,
+		@RequestPart List<MultipartFile> multipartFiles) {
+
+		roomCertificationService.certifyRoom(authorizationMember.id(), roomId, multipartFiles);
 	}
 
 	@PutMapping("/{roomId}/members/{memberId}/mandate")
 	@ResponseStatus(HttpStatus.OK)
-	public void mandateManager(@PathVariable("roomId") Long roomId, @PathVariable("memberId") Long memberId) {
-		roomService.mandateRoomManager(1L, roomId, memberId);
+	public void mandateManager(@CurrentMember AuthorizationMember authorizationMember,
+		@PathVariable("roomId") Long roomId, @PathVariable("memberId") Long memberId) {
+
+		roomService.mandateRoomManager(authorizationMember.id(), roomId, memberId);
 	}
 
 	@DeleteMapping("/{roomId}/members/{memberId}")
 	@ResponseStatus(HttpStatus.OK)
-	public void deportParticipant(@PathVariable("roomId") Long roomId, @PathVariable("memberId") Long memberId) {
-		roomService.deportParticipant(1L, roomId, memberId);
+	public void deportParticipant(@CurrentMember AuthorizationMember authorizationMember,
+		@PathVariable("roomId") Long roomId, @PathVariable("memberId") Long memberId) {
+
+		roomService.deportParticipant(authorizationMember.id(), roomId, memberId);
 	}
 }

src/test/java/com/moabam/api/application/RoomCertificationServiceTest.java → src/test/java/com/moabam/api/application/room/RoomCertificationServiceTest.java

@@ -1,7 +1,7 @@
-package com.moabam.api.application;
+package com.moabam.api.application.room;
 
 import static org.assertj.core.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.anyList;
+import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.BDDMockito.*;
 
 import java.time.LocalDate;
@@ -23,7 +23,6 @@
 
 import com.moabam.api.application.image.ImageService;
 import com.moabam.api.application.member.MemberService;
-import com.moabam.api.application.room.RoomCertificationService;
 import com.moabam.api.domain.image.ImageType;
 import com.moabam.api.domain.member.Member;
 import com.moabam.api.domain.room.DailyMemberCertification;

src/test/java/com/moabam/api/application/RoomServiceTest.java → src/test/java/com/moabam/api/application/room/RoomServiceTest.java

@@ -1,4 +1,4 @@
-package com.moabam.api.application;
+package com.moabam.api.application.room;
 
 import static com.moabam.api.domain.room.RoomType.*;
 import static org.assertj.core.api.Assertions.*;
@@ -17,7 +17,6 @@
 import org.mockito.junit.jupiter.MockitoExtension;
 
 import com.moabam.api.application.member.MemberService;
-import com.moabam.api.application.room.RoomService;
 import com.moabam.api.application.room.mapper.RoomMapper;
 import com.moabam.api.domain.member.Member;
 import com.moabam.api.domain.room.Participant;

src/test/java/com/moabam/api/domain/entity/CertificationTest.java → src/test/java/com/moabam/api/domain/room/CertificationTest.java

@@ -1,15 +1,10 @@
-package com.moabam.api.domain.entity;
+package com.moabam.api.domain.room;
 
 import static org.assertj.core.api.Assertions.*;
 
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
-import com.moabam.api.domain.room.Certification;
-import com.moabam.api.domain.room.Room;
-import com.moabam.api.domain.room.RoomType;
-import com.moabam.api.domain.room.Routine;
-
 class CertificationTest {
 
 	String content = "물 마시기";

src/test/java/com/moabam/api/domain/entity/RoomTest.java → src/test/java/com/moabam/api/domain/room/RoomTest.java

@@ -1,4 +1,4 @@
-package com.moabam.api.domain.entity;
+package com.moabam.api.domain.room;
 
 import static org.assertj.core.api.Assertions.*;
 
@@ -7,8 +7,6 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
 
-import com.moabam.api.domain.room.Room;
-import com.moabam.api.domain.room.RoomType;
 import com.moabam.global.error.exception.BadRequestException;
 import com.moabam.global.error.model.ErrorMessage;
 

src/test/java/com/moabam/api/domain/repository/CertificationsSearchRepositoryTest.java → src/test/java/com/moabam/api/domain/room/repository/CertificationsSearchRepositoryTest.java

@@ -1,4 +1,4 @@
-package com.moabam.api.domain.repository;
+package com.moabam.api.domain.room.repository;
 
 import static org.assertj.core.api.Assertions.*;
 
@@ -16,13 +16,6 @@
 import com.moabam.api.domain.room.Participant;
 import com.moabam.api.domain.room.Room;
 import com.moabam.api.domain.room.Routine;
-import com.moabam.api.domain.room.repository.CertificationRepository;
-import com.moabam.api.domain.room.repository.CertificationsSearchRepository;
-import com.moabam.api.domain.room.repository.DailyMemberCertificationRepository;
-import com.moabam.api.domain.room.repository.DailyRoomCertificationRepository;
-import com.moabam.api.domain.room.repository.ParticipantRepository;
-import com.moabam.api.domain.room.repository.RoomRepository;
-import com.moabam.api.domain.room.repository.RoutineRepository;
 import com.moabam.support.annotation.QuerydslRepositoryTest;
 import com.moabam.support.fixture.RoomFixture;
 

src/test/java/com/moabam/api/domain/repository/ParticipantSearchRepositoryTest.java → src/test/java/com/moabam/api/domain/room/repository/ParticipantSearchRepositoryTest.java

@@ -1,4 +1,4 @@
-package com.moabam.api.domain.repository;
+package com.moabam.api.domain.room.repository;
 
 import static org.assertj.core.api.Assertions.*;
 
@@ -13,9 +13,6 @@
 
 import com.moabam.api.domain.room.Participant;
 import com.moabam.api.domain.room.Room;
-import com.moabam.api.domain.room.repository.ParticipantRepository;
-import com.moabam.api.domain.room.repository.ParticipantSearchRepository;
-import com.moabam.api.domain.room.repository.RoomRepository;
 import com.moabam.global.config.JpaConfig;
 
 @DataJpaTest

src/test/java/com/moabam/api/presentation/BugControllerTest.java

@@ -27,7 +27,7 @@
 import com.moabam.api.application.bug.BugMapper;
 import com.moabam.api.application.member.MemberService;
 import com.moabam.api.domain.bug.repository.BugHistoryRepository;
-import com.moabam.api.domain.repository.BugHistorySearchRepository;
+import com.moabam.api.domain.bug.repository.BugHistorySearchRepository;
 import com.moabam.api.dto.TodayBugResponse;
 import com.moabam.api.dto.bug.BugResponse;
 import com.moabam.support.annotation.WithMember;