2026_09_5H_Spring_KIZAKI/Monegement
16
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[EDIT] 二次機能の定数部分を、定数クラスを参照するよう修正しました。

Browse Source
This commit is contained in:
kkazuya
2026-09-28 10:52:42 +09:00
parent 42c4d7c273
commit b83f360781
6 changed files with 90 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/main/java/com/example/demo/app/presentation/controller/CategoryController.java
View File

@@ -12,6 +12,9 @@ import org.springframework.web.bind.annotation.PostMapping;
import com.example.demo.app.domain.model.LoginModel;
import com.example.demo.app.domain.service.CategoryService;
import com.example.demo.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
import com.example.demo.app.presentation.controller.pageproperty.SessionKeyword;
import com.example.demo.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
import com.example.demo.app.presentation.form.CategoryForm;
import lombok.RequiredArgsConstructor;
@@ -23,64 +26,64 @@ public class CategoryController {
private final CategoryService categoryService;
@GetMapping("/category/list")
@GetMapping(TransitionTargetPageNameKeyword.CATEGORY_LIST)
public String categoryListGet(Model model, HttpSession session) {
LoginModel loginUser = (LoginModel) session.getAttribute("loginUser");
LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
List<CategoryForm> categoryFormList = CategoryForm.convertFrom(categoryService.findAllByuserId(loginUser.getUserId()));
model.addAttribute("categoryFormList", categoryFormList);
model.addAttribute(PageReturnAttributeKeyword.CATEGORY_FORM_LIST, categoryFormList);
return "category-list";
return TransitionTargetPageNameKeyword.CATEGORY_LIST_HTML;
}
@GetMapping("/category/create")
@GetMapping(TransitionTargetPageNameKeyword.CATEGORY_CREATE)
public String categoryCreateGet(@ModelAttribute CategoryForm categoryForm) {
return "category-create";
return TransitionTargetPageNameKeyword.CATEGORY_CREATE_HTML;
}
@PostMapping("/category/create")
@PostMapping(TransitionTargetPageNameKeyword.CATEGORY_CREATE)
public String categoryCreatePost(@ModelAttribute CategoryForm categoryForm, HttpSession session) {
LoginModel loginUser = (LoginModel) session.getAttribute("loginUser");
LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
categoryService.save(CategoryForm.convertTo(categoryForm), loginUser.getUserId());
return "redirect:/category/list";
return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.CATEGORY_LIST;
}
@GetMapping("/category/update")
@GetMapping(TransitionTargetPageNameKeyword.CATEGORY_UPDATE)
public String categoryUpdateGet(Model model, Long categoryId) {
CategoryForm categoryForm = CategoryForm.convertFrom(categoryService.findOne(categoryId));
model.addAttribute("categoryId", categoryId);
model.addAttribute("categoryForm", categoryForm);
model.addAttribute(PageReturnAttributeKeyword.CATEGORY_ID, categoryId);
model.addAttribute(PageReturnAttributeKeyword.CATEGORY_FORM, categoryForm);
return "category-update";
return TransitionTargetPageNameKeyword.CATEGORY_UPDATE_HTML;
}
@PostMapping("/category/update")
@PostMapping(TransitionTargetPageNameKeyword.CATEGORY_UPDATE)
public String categoryUpdatePost(@ModelAttribute CategoryForm categoryForm, HttpSession session, Long categoryId) {
LoginModel loginUser = (LoginModel) session.getAttribute("loginUser");
LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
categoryForm.setCategoryId(categoryId);
categoryService.save(CategoryForm.convertTo(categoryForm), loginUser.getUserId());
return "redirect:/category/list";
return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.CATEGORY_LIST;
}
@PostMapping("/category/delete")
@PostMapping(TransitionTargetPageNameKeyword.CATEGORY_DELETE)
public String categoryDeletePost(Long categoryId) {
categoryService.delete(categoryId);
return "redirect:/category/list";
return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.CATEGORY_LIST;
}

38
src/main/java/com/example/demo/app/presentation/controller/CourseController.java
View File

@@ -88,60 +88,60 @@ public class CourseController {
}
@SessionCheck
@GetMapping("/course/create")
@GetMapping(TransitionTargetPageNameKeyword.COURSE_CREATE)
public String createCourseGet(@ModelAttribute CourseForm courseForm, HttpSession session) {
return "course_create";
return TransitionTargetPageNameKeyword.COURSE_CREATE_HTML;
}
@SessionCheck
@PostMapping("/course/create/ratio")
@PostMapping(TransitionTargetPageNameKeyword.COURSE_CREATE_RATIO)
public String createCourse(@ModelAttribute CourseForm courseForm,
@ModelAttribute AllocationFormList allocationFormList,
HttpSession session, Model model) {
LoginModel loginUser = (LoginModel) session.getAttribute("loginUser");
LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
CourseForm form = CourseForm
.convertFrom(courseService.save(CourseForm.convertTo(courseForm), loginUser.getUserId()));
session.setAttribute("courseId", form.getCourseId());
session.setAttribute(PageReturnAttributeKeyword.COURSE_ID, form.getCourseId());
return "course_create_ratio";
return TransitionTargetPageNameKeyword.COURSE_CREATE_RATIO_HTML;
}
@SessionCheck
@PostMapping("/course/create")
@PostMapping(TransitionTargetPageNameKeyword.COURSE_CREATE)
public String createCoursePost(@ModelAttribute AllocationFormList allocationFormList, HttpSession session) {
List<AllocationModel> allocationModelList = new ArrayList<>();
allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId1(),
(Long) session.getAttribute("courseId"), allocationFormList.getAllocationRatio1()));
(Long) session.getAttribute(PageReturnAttributeKeyword.COURSE_ID), allocationFormList.getAllocationRatio1()));
allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId2(),
(Long) session.getAttribute("courseId"), allocationFormList.getAllocationRatio2()));
(Long) session.getAttribute(PageReturnAttributeKeyword.COURSE_ID), allocationFormList.getAllocationRatio2()));
allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId3(),
(Long) session.getAttribute("courseId"), allocationFormList.getAllocationRatio3()));
(Long) session.getAttribute(PageReturnAttributeKeyword.COURSE_ID), allocationFormList.getAllocationRatio3()));
allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId4(),
(Long) session.getAttribute("courseId"), allocationFormList.getAllocationRatio4()));
(Long) session.getAttribute(PageReturnAttributeKeyword.COURSE_ID), allocationFormList.getAllocationRatio4()));
allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId5(),
(Long) session.getAttribute("courseId"), allocationFormList.getAllocationRatio5()));
(Long) session.getAttribute(PageReturnAttributeKeyword.COURSE_ID), allocationFormList.getAllocationRatio5()));
allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId6(),
(Long) session.getAttribute("courseId"), allocationFormList.getAllocationRatio6()));
(Long) session.getAttribute(PageReturnAttributeKeyword.COURSE_ID), allocationFormList.getAllocationRatio6()));
allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId7(),
(Long) session.getAttribute("courseId"), allocationFormList.getAllocationRatio7()));
(Long) session.getAttribute(PageReturnAttributeKeyword.COURSE_ID), allocationFormList.getAllocationRatio7()));
allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId8(),
(Long) session.getAttribute("courseId"), allocationFormList.getAllocationRatio8()));
(Long) session.getAttribute(PageReturnAttributeKeyword.COURSE_ID), allocationFormList.getAllocationRatio8()));
allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId9(),
(Long) session.getAttribute("courseId"), allocationFormList.getAllocationRatio9()));
(Long) session.getAttribute(PageReturnAttributeKeyword.COURSE_ID), allocationFormList.getAllocationRatio9()));
allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId10(),
(Long) session.getAttribute("courseId"), allocationFormList.getAllocationRatio10()));
(Long) session.getAttribute(PageReturnAttributeKeyword.COURSE_ID), allocationFormList.getAllocationRatio10()));
allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId11(),
(Long) session.getAttribute("courseId"), allocationFormList.getAllocationRatio11()));
(Long) session.getAttribute(PageReturnAttributeKeyword.COURSE_ID), allocationFormList.getAllocationRatio11()));
allocationService.save(allocationModelList);
return "redirect:/course";
return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.COURSE;
}
}

39
src/main/java/com/example/demo/app/presentation/controller/FixedCostController.java
View File

@@ -16,6 +16,9 @@ import com.example.demo.aop.aspect.SessionCheck;
import com.example.demo.app.domain.model.LoginModel;
import com.example.demo.app.domain.service.CategoryService;
import com.example.demo.app.domain.service.FixedCostService;
import com.example.demo.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
import com.example.demo.app.presentation.controller.pageproperty.SessionKeyword;
import com.example.demo.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
import com.example.demo.app.presentation.form.CategoryForm;
import com.example.demo.app.presentation.form.FixedCostForm;
@@ -29,30 +32,30 @@ public class FixedCostController {
private final CategoryService categoryService;
@SessionCheck
@GetMapping("/fixed-cost/list")
@GetMapping(TransitionTargetPageNameKeyword.FIXED_COST_LIST)
public String getFixedCostList(
HttpSession session, Model model, LocalDate today) {
LoginModel loginUser = (LoginModel) session.getAttribute("loginUser");
LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
if (today == null) {
today = (LocalDate) session.getAttribute("today");
today = (LocalDate) session.getAttribute(PageReturnAttributeKeyword.TODAY);
}
List<FixedCostForm> fixedCostFormList = FixedCostForm.convertFrom(fixedCostService.findAllByUserId(loginUser.getUserId()));
fixedCostFormList.forEach(fixedCostForm -> fixedCostForm.setCategoryName(categoryService.findOne(fixedCostForm.getCategoryId()).getCategoryName()));
model.addAttribute("fixedCostFormList", fixedCostFormList);
model.addAttribute(PageReturnAttributeKeyword.FIXED_COST_FORM_LIST, fixedCostFormList);
model.addAttribute("today", today);
model.addAttribute(PageReturnAttributeKeyword.TODAY, today);
return "fixed_cost";
return TransitionTargetPageNameKeyword.FIXED_COST_HTML;
}
@SessionCheck
@GetMapping("/fixed-cost/create")
@GetMapping(TransitionTargetPageNameKeyword.FIXED_COST_CREATE)
public String getFixedCostCreate(
HttpSession session, @ModelAttribute FixedCostForm fixedCostForm, Model model, LocalDate today) {
@@ -72,42 +75,42 @@ public class FixedCostController {
}
model.addAttribute("expenseList", expenseList);
model.addAttribute("incomeList", incomeList);
model.addAttribute("today", today);
model.addAttribute(PageReturnAttributeKeyword.EXPENSE_LIST, expenseList);
model.addAttribute(PageReturnAttributeKeyword.INCOME_LIST, incomeList);
model.addAttribute(PageReturnAttributeKeyword.TODAY, today);
return "fixed_cost_create";
return TransitionTargetPageNameKeyword.FIXED_COST_CREATE_HTML;
}
@SessionCheck
@PostMapping("/fixed-cost/create")
@PostMapping(TransitionTargetPageNameKeyword.FIXED_COST_CREATE)
public String postFixedCostCreate(
HttpSession session, @ModelAttribute FixedCostForm fixedCostForm, Model model, LocalDate today) {
LoginModel loginUser = (LoginModel) session.getAttribute("loginUser");
LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
fixedCostForm.setUserId(loginUser.getUserId());
fixedCostService.save(FixedCostForm.convertTo(fixedCostForm));
session.setAttribute("today", today);
session.setAttribute(PageReturnAttributeKeyword.TODAY, today);
return "redirect:/fixed-cost/list";
return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.FIXED_COST_LIST;
}
@SessionCheck
@PostMapping("/fixed-cost/delete")
@PostMapping(TransitionTargetPageNameKeyword.FIXED_COST_DELETE)
public String postFixedCostDelete(Long fixedCostId, LocalDate today, HttpSession session) {
fixedCostService.delete(fixedCostId);
session.setAttribute("today", today);
session.setAttribute(PageReturnAttributeKeyword.TODAY, today);
return "redirect:/fixed-cost/list";
return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.FIXED_COST_LIST;
}

36
src/main/java/com/example/demo/app/presentation/controller/GoalController.java
View File

@@ -53,7 +53,7 @@ public class GoalController {
HttpSession session,
Long goalId) {
LoginModel loginUser = (LoginModel) session.getAttribute("loginUser");
LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
Long userId = loginUser.getUserId();
@@ -68,15 +68,15 @@ public class GoalController {
.collect(Collectors.toList());
model.addAttribute(
"goalFormList",
PageReturnAttributeKeyword.GOAL_FORM_LIST,
goalFormList);
model.addAttribute(
"achievementList",
PageReturnAttributeKeyword.ACHIEVEMENT_LIST,
new ArrayList<MonthlyAchievementForm>());
if (goalFormList.isEmpty()) {
return "goal_view";
return TransitionTargetPageNameKeyword.GOAL_VIEW_HTML;
}
GoalForm graphGoal;
@@ -95,7 +95,7 @@ public class GoalController {
}
model.addAttribute(
"graphGoal",
PageReturnAttributeKeyword.GRAPH_GOAL,
graphGoal);
int currentAmount = graphGoal.getCurrentAmount();
@@ -223,7 +223,7 @@ public class GoalController {
}
model.addAttribute(
"achievementList",
PageReturnAttributeKeyword.ACHIEVEMENT_LIST,
achievementList);
return TransitionTargetPageNameKeyword.GOAL_VIEW_HTML;
@@ -266,44 +266,44 @@ public class GoalController {
}
@SessionCheck
@GetMapping("/create")
@GetMapping(TransitionTargetPageNameKeyword.CREATE)
public String createGoalGet(@ModelAttribute GoalForm goalForm, HttpSession session) {
return "goal_create";
return TransitionTargetPageNameKeyword.GOAL_CREATE_HTML;
}
@SessionCheck
@PostMapping("/create")
@PostMapping(TransitionTargetPageNameKeyword.CREATE)
public String createGoalPost(@ModelAttribute GoalForm goalForm, HttpSession session) {
LoginModel loginUser = (LoginModel) session.getAttribute("loginUser");
LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
Long userId = loginUser.getUserId();
goalService.createGoal(GoalModel.convertFrom(goalForm), userId);
return "redirect:/goal";
return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.GOAL;
}
@SessionCheck
@PostMapping("/delete") // フラグ考慮してないため、今度修正必要
@PostMapping(TransitionTargetPageNameKeyword.DELETE) // フラグ考慮してないため、今度修正必要
public String deleteGoal(Long goalId, Long record) {
goalService.delete(goalId);
if (record == null) {
return "redirect:/goal";
return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.GOAL;
} else {
return "redirect:/goal/record";
return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.GOAL + TransitionTargetPageNameKeyword.RECORD;
}
}
@SessionCheck
@GetMapping("/record")
@GetMapping(TransitionTargetPageNameKeyword.RECORD)
public String getRecord(HttpSession session, Model model) {
LoginModel loginUser = (LoginModel) session.getAttribute("loginUser");
LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
Long userId = loginUser.getUserId();
goalService.updateGoalComplete(userId);
@@ -320,10 +320,10 @@ public class GoalController {
});
model.addAttribute(
"goalCompleteFormList",
PageReturnAttributeKeyword.GOAL_COMPLETE_FORM_LIST,
goalCompleteFormList);
return "goal_record";
return TransitionTargetPageNameKeyword.GOAL_RECORD_HTML;
}
}

4
src/main/java/com/example/demo/app/presentation/controller/LoginController.java
View File

@@ -26,8 +26,8 @@ public class LoginController {
@GetMapping(TransitionTargetPageNameKeyword.LOGIN)
public String showLogin(@ModelAttribute LoginForm loginForm, HttpSession session) {
if (session.getAttribute("loginUser") != null) {
return "redirect:/menu";
if (session.getAttribute(SessionKeyword.LOGIN_USER) != null) {
return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.MENU;
}
return TransitionTargetPageNameKeyword.LOGIN_HTML;

16
src/main/java/com/example/demo/app/presentation/controller/TransactionController.java
View File

@@ -192,7 +192,7 @@ public class TransactionController {
Long fixedCostId,
Model model, HttpSession session) {
LoginModel loginUser = (LoginModel) session.getAttribute("loginUser");
LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
if (today == null) {
today = LocalDate.now();
}
@@ -253,7 +253,7 @@ public class TransactionController {
public String updateOneGet(@RequestParam Long transactionId, @RequestParam(defaultValue = "") LocalDate today,
Model model, HttpSession session) {
LoginModel loginUser = (LoginModel) session.getAttribute("loginUser");
LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
if (today == null) {
today = LocalDate.now();
}
@@ -295,7 +295,7 @@ public class TransactionController {
@RequestParam LocalDate today, Model model,
HttpSession session) {
LoginModel loginUser = (LoginModel) session.getAttribute("loginUser");
LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
transactionForm.setUserId(loginUser.getUserId());
transactionForm.setTransactionId(transactionId);
@@ -407,15 +407,17 @@ public class TransactionController {
model.addAttribute(PageReturnAttributeKeyword.DEADLINE, result.getDeadline());
} else {
model.addAttribute(PageReturnAttributeKeyword.ACHIEVEMENT_RATE, "目標を設定してください");
final String MESSAGE = "目標を設定してください";
model.addAttribute(PageReturnAttributeKeyword.CURRENT_AMOUNT, "目標を設定してください");
model.addAttribute(PageReturnAttributeKeyword.ACHIEVEMENT_RATE, MESSAGE);
model.addAttribute(PageReturnAttributeKeyword.TARGET_AMOUNT, "目標を設定してください");
model.addAttribute(PageReturnAttributeKeyword.CURRENT_AMOUNT, MESSAGE);
model.addAttribute(PageReturnAttributeKeyword.TARGET_AMOUNT, MESSAGE);
model.addAttribute(PageReturnAttributeKeyword.SAVING, userForm.getSaving());
model.addAttribute(PageReturnAttributeKeyword.DEADLINE, "目標を設定してください");
model.addAttribute(PageReturnAttributeKeyword.DEADLINE, MESSAGE);
}
return TransitionTargetPageNameKeyword.MENU_HTML;