Skip to content

Commit b97e65f

Browse files
committed
refactor: Service단 Validate 리팩토링
1 parent 3ea5f39 commit b97e65f

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/main/java/org/prography/spring/service/validation/ValidateRoomService.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public class ValidateRoomService {
3333
public void validateUserStatusIsActive(Long userId) {
3434
Optional<User> checkUserStatusIsActive = userRepository.findByIdAndStatus(userId, ACTIVE);
3535

36-
if (!checkUserStatusIsActive.isPresent()) {
36+
if (checkUserStatusIsActive.isEmpty()) {
3737
throw new BussinessException(BAD_REQUEST);
3838
}
3939
}
@@ -55,15 +55,15 @@ public User validateUserIsExist(Long userId) {
5555
public void validateRoomIsExist(Long roomId) {
5656
Optional<Room> checkRoomIsExist = roomRepository.findById(roomId);
5757

58-
if (!checkRoomIsExist.isPresent()) {
58+
if (checkRoomIsExist.isEmpty()) {
5959
throw new BussinessException(BAD_REQUEST);
6060
}
6161
}
6262

6363
public void validateRoomStatusIsWait(Long roomId) {
6464
Optional<Room> checkRoomStatusIsWait = roomRepository.findByIdAndStatus(roomId, WAIT);
6565

66-
if (!checkRoomStatusIsWait.isPresent()) {
66+
if (checkRoomStatusIsWait.isEmpty()) {
6767
throw new BussinessException(BAD_REQUEST);
6868
}
6969
}
@@ -107,7 +107,7 @@ public void validateHostOfRoom(Long roomId, Long userId) {
107107
public void validateUserIsInRoom(Long roomId, Long userId) {
108108
Optional<UserRoom> checkUserParticipate = userRoomRepository.findByRoomId_IdAndUserId_Id(roomId, userId);
109109

110-
if (!checkUserParticipate.isPresent()) {
110+
if (checkUserParticipate.isEmpty()) {
111111
throw new BussinessException(BAD_REQUEST);
112112
}
113113
}

src/main/java/org/prography/spring/service/validation/ValidateTeamService.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,15 @@ public void validateRoomIsExist(Long roomId) {
3434
public void validateRoomStatusIsWait(Long roomId) {
3535
Optional<Room> checkRoomStatusIsWait = roomRepository.findByIdAndStatus(roomId, WAIT);
3636

37-
if (!checkRoomStatusIsWait.isPresent()) {
37+
if (checkRoomStatusIsWait.isEmpty()) {
3838
throw new BussinessException(BAD_REQUEST);
3939
}
4040
}
4141

4242
public void validateUserParticipationInRoom(Long roomId, Long userId) {
4343
Optional<UserRoom> checkUserIsParticipate = userRoomRepository.findByUserId_IdAndRoomId_Id(userId, roomId);
4444

45-
if (!checkUserIsParticipate.isPresent()) {
45+
if (checkUserIsParticipate.isEmpty()) {
4646
throw new BussinessException(BAD_REQUEST);
4747
}
4848
}

0 commit comments

Comments
 (0)