diff --git a/src/main/java/com/example/demo/app/presentation/controller/TransactionController.java b/src/main/java/com/example/demo/app/presentation/controller/TransactionController.java index 8643554..0b0984b 100644 --- a/src/main/java/com/example/demo/app/presentation/controller/TransactionController.java +++ b/src/main/java/com/example/demo/app/presentation/controller/TransactionController.java @@ -28,6 +28,7 @@ import com.example.demo.app.domain.service.UserService; import com.example.demo.app.presentation.form.CategoryForm; import com.example.demo.app.presentation.form.Expense; import com.example.demo.app.presentation.form.FixedCostForm; +import com.example.demo.app.presentation.form.GoalForm; import com.example.demo.app.presentation.form.Income; import com.example.demo.app.presentation.form.TransactionForm; import com.example.demo.app.presentation.form.UserForm; @@ -371,19 +372,24 @@ public class TransactionController { model.addAttribute("totalIncome", totalIncome); model.addAttribute("totalExpense", totalExpense); - // List goalForm = GoalForm.convertFrom(goalService.getGoalByUserId(loginUser.getUserId())); + List goalForm = GoalForm.convertFrom(goalService.getGoalByUserId(loginUser.getUserId())); UserForm userForm = UserForm.convertFrom(userService.findByUserId(loginUser.getUserId())); - // model.addAttribute("achievementRate", goalForm.getAchievementRate()); - // - // model.addAttribute("currentAmount", goalForm.getCurrentAmount()); - // - // model.addAttribute("targetAmount", goalForm.getTargetAmount()); + List resultList = goalForm.stream().filter(goal -> goal.getGoalComplete() == 0) + .collect(Collectors.toList()); + + GoalForm result = resultList.getFirst(); + + model.addAttribute("achievementRate", result.getAchievementRate()); + + model.addAttribute("currentAmount", result.getCurrentAmount()); + + model.addAttribute("targetAmount", result.getTargetAmount()); model.addAttribute("saving", userForm.getSaving()); - // model.addAttribute("deadline", goalForm.getDeadline()); + model.addAttribute("deadline", result.getDeadline()); return "menu"; }