refactor [#109] 엔티티 존재 여부 메소드 분리

SOPT-all · Jan 18, 2025 · 51f0d4a · 51f0d4a
1 parent 200401d
commit 51f0d4a
Showing 1 changed file with 24 additions and 9 deletions.
diff --git a/src/main/java/org/sopt/confeti/api/user/facade/UserTimetableFacade.java b/src/main/java/org/sopt/confeti/api/user/facade/UserTimetableFacade.java
@@ -23,25 +23,40 @@ public class UserTimetableFacade {
 
     @Transactional(readOnly = true)
     public UserTimetableDTO getTimetablesListAndDate(long userId) {
-        if (!userService.existsById(userId)) {
-            throw new NotFoundException(ErrorMessage.NOT_FOUND);
-        }
+        validateExistUser(userId);
 
         List<TimetableFestival> festivalList =  timetableFestivalService.getFetivalList(userId);
         return UserTimetableDTO.from(festivalList);
     }
 
     @Transactional
     public void removeTimetableFestival(final long userId, final long festivalId) {
-        if (
-                !userService.existsById(userId) ||
-                        !festivalService.existsById(festivalId) ||
-                        !timetableFestivalService.existsByUserIdAndFestivalId(userId, festivalId)
-        ) {
+        validateExistUser(userId);
+        validateExistFestival(festivalId);
+        validateExistTimetableFestival(userId, festivalId);
+
+        timetableFestivalService.removeTimetableFestival(userId, festivalId);
+    }
+
+    @Transactional(readOnly = true)
+    protected void validateExistUser(final long userId) {
+        if (!userService.existsById(userId)) {
             throw new NotFoundException(ErrorMessage.NOT_FOUND);
         }
+    }
 
-        timetableFestivalService.removeTimetableFestival(userId, festivalId);
+    @Transactional(readOnly = true)
+    protected void validateExistFestival(final long festivalId) {
+        if (!festivalService.existsById(festivalId)) {
+            throw new NotFoundException(ErrorMessage.NOT_FOUND);
+        }
+    }
+
+    @Transactional(readOnly = true)
+    protected void validateExistTimetableFestival(final long userId, final long festivalId) {
+        if (!timetableFestivalService.existsByUserIdAndFestivalId(userId, festivalId)) {
+            throw new NotFoundException(ErrorMessage.NOT_FOUND);
+        }
     }
 }