[FIX] 루틴 조회 API 그룹 루틴 알람 여부 값 형식 수정

Author: ChaeAg

src/main/java/org/routineade/RoutineAdeServer/dto/routine/GroupRoutineInfo.java

@@ -5,10 +5,9 @@
 public record GroupRoutineInfo(
         Long routineId,
         String routineTitle,
-        Boolean isCompletion,
-        Boolean isAlarmEnabled
+        Boolean isCompletion
 ) {
-    public static GroupRoutineInfo of(Routine routine, Boolean isCompletion, Boolean isAlarmEnabled) {
-        return new GroupRoutineInfo(routine.getRoutineId(), routine.getRoutineTitle(), isCompletion, isAlarmEnabled);
+    public static GroupRoutineInfo of(Routine routine, Boolean isCompletion) {
+        return new GroupRoutineInfo(routine.getRoutineId(), routine.getRoutineTitle(), isCompletion);
     }
 }

src/main/java/org/routineade/RoutineAdeServer/dto/routine/GroupRoutinesGetResponse.java

@@ -6,9 +6,11 @@
 public record GroupRoutinesGetResponse(
         Long groupId,
         String groupTitle,
+        Boolean isAlarmEnabled,
         List<GroupRoutinesCategoryInfo> groupRoutines
 ) {
-    public static GroupRoutinesGetResponse of(Group group, List<GroupRoutinesCategoryInfo> groupRoutines) {
-        return new GroupRoutinesGetResponse(group.getGroupId(), group.getGroupTitle(), groupRoutines);
+    public static GroupRoutinesGetResponse of(Group group, Boolean isAlarmEnabled,
+                                              List<GroupRoutinesCategoryInfo> groupRoutines) {
+        return new GroupRoutinesGetResponse(group.getGroupId(), group.getGroupTitle(), isAlarmEnabled, groupRoutines);
     }
 }

src/main/java/org/routineade/RoutineAdeServer/service/RoutineService.java

@@ -29,8 +29,6 @@
 import org.routineade.RoutineAdeServer.dto.routine.GroupRoutineInfo;
 import org.routineade.RoutineAdeServer.dto.routine.GroupRoutinesCategoryInfo;
 import org.routineade.RoutineAdeServer.dto.routine.GroupRoutinesGetResponse;
-import org.routineade.RoutineAdeServer.dto.routine.PersonalRoutineByUserProfileGetResponse;
-import org.routineade.RoutineAdeServer.dto.routine.PersonalRoutineByUserProfileInfo;
 import org.routineade.RoutineAdeServer.dto.routine.PersonalRoutineGetResponse;
 import org.routineade.RoutineAdeServer.dto.routine.PersonalRoutineInfo;
 import org.routineade.RoutineAdeServer.dto.routine.RoutineCreateRequest;
@@ -111,8 +109,8 @@ public RoutinesGetResponse getRoutines(User user, String routineDate) {
             }
 
             groupRoutinesGetResponses.add(
-                    GroupRoutinesGetResponse.of(userGroup, createGroupRoutineCategories(user, filterRoutines,
-                            date, groupMember.getIsGroupAlarmEnabled())));
+                    GroupRoutinesGetResponse.of(userGroup, groupMember.getIsGroupAlarmEnabled(),
+                            createGroupRoutineCategories(user, filterRoutines, date)));
         }
 
         return RoutinesGetResponse.of(personalRoutineGetResponses, groupRoutinesGetResponses,
@@ -128,8 +126,8 @@ public RoutinesByUserProfileGetResponse getRoutinesByUserProfile(Group group, Us
         List<Routine> filterRoutines = routineRepeatDayService.filterRoutinesByDay(routines, date.getDayOfWeek());
 
         return RoutinesByUserProfileGetResponse.of(user, userEmotionService.getUserEmotionByDate(user, date),
-                GroupRoutinesGetResponse.of(group,
-                        createGroupRoutineCategories(user, filterRoutines, date, isAlarmEnabled)));
+                GroupRoutinesGetResponse.of(group, isAlarmEnabled,
+                        createGroupRoutineCategories(user, filterRoutines, date)));
     }
 
     public void createRoutine(User user, RoutineCreateRequest request) {
@@ -357,7 +355,7 @@ private List<PersonalRoutineGetResponse> createPersonalRoutineCategories(User us
     }
 
     private List<GroupRoutinesCategoryInfo> createGroupRoutineCategories(User user, List<Routine> routines,
-                                                                         LocalDate date, Boolean isAlarmEnabled) {
+                                                                         LocalDate date) {
         return Arrays.stream(Category.values())
                 .map(category -> GroupRoutinesCategoryInfo.of(
                         category.getLabel(),
@@ -366,31 +364,10 @@ private List<GroupRoutinesCategoryInfo> createGroupRoutineCategories(User user,
                                         || r.getStartDate().isEqual(date)))
                                 .map(r -> GroupRoutineInfo.of(
                                         r,
-                                        completionRoutineService.getIsCompletionRoutine(user, r, date),
-                                        isAlarmEnabled))
-                                .toList()
-                ))
-                .filter(grci -> !grci.routines().isEmpty())
-                .toList();
-    }
-
-    private List<PersonalRoutineByUserProfileGetResponse> createProfilePersonalRoutineCategories(User user,
-                                                                                                 List<Routine> routines,
-                                                                                                 LocalDate date) {
-        return Arrays.stream(Category.values())
-                .map(category -> PersonalRoutineByUserProfileGetResponse.of(
-                        category.getLabel(),
-                        routines.stream()
-                                .filter(r -> r.getRoutineCategory().equals(category) && (r.getStartDate().isBefore(date)
-                                        || r.getStartDate().isEqual(date)))
-                                .map(r -> PersonalRoutineByUserProfileInfo.of(
-                                        r,
-                                        r.getRoutineRepeatDays().stream()
-                                                .map(rd -> rd.getRepeatDay().getLabel())
-                                                .toList(),
                                         completionRoutineService.getIsCompletionRoutine(user, r, date)))
                                 .toList()
                 ))
+                .filter(grci -> !grci.routines().isEmpty())
                 .toList();
     }