diff --git a/src/main/java/tenten/blooming/domain/subgoal/dto/SubgoalResponse.java b/src/main/java/tenten/blooming/domain/subgoal/dto/SubgoalResponse.java index 84bef9e..4915f5d 100644 --- a/src/main/java/tenten/blooming/domain/subgoal/dto/SubgoalResponse.java +++ b/src/main/java/tenten/blooming/domain/subgoal/dto/SubgoalResponse.java @@ -15,11 +15,12 @@ public class SubgoalResponse { private String goalName; private Long goalId; private LocalDate goalCreateDate; - private List Subgoals; + private List SubgoalList; @Data @NoArgsConstructor public static class SubgoalInfo { + private Long subgoalId; private String subgoalName; private List doneDateList; } diff --git a/src/main/java/tenten/blooming/domain/subgoal/service/SubgoalService.java b/src/main/java/tenten/blooming/domain/subgoal/service/SubgoalService.java index 11cb166..6c55647 100644 --- a/src/main/java/tenten/blooming/domain/subgoal/service/SubgoalService.java +++ b/src/main/java/tenten/blooming/domain/subgoal/service/SubgoalService.java @@ -13,6 +13,7 @@ import tenten.blooming.domain.user.repository.UserRepository; import java.time.LocalDate; +import java.util.ArrayList; import java.util.List; import java.util.Optional; @@ -52,10 +53,23 @@ public List getGoalByUserId(Long userId) { public SubgoalResponse getSubgoalInfoByUserId(Long userId) { List goals = getGoalByUserId(userId); -// Goal goal = goals.get(goals.size() - 1); + Goal goal = goals.get(goals.size() - 1); + List subgoals = goal.getSubgoals(); + SubgoalResponse subgoalResponse = new SubgoalResponse(); + List subgoalInfoList = new ArrayList<>(); + for(Subgoal subgoal : subgoals) { + SubgoalResponse.SubgoalInfo subgoalInfo = new SubgoalResponse.SubgoalInfo(); + subgoalInfo.setSubgoalId(subgoal.getSubgoalId()); + subgoalInfo.setSubgoalName(subgoal.getSubgoalName()); + subgoalInfo.setDoneDateList(subgoal.getDoneDates()); + subgoalInfoList.add(subgoalInfo); + } - SubgoalResponse subgoalResponse = new SubgoalResponse(); + subgoalResponse.setGoalName(goal.getGoalName()); + subgoalResponse.setGoalId(goal.getGoalId()); + subgoalResponse.setGoalCreateDate(goal.getCreatedAt()); + subgoalResponse.setSubgoalList(subgoalInfoList); return subgoalResponse; }