Merge pull request #16 from Sam3Star/gayeong

Gayeong
Sam3Star · Jun 25, 2024 · 62a558b · 62a558b
2 parents d78f5e4 + 0c96366
commit 62a558b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/...main/java/kr/hs/dgsw/clock_server/domain/routine/presentation/dto/res/RoutineLoadRes.java b/...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
@@ -69,10 +69,13 @@ public List<RoutineLoadRes> loadRoutine() {
 
         List<RoutineLoadRes> 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;
     }