Merge branch 's-choi' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into k-kobayashi
This commit is contained in:
@@ -0,0 +1,10 @@
|
||||
package com.example.demo.app.domain.model;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
|
||||
@Getter
|
||||
@AllArgsConstructor
|
||||
public class LoginModel {
|
||||
private Long userId;
|
||||
}
|
||||
@@ -3,7 +3,9 @@ package com.example.demo.app.domain.model;
|
||||
import java.time.LocalDate;
|
||||
import java.util.List;
|
||||
|
||||
import com.example.demo.app.infra.entity.CategoryEntity;
|
||||
import com.example.demo.app.infra.entity.TransactionEntity;
|
||||
import com.example.demo.app.infra.entity.UserEntity;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
@@ -35,4 +37,13 @@ public class TransactionModel {
|
||||
return transactionEntityList.stream().map(TransactionModel::convertFrom).toList();
|
||||
}
|
||||
|
||||
public static TransactionEntity convertTo(TransactionModel transactionModel, UserEntity userEntity, CategoryEntity categoryEntity) {
|
||||
return new TransactionEntity(
|
||||
transactionModel.getTransactionId(),
|
||||
userEntity,
|
||||
categoryEntity,
|
||||
transactionModel.getAmount(),
|
||||
transactionModel.getTransactionDate());
|
||||
}
|
||||
|
||||
}
|
||||
@@ -9,4 +9,6 @@ public interface CategoryService {
|
||||
public List<CategoryModel> findAll();
|
||||
|
||||
public CategoryModel findOne(Long categoryId);
|
||||
|
||||
public CategoryModel findOneByCategoryName(String categoryName);
|
||||
}
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
package com.example.demo.app.domain.service;
|
||||
|
||||
import com.example.demo.app.infra.entity.UserEntity;
|
||||
import com.example.demo.app.domain.model.LoginModel;
|
||||
|
||||
public interface LoginService {
|
||||
|
||||
UserEntity login(String mailAddress, String password);
|
||||
LoginModel login(String mailAddress, String password);
|
||||
}
|
||||
|
||||
|
||||
@@ -16,4 +16,8 @@ public interface TransactionService {
|
||||
|
||||
public int findTotalexpense(LocalDate startDate, LocalDate endDate, Long userId);
|
||||
|
||||
public int createTransaction(TransactionModel transactionModel);
|
||||
|
||||
public int updateTransaction(TransactionModel transactionModel);
|
||||
|
||||
}
|
||||
|
||||
@@ -14,26 +14,38 @@ import lombok.RequiredArgsConstructor;
|
||||
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
public class CategoryServiceImpl implements CategoryService{
|
||||
public class CategoryServiceImpl implements CategoryService {
|
||||
|
||||
private final CategoryRepository categoryRepository;
|
||||
|
||||
|
||||
public List<CategoryModel> findAll() {
|
||||
|
||||
|
||||
return CategoryModel.convertFrom(categoryRepository.findAll());
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
public CategoryModel findOne(Long categoryId) {
|
||||
|
||||
|
||||
Optional<CategoryEntity> optionalCategoryModel = categoryRepository.findById(categoryId);
|
||||
|
||||
|
||||
if (optionalCategoryModel.isEmpty()) {
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
return CategoryModel.convertFrom(optionalCategoryModel.get());
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
public CategoryModel findOneByCategoryName(String categoryName) {
|
||||
|
||||
CategoryEntity categoryModel = categoryRepository.findByCategoryName(categoryName);
|
||||
|
||||
if (categoryModel == null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return CategoryModel.convertFrom(categoryModel);
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -2,6 +2,7 @@ package com.example.demo.app.domain.service.impl;
|
||||
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import com.example.demo.app.domain.model.LoginModel;
|
||||
import com.example.demo.app.domain.service.LoginService;
|
||||
import com.example.demo.app.infra.entity.UserEntity;
|
||||
import com.example.demo.app.infra.repository.UserRepository;
|
||||
@@ -15,11 +16,16 @@ public class LoginServiceImpl implements LoginService {
|
||||
private final UserRepository userRepository;
|
||||
|
||||
@Override
|
||||
public UserEntity login(String mailAddress, String password) {
|
||||
public LoginModel login(String mailAddress, String password) {
|
||||
|
||||
return userRepository.findByMailAddressAndPassword(
|
||||
UserEntity userEntity = userRepository.findByMailAddressAndPassword(
|
||||
mailAddress,
|
||||
password).orElse(null);
|
||||
|
||||
if (userEntity == null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return new LoginModel(userEntity.getUserId());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -3,14 +3,19 @@ package com.example.demo.app.domain.service.impl;
|
||||
import java.time.LocalDate;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Optional;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import com.example.demo.app.domain.model.TransactionModel;
|
||||
import com.example.demo.app.domain.service.TransactionService;
|
||||
import com.example.demo.app.infra.entity.CategoryEntity;
|
||||
import com.example.demo.app.infra.entity.TransactionEntity;
|
||||
import com.example.demo.app.infra.entity.UserEntity;
|
||||
import com.example.demo.app.infra.repository.CategoryRepository;
|
||||
import com.example.demo.app.infra.repository.TransactionRepository;
|
||||
import com.example.demo.app.infra.repository.UserRepository;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
|
||||
@@ -19,6 +24,8 @@ import lombok.RequiredArgsConstructor;
|
||||
public class TransactionServiceImpl implements TransactionService {
|
||||
|
||||
private final TransactionRepository transactionRepository;
|
||||
private final UserRepository userRepository;
|
||||
private final CategoryRepository categoryRepository;
|
||||
|
||||
public Map<LocalDate, List<TransactionModel>> findAllByDate(LocalDate startDate, LocalDate endDate, Long userId) {
|
||||
|
||||
@@ -34,16 +41,17 @@ public class TransactionServiceImpl implements TransactionService {
|
||||
return transactionModelMap;
|
||||
|
||||
}
|
||||
|
||||
|
||||
public int findTotalIncome(LocalDate startDate, LocalDate endDate, Long userId) {
|
||||
|
||||
|
||||
return transactionRepository.findTotalIncome(startDate, endDate, userId);
|
||||
|
||||
|
||||
}
|
||||
|
||||
public int findTotalexpense(LocalDate startDate, LocalDate endDate, Long userId) {
|
||||
|
||||
|
||||
return transactionRepository.findTotalIncome(startDate, endDate, userId);
|
||||
|
||||
|
||||
}
|
||||
|
||||
public List<TransactionModel> findByUserIdAndDate(LocalDate todayDate, Long userId) {
|
||||
@@ -52,4 +60,59 @@ public class TransactionServiceImpl implements TransactionService {
|
||||
|
||||
}
|
||||
|
||||
public int createTransaction(TransactionModel transactionModel) {
|
||||
|
||||
Optional<UserEntity> userEntityOptional = userRepository.findById(transactionModel.getUserId());
|
||||
|
||||
if (userEntityOptional.isEmpty()) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
Optional<CategoryEntity> categoryEntityOptional = categoryRepository.findById(transactionModel.getCategoryId());
|
||||
if (categoryEntityOptional.isEmpty()) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
TransactionEntity transactionEntity = TransactionModel.convertTo(
|
||||
transactionModel,
|
||||
userEntityOptional.get(),
|
||||
categoryEntityOptional.get());
|
||||
if (transactionRepository.save(transactionEntity) != null) {
|
||||
return 0;
|
||||
|
||||
} else {
|
||||
return -1;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public int updateTransaction(TransactionModel transactionModel) {
|
||||
|
||||
if (!transactionRepository.existsById(transactionModel.getTransactionId())) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
Optional<UserEntity> userEntityOptional = userRepository.findById(transactionModel.getUserId());
|
||||
|
||||
if (userEntityOptional.isEmpty()) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
Optional<CategoryEntity> categoryEntityOptional = categoryRepository.findById(transactionModel.getCategoryId());
|
||||
if (categoryEntityOptional.isEmpty()) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
TransactionEntity transactionEntity = TransactionModel.convertTo(
|
||||
transactionModel,
|
||||
userEntityOptional.get(),
|
||||
categoryEntityOptional.get());
|
||||
if (transactionRepository.save(transactionEntity) != null) {
|
||||
return 0;
|
||||
|
||||
} else {
|
||||
return -1;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -15,7 +15,7 @@ import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
@Entity
|
||||
@Table(name = "category")
|
||||
@Table(name = "category_t")
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
|
||||
@@ -15,7 +15,7 @@ import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
@Entity
|
||||
@Table(name = "goal")
|
||||
@Table(name = "goal_t")
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
|
||||
@@ -15,7 +15,7 @@ import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
@Entity
|
||||
@Table(name = "question")
|
||||
@Table(name = "question_m")
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
|
||||
@@ -17,7 +17,7 @@ import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
@Entity
|
||||
@Table(name = "transaction")
|
||||
@Table(name = "transaction_t")
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
@@ -27,6 +27,14 @@ public class TransactionEntity {
|
||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
@Column(name = "transaction_id")
|
||||
private Long transactionId;
|
||||
|
||||
@ManyToOne(fetch = FetchType.LAZY)
|
||||
@JoinColumn(name = "user_id")
|
||||
private UserEntity userEntity;
|
||||
|
||||
@ManyToOne(fetch = FetchType.LAZY)
|
||||
@JoinColumn(name = "category_id")
|
||||
private CategoryEntity categoryEntity;
|
||||
|
||||
@Column(name = "amount", nullable = false)
|
||||
private Integer amount;
|
||||
@@ -34,12 +42,4 @@ public class TransactionEntity {
|
||||
@Column(name = "transaction_date", nullable = false)
|
||||
private LocalDate transactionDate;
|
||||
|
||||
@ManyToOne(fetch = FetchType.LAZY)
|
||||
@JoinColumn(name = "user_id")
|
||||
private UserEntity userEntity;
|
||||
|
||||
@ManyToOne(fetch = FetchType.LAZY)
|
||||
@JoinColumn(name = "category_id")
|
||||
private CategoryEntity categoryEntity;
|
||||
|
||||
}
|
||||
|
||||
@@ -1,9 +1,15 @@
|
||||
package com.example.demo.app.infra.repository;
|
||||
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import org.springframework.data.jpa.repository.Query;
|
||||
import org.springframework.data.repository.query.Param;
|
||||
|
||||
import com.example.demo.app.infra.entity.CategoryEntity;
|
||||
|
||||
public interface CategoryRepository extends JpaRepository<CategoryEntity, Long> {
|
||||
|
||||
|
||||
@Query("select c from CategoryEntity c where c.categoryName = :categoryName")
|
||||
public CategoryEntity findByCategoryName(@Param("categoryName") String categoryName);
|
||||
|
||||
}
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
package com.example.demo.app.infra.repository;
|
||||
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
|
||||
import com.example.demo.app.infra.entity.QuestionEntity;
|
||||
|
||||
public interface QuestionRepository extends JpaRepository<QuestionEntity, Long> {
|
||||
|
||||
}
|
||||
@@ -22,5 +22,6 @@ public interface TransactionRepository extends JpaRepository<TransactionEntity,
|
||||
@Query("select sum(t.amount) from TransactionEntity t inner join CategoryEntity c on t.categoryId = c.categoryId where (t.userId = :userId and t.transactionDate between :startDate and :endDate) and c.transactionType = 1")
|
||||
public Integer findTotalIncome(LocalDate startDate, LocalDate endDate, Long userId);
|
||||
|
||||
|
||||
@Query("select sum(t.amount) from TransactionEntity t where t.userEntity.userId = :userId and t.categoryEntity.categoryId = :categoryId and t.transactionDate between :startDate and :endDate")
|
||||
public Integer findCategoryExpense(LocalDate startDate, LocalDate endDate, Long userId, Long categoryId);
|
||||
}
|
||||
|
||||
@@ -3,6 +3,7 @@ package com.example.demo.app.infra.repository;
|
||||
import java.util.Optional;
|
||||
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import org.springframework.data.jpa.repository.Query;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
import com.example.demo.app.infra.entity.UserEntity;
|
||||
@@ -10,6 +11,10 @@ import com.example.demo.app.infra.entity.UserEntity;
|
||||
@Repository
|
||||
public interface UserRepository extends JpaRepository<UserEntity, Long> {
|
||||
|
||||
Optional<UserEntity> findByMailAddressAndPassword(String mailAddress, String password);
|
||||
@Query("select u from UserEntity u where u.mailAddress = :mailAddress and u.password = :password and u.deleteFlag = 0")
|
||||
Optional<UserEntity> findByMailAddressAndPassword(
|
||||
String mailAddress,
|
||||
String password);
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -8,8 +8,8 @@ import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
|
||||
import com.example.demo.app.domain.model.LoginModel;
|
||||
import com.example.demo.app.domain.service.LoginService;
|
||||
import com.example.demo.app.infra.entity.UserEntity;
|
||||
import com.example.demo.app.presentation.form.LoginForm;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
@@ -33,13 +33,14 @@ public class LoginController {
|
||||
@PostMapping("/login")
|
||||
public String login(
|
||||
@ModelAttribute LoginForm loginForm,
|
||||
Model model, HttpSession session) {
|
||||
Model model,
|
||||
HttpSession session) {
|
||||
|
||||
UserEntity loginUser = loginService.login(
|
||||
LoginModel loginModel = loginService.login(
|
||||
loginForm.getMailAddress(),
|
||||
loginForm.getPassword());
|
||||
|
||||
if (loginUser == null) {
|
||||
if (loginModel == null) {
|
||||
model.addAttribute(
|
||||
"errorMessage",
|
||||
"Email address or password is incorrect.");
|
||||
@@ -47,9 +48,8 @@ public class LoginController {
|
||||
return "login";
|
||||
}
|
||||
|
||||
session.setAttribute("loginUser", loginUser);
|
||||
session.setAttribute("loginUser", loginModel);
|
||||
|
||||
return "menu";
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -11,8 +11,11 @@ import jakarta.servlet.http.HttpSession;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
|
||||
import com.example.demo.app.domain.model.LoginModel;
|
||||
import com.example.demo.app.domain.service.CategoryService;
|
||||
import com.example.demo.app.domain.service.TransactionService;
|
||||
import com.example.demo.app.presentation.form.CategoryForm;
|
||||
@@ -26,27 +29,32 @@ public class TransactionController {
|
||||
|
||||
private final TransactionService transactionService;
|
||||
private final CategoryService categoryService;
|
||||
|
||||
// 一覧画面
|
||||
|
||||
@GetMapping("/transaction/list")
|
||||
public String transactionList(@RequestParam LocalDate startDate, @RequestParam LocalDate endDate, Model model,
|
||||
public String transactionList(@RequestParam(required = false) LocalDate startDates,
|
||||
@RequestParam(required = false) LocalDate endDates, Model model,
|
||||
HttpSession session) {
|
||||
|
||||
LoginUser loginUser = (LoginUser) session.getAttribute("loginUser");
|
||||
LocalDate startDate = (startDates == null) ? LocalDate.now().withDayOfMonth(1) : startDates;
|
||||
|
||||
LocalDate endDate = (endDates == null) ? LocalDate.now().withDayOfMonth(LocalDate.now().lengthOfMonth())
|
||||
: endDates;
|
||||
|
||||
LoginModel loginUser = (LoginModel) session.getAttribute("loginUser");
|
||||
|
||||
Map<LocalDate, List<TransactionForm>> transactionFormMap = new HashMap<>();
|
||||
|
||||
|
||||
transactionService.findAll(startDate, endDate, loginUser.getUserId).forEach((date, list) -> {
|
||||
|
||||
transactionService.findAllByDate(startDate, endDate, loginUser.getUserId()).forEach((date, list) -> {
|
||||
List<TransactionForm> transactionFormList = list.stream().map(transaction -> {
|
||||
TransactionForm transactionForm = TransactionForm.convertFrom(
|
||||
transaction,
|
||||
CategoryForm.convertFrom(categoryService.findOne(transaction.getCategoryId())).getCategoryName(),
|
||||
transactionService.findTotalexpense(startDate, endDate, loginUser.getUserId),
|
||||
transactionService.findTotalIncome(startDate, endDate, loginUser.getUserId),
|
||||
CategoryForm.convertFrom(categoryService.findOne(transaction.getCategoryId())).getTransactionType()
|
||||
);
|
||||
CategoryForm.convertFrom(categoryService.findOne(transaction.getCategoryId()))
|
||||
.getCategoryName(),
|
||||
transactionService.findTotalexpense(startDate, endDate, loginUser.getUserId()),
|
||||
transactionService.findTotalIncome(startDate, endDate, loginUser.getUserId()),
|
||||
CategoryForm.convertFrom(categoryService.findOne(transaction.getCategoryId()))
|
||||
.getTransactionType());
|
||||
return transactionForm;
|
||||
}).collect(Collectors.toList());
|
||||
transactionFormMap.put(date, transactionFormList);
|
||||
@@ -54,30 +62,69 @@ public class TransactionController {
|
||||
|
||||
model.addAttribute("transactionFormMap", transactionFormMap);
|
||||
|
||||
return "transactionList";
|
||||
return "transaction_list";
|
||||
}
|
||||
|
||||
// 詳細画面
|
||||
@GetMapping()
|
||||
public String findOne(@RequestParam LocalDate todayDate, Model model, HttpSession session) {
|
||||
public String findOne(@RequestParam(required = false) LocalDate todayDates, Model model, HttpSession session) {
|
||||
|
||||
LoginUser loginUser = (LoginUser) session.getAttribute("loginUser");
|
||||
|
||||
List<TransactionForm> transactionFormList = transactionService.findByUserIdAndDate(todayDate, ((LoginUser)session.getAttribute("loginUser")).getUserId).stream().map(transaction -> {
|
||||
TransactionForm transactionForm = TransactionForm.convertFrom(
|
||||
transaction,
|
||||
CategoryForm.convertFrom(categoryService.findOne(transaction.getCategoryId())).getCategoryName(),
|
||||
transactionService.findTotalexpense(todayDate, todayDate, loginUser.getUserId),
|
||||
transactionService.findTotalIncome(todayDate, todayDate, loginUser.getUserId),
|
||||
CategoryForm.convertFrom(categoryService.findOne(transaction.getCategoryId())).getTransactionType()
|
||||
);
|
||||
return transactionForm;
|
||||
}).collect(Collectors.toList());
|
||||
LocalDate todayDate = (todayDates == null) ? LocalDate.now() : todayDates;
|
||||
|
||||
|
||||
LoginModel loginUser = (LoginModel) session.getAttribute("loginUser");
|
||||
|
||||
List<TransactionForm> transactionFormList = transactionService
|
||||
.findByUserIdAndDate(todayDate, loginUser.getUserId()).stream()
|
||||
.map(transaction -> {
|
||||
TransactionForm transactionForm = TransactionForm.convertFrom(
|
||||
transaction,
|
||||
CategoryForm.convertFrom(categoryService.findOne(transaction.getCategoryId()))
|
||||
.getCategoryName(),
|
||||
transactionService.findTotalexpense(todayDate, todayDate, loginUser.getUserId()),
|
||||
transactionService.findTotalIncome(todayDate, todayDate, loginUser.getUserId()),
|
||||
CategoryForm.convertFrom(categoryService.findOne(transaction.getCategoryId()))
|
||||
.getTransactionType());
|
||||
return transactionForm;
|
||||
}).collect(Collectors.toList());
|
||||
|
||||
model.addAttribute("transactionFormList", transactionFormList);
|
||||
|
||||
return "";
|
||||
}
|
||||
|
||||
@GetMapping("")
|
||||
public String createOneGet(@ModelAttribute TransactionForm transactionForm) {
|
||||
|
||||
return "";
|
||||
}
|
||||
|
||||
@PostMapping()
|
||||
public String createOnePost(@ModelAttribute TransactionForm transactionForm, Model model) {
|
||||
|
||||
if (transactionService.createTransaction(TransactionForm.convertTo(transactionForm)) != 0) {
|
||||
return "error";
|
||||
}
|
||||
|
||||
return "";
|
||||
|
||||
}
|
||||
|
||||
@GetMapping("")
|
||||
public String updateOneGet(@ModelAttribute TransactionForm transactionForm) {
|
||||
|
||||
return "";
|
||||
}
|
||||
|
||||
@PostMapping()
|
||||
public String updateOnePost(@ModelAttribute TransactionForm transactionForm, Model model) {
|
||||
|
||||
if (transactionService.updateTransaction(TransactionForm.convertTo(transactionForm)) != 0) {
|
||||
return "error";
|
||||
}
|
||||
|
||||
return "";
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -32,6 +32,7 @@ public class TransactionForm {
|
||||
|
||||
private Integer transactionType;
|
||||
|
||||
|
||||
public static TransactionForm convertFrom(TransactionModel transactionModel, String categoryName, int income, int expense, int transactionType) {
|
||||
return new TransactionForm(
|
||||
transactionModel.getTransactionId(),
|
||||
@@ -45,6 +46,7 @@ public class TransactionForm {
|
||||
transactionType);
|
||||
}
|
||||
|
||||
|
||||
public static List<TransactionForm> convertFrom(List<TransactionModel> transactionModelList, String categoryName, int income, int expense, int transactionType ) {
|
||||
return transactionModelList.stream().map(transactionModel -> TransactionForm.convertFrom(transactionModel, categoryName, income, expense, transactionType)).toList();
|
||||
}
|
||||
|
||||
136
src/main/resources/templates/user_register.html
Normal file
136
src/main/resources/templates/user_register.html
Normal file
@@ -0,0 +1,136 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="ja"xmlns:th="http://www.thymeleaf.org">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<title>新規会員登録</title>
|
||||
</head>
|
||||
<body>
|
||||
<header></header>
|
||||
|
||||
<main>
|
||||
<h1>新規会員登録</h1>
|
||||
|
||||
<form th:action="@{/user/register/confirm}" th:object="${userForm}" method="post">
|
||||
<div>
|
||||
<label for="userName">氏名</label>
|
||||
<input type="text"
|
||||
id="userName"
|
||||
th:field="*{userName}"
|
||||
maxlength="100"
|
||||
required>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label for="mailAddress">メールアドレス</label>
|
||||
<input type="email"
|
||||
id="mailAddress"
|
||||
th:field="*{mailAddress}"
|
||||
maxlength="255"
|
||||
required>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label for="birthDate">生年月日</label>
|
||||
<input type="date"
|
||||
id="birthDate"
|
||||
th:field="*{birthDate}"
|
||||
required>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label for="password">パスワード</label>
|
||||
<input type="password"
|
||||
id="password"
|
||||
th:field="*{password}"
|
||||
minlength="8"
|
||||
maxlength="255"
|
||||
required>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label for="secretQuestionId">秘密の質問</label>
|
||||
<select id="secretQuestionId"
|
||||
th:field="*{secretQuestionId}"
|
||||
required>
|
||||
<option value="">選択してください</option>
|
||||
<option th:each="question : ${questionList}"
|
||||
th:value="${question.secretQuestionId}"
|
||||
th:text="${question.questionText}">
|
||||
</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label for="secretAnswer">秘密の質問の回答</label>
|
||||
<input type="text"
|
||||
id="secretAnswer"
|
||||
th:field="*{secretAnswer}"
|
||||
maxlength="100"
|
||||
required>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label for="saving">貯蓄金</label>
|
||||
<input type="number"
|
||||
id="saving"
|
||||
th:field="*{saving}"
|
||||
min="0"
|
||||
required>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label for="annualIncome">年収</label>
|
||||
<input type="number"
|
||||
id="annualIncome"
|
||||
th:field="*{annualIncome}"
|
||||
min="0"
|
||||
required>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label for="monthlyBudget">月別使用可能金額</label>
|
||||
<input type="number"
|
||||
id="monthlyBudget"
|
||||
th:field="*{monthlyBudget}"
|
||||
min="0"
|
||||
required>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label for="goalId">目標</label>
|
||||
<select id="goalId"
|
||||
th:field="*{goalId}"
|
||||
required>
|
||||
<option value="">選択してください</option>
|
||||
<option th:each="goal : ${goalList}"
|
||||
th:value="${goal.goalId}"
|
||||
th:text="${goal.goalTitle}">
|
||||
</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label for="courseId">コース</label>
|
||||
<select id="courseId"
|
||||
th:field="*{courseId}"
|
||||
required>
|
||||
<option value="">選択してください</option>
|
||||
<option th:each="course : ${courseList}"
|
||||
th:value="${course.courseId}"
|
||||
th:text="${course.courseName}">
|
||||
</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<button type="submit">作成</button>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
<form th:action="@{/login}" method="get">
|
||||
<button type="submit">戻る</button>
|
||||
</form>
|
||||
|
||||
</main>
|
||||
</body>
|
||||
</html>
|
||||
78
src/main/resources/templates/user_register_confirm.html
Normal file
78
src/main/resources/templates/user_register_confirm.html
Normal file
@@ -0,0 +1,78 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<title>新規会員登録確認</title>
|
||||
</head>
|
||||
<body>
|
||||
<header></header>
|
||||
|
||||
<main>
|
||||
<h1>新規会員登録確認</h1>
|
||||
|
||||
<div>
|
||||
<p>氏名</p>
|
||||
<p th:text="${session.userForm.userName}" readonly></p>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<p>メールアドレス</p>
|
||||
<p th:text="${session.userForm.mailAddress}" readonly></p>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<p>生年月日</p>
|
||||
<p th:text="${session.userForm.barthDate}" readonly></p>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<p>パスワード</p>
|
||||
<p>********</p>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<p>秘密の質問</p>
|
||||
<p th:text="${session.userForm.secretQuestionId}" readonly></p>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<p>秘密の質問の回答</p>
|
||||
<p th:text="${session.userForm.secretAnswer}" readonly></p>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<p>貯蓄金</p>
|
||||
<p th:text="${session.userForm.saving}" readonly></p>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<p>年収</p>
|
||||
<p th:text="${session.userForm.annualIncome}" readonly></p>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<p>月別使用可能額</p>
|
||||
<p th:text="${session.userForm.monthlyBudget}" readonly></p>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<p>目標</p>
|
||||
<p th:text="${session.userForm.goalId}" readonly></p>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<p>コース</p>
|
||||
<p th:text="${session.userForm.courseId}" readonly></p>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<form th:action="@{/user/register}" method="get">
|
||||
<button type="submit">戻る</button>
|
||||
</form>
|
||||
</div>
|
||||
<form th:action="@{/user/register/complete}" method="post">
|
||||
<button type="submit">確定</button>
|
||||
</form>
|
||||
</main>
|
||||
</body>
|
||||
</html>
|
||||
Reference in New Issue
Block a user