Compare commits
1 Commits
702dd24d2e
...
s-kikuchi
| Author | SHA1 | Date | |
|---|---|---|---|
|
5f9287765d |
0
kikuchi.txt
Normal file
0
kikuchi.txt
Normal file
@@ -1,14 +0,0 @@
|
||||
package com.example.demo.app.domain.model;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
|
||||
@Getter
|
||||
@AllArgsConstructor
|
||||
public class AllocationModel {
|
||||
|
||||
private Long categoryId;
|
||||
private Long courseId;
|
||||
private Integer allocationRatio;
|
||||
|
||||
}
|
||||
@@ -1,20 +0,0 @@
|
||||
package com.example.demo.app.domain.model;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
|
||||
@Getter
|
||||
@AllArgsConstructor
|
||||
public class AnalysisModel {
|
||||
|
||||
private Integer currentMonthTotalAmount;
|
||||
|
||||
private Integer previousMonthTotalAmount;
|
||||
|
||||
private Integer totalDifferenceAmount;
|
||||
|
||||
private List<CategoryAnalysisModel>
|
||||
categoryAnalysisModelList;
|
||||
}
|
||||
@@ -1,10 +0,0 @@
|
||||
package com.example.demo.app.domain.model;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
|
||||
@Getter
|
||||
@AllArgsConstructor
|
||||
public class AuthenticationModel {
|
||||
private Long userId;
|
||||
}
|
||||
@@ -1,21 +0,0 @@
|
||||
package com.example.demo.app.domain.model;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
|
||||
@Getter
|
||||
@AllArgsConstructor
|
||||
public class CategoryAnalysisModel {
|
||||
|
||||
private String categoryName;
|
||||
|
||||
private Integer currentMonthAmount;
|
||||
|
||||
private Integer previousMonthAmount;
|
||||
|
||||
private Integer monthDifferenceAmount;
|
||||
|
||||
private Integer courseLimitAmount;
|
||||
|
||||
private Integer courseDifferenceAmount;
|
||||
}
|
||||
@@ -1,30 +0,0 @@
|
||||
package com.example.demo.app.domain.model;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import com.example.demo.app.infra.entity.CategoryEntity;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
|
||||
@Getter
|
||||
@AllArgsConstructor
|
||||
public class CategoryModel {
|
||||
|
||||
private Long categoryId;
|
||||
private String categoryName;
|
||||
private Integer transactionType;
|
||||
|
||||
|
||||
public static CategoryModel convertFrom(CategoryEntity categoryEntity) {
|
||||
return new CategoryModel(
|
||||
categoryEntity.getCategoryId(),
|
||||
categoryEntity.getCategoryName(),
|
||||
categoryEntity.getTransactionType());
|
||||
}
|
||||
|
||||
public static List<CategoryModel> convertFrom(List<CategoryEntity> categoryEntityList) {
|
||||
return categoryEntityList.stream().map(CategoryModel::convertFrom).toList();
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,20 +0,0 @@
|
||||
package com.example.demo.app.domain.model;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
|
||||
@Getter
|
||||
@AllArgsConstructor
|
||||
public class CourseInfoModel {
|
||||
|
||||
private Long courseId;
|
||||
|
||||
private String courseName;
|
||||
|
||||
private Long categoryId;
|
||||
|
||||
private String categoryName;
|
||||
|
||||
private Integer allocationRatio;
|
||||
|
||||
}
|
||||
@@ -1,28 +0,0 @@
|
||||
package com.example.demo.app.domain.model;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import com.example.demo.app.infra.entity.CourseEntity;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
|
||||
@Getter
|
||||
@AllArgsConstructor
|
||||
public class CourseModel {
|
||||
|
||||
private Long courseId;
|
||||
private String courseName;
|
||||
private String description;
|
||||
|
||||
public static CourseModel convertFrom(CourseEntity courseEntity) {
|
||||
return new CourseModel(
|
||||
courseEntity.getCourseId(),
|
||||
courseEntity.getCourseName(),
|
||||
courseEntity.getDescription());
|
||||
}
|
||||
|
||||
public static List<CourseModel> convertFrom(List<CourseEntity> courseEntityList) {
|
||||
return courseEntityList.stream().map(CourseModel::convertFrom).toList();
|
||||
}
|
||||
}
|
||||
@@ -1,58 +0,0 @@
|
||||
package com.example.demo.app.domain.model;
|
||||
|
||||
import java.time.LocalDate;
|
||||
|
||||
import com.example.demo.app.infra.entity.GoalEntity;
|
||||
import com.example.demo.app.presentation.form.GoalForm;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
|
||||
@Getter
|
||||
@AllArgsConstructor
|
||||
public class GoalModel {
|
||||
|
||||
private Long goalId;
|
||||
|
||||
private String goalTitle;
|
||||
|
||||
private String goalSubtitle;
|
||||
|
||||
private Integer targetAmount;
|
||||
|
||||
private LocalDate deadline;
|
||||
|
||||
private Integer goalComplete;
|
||||
|
||||
public static GoalModel convertFrom(GoalEntity goalEntity) {
|
||||
return new GoalModel(
|
||||
goalEntity.getGoalId(),
|
||||
goalEntity.getGoalTitle(),
|
||||
goalEntity.getGoalSubtitle(),
|
||||
goalEntity.getTargetAmount(),
|
||||
goalEntity.getDeadline(),
|
||||
goalEntity.getGoalComplete());
|
||||
}
|
||||
|
||||
public static GoalEntity convertTo(GoalModel goalModel) {
|
||||
return new GoalEntity(
|
||||
goalModel.getGoalId(),
|
||||
goalModel.getGoalTitle(),
|
||||
goalModel.getGoalSubtitle(),
|
||||
goalModel.getTargetAmount(),
|
||||
goalModel.getDeadline(),
|
||||
goalModel.getGoalComplete(),
|
||||
null);
|
||||
}
|
||||
|
||||
public static GoalModel convertFrom(GoalForm goalForm) {
|
||||
return new GoalModel(
|
||||
goalForm.getGoalId(),
|
||||
goalForm.getGoalTitle(),
|
||||
goalForm.getGoalSubtitle(),
|
||||
goalForm.getTargetAmount(),
|
||||
goalForm.getDeadline(),
|
||||
goalForm.getGoalComplete());
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,10 +0,0 @@
|
||||
package com.example.demo.app.domain.model;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
|
||||
@Getter
|
||||
@AllArgsConstructor
|
||||
public class LoginModel {
|
||||
private Long userId;
|
||||
}
|
||||
@@ -1,49 +0,0 @@
|
||||
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;
|
||||
|
||||
@Getter
|
||||
@AllArgsConstructor
|
||||
public class TransactionModel {
|
||||
|
||||
private Long transactionId;
|
||||
|
||||
private Long userId;
|
||||
|
||||
private Long categoryId;
|
||||
|
||||
private Integer amount;
|
||||
|
||||
private LocalDate transactionDate;
|
||||
|
||||
public static TransactionModel convertFrom(TransactionEntity transactionEntity) {
|
||||
return new TransactionModel(
|
||||
transactionEntity.getTransactionId(),
|
||||
transactionEntity.getUserEntity().getUserId(),
|
||||
transactionEntity.getCategoryEntity().getCategoryId(),
|
||||
transactionEntity.getAmount(),
|
||||
transactionEntity.getTransactionDate());
|
||||
}
|
||||
|
||||
public static List<TransactionModel> convertFrom(List<TransactionEntity> transactionEntityList) {
|
||||
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());
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,24 +0,0 @@
|
||||
package com.example.demo.app.domain.model;
|
||||
|
||||
import java.time.LocalDate;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
|
||||
@Getter
|
||||
@AllArgsConstructor
|
||||
public class UserModel {
|
||||
private Long userId;
|
||||
private String userName;
|
||||
private String mailAddress;
|
||||
private String password;
|
||||
private Integer secretQuestionId;
|
||||
private String secretAnswer;
|
||||
private LocalDate brithDate;
|
||||
private Integer saving;
|
||||
private Integer annualIncome;
|
||||
private Integer monthlyBudget;
|
||||
private Long goalId;
|
||||
private Long courseId;
|
||||
private Integer deleteFlag;
|
||||
}
|
||||
@@ -1,11 +0,0 @@
|
||||
package com.example.demo.app.domain.service;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import com.example.demo.app.domain.model.AllocationModel;
|
||||
|
||||
public interface AllocationService {
|
||||
|
||||
public List<AllocationModel> findAll();
|
||||
|
||||
}
|
||||
@@ -1,9 +0,0 @@
|
||||
package com.example.demo.app.domain.service;
|
||||
|
||||
import com.example.demo.app.domain.model.AnalysisModel;
|
||||
|
||||
public interface AnalysisService {
|
||||
|
||||
AnalysisModel getAnalysis(Long userId);
|
||||
|
||||
}
|
||||
@@ -1,9 +0,0 @@
|
||||
package com.example.demo.app.domain.service;
|
||||
|
||||
import com.example.demo.app.domain.model.AuthenticationModel;
|
||||
import com.example.demo.app.presentation.form.AuthenticationForm;
|
||||
|
||||
public interface AuthenticationService {
|
||||
|
||||
AuthenticationModel authenticate(AuthenticationForm authenticationForm);
|
||||
}
|
||||
@@ -1,14 +0,0 @@
|
||||
package com.example.demo.app.domain.service;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import com.example.demo.app.domain.model.CategoryModel;
|
||||
|
||||
public interface CategoryService {
|
||||
|
||||
public List<CategoryModel> findAll();
|
||||
|
||||
public CategoryModel findOne(Long categoryId);
|
||||
|
||||
public CategoryModel findOneByCategoryName(String categoryName);
|
||||
}
|
||||
@@ -1,10 +0,0 @@
|
||||
package com.example.demo.app.domain.service;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import com.example.demo.app.domain.model.CourseInfoModel;
|
||||
|
||||
public interface CourseInfoService {
|
||||
//
|
||||
public List<CourseInfoModel> findAll();
|
||||
}
|
||||
@@ -1,11 +0,0 @@
|
||||
package com.example.demo.app.domain.service;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import com.example.demo.app.domain.model.CourseModel;
|
||||
|
||||
public interface CourseService {
|
||||
//
|
||||
public List<CourseModel> findAll();
|
||||
|
||||
}
|
||||
@@ -1,15 +0,0 @@
|
||||
package com.example.demo.app.domain.service;
|
||||
|
||||
import com.example.demo.app.domain.model.GoalModel;
|
||||
|
||||
public interface GoalService {
|
||||
|
||||
GoalModel getGoalById(Long goalId);
|
||||
|
||||
GoalModel createGoal(GoalModel goalModel);
|
||||
|
||||
GoalModel updateGoal(GoalModel goalModel);
|
||||
|
||||
// void deleteGoal(Long goalId);
|
||||
|
||||
}
|
||||
@@ -1,9 +0,0 @@
|
||||
package com.example.demo.app.domain.service;
|
||||
|
||||
import com.example.demo.app.domain.model.LoginModel;
|
||||
|
||||
public interface LoginService {
|
||||
|
||||
LoginModel login(String mailAddress, String password);
|
||||
}
|
||||
|
||||
@@ -1,23 +0,0 @@
|
||||
package com.example.demo.app.domain.service;
|
||||
|
||||
import java.time.LocalDate;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import com.example.demo.app.domain.model.TransactionModel;
|
||||
|
||||
public interface TransactionService {
|
||||
|
||||
public Map<LocalDate, List<TransactionModel>> findAllByDate(LocalDate startDate, LocalDate endDate, Long userId);
|
||||
|
||||
public List<TransactionModel> findByUserIdAndDate(LocalDate todayDate, Long userId);
|
||||
|
||||
public int findTotalIncome(LocalDate startDate, LocalDate endDate, Long userId);
|
||||
|
||||
public int findTotalexpense(LocalDate startDate, LocalDate endDate, Long userId);
|
||||
|
||||
public int createTransaction(TransactionModel transactionModel);
|
||||
|
||||
public int updateTransaction(TransactionModel transactionModel);
|
||||
|
||||
}
|
||||
@@ -1,24 +0,0 @@
|
||||
package com.example.demo.app.domain.service.impl;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import com.example.demo.app.domain.model.AllocationModel;
|
||||
import com.example.demo.app.domain.service.AllocationService;
|
||||
import com.example.demo.app.infra.entity.AllocationEntity;
|
||||
import com.example.demo.app.infra.repository.AllocationRepository;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
public class AllocationServiceImpl implements AllocationService {
|
||||
|
||||
AllocationRepository allocationRepository;
|
||||
|
||||
public List<AllocationModel> findAll(){
|
||||
return AllocationEntity.createAllocationModelList(allocationRepository.findAll());
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,144 +0,0 @@
|
||||
package com.example.demo.app.domain.service.impl;
|
||||
|
||||
import java.time.LocalDate;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import com.example.demo.app.domain.model.AnalysisModel;
|
||||
import com.example.demo.app.domain.model.CategoryAnalysisModel;
|
||||
import com.example.demo.app.domain.service.AnalysisService;
|
||||
import com.example.demo.app.infra.entity.AllocationEntity;
|
||||
import com.example.demo.app.infra.entity.CategoryEntity;
|
||||
import com.example.demo.app.infra.entity.UserEntity;
|
||||
import com.example.demo.app.infra.repository.AllocationRepository;
|
||||
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;
|
||||
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
public class AnalysisServiceImpl implements AnalysisService {
|
||||
|
||||
//Repositoryの呼び出し
|
||||
private final TransactionRepository transactionRepository;
|
||||
private final AllocationRepository allocationRepository;
|
||||
private final UserRepository userRepository;
|
||||
private final CategoryRepository categoryRepository;
|
||||
|
||||
@Override
|
||||
public AnalysisModel getAnalysis(Long userId) {
|
||||
|
||||
// ユーザー情報取得、月別使用可能資金取得
|
||||
UserEntity userEntity = userRepository.findById(userId).orElseThrow(() ->
|
||||
new RuntimeException(
|
||||
"User not found."));
|
||||
|
||||
// コースID取得
|
||||
Long courseId = userEntity.getCourseEntity().getCourseId();
|
||||
|
||||
// 月別使用可能資金取得
|
||||
Integer monthlyBudget =userEntity.getMonthlyBudget();
|
||||
|
||||
// 今月の期間取得
|
||||
LocalDate currentMonthStartDate = LocalDate.now().withDayOfMonth(1);
|
||||
LocalDate currentMonthEndDate = LocalDate.now().withDayOfMonth(LocalDate.now().lengthOfMonth());
|
||||
|
||||
// 前月の期間取得
|
||||
LocalDate previousMonthStartDate = LocalDate.now().minusMonths(1).withDayOfMonth(1);
|
||||
LocalDate previousMonthEndDate = LocalDate.now().minusMonths(1).withDayOfMonth(LocalDate.now().minusMonths(1).lengthOfMonth());
|
||||
|
||||
// 今月の支出取得
|
||||
Integer currentMonthTotalAmount = transactionRepository.findTotalExpense(currentMonthStartDate, currentMonthEndDate, userId);
|
||||
|
||||
if (currentMonthTotalAmount == null) {
|
||||
currentMonthTotalAmount = 0;
|
||||
}
|
||||
|
||||
// 前月の支出取得
|
||||
Integer previousMonthTotalAmount = transactionRepository.findTotalExpense(previousMonthStartDate, previousMonthEndDate, userId);
|
||||
|
||||
if (previousMonthTotalAmount == null) {
|
||||
previousMonthTotalAmount = 0;
|
||||
}
|
||||
|
||||
//総支出差額算出
|
||||
Integer totalDifferenceAmount = currentMonthTotalAmount - previousMonthTotalAmount;
|
||||
|
||||
//カテゴリ一覧取得
|
||||
List<CategoryAnalysisModel> categoryAnalysisModelList = new ArrayList<>();
|
||||
List<CategoryEntity> categoryEntityList = categoryRepository.findAll();
|
||||
List<AllocationEntity> allocationEntityList = allocationRepository.findByCourseEntity_CourseId(courseId);
|
||||
|
||||
//取得ループ
|
||||
for (CategoryEntity categoryEntity : categoryEntityList) {
|
||||
|
||||
if (categoryEntity.getTransactionType() != 0) {
|
||||
continue;
|
||||
}
|
||||
// カテゴリ別今月金額取得
|
||||
Integer currentMonthAmount =
|
||||
transactionRepository.findCategoryExpense(currentMonthStartDate,
|
||||
currentMonthEndDate,
|
||||
userId,
|
||||
categoryEntity.getCategoryId());
|
||||
|
||||
// カテゴリ別前月金額取得
|
||||
Integer previousMonthAmount =
|
||||
transactionRepository.findCategoryExpense(previousMonthStartDate,
|
||||
previousMonthEndDate,
|
||||
userId,
|
||||
categoryEntity.getCategoryId());
|
||||
|
||||
if (currentMonthAmount == null) {
|
||||
currentMonthAmount = 0;
|
||||
}
|
||||
|
||||
if (previousMonthAmount == null) {
|
||||
previousMonthAmount = 0;
|
||||
}
|
||||
|
||||
// カテゴリ別前月差額算出
|
||||
Integer monthDifferenceAmount = currentMonthAmount - previousMonthAmount;
|
||||
|
||||
// コース配分取得
|
||||
AllocationEntity allocationEntity = allocationEntityList.stream().filter(allocation ->
|
||||
allocation.getCategoryEntity()
|
||||
.getCategoryId()
|
||||
.equals(categoryEntity.getCategoryId()))
|
||||
.findFirst()
|
||||
.orElse(null);
|
||||
|
||||
Integer allocationRatio = 0;
|
||||
|
||||
if (allocationEntity != null) {
|
||||
allocationRatio =
|
||||
allocationEntity.getAllocationRatio();
|
||||
}
|
||||
|
||||
// コース限度額算出
|
||||
Integer courseLimitAmount = monthlyBudget * allocationRatio / 100;
|
||||
|
||||
// コース差額算出
|
||||
Integer courseDifferenceAmount = currentMonthAmount - courseLimitAmount;
|
||||
|
||||
// CategoryAnalysisModel生成
|
||||
CategoryAnalysisModel categoryAnalysisModel = new CategoryAnalysisModel(
|
||||
categoryEntity.getCategoryName(),
|
||||
currentMonthAmount,
|
||||
previousMonthAmount,
|
||||
monthDifferenceAmount,
|
||||
courseLimitAmount,
|
||||
courseDifferenceAmount);
|
||||
|
||||
categoryAnalysisModelList.add(categoryAnalysisModel);
|
||||
}
|
||||
|
||||
// AnalysisModelの生成
|
||||
return new AnalysisModel(currentMonthTotalAmount, previousMonthTotalAmount, totalDifferenceAmount, categoryAnalysisModelList);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,42 +0,0 @@
|
||||
package com.example.demo.app.domain.service.impl;
|
||||
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import com.example.demo.app.domain.model.AuthenticationModel;
|
||||
import com.example.demo.app.domain.service.AuthenticationService;
|
||||
import com.example.demo.app.infra.entity.UserEntity;
|
||||
import com.example.demo.app.infra.repository.UserRepository;
|
||||
import com.example.demo.app.presentation.form.AuthenticationForm;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
public class AuthenticationServiceImpl implements AuthenticationService {
|
||||
|
||||
private final UserRepository userRepository;
|
||||
|
||||
@Override
|
||||
public AuthenticationModel authenticate(AuthenticationForm authenticationForm) {
|
||||
|
||||
UserEntity userEntity = userRepository.findByMailAddress(
|
||||
authenticationForm.getMailAddress())
|
||||
.orElse(null);
|
||||
|
||||
if (userEntity == null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
if (!userEntity.getQuestionEntity().getSecretQuestionId()
|
||||
.equals(authenticationForm.getSecretQuestionId())) {
|
||||
return null;
|
||||
}
|
||||
|
||||
if (!userEntity.getSecretQuestionAnswer()
|
||||
.equals(authenticationForm.getSecretAnswer())) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return new AuthenticationModel(userEntity.getUserId());
|
||||
}
|
||||
}
|
||||
@@ -1,51 +0,0 @@
|
||||
package com.example.demo.app.domain.service.impl;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import com.example.demo.app.domain.model.CategoryModel;
|
||||
import com.example.demo.app.domain.service.CategoryService;
|
||||
import com.example.demo.app.infra.entity.CategoryEntity;
|
||||
import com.example.demo.app.infra.repository.CategoryRepository;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
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);
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,25 +0,0 @@
|
||||
package com.example.demo.app.domain.service.impl;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import com.example.demo.app.domain.model.CourseModel;
|
||||
import com.example.demo.app.domain.service.CourseService;
|
||||
import com.example.demo.app.infra.entity.CourseEntity;
|
||||
import com.example.demo.app.infra.repository.CourseRepository;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
public class CourseServiceImpl implements CourseService {
|
||||
|
||||
private final CourseRepository courseRepository;
|
||||
|
||||
public List<CourseModel> findAll(){
|
||||
|
||||
return CourseEntity.createCourseModelList(courseRepository.findAll());
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,49 +0,0 @@
|
||||
package com.example.demo.app.domain.service.impl;
|
||||
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import com.example.demo.app.domain.model.GoalModel;
|
||||
import com.example.demo.app.domain.service.GoalService;
|
||||
import com.example.demo.app.infra.entity.GoalEntity;
|
||||
import com.example.demo.app.infra.repository.GoalRepository;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
public class GoalServiceImpl implements GoalService {
|
||||
|
||||
private final GoalRepository goalRepository;
|
||||
|
||||
@Override
|
||||
public GoalModel getGoalById(Long goalId) {
|
||||
|
||||
GoalEntity goalEntity = goalRepository.findById(goalId).orElse(null);
|
||||
|
||||
return GoalModel.convertFrom(goalEntity);
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public GoalModel createGoal(GoalModel goalModel) {
|
||||
|
||||
GoalEntity goalEntity = GoalModel.convertTo(goalModel);
|
||||
|
||||
GoalEntity savedGoalEntity = goalRepository.save(goalEntity);
|
||||
|
||||
return GoalModel.convertFrom(savedGoalEntity);
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public GoalModel updateGoal(GoalModel goalModel) {
|
||||
|
||||
GoalEntity goalEntity = GoalModel.convertTo(goalModel);
|
||||
|
||||
GoalEntity updatedGoalEntity = goalRepository.save(goalEntity);
|
||||
|
||||
return GoalModel.convertFrom(updatedGoalEntity);
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,31 +0,0 @@
|
||||
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;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
public class LoginServiceImpl implements LoginService {
|
||||
|
||||
private final UserRepository userRepository;
|
||||
|
||||
@Override
|
||||
public LoginModel login(String mailAddress, String password) {
|
||||
|
||||
UserEntity userEntity = userRepository.findByMailAddressAndPassword(
|
||||
mailAddress,
|
||||
password).orElse(null);
|
||||
|
||||
if (userEntity == null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return new LoginModel(userEntity.getUserId());
|
||||
}
|
||||
}
|
||||
@@ -1,118 +0,0 @@
|
||||
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;
|
||||
|
||||
@Service
|
||||
@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) {
|
||||
|
||||
List<TransactionEntity> transactionEntityList = transactionRepository.findAllByDateAndUserId(startDate, endDate,
|
||||
userId);
|
||||
|
||||
List<TransactionModel> transactionModelList = TransactionModel
|
||||
.convertFrom(transactionEntityList);
|
||||
|
||||
Map<LocalDate, List<TransactionModel>> transactionModelMap = transactionModelList.stream()
|
||||
.collect(Collectors.groupingBy(TransactionModel::getTransactionDate));
|
||||
|
||||
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) {
|
||||
|
||||
return TransactionModel.convertFrom(transactionRepository.findByUserIdAndDate(todayDate, userId));
|
||||
|
||||
}
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
@@ -1,53 +0,0 @@
|
||||
package com.example.demo.app.infra.entity;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import jakarta.persistence.Column;
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.FetchType;
|
||||
import jakarta.persistence.Id;
|
||||
import jakarta.persistence.IdClass;
|
||||
import jakarta.persistence.JoinColumn;
|
||||
import jakarta.persistence.ManyToOne;
|
||||
import jakarta.persistence.OneToOne;
|
||||
import jakarta.persistence.Table;
|
||||
|
||||
import com.example.demo.app.domain.model.AllocationModel;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
@Entity
|
||||
@IdClass(AllocationId.class)
|
||||
@Table(name = "allocation_m")
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class AllocationEntity {
|
||||
|
||||
@Id
|
||||
@ManyToOne(fetch = FetchType.LAZY)
|
||||
@JoinColumn(name = "category_id")
|
||||
private CategoryEntity categoryEntity;
|
||||
|
||||
@Id
|
||||
@OneToOne(fetch = FetchType.LAZY)
|
||||
@JoinColumn(name = "course_id")
|
||||
private CourseEntity courseEntity;
|
||||
|
||||
@Column(name = "allocation_ratio", nullable = false)
|
||||
private Integer allocationRatio;
|
||||
|
||||
|
||||
public static List<AllocationModel> createAllocationModelList(List<AllocationEntity> allocationEntityList) {
|
||||
|
||||
return allocationEntityList
|
||||
.stream()
|
||||
.map(allocationEntity -> new AllocationModel(
|
||||
allocationEntity.getCategoryEntity().getCategoryId(),
|
||||
allocationEntity.getCourseEntity().getCourseId(),
|
||||
allocationEntity.getAllocationRatio()
|
||||
)).toList();
|
||||
}
|
||||
}
|
||||
@@ -1,16 +0,0 @@
|
||||
package com.example.demo.app.infra.entity;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class AllocationId implements Serializable {
|
||||
private Long categoryEntity;
|
||||
|
||||
private Long courseEntity;
|
||||
}
|
||||
@@ -1,40 +0,0 @@
|
||||
package com.example.demo.app.infra.entity;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import jakarta.persistence.Column;
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.GeneratedValue;
|
||||
import jakarta.persistence.GenerationType;
|
||||
import jakarta.persistence.Id;
|
||||
import jakarta.persistence.OneToMany;
|
||||
import jakarta.persistence.Table;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
@Entity
|
||||
@Table(name = "category_t")
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class CategoryEntity {
|
||||
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
@Column(name = "category_id")
|
||||
private Long categoryId;
|
||||
|
||||
@Column(name = "category_name", nullable = false)
|
||||
private String categoryName;
|
||||
|
||||
@Column(name = "transaction_type", nullable = false)
|
||||
private Integer transactionType;
|
||||
|
||||
@OneToMany(mappedBy = "categoryEntity")
|
||||
private List<TransactionEntity> transactionEntity;
|
||||
|
||||
@OneToMany(mappedBy = "categoryEntity")
|
||||
private List<AllocationEntity> allocationEntity;
|
||||
}
|
||||
@@ -1,52 +0,0 @@
|
||||
package com.example.demo.app.infra.entity;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import jakarta.persistence.Column;
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.GeneratedValue;
|
||||
import jakarta.persistence.GenerationType;
|
||||
import jakarta.persistence.Id;
|
||||
import jakarta.persistence.OneToMany;
|
||||
import jakarta.persistence.Table;
|
||||
|
||||
import com.example.demo.app.domain.model.CourseModel;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
@Entity
|
||||
@Table(name = "course_m")
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class CourseEntity {
|
||||
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
@Column(name = "course_id")
|
||||
private Long courseId;
|
||||
|
||||
@Column(name = "course_name", nullable = false)
|
||||
private String courseName;
|
||||
|
||||
|
||||
@Column(name = "description", nullable = false)
|
||||
private String description;
|
||||
|
||||
@OneToMany(mappedBy = "courseEntity")
|
||||
private List<UserEntity> userEntity;
|
||||
|
||||
public static List<CourseModel> createCourseModelList(List<CourseEntity> courseEntityList) {
|
||||
|
||||
return courseEntityList
|
||||
.stream()
|
||||
.map(courseEntity -> new CourseModel(
|
||||
courseEntity.getCourseId(),
|
||||
courseEntity.getCourseName(),
|
||||
courseEntity.getDescription()
|
||||
)).toList();
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,47 +0,0 @@
|
||||
package com.example.demo.app.infra.entity;
|
||||
|
||||
import java.time.LocalDate;
|
||||
|
||||
import jakarta.persistence.Column;
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.GeneratedValue;
|
||||
import jakarta.persistence.GenerationType;
|
||||
import jakarta.persistence.Id;
|
||||
import jakarta.persistence.OneToOne;
|
||||
import jakarta.persistence.Table;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
@Entity
|
||||
@Table(name = "goal_t")
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class GoalEntity {
|
||||
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
@Column(name = "goal_id")
|
||||
private Long goalId;
|
||||
|
||||
@Column(name = "goal_title", nullable = true)
|
||||
private String goalTitle;
|
||||
|
||||
@Column(name = "goal_subtitle", nullable = true)
|
||||
private String goalSubtitle;
|
||||
|
||||
@Column(name = "target_amount", nullable = false)
|
||||
private Integer targetAmount;
|
||||
|
||||
@Column(name = "deadline", nullable = false)
|
||||
private LocalDate deadline;
|
||||
|
||||
@Column(name = "goal_complete", nullable = false)
|
||||
private Integer goalComplete;
|
||||
|
||||
@OneToOne(mappedBy = "goalEntity")
|
||||
private UserEntity userEntity;
|
||||
|
||||
}
|
||||
@@ -1,35 +0,0 @@
|
||||
package com.example.demo.app.infra.entity;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import jakarta.persistence.Column;
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.GeneratedValue;
|
||||
import jakarta.persistence.GenerationType;
|
||||
import jakarta.persistence.Id;
|
||||
import jakarta.persistence.OneToMany;
|
||||
import jakarta.persistence.Table;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
@Entity
|
||||
@Table(name = "question_m")
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class QuestionEntity {
|
||||
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
@Column(name = "secret_question_id")
|
||||
private Long secretQuestionId;
|
||||
|
||||
@Column(name = "question_text", nullable = false)
|
||||
private String questionText;
|
||||
|
||||
@OneToMany(mappedBy = "questionEntity")
|
||||
private List<UserEntity> userEntity;
|
||||
|
||||
}
|
||||
@@ -1,45 +0,0 @@
|
||||
package com.example.demo.app.infra.entity;
|
||||
|
||||
import java.time.LocalDate;
|
||||
|
||||
import jakarta.persistence.Column;
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.FetchType;
|
||||
import jakarta.persistence.GeneratedValue;
|
||||
import jakarta.persistence.GenerationType;
|
||||
import jakarta.persistence.Id;
|
||||
import jakarta.persistence.JoinColumn;
|
||||
import jakarta.persistence.ManyToOne;
|
||||
import jakarta.persistence.Table;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
@Entity
|
||||
@Table(name = "transaction_t")
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class TransactionEntity {
|
||||
|
||||
@Id
|
||||
@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;
|
||||
|
||||
@Column(name = "transaction_date", nullable = false)
|
||||
private LocalDate transactionDate;
|
||||
|
||||
}
|
||||
@@ -1,76 +0,0 @@
|
||||
package com.example.demo.app.infra.entity;
|
||||
|
||||
import java.time.LocalDate;
|
||||
import java.util.List;
|
||||
|
||||
import jakarta.persistence.Column;
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.FetchType;
|
||||
import jakarta.persistence.GeneratedValue;
|
||||
import jakarta.persistence.GenerationType;
|
||||
import jakarta.persistence.Id;
|
||||
import jakarta.persistence.JoinColumn;
|
||||
import jakarta.persistence.ManyToOne;
|
||||
import jakarta.persistence.OneToMany;
|
||||
import jakarta.persistence.OneToOne;
|
||||
import jakarta.persistence.Table;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
@Entity
|
||||
@Table(name = "user_t")
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class UserEntity {
|
||||
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
@Column(name = "user_id")
|
||||
private Long userId;
|
||||
|
||||
@Column(name = "user_name", nullable = false)
|
||||
private String userName;
|
||||
|
||||
@Column(name = "mail_address", nullable = false)
|
||||
private String mailAddress;
|
||||
|
||||
@Column(name = "password", nullable = false)
|
||||
private String password;
|
||||
|
||||
@Column(name = "secret_answer", nullable = false)
|
||||
private String secretQuestionAnswer;
|
||||
|
||||
@Column(name = "birth_date", nullable = false)
|
||||
private LocalDate birthDate;
|
||||
|
||||
@Column(name = "saving", nullable = false)
|
||||
private Integer saving;
|
||||
|
||||
@Column(name = "annual_income", nullable = false)
|
||||
private Integer annualIncome;
|
||||
|
||||
@Column(name = "monthly_budget", nullable = false)
|
||||
private Integer monthlyBudget;
|
||||
|
||||
@Column(name = "delete_flag", nullable = false)
|
||||
private Integer deleteFlag;
|
||||
|
||||
@OneToMany(mappedBy = "userEntity")
|
||||
private List<TransactionEntity> transactionEntityList;
|
||||
|
||||
@ManyToOne(fetch = FetchType.LAZY)
|
||||
@JoinColumn(name = "secret_question_id")
|
||||
private QuestionEntity questionEntity;
|
||||
|
||||
@OneToOne(fetch = FetchType.LAZY)
|
||||
@JoinColumn(name = "goal_id")
|
||||
private GoalEntity goalEntity;
|
||||
|
||||
@ManyToOne(fetch = FetchType.LAZY)
|
||||
@JoinColumn(name = "course_id")
|
||||
private CourseEntity courseEntity;
|
||||
|
||||
}
|
||||
@@ -1,32 +0,0 @@
|
||||
package com.example.demo.app.infra.repository;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import org.springframework.data.jpa.repository.Query;
|
||||
|
||||
import com.example.demo.app.domain.model.CourseInfoModel;
|
||||
import com.example.demo.app.infra.entity.AllocationEntity;
|
||||
import com.example.demo.app.infra.entity.AllocationId;
|
||||
|
||||
public interface AllocationRepository extends JpaRepository<AllocationEntity, AllocationId>{
|
||||
|
||||
List<AllocationEntity> findByCourseEntity_CourseId(Long courseId);
|
||||
|
||||
@Query(" SELECT new com.example.demo.app.domain.model.CourseInfoModel("
|
||||
+ "co.courseId, "
|
||||
+ " co.courseName, "
|
||||
+ " ca.categoryId, "
|
||||
+ " ca.categoryName, "
|
||||
+ " a.allocationRatio )"
|
||||
+ " FROM AllocationEntity a"
|
||||
+ " INNER JOIN CourseEntity co "
|
||||
+ " ON a.courseEntity.courseId = co.courseId "
|
||||
+ " INNER JOIN CategoryEntity ca "
|
||||
+ " on a.categoryEntity.categoryId = ca.categoryId "
|
||||
+ " WHERE ca.transactionType = 0 "
|
||||
+ " ORDER BY a.courseEntity.courseId ASC, "
|
||||
+ " a.categoryEntity.categoryId ASC ")
|
||||
List<CourseInfoModel> findAllJoinedAllocation();
|
||||
|
||||
}
|
||||
@@ -1,15 +0,0 @@
|
||||
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);
|
||||
|
||||
}
|
||||
@@ -1,9 +0,0 @@
|
||||
package com.example.demo.app.infra.repository;
|
||||
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
|
||||
import com.example.demo.app.infra.entity.CourseEntity;
|
||||
|
||||
public interface CourseRepository extends JpaRepository<CourseEntity, Long> {
|
||||
|
||||
}
|
||||
@@ -1,11 +0,0 @@
|
||||
package com.example.demo.app.infra.repository;
|
||||
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
import com.example.demo.app.infra.entity.GoalEntity;
|
||||
|
||||
@Repository
|
||||
public interface GoalRepository extends JpaRepository<GoalEntity, Long> {
|
||||
|
||||
}
|
||||
@@ -1,9 +0,0 @@
|
||||
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> {
|
||||
|
||||
}
|
||||
@@ -1,27 +0,0 @@
|
||||
package com.example.demo.app.infra.repository;
|
||||
|
||||
import java.time.LocalDate;
|
||||
import java.util.List;
|
||||
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import org.springframework.data.jpa.repository.Query;
|
||||
|
||||
import com.example.demo.app.infra.entity.TransactionEntity;
|
||||
|
||||
public interface TransactionRepository extends JpaRepository<TransactionEntity, Long> {
|
||||
|
||||
@Query("select t from TransactionEntity t where t.userEntity.userId = :userId and t.transactionDate = :transactionDate")
|
||||
public List<TransactionEntity> findByUserIdAndDate(LocalDate todayDate, Long userId);
|
||||
|
||||
@Query("select t from TransactionEntity t where (t.transactionDate between :startDate and :endDate) and (t.userEntity.userId = :userId) order by t.transactionDate asc")
|
||||
public List<TransactionEntity> findAllByDateAndUserId(LocalDate startDate, LocalDate endDate, Long userId);
|
||||
|
||||
@Query("select sum(t.amount) from TransactionEntity t inner join CategoryEntity c on t.categoryEntity.categoryId = c.categoryId where (t.userEntity.userId = :userId and t.transactionDate between :startDate and :endDate) and c.transactionType = 0")
|
||||
public Integer findTotalExpense(LocalDate startDate, LocalDate endDate, Long userId);
|
||||
|
||||
@Query("select sum(t.amount) from TransactionEntity t inner join CategoryEntity c on t.categoryEntity.categoryId = c.categoryId where (t.userEntity.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);
|
||||
}
|
||||
@@ -1,21 +0,0 @@
|
||||
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;
|
||||
|
||||
@Repository
|
||||
public interface UserRepository extends JpaRepository<UserEntity, Long> {
|
||||
|
||||
@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);
|
||||
|
||||
Optional<UserEntity> findByMailAddress(String mailAddress);
|
||||
}
|
||||
|
||||
@@ -1,40 +0,0 @@
|
||||
package com.example.demo.app.presentation.controller;
|
||||
|
||||
import jakarta.servlet.http.HttpSession;
|
||||
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
|
||||
import com.example.demo.app.domain.model.AnalysisModel;
|
||||
import com.example.demo.app.domain.model.LoginModel;
|
||||
import com.example.demo.app.domain.service.AnalysisService;
|
||||
import com.example.demo.app.presentation.form.AnalysisForm;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
|
||||
|
||||
@Controller
|
||||
@RequiredArgsConstructor
|
||||
public class AnalysisController {
|
||||
|
||||
private final AnalysisService analysisService;
|
||||
|
||||
@GetMapping("/analysis")
|
||||
public String showAnalysis(Model model, HttpSession session) {
|
||||
|
||||
//ログインユーザーの取得（セッション）
|
||||
LoginModel loginUser = (LoginModel) session.getAttribute("loginUser");
|
||||
|
||||
//分析結果の取得(Service)
|
||||
AnalysisModel analysisModel = analysisService.getAnalysis(loginUser.getUserId());
|
||||
|
||||
AnalysisForm analysisForm = AnalysisForm.convertFrom(analysisModel);
|
||||
|
||||
//model格納
|
||||
model.addAttribute("analysisForm", analysisForm);
|
||||
|
||||
return "analysis";
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,56 +0,0 @@
|
||||
package com.example.demo.app.presentation.controller;
|
||||
|
||||
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.PostMapping;
|
||||
|
||||
import com.example.demo.app.domain.model.AuthenticationModel;
|
||||
import com.example.demo.app.domain.service.AuthenticationService;
|
||||
import com.example.demo.app.infra.repository.QuestionRepository;
|
||||
import com.example.demo.app.presentation.form.AuthenticationForm;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
|
||||
@Controller
|
||||
@RequiredArgsConstructor
|
||||
public class AuthenticationController {
|
||||
|
||||
private final AuthenticationService authenticationService;
|
||||
private final QuestionRepository questionRepository;
|
||||
|
||||
@GetMapping("/authentication")
|
||||
public String showAuthentication(Model model) {
|
||||
|
||||
model.addAttribute("authenticationForm", new AuthenticationForm());
|
||||
model.addAttribute("questionList", questionRepository.findAll());
|
||||
|
||||
return "authentication";
|
||||
}
|
||||
|
||||
@PostMapping("/authentication")
|
||||
public String authenticate(
|
||||
AuthenticationForm authenticationForm,
|
||||
Model model,
|
||||
HttpSession session) {
|
||||
|
||||
AuthenticationModel authenticationModel =
|
||||
authenticationService.authenticate(authenticationForm);
|
||||
|
||||
if (authenticationModel == null) {
|
||||
model.addAttribute("errorMessage", "認証情報が正しくありません。");
|
||||
model.addAttribute("questionList", questionRepository.findAll());
|
||||
|
||||
return "authentication";
|
||||
}
|
||||
|
||||
session.setAttribute(
|
||||
"passwordResetUserId",
|
||||
authenticationModel.getUserId());
|
||||
|
||||
return "password_reset";
|
||||
|
||||
}
|
||||
}
|
||||
@@ -1,52 +0,0 @@
|
||||
package com.example.demo.app.presentation.controller;
|
||||
|
||||
import java.util.logging.Logger;
|
||||
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
|
||||
import com.example.demo.app.domain.service.CourseInfoService;
|
||||
import com.example.demo.app.domain.service.CourseService;
|
||||
import com.example.demo.app.presentation.form.CourseForm;
|
||||
import com.example.demo.app.presentation.form.CourseInfoForm;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
|
||||
|
||||
@Controller
|
||||
@RequiredArgsConstructor
|
||||
public class CourseController {
|
||||
|
||||
private final static Logger LOGGER = Logger.getLogger(CourseController.class.getName());
|
||||
// エラーメッセージ用の定数フィールド
|
||||
private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
|
||||
|
||||
// private final HttpSession httpSession;
|
||||
private final CourseService courseService;
|
||||
private final CourseInfoService courseInfoService;
|
||||
|
||||
|
||||
|
||||
@GetMapping("/select-course")
|
||||
public String select(Model model) {
|
||||
|
||||
//try {
|
||||
model.addAttribute("courseList", CourseForm.convertFrom(courseService.findAll()));
|
||||
model.addAttribute("courseInfoList", CourseInfoForm.convertFrom(courseInfoService.findAll()));
|
||||
|
||||
return "select_course";
|
||||
|
||||
//} catch (Exception e) {
|
||||
// // ログイン情報の破棄
|
||||
// httpSession.invalidate();
|
||||
//
|
||||
// e.printStackTrace();
|
||||
//
|
||||
// // エラーログ出力
|
||||
// LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
|
||||
// // エラー画面遷移
|
||||
// return null;
|
||||
// }
|
||||
}
|
||||
}
|
||||
@@ -1,61 +0,0 @@
|
||||
package com.example.demo.app.presentation.controller;
|
||||
|
||||
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.PathVariable;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
|
||||
import com.example.demo.app.domain.model.GoalModel;
|
||||
import com.example.demo.app.domain.service.GoalService;
|
||||
import com.example.demo.app.presentation.form.GoalForm;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
|
||||
@Controller
|
||||
@RequiredArgsConstructor
|
||||
@RequestMapping("/goal")
|
||||
public class GoalController {
|
||||
|
||||
private final GoalService goalService;
|
||||
|
||||
@GetMapping("/{goalId}")
|
||||
public String getGoal(@PathVariable Long goalId, Model model) {
|
||||
|
||||
GoalModel goalModel = goalService.getGoalById(goalId);
|
||||
|
||||
GoalForm goalForm = GoalForm.convertFrom(goalModel);
|
||||
|
||||
model.addAttribute("goalForm", goalForm);
|
||||
|
||||
return "goal_view";
|
||||
|
||||
}
|
||||
|
||||
@GetMapping("/{goalId}/edit")
|
||||
public String editGoal(@PathVariable Long goalId, Model model) {
|
||||
|
||||
GoalModel goalModel = goalService.getGoalById(goalId);
|
||||
|
||||
GoalForm goalForm = GoalForm.convertFrom(goalModel);
|
||||
|
||||
model.addAttribute("goalForm", goalForm);
|
||||
|
||||
return "goal_edit";
|
||||
|
||||
}
|
||||
|
||||
@PostMapping("/update")
|
||||
public String updateGoal(@ModelAttribute GoalForm goalForm) {
|
||||
|
||||
GoalModel goalModel = GoalModel.convertFrom(goalForm);
|
||||
|
||||
goalService.updateGoal(goalModel);
|
||||
|
||||
return "redirect:/goal/" + goalForm.getGoalId();
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,55 +0,0 @@
|
||||
package com.example.demo.app.presentation.controller;
|
||||
|
||||
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 com.example.demo.app.domain.model.LoginModel;
|
||||
import com.example.demo.app.domain.service.LoginService;
|
||||
import com.example.demo.app.presentation.form.LoginForm;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
|
||||
@Controller
|
||||
@RequiredArgsConstructor
|
||||
public class LoginController {
|
||||
|
||||
private final LoginService loginService;
|
||||
|
||||
@GetMapping("/login")
|
||||
public String showLogin(Model model) {
|
||||
|
||||
model.addAttribute(
|
||||
"loginForm",
|
||||
new LoginForm());
|
||||
|
||||
return "login";
|
||||
}
|
||||
|
||||
@PostMapping("/login")
|
||||
public String login(
|
||||
@ModelAttribute LoginForm loginForm,
|
||||
Model model,
|
||||
HttpSession session) {
|
||||
|
||||
LoginModel loginModel = loginService.login(
|
||||
loginForm.getMailAddress(),
|
||||
loginForm.getPassword());
|
||||
|
||||
if (loginModel == null) {
|
||||
model.addAttribute(
|
||||
"errorMessage",
|
||||
"Email address or password is incorrect.");
|
||||
|
||||
return "login";
|
||||
}
|
||||
|
||||
session.setAttribute("loginUser", loginModel);
|
||||
|
||||
return "menu";
|
||||
}
|
||||
}
|
||||
@@ -1,130 +0,0 @@
|
||||
package com.example.demo.app.presentation.controller;
|
||||
|
||||
import java.time.LocalDate;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
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;
|
||||
import com.example.demo.app.presentation.form.TransactionForm;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
|
||||
@Controller
|
||||
@RequiredArgsConstructor
|
||||
public class TransactionController {
|
||||
|
||||
private final TransactionService transactionService;
|
||||
private final CategoryService categoryService;
|
||||
// 一覧画面
|
||||
|
||||
@GetMapping("/transaction/list")
|
||||
public String transactionList(@RequestParam(required = false) LocalDate startDates,
|
||||
@RequestParam(required = false) LocalDate endDates, Model model,
|
||||
HttpSession session) {
|
||||
|
||||
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.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());
|
||||
return transactionForm;
|
||||
}).collect(Collectors.toList());
|
||||
transactionFormMap.put(date, transactionFormList);
|
||||
});
|
||||
|
||||
model.addAttribute("transactionFormMap", transactionFormMap);
|
||||
|
||||
return "transaction_list";
|
||||
}
|
||||
|
||||
// 詳細画面
|
||||
@GetMapping("/transaction/detail")
|
||||
public String findOne(@RequestParam(required = false) LocalDate todayDates, Model model, HttpSession session) {
|
||||
|
||||
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("/transaction/create")
|
||||
public String createOneGet(@ModelAttribute TransactionForm transactionForm) {
|
||||
|
||||
return "";
|
||||
}
|
||||
|
||||
@PostMapping("/transaction/create")
|
||||
public String createOnePost(@ModelAttribute TransactionForm transactionForm, Model model) {
|
||||
|
||||
if (transactionService.createTransaction(TransactionForm.convertTo(transactionForm)) != 0) {
|
||||
return "error";
|
||||
}
|
||||
|
||||
return "";
|
||||
|
||||
}
|
||||
|
||||
@GetMapping("/transaction/update")
|
||||
public String updateOneGet(@ModelAttribute TransactionForm transactionForm) {
|
||||
|
||||
return "";
|
||||
}
|
||||
|
||||
@PostMapping("/transaction/update")
|
||||
public String updateOnePost(@ModelAttribute TransactionForm transactionForm, Model model) {
|
||||
|
||||
if (transactionService.updateTransaction(TransactionForm.convertTo(transactionForm)) != 0) {
|
||||
return "error";
|
||||
}
|
||||
|
||||
return "";
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,28 +0,0 @@
|
||||
package com.example.demo.app.presentation.form;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import com.example.demo.app.domain.model.AllocationModel;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class AllocationForm {
|
||||
|
||||
private Long categoryId;
|
||||
private Long courseId;
|
||||
private Integer allocationRatio;
|
||||
|
||||
public static AllocationForm convertFrom(AllocationModel allocationModel) {
|
||||
return new AllocationForm(allocationModel.getCategoryId(), allocationModel.getCourseId(), allocationModel.getAllocationRatio());
|
||||
}
|
||||
|
||||
public static List<AllocationForm> convertFrom(List<AllocationModel> allocationModelList){
|
||||
return allocationModelList.stream().map(AllocationForm::convertFrom).toList();
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,35 +0,0 @@
|
||||
package com.example.demo.app.presentation.form;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import com.example.demo.app.domain.model.AnalysisModel;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class AnalysisForm {
|
||||
|
||||
private Integer currentMonthTotalAmount;
|
||||
|
||||
private Integer previousMonthTotalAmount;
|
||||
|
||||
private Integer totalDifferenceAmount;
|
||||
|
||||
private List<CategoryAnalysisForm>
|
||||
categoryAnalysisFormList;
|
||||
|
||||
public static AnalysisForm convertFrom(
|
||||
AnalysisModel analysisModel) {
|
||||
|
||||
return new AnalysisForm(
|
||||
analysisModel.getCurrentMonthTotalAmount(),
|
||||
analysisModel.getPreviousMonthTotalAmount(),
|
||||
analysisModel.getTotalDifferenceAmount(),
|
||||
CategoryAnalysisForm.convertFrom(
|
||||
analysisModel.getCategoryAnalysisModelList()));
|
||||
}
|
||||
}
|
||||
@@ -1,14 +0,0 @@
|
||||
package com.example.demo.app.presentation.form;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class AuthenticationForm {
|
||||
private String mailAddress;
|
||||
private Integer secretQuestionId;
|
||||
private String secretAnswer;
|
||||
}
|
||||
@@ -1,47 +0,0 @@
|
||||
package com.example.demo.app.presentation.form;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import com.example.demo.app.domain.model.CategoryAnalysisModel;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class CategoryAnalysisForm {
|
||||
|
||||
private String categoryName;
|
||||
|
||||
private Integer currentMonthAmount;
|
||||
|
||||
private Integer previousMonthAmount;
|
||||
|
||||
private Integer monthDifferenceAmount;
|
||||
|
||||
private Integer courseLimitAmount;
|
||||
|
||||
private Integer courseDifferenceAmount;
|
||||
|
||||
public static CategoryAnalysisForm convertFrom(
|
||||
CategoryAnalysisModel categoryAnalysisModel) {
|
||||
|
||||
return new CategoryAnalysisForm(
|
||||
categoryAnalysisModel.getCategoryName(),
|
||||
categoryAnalysisModel.getCurrentMonthAmount(),
|
||||
categoryAnalysisModel.getPreviousMonthAmount(),
|
||||
categoryAnalysisModel.getMonthDifferenceAmount(),
|
||||
categoryAnalysisModel.getCourseLimitAmount(),
|
||||
categoryAnalysisModel.getCourseDifferenceAmount());
|
||||
}
|
||||
|
||||
public static List<CategoryAnalysisForm> convertFrom(
|
||||
List<CategoryAnalysisModel> categoryAnalysisModelList) {
|
||||
|
||||
return categoryAnalysisModelList.stream()
|
||||
.map(CategoryAnalysisForm::convertFrom)
|
||||
.toList();
|
||||
}
|
||||
}
|
||||
@@ -1,28 +0,0 @@
|
||||
package com.example.demo.app.presentation.form;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import com.example.demo.app.domain.model.CategoryModel;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class CategoryForm {
|
||||
|
||||
private Long categoryId;
|
||||
private String categoryName;
|
||||
private Integer transactionType;
|
||||
|
||||
public static CategoryForm convertFrom(CategoryModel categoryModel) {
|
||||
return new CategoryForm(categoryModel.getCategoryId(), categoryModel.getCategoryName(), categoryModel.getTransactionType());
|
||||
}
|
||||
|
||||
public static List<CategoryForm> convertFrom(List<CategoryModel> categoryModelList){
|
||||
return categoryModelList.stream().map(CategoryForm::convertFrom).toList();
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,33 +0,0 @@
|
||||
package com.example.demo.app.presentation.form;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import com.example.demo.app.domain.model.CourseModel;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class CourseForm {
|
||||
|
||||
private Long courseId;
|
||||
private String courseName;
|
||||
private String description;
|
||||
|
||||
|
||||
public static CourseForm convertFrom(CourseModel courseModel) {
|
||||
return new CourseForm(
|
||||
courseModel.getCourseId(),
|
||||
courseModel.getCourseName(),
|
||||
courseModel.getDescription()
|
||||
);
|
||||
}
|
||||
|
||||
public static List<CourseForm> convertFrom(List<CourseModel> courseModelList){
|
||||
return courseModelList.stream().map(CourseForm::convertFrom).toList();
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,44 +0,0 @@
|
||||
package com.example.demo.app.presentation.form;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import com.example.demo.app.domain.model.CourseInfoModel;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class CourseInfoForm {
|
||||
|
||||
private Long courseId;
|
||||
|
||||
private String courseName;
|
||||
|
||||
private Long categoryId;
|
||||
|
||||
private String categoryName;
|
||||
|
||||
private Integer allocationRatio;
|
||||
|
||||
|
||||
public static CourseInfoForm convertFrom(CourseInfoModel courseInfoModel ) {
|
||||
return new CourseInfoForm(courseInfoModel.getCourseId(), courseInfoModel.getCourseName(), courseInfoModel.getCategoryId(), courseInfoModel.getCategoryName(), courseInfoModel.getAllocationRatio());
|
||||
}
|
||||
|
||||
public static List<CourseInfoForm> convertFrom(List<CourseInfoModel> courseInfoModelList ) {
|
||||
return courseInfoModelList.stream().map(CourseInfoForm::convertFrom).toList();
|
||||
}
|
||||
|
||||
public static CourseInfoModel convertTo(CourseInfoForm courseInfoForm) {
|
||||
return new CourseInfoModel(
|
||||
courseInfoForm.getCourseId(),
|
||||
courseInfoForm.getCourseName(),
|
||||
courseInfoForm.getCategoryId(),
|
||||
courseInfoForm.getCategoryName(),
|
||||
courseInfoForm.getAllocationRatio());
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,42 +0,0 @@
|
||||
package com.example.demo.app.presentation.form;
|
||||
|
||||
import java.time.LocalDate;
|
||||
|
||||
import com.example.demo.app.domain.model.GoalModel;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class GoalForm {
|
||||
|
||||
private Long goalId;
|
||||
|
||||
private String goalTitle;
|
||||
|
||||
private String goalSubtitle;
|
||||
|
||||
private Integer targetAmount;
|
||||
|
||||
private LocalDate deadline;
|
||||
|
||||
private Integer goalComplete;
|
||||
|
||||
public static GoalForm convertFrom(GoalModel goalModel) {
|
||||
return new GoalForm(
|
||||
goalModel.getGoalId(),
|
||||
goalModel.getGoalTitle(),
|
||||
goalModel.getGoalSubtitle(),
|
||||
goalModel.getTargetAmount(),
|
||||
goalModel.getDeadline(),
|
||||
goalModel.getGoalComplete());
|
||||
}
|
||||
|
||||
// public static List<GoalForm> convertFrom(List<GoalModel> goalModelList) {
|
||||
// return goalModelList.stream().map(GoalForm::convertFrom).toList();
|
||||
// }
|
||||
|
||||
}
|
||||
@@ -1,15 +0,0 @@
|
||||
package com.example.demo.app.presentation.form;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class LoginForm {
|
||||
|
||||
private String mailAddress;
|
||||
private String password;
|
||||
}
|
||||
|
||||
@@ -1,63 +0,0 @@
|
||||
package com.example.demo.app.presentation.form;
|
||||
|
||||
import java.time.LocalDate;
|
||||
import java.util.List;
|
||||
|
||||
import com.example.demo.app.domain.model.TransactionModel;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class TransactionForm {
|
||||
|
||||
private Long transactionId;
|
||||
|
||||
private Long userId;
|
||||
|
||||
private Long categoryId;
|
||||
|
||||
private Integer amount;
|
||||
|
||||
private LocalDate transactionDate;
|
||||
|
||||
private String categoryName;
|
||||
|
||||
private Integer income;
|
||||
|
||||
private Integer expense;
|
||||
|
||||
private Integer transactionType;
|
||||
|
||||
|
||||
public static TransactionForm convertFrom(TransactionModel transactionModel, String categoryName, int income, int expense, int transactionType) {
|
||||
return new TransactionForm(
|
||||
transactionModel.getTransactionId(),
|
||||
transactionModel.getUserId(),
|
||||
transactionModel.getCategoryId(),
|
||||
transactionModel.getAmount(),
|
||||
transactionModel.getTransactionDate(),
|
||||
categoryName,
|
||||
income,
|
||||
expense,
|
||||
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();
|
||||
}
|
||||
|
||||
public static TransactionModel convertTo(TransactionForm transactionForm) {
|
||||
return new TransactionModel(
|
||||
transactionForm.getTransactionId(),
|
||||
transactionForm.getUserId(),
|
||||
transactionForm.getCategoryId(),
|
||||
transactionForm.getAmount(),
|
||||
transactionForm.getTransactionDate());
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,5 +0,0 @@
|
||||
package com.example.demo.utility;
|
||||
|
||||
public class Constant {
|
||||
|
||||
}
|
||||
@@ -1,53 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html xmlns:th="http://www.thymeleaf.org">
|
||||
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<title>認証</title>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<main>
|
||||
<h1>本人認証確認</h1>
|
||||
|
||||
<form th:action="@{/authentication}" th:object="${authenticationForm}" method="post">
|
||||
|
||||
<div>
|
||||
<label for="mailAddress">メールアドレス</label>
|
||||
<input type="email" id="mailAddress" th:field="*{mailAddress}">
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label for="secretQuestionId">秘密の質問</label>
|
||||
<select id="secretQuestionId" th:field="*{secretQuestionId}">
|
||||
|
||||
<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}">
|
||||
</div>
|
||||
|
||||
<button type="submit">確認</button>
|
||||
|
||||
</form>
|
||||
|
||||
<form th:action="@{/login}" method="get">
|
||||
<button type="submit">戻る</button>
|
||||
</form>
|
||||
</main>
|
||||
|
||||
<script th:if="${errorMessage}" th:inline="javascript">
|
||||
alert(/*[[${errorMessage}]]*/);
|
||||
</script>
|
||||
|
||||
</body>
|
||||
|
||||
</html>
|
||||
@@ -1,83 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html xmlns:th="http://www.thymeleaf.org">
|
||||
<head>
|
||||
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
|
||||
<title>分析画面</title>
|
||||
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.7/dist/css/bootstrap.min.css" rel="stylesheet">
|
||||
</head>
|
||||
<body>
|
||||
|
||||
<h2 class="text-center">支出分析</h2>
|
||||
|
||||
<table class="table text-center">
|
||||
<thead>
|
||||
<tr>
|
||||
<th scope="col">カテゴリ別</th>
|
||||
<th scope="col">支出</th>
|
||||
<th scope="col">前月比</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr>
|
||||
<th scope="row">総支出</th>
|
||||
<td th:text="'￥' + ${analysisForm.currentMonthTotalAmount}">
|
||||
0
|
||||
</td>
|
||||
<td th:text="${analysisForm.totalDifferenceAmount >= 0}
|
||||
? '＋' + ${analysisForm.totalDifferenceAmount}
|
||||
: ${analysisForm.totalDifferenceAmount}"
|
||||
th:class="${analysisForm.totalDifferenceAmount >= 0}
|
||||
? 'color-danger;'
|
||||
: 'color-primary;'">
|
||||
0
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<hr class="border border-primary border-2 opacity-50">
|
||||
|
||||
<table class="table text-center">
|
||||
<thead>
|
||||
<tr>
|
||||
<th scope="col">カテゴリ別</th>
|
||||
<th scope="col">支出</th>
|
||||
<th scope="col">前月比<br>コース比</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr th:each="category : ${analysisForm.categoryAnalysisFormList}">
|
||||
|
||||
<th scope="row"
|
||||
th:text="${category.categoryName}">
|
||||
食費
|
||||
</th>
|
||||
|
||||
<td th:text="'￥' + ${category.currentMonthAmount}">
|
||||
0
|
||||
</td>
|
||||
|
||||
<td>
|
||||
<span th:text="${category.monthDifferenceAmount >= 0}
|
||||
? '＋' + ${category.monthDifferenceAmount}
|
||||
: ${category.monthDifferenceAmount}"
|
||||
th:class="${category.monthDifferenceAmount >= 0}
|
||||
? 'color-danger;'
|
||||
: 'color-primary;'">
|
||||
</span>
|
||||
<br>
|
||||
<span th:text="${category.courseDifferenceAmount >= 0}
|
||||
? '＋' + ${category.courseDifferenceAmount}
|
||||
: ${category.courseDifferenceAmount}"
|
||||
th:class="${category.courseDifferenceAmount >= 0}
|
||||
? 'color-danger;'
|
||||
: 'color-primary;'">
|
||||
</span>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.7/dist/js/bootstrap.bundle.min.js"></script>
|
||||
</body>
|
||||
</html>
|
||||
@@ -1,43 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html xmlns:th="http://www.thymeleaf.org">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<title>目標編集</title>
|
||||
</head>
|
||||
<body>
|
||||
|
||||
<h1>目標編集</h1>
|
||||
|
||||
<form th:action="@{/goal/update}" th:object="${goalForm}" method="post">
|
||||
|
||||
<input type="hidden" th:field="*{goalId}">
|
||||
|
||||
<!--
|
||||
<div>
|
||||
<label>目標名</label>
|
||||
<input type="text" th:field="*{goalTitle}">
|
||||
</div>
|
||||
-->
|
||||
|
||||
<div>
|
||||
<label>目標補足説明</label>
|
||||
<textarea th:field="*{goalSubtitle}"></textarea>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label>目標金額</label>
|
||||
<input type="number" th:field="*{targetAmount}">
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label>目標達成期限</label>
|
||||
<input type="date" th:field="*{deadline}">
|
||||
</div>
|
||||
|
||||
|
||||
<button type="submit">更新する</button>
|
||||
|
||||
</form>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
@@ -1,37 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html xmlns:th="http://www.thymeleaf.org">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<title>目標詳細</title>
|
||||
</head>
|
||||
<body>
|
||||
|
||||
<h1>目標詳細</h1>
|
||||
|
||||
<table>
|
||||
<!--
|
||||
<tr>
|
||||
<th>目標名</th>
|
||||
<td th:text="${goalForm.goalTitle}"></td>
|
||||
</tr>
|
||||
-->
|
||||
|
||||
|
||||
<tr>
|
||||
<th>目標補足説明</th>
|
||||
<td th:text="${goalForm.goalSubtitle}"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>目標金額</th>
|
||||
<td th:text="${goalForm.targetAmount}"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>目標達成期限</th>
|
||||
<td th:text="${goalForm.deadline}"></td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
<a th:href="@{/goal/{goalId}/edit(goalId=${goalForm.goalId})}">編集する</a>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
@@ -1,47 +0,0 @@
|
||||
<!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>
|
||||
|
||||
<div th:if="${errorMessage}" th:text="${errorMessage}"></div>
|
||||
<form th:action="@{/login}" th:object="${loginForm}" method="post">
|
||||
<div>
|
||||
<label for="emailAddress">メールアドレス</label>
|
||||
|
||||
<input type="email"
|
||||
id="emailAddress"
|
||||
th:field="{emailAddress}"
|
||||
required>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label for="password">パスワード</label>
|
||||
|
||||
<input type="password"
|
||||
id="password"
|
||||
th:field="{password}"
|
||||
required>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<button type="submit">ログイン</button>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
<div>
|
||||
<a href="@{user/register}">新規会員登録</a>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<a href="@{password/authentication}">パスワードを忘れた方</a>
|
||||
</div>
|
||||
</main>
|
||||
</body>
|
||||
</html>
|
||||
@@ -1,35 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html xmlns:th="http://www.thymeleaf.org">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<title>コース選択</title>
|
||||
</head>
|
||||
<body>
|
||||
|
||||
<div class="accordion" id="accordionExample">
|
||||
<div class="accordion-item" th:each="course:${courseList}">
|
||||
<h2 class="accordion-header">
|
||||
<button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#collapseOne" aria-expanded="true" aria-controls="collapseOne">
|
||||
<span th:text="${course.courseName}"></span>
|
||||
</button>
|
||||
</h2>
|
||||
<div id="collapseOne" class="accordion-collapse collapse show" data-bs-parent="#accordionExample">
|
||||
<div class="accordion-body">
|
||||
<span th:text="${course.description}"></span>
|
||||
<table border="1">
|
||||
<tr>
|
||||
<th>カテゴリ名</th><tr>配分(%)</tr>
|
||||
</tr>
|
||||
<tr th:each="courseInfo:${courseInfoList}" th:if="course.courseId == courseInfo.courseId">
|
||||
<td th:text="${courseInfo.categoryName}"></td>
|
||||
<td th:text="${courseInfo.allocationRatio}"></td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
</body>
|
||||
</html>
|
||||
@@ -1,136 +0,0 @@
|
||||
<!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>
|
||||
@@ -1,78 +0,0 @@
|
||||
<!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