diff --git a/src/main/java/kr/hs/dgsw/clock_server/domain/routine/presentation/dto/res/RoutineLoadRes.java b/src/main/java/kr/hs/dgsw/clock_server/domain/routine/presentation/dto/res/RoutineLoadRes.java index 9aae561..c004b5d 100644 --- a/src/main/java/kr/hs/dgsw/clock_server/domain/routine/presentation/dto/res/RoutineLoadRes.java +++ b/src/main/java/kr/hs/dgsw/clock_server/domain/routine/presentation/dto/res/RoutineLoadRes.java @@ -2,17 +2,20 @@ import kr.hs.dgsw.clock_server.global.common.enums.ColorEnum; import kr.hs.dgsw.clock_server.global.common.enums.ImportanceEnum; +import kr.hs.dgsw.clock_server.global.common.enums.State; public record RoutineLoadRes( Long id, String name, ImportanceEnum importanceEnum, - ColorEnum colorEnum + ColorEnum colorEnum, + State state ) { public static RoutineLoadRes of(Long id, String name, ImportanceEnum importanceEnum, - ColorEnum colorEnum){ - return new RoutineLoadRes(id, name, importanceEnum, colorEnum); + ColorEnum colorEnum, + State state){ + return new RoutineLoadRes(id, name, importanceEnum, colorEnum, state); } } diff --git a/src/main/java/kr/hs/dgsw/clock_server/domain/routine/service/RoutineServiceImpl.java b/src/main/java/kr/hs/dgsw/clock_server/domain/routine/service/RoutineServiceImpl.java index 6fc8c54..ef3cbbf 100644 --- a/src/main/java/kr/hs/dgsw/clock_server/domain/routine/service/RoutineServiceImpl.java +++ b/src/main/java/kr/hs/dgsw/clock_server/domain/routine/service/RoutineServiceImpl.java @@ -69,10 +69,13 @@ public List loadRoutine() { List routineLoadResList = new ArrayList<>(); for (RoutineEntity routine : routineEntity){ - routineLoadResList.add(RoutineLoadRes.of(routine.getRoutineId(), + routineLoadResList.add(RoutineLoadRes.of( + routine.getRoutineId(), routine.getName(), routine.getImportanceEnum(), - routine.getColorEnum())); + routine.getColorEnum(), + routine.getState()) + ); } return routineLoadResList; }