refactor: Service단 Validate 리팩토링

jay-so · Feb 19, 2024 · b97e65f · b97e65f
1 parent 3ea5f39
commit b97e65f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/main/java/org/prography/spring/service/validation/ValidateRoomService.java b/src/main/java/org/prography/spring/service/validation/ValidateRoomService.java
@@ -33,7 +33,7 @@ public class ValidateRoomService {
     public void validateUserStatusIsActive(Long userId) {
         Optional<User> checkUserStatusIsActive = userRepository.findByIdAndStatus(userId, ACTIVE);
 
-        if (!checkUserStatusIsActive.isPresent()) {
+        if (checkUserStatusIsActive.isEmpty()) {
             throw new BussinessException(BAD_REQUEST);
         }
     }
@@ -55,15 +55,15 @@ public User validateUserIsExist(Long userId) {
     public void validateRoomIsExist(Long roomId) {
         Optional<Room> checkRoomIsExist = roomRepository.findById(roomId);
 
-        if (!checkRoomIsExist.isPresent()) {
+        if (checkRoomIsExist.isEmpty()) {
             throw new BussinessException(BAD_REQUEST);
         }
     }
 
     public void validateRoomStatusIsWait(Long roomId) {
         Optional<Room> checkRoomStatusIsWait = roomRepository.findByIdAndStatus(roomId, WAIT);
 
-        if (!checkRoomStatusIsWait.isPresent()) {
+        if (checkRoomStatusIsWait.isEmpty()) {
             throw new BussinessException(BAD_REQUEST);
         }
     }
@@ -107,7 +107,7 @@ public void validateHostOfRoom(Long roomId, Long userId) {
     public void validateUserIsInRoom(Long roomId, Long userId) {
         Optional<UserRoom> checkUserParticipate = userRoomRepository.findByRoomId_IdAndUserId_Id(roomId, userId);
 
-        if (!checkUserParticipate.isPresent()) {
+        if (checkUserParticipate.isEmpty()) {
             throw new BussinessException(BAD_REQUEST);
         }
     }

diff --git a/src/main/java/org/prography/spring/service/validation/ValidateTeamService.java b/src/main/java/org/prography/spring/service/validation/ValidateTeamService.java
@@ -34,15 +34,15 @@ public void validateRoomIsExist(Long roomId) {
     public void validateRoomStatusIsWait(Long roomId) {
         Optional<Room> checkRoomStatusIsWait = roomRepository.findByIdAndStatus(roomId, WAIT);
 
-        if (!checkRoomStatusIsWait.isPresent()) {
+        if (checkRoomStatusIsWait.isEmpty()) {
             throw new BussinessException(BAD_REQUEST);
         }
     }
 
     public void validateUserParticipationInRoom(Long roomId, Long userId) {
         Optional<UserRoom> checkUserIsParticipate = userRoomRepository.findByUserId_IdAndRoomId_Id(userId, roomId);
 
-        if (!checkUserIsParticipate.isPresent()) {
+        if (checkUserIsParticipate.isEmpty()) {
             throw new BussinessException(BAD_REQUEST);
         }
     }