refactor: 코드 리뷰 반영

team-moabam · Nov 1, 2023 · a0bacae · a0bacae
1 parent c299ac3
commit a0bacae
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 10 deletions.
diff --git a/src/main/java/com/moabam/api/application/RoomService.java b/src/main/java/com/moabam/api/application/RoomService.java
@@ -11,6 +11,7 @@
 import com.moabam.api.domain.entity.Room;
 import com.moabam.api.domain.entity.Routine;
 import com.moabam.api.domain.repository.ParticipantRepository;
+import com.moabam.api.domain.repository.ParticipantSearchRepository;
 import com.moabam.api.domain.repository.RoomRepository;
 import com.moabam.api.domain.repository.RoutineRepository;
 import com.moabam.api.dto.CreateRoomRequest;
@@ -29,6 +30,7 @@ public class RoomService {
 	private final RoomRepository roomRepository;
 	private final RoutineRepository routineRepository;
 	private final ParticipantRepository participantRepository;
+	private final ParticipantSearchRepository participantSearchRepository;
 
 	@Transactional
 	public void createRoom(Long memberId, CreateRoomRequest createRoomRequest) {
@@ -39,7 +41,6 @@ public void createRoom(Long memberId, CreateRoomRequest createRoomRequest) {
 			.memberId(memberId)
 			.build();
 		participant.enableManager();
-
 		roomRepository.save(room);
 		routineRepository.saveAll(routines);
 		participantRepository.save(participant);
@@ -48,7 +49,7 @@ public void createRoom(Long memberId, CreateRoomRequest createRoomRequest) {
 	@Transactional
 	public void modifyRoom(Long memberId, Long roomId, ModifyRoomRequest modifyRoomRequest) {
 		// TODO: 추후에 별도 메서드로 뺄듯
-		Participant participant = participantRepository.findParticipantByRoomIdAndMemberId(roomId, memberId)
+		Participant participant = participantSearchRepository.findParticipant(roomId, memberId)
 			.orElseThrow(() -> new NotFoundException(PARTICIPANT_NOT_FOUND));
 
 		if (!participant.isManager()) {

diff --git a/src/main/java/com/moabam/api/domain/entity/Certification.java b/src/main/java/com/moabam/api/domain/entity/Certification.java
@@ -40,7 +40,8 @@ public class Certification extends BaseTimeEntity {
 	private String image;
 
 	@Builder
-	private Certification(Routine routine, Long memberId, String image) {
+	private Certification(Long id, Routine routine, Long memberId, String image) {
+		this.id = id;
 		this.routine = requireNonNull(routine);
 		this.memberId = requireNonNull(memberId);
 		this.image = requireNonNull(image);

diff --git a/src/main/java/com/moabam/api/domain/entity/Participant.java b/src/main/java/com/moabam/api/domain/entity/Participant.java
@@ -23,7 +23,7 @@
 @Entity
 @Getter
 @Table(name = "participant")
-@SQLDelete(sql = "UPDATE participants SET deleted_at = CURRENT_TIMESTAMP where id = ?")
+@SQLDelete(sql = "UPDATE participant SET deleted_at = CURRENT_TIMESTAMP where id = ?")
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 public class Participant {
 
@@ -49,7 +49,8 @@ public class Participant {
 	private LocalDateTime deletedAt;
 
 	@Builder
-	private Participant(Room room, Long memberId) {
+	private Participant(Long id, Room room, Long memberId) {
+		this.id = id;
 		this.room = requireNonNull(room);
 		this.memberId = requireNonNull(memberId);
 		this.isManager = false;

diff --git a/src/main/java/com/moabam/api/domain/entity/Room.java b/src/main/java/com/moabam/api/domain/entity/Room.java
@@ -32,7 +32,6 @@ public class Room extends BaseTimeEntity {
 	private static final String ROOM_LEVEL_0_IMAGE = "'temptemp'";
 	private static final String ROOM_LEVEL_10_IMAGE = "'temp'";
 	private static final String ROOM_LEVEL_20_IMAGE = "'tempp'";
-
 	private static final int MORNING_START_TIME = 4;
 	private static final int MORNING_END_TIME = 10;
 	private static final int NIGHT_START_TIME = 20;
@@ -55,7 +54,7 @@ public class Room extends BaseTimeEntity {
 	private int level;
 
 	@Enumerated(value = EnumType.STRING)
-	@Column(name = "type")
+	@Column(name = "room_type")
 	private RoomType roomType;
 
 	@Column(name = "certify_time", nullable = false)
@@ -76,7 +75,8 @@ public class Room extends BaseTimeEntity {
 	private String roomImage;
 
 	@Builder
-	private Room(String title, String password, RoomType roomType, int certifyTime, int maxUserCount) {
+	private Room(Long id, String title, String password, RoomType roomType, int certifyTime, int maxUserCount) {
+		this.id = id;
 		this.title = requireNonNull(title);
 		this.password = password;
 		this.level = 0;

diff --git a/src/main/java/com/moabam/api/domain/entity/Routine.java b/src/main/java/com/moabam/api/domain/entity/Routine.java
@@ -37,7 +37,8 @@ public class Routine extends BaseTimeEntity {
 	private String content;
 
 	@Builder
-	private Routine(Room room, String content) {
+	private Routine(Long id, Room room, String content) {
+		this.id = id;
 		this.room = requireNonNull(room);
 		this.content = requireNonNull(content);
 	}

diff --git a/src/main/java/com/moabam/api/domain/entity/enums/RoomType.java b/src/main/java/com/moabam/api/domain/entity/enums/RoomType.java
@@ -2,5 +2,6 @@
 
 public enum RoomType {
 
-	MORNING, NIGHT
+	MORNING,
+	NIGHT
 }
diff --git a/src/main/java/com/moabam/api/domain/repository/ParticipantSearchRepository.java b/src/main/java/com/moabam/api/domain/repository/ParticipantSearchRepository.java
@@ -0,0 +1,30 @@
+package com.moabam.api.domain.repository;
+
+import static com.moabam.api.domain.entity.QParticipant.*;
+
+import java.util.Optional;
+
+import org.springframework.stereotype.Repository;
+
+import com.moabam.api.domain.entity.Participant;
+import com.moabam.global.common.util.DynamicQuery;
+import com.querydsl.jpa.impl.JPAQueryFactory;
+
+import lombok.RequiredArgsConstructor;
+
+@Repository
+@RequiredArgsConstructor
+public class ParticipantSearchRepository {
+
+	private final JPAQueryFactory jpaQueryFactory;
+
+	public Optional<Participant> findParticipant(Long roomId, Long memberId) {
+		return Optional.ofNullable(
+			jpaQueryFactory.selectFrom(participant)
+				.where(
+					DynamicQuery.generateEq(roomId, participant.room.id::eq),
+					DynamicQuery.generateEq(memberId, participant.memberId::eq)
+				).fetchOne()
+		);
+	}
+}