Compare commits
1 Commits
1e0cc3a953
...
s-kikuchi
| Author | SHA1 | Date | |
|---|---|---|---|
|
5f9287765d |
1
.gitignore
vendored
1
.gitignore
vendored
@@ -31,4 +31,3 @@ build/
|
||||
|
||||
### VS Code ###
|
||||
.vscode/
|
||||
/bin/
|
||||
|
||||
0
kikuchi.txt
Normal file
0
kikuchi.txt
Normal file
@@ -1,11 +0,0 @@
|
||||
package com.example.demo.aop.aspect;
|
||||
|
||||
import java.lang.annotation.ElementType;
|
||||
import java.lang.annotation.Retention;
|
||||
import java.lang.annotation.RetentionPolicy;
|
||||
import java.lang.annotation.Target;
|
||||
|
||||
@Retention(RetentionPolicy.RUNTIME)
|
||||
@Target(ElementType.METHOD)
|
||||
public @interface SessionCheck {
|
||||
}
|
||||
@@ -1,41 +0,0 @@
|
||||
package com.example.demo.aop.aspect;
|
||||
|
||||
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import jakarta.servlet.http.HttpSession;
|
||||
|
||||
import org.aspectj.lang.annotation.Aspect;
|
||||
import org.aspectj.lang.annotation.Before;
|
||||
import org.aspectj.lang.annotation.Pointcut;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import com.example.demo.exception.NoSessionException;
|
||||
|
||||
|
||||
@Aspect
|
||||
@Component
|
||||
public class SessionCheckAspect {
|
||||
|
||||
HttpServletRequest request;
|
||||
|
||||
@Autowired
|
||||
public SessionCheckAspect(HttpServletRequest request) {
|
||||
this.request = request;
|
||||
}
|
||||
|
||||
@Pointcut("@annotation(com.example.demo.aop.aspect.SessionCheck)")
|
||||
public void sessionCheckMethod() {
|
||||
}
|
||||
|
||||
@Before("sessionCheckMethod()")
|
||||
public void checkSession() {
|
||||
HttpSession session = request.getSession(false);
|
||||
|
||||
if (session == null || session.getAttribute("loginUser") == null) {
|
||||
throw new NoSessionException("不正なログインです");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,61 +0,0 @@
|
||||
package com.example.demo.aop.handler;
|
||||
|
||||
|
||||
import java.util.logging.Level;
|
||||
import java.util.logging.Logger;
|
||||
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.HttpRequestMethodNotSupportedException;
|
||||
import org.springframework.web.bind.annotation.ControllerAdvice;
|
||||
import org.springframework.web.bind.annotation.ExceptionHandler;
|
||||
|
||||
import com.example.demo.exception.NoSessionException;
|
||||
|
||||
@ControllerAdvice
|
||||
public class GlobalExceptionHandler {
|
||||
|
||||
private final static Logger LOGGER = Logger.getLogger(GlobalExceptionHandler.class.getName());
|
||||
|
||||
private final String SEVERE_ERROR_MESSAGE_ILLEGAL_TRANSITION = "不正な遷移です。";
|
||||
private final String SEVERE_ERROR_MESSAGE_BAD_REQUEST = "不正なリクエストです。";
|
||||
|
||||
@ExceptionHandler(NoSessionException.class)
|
||||
public String handleNoSessionException(Model model, Exception e) {
|
||||
|
||||
e.printStackTrace();
|
||||
|
||||
LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE_ILLEGAL_TRANSITION, e);
|
||||
|
||||
model.addAttribute(
|
||||
"errorMessage",
|
||||
"システムエラーが発生しました。"
|
||||
+ "初めからやり直してください。");
|
||||
|
||||
return "error";
|
||||
|
||||
}
|
||||
|
||||
@ExceptionHandler(HttpRequestMethodNotSupportedException.class)
|
||||
public String handleBadRequestException(Model model, Exception e) {
|
||||
model.addAttribute("error", SEVERE_ERROR_MESSAGE_BAD_REQUEST);
|
||||
model.addAttribute("status", HttpStatus.BAD_REQUEST.value());
|
||||
|
||||
e.printStackTrace();
|
||||
|
||||
LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE_ILLEGAL_TRANSITION, e);
|
||||
|
||||
return "error";
|
||||
}
|
||||
|
||||
@ExceptionHandler(Exception.class)
|
||||
public String AllException(Model model, Exception e) {
|
||||
model.addAttribute("error", SEVERE_ERROR_MESSAGE_BAD_REQUEST);
|
||||
|
||||
e.printStackTrace();
|
||||
|
||||
LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE_ILLEGAL_TRANSITION, e);
|
||||
|
||||
return "error";
|
||||
}
|
||||
}
|
||||
@@ -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,64 +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;
|
||||
|
||||
private Integer achievementRate; // 達成率
|
||||
|
||||
private Integer currentAmount; // 現在の資産
|
||||
|
||||
public static GoalModel convertFrom(GoalEntity goalEntity) {
|
||||
return new GoalModel(
|
||||
goalEntity.getGoalId(),
|
||||
goalEntity.getGoalTitle(),
|
||||
goalEntity.getGoalSubtitle(),
|
||||
goalEntity.getTargetAmount(),
|
||||
goalEntity.getDeadline(),
|
||||
goalEntity.getGoalComplete(),
|
||||
null,null);
|
||||
}
|
||||
|
||||
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()
|
||||
,null,null);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -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,18 +0,0 @@
|
||||
package com.example.demo.app.domain.model;
|
||||
|
||||
import java.time.LocalDate;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
|
||||
@Getter
|
||||
@AllArgsConstructor
|
||||
public class ProfileModel {
|
||||
private Long userId;
|
||||
private String userName;
|
||||
private String mailAddress;
|
||||
private LocalDate birthDate;
|
||||
private Integer saving;
|
||||
private Integer annualIncome;
|
||||
private Integer monthlyBudget;
|
||||
}
|
||||
@@ -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,44 +0,0 @@
|
||||
package com.example.demo.app.domain.model;
|
||||
|
||||
import java.time.LocalDate;
|
||||
|
||||
import com.example.demo.app.infra.entity.UserEntity;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
|
||||
@Getter
|
||||
@AllArgsConstructor
|
||||
public class UserModel {
|
||||
private Long userId;
|
||||
private String userName;
|
||||
private String mailAddress;
|
||||
private String password;
|
||||
private Long 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;
|
||||
|
||||
public static UserModel convertFrom(UserEntity userEntity) {
|
||||
return new UserModel(
|
||||
userEntity.getUserId(),
|
||||
userEntity.getUserName(),
|
||||
userEntity.getMailAddress(),
|
||||
userEntity.getPassword(),
|
||||
userEntity.getQuestionEntity().getSecretQuestionId(),
|
||||
userEntity.getSecretQuestionAnswer(),
|
||||
userEntity.getBirthDate(),
|
||||
userEntity.getSaving(),
|
||||
userEntity.getAnnualIncome(),
|
||||
userEntity.getMonthlyBudget(),
|
||||
userEntity.getGoalEntity().getGoalId(),
|
||||
userEntity.getCourseEntity().getCourseId(),
|
||||
userEntity.getDeleteFlag()
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -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,12 +0,0 @@
|
||||
package com.example.demo.app.domain.service;
|
||||
|
||||
import com.example.demo.app.domain.model.AnalysisModel;
|
||||
|
||||
public interface AnalysisService {
|
||||
|
||||
AnalysisModel getAnalysis(
|
||||
Long userId,
|
||||
Integer year,
|
||||
Integer month);
|
||||
|
||||
}
|
||||
@@ -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,16 +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);
|
||||
|
||||
public CategoryModel findByTransactionId(Long transactionId);
|
||||
}
|
||||
@@ -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,14 +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();
|
||||
|
||||
public CourseModel findById(Long courseId);
|
||||
|
||||
public Long findByName(String courName);
|
||||
}
|
||||
@@ -1,17 +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 getGoalByUserId(Long userId);
|
||||
|
||||
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,7 +0,0 @@
|
||||
package com.example.demo.app.domain.service;
|
||||
|
||||
import com.example.demo.app.presentation.form.PasswordResetForm;
|
||||
|
||||
public interface PasswordResetService {
|
||||
boolean resetPassword(Long userId, PasswordResetForm passwordResetForm);
|
||||
}
|
||||
@@ -1,10 +0,0 @@
|
||||
package com.example.demo.app.domain.service;
|
||||
|
||||
import com.example.demo.app.domain.model.ProfileModel;
|
||||
import com.example.demo.app.presentation.form.ProfileEditForm;
|
||||
|
||||
public interface ProfileService {
|
||||
ProfileModel findOne(Long userId);
|
||||
void withdraw(Long userId);
|
||||
void update(Long userId, ProfileEditForm profileEditForm);
|
||||
}
|
||||
@@ -1,9 +0,0 @@
|
||||
package com.example.demo.app.domain.service;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import com.example.demo.app.infra.entity.QuestionEntity;
|
||||
|
||||
public interface QuestionService {
|
||||
public List<QuestionEntity> findAll();
|
||||
}
|
||||
@@ -1,35 +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;
|
||||
import com.example.demo.app.presentation.form.Expense;
|
||||
import com.example.demo.app.presentation.form.Income;
|
||||
|
||||
public interface TransactionService {
|
||||
|
||||
public TransactionModel findByTransactionId(Long transactionId);
|
||||
|
||||
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 findMoneyRecord(Long transactionId);
|
||||
|
||||
public int createTransaction(TransactionModel transactionModel);
|
||||
|
||||
public int updateTransaction(TransactionModel transactionModel);
|
||||
|
||||
public void deleteTransaction(Long transactionId);
|
||||
|
||||
public List<Income> findTotalIncomeList(LocalDate startDate, LocalDate endDate, Long userId);
|
||||
|
||||
public List<Expense> findTotalExpenseList(LocalDate startDate, LocalDate endDate, Long userId);
|
||||
|
||||
}
|
||||
@@ -1,13 +0,0 @@
|
||||
package com.example.demo.app.domain.service;
|
||||
|
||||
import com.example.demo.app.domain.model.UserModel;
|
||||
import com.example.demo.app.presentation.form.UserForm;
|
||||
|
||||
public interface UserService {
|
||||
|
||||
void register(UserForm userForm, Long courseId);
|
||||
|
||||
public void updateCourse(Long userId, Long courseId);
|
||||
|
||||
public UserModel findByUserId(Long userId);
|
||||
}
|
||||
@@ -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,147 +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, Integer year, Integer month) {
|
||||
|
||||
// ユーザー情報取得、月別使用可能資金取得
|
||||
UserEntity userEntity = userRepository.findById(userId).orElseThrow(() ->
|
||||
new RuntimeException(
|
||||
"User not found."));
|
||||
|
||||
// コースID取得
|
||||
Long courseId = userEntity.getCourseEntity().getCourseId();
|
||||
|
||||
// 月別使用可能資金取得
|
||||
Integer monthlyBudget =userEntity.getMonthlyBudget();
|
||||
|
||||
// 今月の期間取得
|
||||
LocalDate targetDate = LocalDate.of(year, month, 1);
|
||||
LocalDate currentMonthStartDate = targetDate.withDayOfMonth(1);
|
||||
LocalDate currentMonthEndDate = targetDate.withDayOfMonth(targetDate.lengthOfMonth());
|
||||
|
||||
// 前月の期間取得
|
||||
LocalDate previousDate = targetDate.minusMonths(1);
|
||||
|
||||
LocalDate previousMonthStartDate = previousDate.withDayOfMonth(1);
|
||||
LocalDate previousMonthEndDate = previousDate.withDayOfMonth(previousDate.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,56 +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);
|
||||
|
||||
}
|
||||
|
||||
public CategoryModel findByTransactionId(Long transactionId) {
|
||||
return CategoryModel.convertFrom(categoryRepository.findByTransactionId(transactionId));
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -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.CourseInfoModel;
|
||||
import com.example.demo.app.domain.service.CourseInfoService;
|
||||
import com.example.demo.app.infra.repository.AllocationRepository;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
public class CourseInfoServiceImpl implements CourseInfoService {
|
||||
|
||||
private final AllocationRepository allocationRepository;
|
||||
|
||||
@Override
|
||||
public List<CourseInfoModel> findAll() {
|
||||
return allocationRepository.findAllJoinedAllocation();
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,32 +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());
|
||||
}
|
||||
|
||||
public CourseModel findById(Long courseId) {
|
||||
return CourseModel.convertFrom(courseRepository.findByCourseId(courseId));
|
||||
}
|
||||
|
||||
public Long findByName(String courseName) {
|
||||
return courseRepository.findByCourseName(courseName).getCourseId();
|
||||
}
|
||||
}
|
||||
@@ -1,83 +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.entity.UserEntity;
|
||||
import com.example.demo.app.infra.repository.GoalRepository;
|
||||
import com.example.demo.app.infra.repository.UserRepository;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
public class GoalServiceImpl implements GoalService {
|
||||
|
||||
private final GoalRepository goalRepository;
|
||||
private final UserRepository userRepository;
|
||||
|
||||
@Override
|
||||
public GoalModel getGoalById(Long goalId) {
|
||||
GoalEntity goalEntity = goalRepository.findById(goalId).orElse(null);
|
||||
return GoalModel.convertFrom(goalEntity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public GoalModel getGoalByUserId(Long userId) {
|
||||
|
||||
UserEntity userEntity = userRepository.findById(userId).orElseThrow();
|
||||
GoalEntity goalEntity = userEntity.getGoalEntity();
|
||||
|
||||
// 収支の合計を計算(収入はプラス、支出はマイナス)
|
||||
int transactionTotal = userEntity.getTransactionEntityList().stream()
|
||||
.mapToInt(t -> {
|
||||
int sign = t.getCategoryEntity().getTransactionType() == 1 ? 1 : -1;
|
||||
return sign * t.getAmount();
|
||||
})
|
||||
.sum();
|
||||
|
||||
// 現在の資産 = 貯蓄金 + 収支合計
|
||||
int currentAmount = userEntity.getSaving() + transactionTotal;
|
||||
|
||||
// 達成率(%) = 現在の資産 ÷ 目標金額 × 100
|
||||
int achievementRate =
|
||||
(goalEntity.getTargetAmount() == null)
|
||||
? 0 :
|
||||
(int) ((currentAmount * 100.0) / goalEntity.getTargetAmount());
|
||||
|
||||
GoalModel goalModel = GoalModel.convertFrom(goalEntity);
|
||||
|
||||
return new GoalModel(
|
||||
goalModel.getGoalId(),
|
||||
goalModel.getGoalTitle(),
|
||||
goalModel.getGoalSubtitle(),
|
||||
goalModel.getTargetAmount(),
|
||||
goalModel.getDeadline(),
|
||||
goalModel.getGoalComplete(),
|
||||
achievementRate,
|
||||
currentAmount);
|
||||
}
|
||||
|
||||
@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,42 +0,0 @@
|
||||
package com.example.demo.app.domain.service.impl;
|
||||
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import com.example.demo.app.domain.service.PasswordResetService;
|
||||
import com.example.demo.app.infra.entity.UserEntity;
|
||||
import com.example.demo.app.infra.repository.UserRepository;
|
||||
import com.example.demo.app.presentation.form.PasswordResetForm;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
public class PasswordResetServiceImpl implements PasswordResetService {
|
||||
|
||||
private final UserRepository userRepository;
|
||||
|
||||
@Override
|
||||
public boolean resetPassword(
|
||||
Long userId,
|
||||
PasswordResetForm passwordResetForm) {
|
||||
|
||||
if (!passwordResetForm.getPassword()
|
||||
.equals(passwordResetForm.getPasswordConfirm())) {
|
||||
return false;
|
||||
}
|
||||
|
||||
UserEntity userEntity =
|
||||
userRepository.findById(userId).orElse(null);
|
||||
|
||||
if (userEntity == null) {
|
||||
return false;
|
||||
}
|
||||
|
||||
userEntity.setPassword(
|
||||
passwordResetForm.getPassword());
|
||||
|
||||
userRepository.save(userEntity);
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -1,63 +0,0 @@
|
||||
package com.example.demo.app.domain.service.impl;
|
||||
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import com.example.demo.app.domain.model.ProfileModel;
|
||||
import com.example.demo.app.domain.service.ProfileService;
|
||||
import com.example.demo.app.infra.entity.UserEntity;
|
||||
import com.example.demo.app.infra.repository.UserRepository;
|
||||
import com.example.demo.app.presentation.form.ProfileEditForm;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
public class ProfileServiceImpl implements ProfileService{
|
||||
private final UserRepository userRepository;
|
||||
|
||||
@Override
|
||||
public ProfileModel findOne(Long userId) {
|
||||
UserEntity userEntity = userRepository.findById(userId).orElse(null);
|
||||
|
||||
if(userEntity == null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return new ProfileModel(
|
||||
userEntity.getUserId(),
|
||||
userEntity.getUserName(),
|
||||
userEntity.getMailAddress(),
|
||||
userEntity.getBirthDate(),
|
||||
userEntity.getSaving(),
|
||||
userEntity.getAnnualIncome(),
|
||||
userEntity.getMonthlyBudget());
|
||||
}
|
||||
|
||||
@Override
|
||||
public void withdraw(Long userId) {
|
||||
UserEntity userEntity = userRepository.findById(userId).orElse(null);
|
||||
|
||||
if (userEntity == null) {
|
||||
return;
|
||||
}
|
||||
|
||||
userEntity.setDeleteFlag(1);
|
||||
userRepository.save(userEntity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void update(Long userId, ProfileEditForm profileEditForm) {
|
||||
UserEntity userEntity = userRepository.findById(userId).orElse(null);
|
||||
|
||||
if (userEntity == null) {
|
||||
return;
|
||||
}
|
||||
|
||||
userEntity.setUserName(profileEditForm.getUserName());
|
||||
userEntity.setMailAddress(profileEditForm.getMailAddress());
|
||||
userEntity.setSaving(profileEditForm.getSaving());
|
||||
userEntity.setAnnualIncome(profileEditForm.getAnnualIncome());
|
||||
userEntity.setMonthlyBudget(profileEditForm.getMonthlyBudget());
|
||||
userRepository.save(userEntity);
|
||||
}
|
||||
}
|
||||
@@ -1,23 +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.service.QuestionService;
|
||||
import com.example.demo.app.infra.entity.QuestionEntity;
|
||||
import com.example.demo.app.infra.repository.QuestionRepository;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
public class QuestionServiceImpl implements QuestionService{
|
||||
|
||||
private final QuestionRepository questionRepository;
|
||||
|
||||
public List<QuestionEntity> findAll() {
|
||||
return questionRepository.findAll();
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,168 +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 com.example.demo.app.presentation.form.Expense;
|
||||
import com.example.demo.app.presentation.form.Income;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
public class TransactionServiceImpl implements TransactionService {
|
||||
|
||||
private final TransactionRepository transactionRepository;
|
||||
private final UserRepository userRepository;
|
||||
private final CategoryRepository categoryRepository;
|
||||
|
||||
|
||||
public TransactionModel findByTransactionId(Long transactionId) {
|
||||
|
||||
return TransactionModel.convertFrom(transactionRepository.findById(transactionId).get());
|
||||
|
||||
}
|
||||
|
||||
public Map<LocalDate, List<TransactionModel>> findAllByDate(
|
||||
LocalDate startDate,
|
||||
LocalDate endDate,
|
||||
Long userId) {
|
||||
|
||||
System.out.println("========== findAllByDate ==========");
|
||||
System.out.println("startDate = " + startDate);
|
||||
System.out.println("endDate = " + endDate);
|
||||
System.out.println("userId = " + userId);
|
||||
|
||||
List<TransactionEntity> transactionEntityList = transactionRepository.findAllByDateAndUserId(startDate, endDate,
|
||||
userId);
|
||||
|
||||
System.out.println("Entity count = " + transactionEntityList.size());
|
||||
|
||||
transactionEntityList.forEach(t -> {
|
||||
System.out.println(
|
||||
"date = " + t.getTransactionDate()
|
||||
+ ", amount = " + t.getAmount());
|
||||
});
|
||||
|
||||
List<TransactionModel> transactionModelList = TransactionModel.convertFrom(transactionEntityList);
|
||||
|
||||
System.out.println("Model count = " + transactionModelList.size());
|
||||
|
||||
Map<LocalDate, List<TransactionModel>> transactionModelMap = transactionModelList.stream()
|
||||
.collect(Collectors.groupingBy(
|
||||
TransactionModel::getTransactionDate));
|
||||
|
||||
System.out.println("Map = " + transactionModelMap);
|
||||
|
||||
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.findTotalExpense(startDate, endDate, userId);
|
||||
|
||||
}
|
||||
|
||||
public List<Income> findTotalIncomeList(LocalDate startDate, LocalDate endDate, Long userId) {
|
||||
|
||||
return transactionRepository.findTotalIncomeList(startDate, endDate, userId);
|
||||
|
||||
}
|
||||
|
||||
public List<Expense> findTotalExpenseList(LocalDate startDate, LocalDate endDate, Long userId) {
|
||||
|
||||
return transactionRepository.findTotalExpenseList(startDate, endDate, userId);
|
||||
|
||||
}
|
||||
|
||||
public List<TransactionModel> findByUserIdAndDate(LocalDate todayDate, Long userId) {
|
||||
|
||||
return TransactionModel.convertFrom(transactionRepository.findByUserIdAndDate(todayDate, userId));
|
||||
|
||||
}
|
||||
|
||||
public int findMoneyRecord(Long transactionId) {
|
||||
return transactionRepository.findMoneyRecord(transactionId);
|
||||
}
|
||||
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public void deleteTransaction(Long transactionId) {
|
||||
transactionRepository.deleteById(transactionId);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,75 +0,0 @@
|
||||
package com.example.demo.app.domain.service.impl;
|
||||
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import com.example.demo.app.domain.model.UserModel;
|
||||
import com.example.demo.app.domain.service.UserService;
|
||||
import com.example.demo.app.infra.entity.CourseEntity;
|
||||
import com.example.demo.app.infra.entity.GoalEntity;
|
||||
import com.example.demo.app.infra.entity.QuestionEntity;
|
||||
import com.example.demo.app.infra.entity.UserEntity;
|
||||
import com.example.demo.app.infra.repository.CourseRepository;
|
||||
import com.example.demo.app.infra.repository.GoalRepository;
|
||||
import com.example.demo.app.infra.repository.QuestionRepository;
|
||||
import com.example.demo.app.infra.repository.UserRepository;
|
||||
import com.example.demo.app.presentation.form.UserForm;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
public class UserServiceImpl implements UserService {
|
||||
private final UserRepository userRepository;
|
||||
private final QuestionRepository questionRepository;
|
||||
private final GoalRepository goalRepository;
|
||||
private final CourseRepository courseRepository;
|
||||
|
||||
@Override
|
||||
public void register(UserForm userForm, Long courseId) {
|
||||
|
||||
UserEntity userEntity = new UserEntity();
|
||||
|
||||
userEntity.setUserName(userForm.getUserName());
|
||||
userEntity.setMailAddress(userForm.getMailAddress());
|
||||
userEntity.setPassword(userForm.getPassword());
|
||||
userEntity.setSecretQuestionAnswer(userForm.getSecretAnswer());
|
||||
userEntity.setBirthDate(userForm.getBirthDate());
|
||||
userEntity.setSaving(userForm.getSaving());
|
||||
userEntity.setBirthDate(userForm.getBirthDate());
|
||||
userEntity.setSaving(userForm.getSaving());
|
||||
userEntity.setAnnualIncome(userForm.getAnnualIncome());
|
||||
userEntity.setMonthlyBudget(userForm.getMonthlyBudget());
|
||||
|
||||
QuestionEntity questionEntity = questionRepository.findById(userForm.getSecretQuestionId()).orElse(null);
|
||||
|
||||
GoalEntity goalEntity = new GoalEntity();
|
||||
goalEntity.setTargetAmount(Integer.parseInt(String.valueOf(userForm.getGoalId())));
|
||||
|
||||
CourseEntity courseEntity = courseRepository.findById(courseId).orElse(null);
|
||||
|
||||
userEntity.setQuestionEntity(questionEntity);
|
||||
userEntity.setGoalEntity(goalRepository.save(
|
||||
goalEntity));
|
||||
userEntity.setCourseEntity(courseEntity);
|
||||
|
||||
userEntity.setDeleteFlag(0);
|
||||
|
||||
userRepository.save(userEntity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateCourse(Long userId, Long courseId) {
|
||||
UserEntity userEntity = userRepository.findById(userId).orElseThrow();
|
||||
|
||||
CourseEntity courseEntity = courseRepository.findById(courseId).orElseThrow();
|
||||
|
||||
userEntity.setCourseEntity(courseEntity);
|
||||
|
||||
userRepository.save(userEntity);
|
||||
}
|
||||
|
||||
public UserModel findByUserId(Long userId) {
|
||||
|
||||
return UserModel.convertFrom(userRepository.findById(userId).get());
|
||||
}
|
||||
}
|
||||
@@ -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 = true)
|
||||
private Integer targetAmount;
|
||||
|
||||
@Column(name = "deadline", nullable = true)
|
||||
private LocalDate deadline = LocalDate.now().plusYears(1L);
|
||||
|
||||
@Column(name = "goal_complete", nullable = false)
|
||||
private Integer goalComplete = 0;
|
||||
|
||||
@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,18 +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);
|
||||
|
||||
@Query("select c from CategoryEntity c inner join TransactionEntity t on c.categoryId = t.categoryEntity.categoryId where t.transactionId = :transactionId")
|
||||
public CategoryEntity findByTransactionId(Long transactionId);
|
||||
|
||||
}
|
||||
@@ -1,17 +0,0 @@
|
||||
package com.example.demo.app.infra.repository;
|
||||
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import org.springframework.data.jpa.repository.Query;
|
||||
|
||||
import com.example.demo.app.infra.entity.CourseEntity;
|
||||
|
||||
public interface CourseRepository extends JpaRepository<CourseEntity, Long> {
|
||||
|
||||
@Query("SELECT c FROM CourseEntity c WHERE c.courseId = :courseId ")
|
||||
public CourseEntity findByCourseId(Long courseId);
|
||||
|
||||
@Query("SELECT c FROM CourseEntity c WHERE c.courseName = :courseName ")
|
||||
public CourseEntity findByCourseName(String courseName);
|
||||
|
||||
|
||||
}
|
||||
@@ -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,39 +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;
|
||||
import com.example.demo.app.presentation.form.Expense;
|
||||
import com.example.demo.app.presentation.form.Income;
|
||||
|
||||
public interface TransactionRepository extends JpaRepository<TransactionEntity, Long> {
|
||||
|
||||
@Query("select t from TransactionEntity t where t.userEntity.userId = :userId and t.transactionDate = :todayDate")
|
||||
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 coalesce(sum(t.amount), 0) 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 coalesce(sum(t.amount), 0) 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 coalesce(sum(t.amount), 0) 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);
|
||||
|
||||
@Query("select new com.example.demo.app.presentation.form.Expense(t.transactionDate, coalesce(sum(t.amount), 0)) 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 group by t.transactionDate order by t.transactionDate asc")
|
||||
public List<Expense> findTotalExpenseList(LocalDate startDate, LocalDate endDate, Long userId);
|
||||
|
||||
@Query("select new com.example.demo.app.presentation.form.Income(t.transactionDate, coalesce(sum(t.amount), 0)) 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 group by t.transactionDate order by t.transactionDate asc")
|
||||
public List<Income> findTotalIncomeList(LocalDate startDate, LocalDate endDate, Long userId);
|
||||
|
||||
@Query("select coalesce(t.amount, 0) from TransactionEntity t where t.transactionId = :transactionId")
|
||||
public Integer findMoneyRecord(Long transactionId);
|
||||
|
||||
}
|
||||
@@ -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,72 +0,0 @@
|
||||
package com.example.demo.app.presentation.controller;
|
||||
|
||||
import java.time.LocalDate;
|
||||
|
||||
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.RequestParam;
|
||||
|
||||
import com.example.demo.aop.aspect.SessionCheck;
|
||||
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;
|
||||
|
||||
@SessionCheck
|
||||
@GetMapping("/analysis")
|
||||
public String showAnalysis(
|
||||
@RequestParam(required = false) Integer year,
|
||||
@RequestParam(required = false) Integer month,
|
||||
Model model,
|
||||
HttpSession session) {
|
||||
|
||||
//ログインユーザーの取得（セッション）
|
||||
LoginModel loginUser = (LoginModel) session.getAttribute("loginUser");
|
||||
|
||||
//初期年月表示
|
||||
LocalDate nowDate = LocalDate.now();
|
||||
|
||||
if (year == null) {
|
||||
year = nowDate.getYear();
|
||||
}
|
||||
|
||||
if (month == null) {
|
||||
month = nowDate.getMonthValue();
|
||||
}
|
||||
|
||||
//前月・翌月作成
|
||||
LocalDate targetDate = LocalDate.of(year, month, 1);
|
||||
|
||||
LocalDate previousDate = targetDate.minusMonths(1);
|
||||
LocalDate nextDate = targetDate.plusMonths(1);
|
||||
|
||||
//分析結果の取得(Service)
|
||||
AnalysisModel analysisModel = analysisService.getAnalysis(loginUser.getUserId(), year, month);
|
||||
|
||||
AnalysisForm analysisForm = AnalysisForm.convertFrom(analysisModel);
|
||||
|
||||
//model格納
|
||||
model.addAttribute("analysisForm", analysisForm);
|
||||
model.addAttribute("year", year);
|
||||
model.addAttribute("month", month);
|
||||
model.addAttribute("previousYear", previousDate.getYear());
|
||||
model.addAttribute("previousMonth", previousDate.getMonthValue());
|
||||
model.addAttribute("nextYear", nextDate.getYear());
|
||||
model.addAttribute("nextMonth", nextDate.getMonthValue());
|
||||
|
||||
return "analysis";
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,61 +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 com.example.demo.app.presentation.form.PasswordResetForm;
|
||||
|
||||
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());
|
||||
|
||||
model.addAttribute(
|
||||
"passwordResetForm",
|
||||
new PasswordResetForm());
|
||||
|
||||
return "password_reset";
|
||||
|
||||
}
|
||||
}
|
||||
@@ -1,81 +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 org.springframework.web.bind.annotation.RequestParam;
|
||||
|
||||
import com.example.demo.aop.aspect.SessionCheck;
|
||||
import com.example.demo.app.domain.model.LoginModel;
|
||||
import com.example.demo.app.domain.service.CourseInfoService;
|
||||
import com.example.demo.app.domain.service.CourseService;
|
||||
import com.example.demo.app.domain.service.UserService;
|
||||
import com.example.demo.app.presentation.form.CourseForm;
|
||||
import com.example.demo.app.presentation.form.CourseInfoForm;
|
||||
import com.example.demo.app.presentation.form.UserForm;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
|
||||
|
||||
@Controller
|
||||
@RequiredArgsConstructor
|
||||
public class CourseController {
|
||||
|
||||
private final CourseService courseService;
|
||||
private final CourseInfoService courseInfoService;
|
||||
private final UserService userService;
|
||||
|
||||
|
||||
@PostMapping("/user/register/course")
|
||||
public String showSelectCourse(@ModelAttribute UserForm userForm, Model model, HttpSession session) {
|
||||
|
||||
|
||||
|
||||
session.setAttribute("userForm", userForm);
|
||||
model.addAttribute("mode", "regist");
|
||||
model.addAttribute("currentCourseId", courseService.findByName("バランスコース"));
|
||||
model.addAttribute("courseList", CourseForm.convertFrom(courseService.findAll()));
|
||||
model.addAttribute("courseInfoList", CourseInfoForm.convertFrom(courseInfoService.findAll()));
|
||||
|
||||
return "select_course";
|
||||
|
||||
|
||||
}
|
||||
|
||||
@SessionCheck
|
||||
@GetMapping("/course")
|
||||
public String showChangeCourse(Model model, HttpSession session) {
|
||||
|
||||
|
||||
LoginModel loginUser = (LoginModel) session.getAttribute("loginUser");
|
||||
Long userId = loginUser.getUserId();
|
||||
|
||||
Long currentCourseId = userService.findByUserId(userId).getCourseId();
|
||||
model.addAttribute("mode", "change");
|
||||
model.addAttribute("currentCourseId", currentCourseId);
|
||||
model.addAttribute("courseList", CourseForm.convertFrom(courseService.findAll()));
|
||||
model.addAttribute("courseInfoList", CourseInfoForm.convertFrom(courseInfoService.findAll()));
|
||||
|
||||
|
||||
return "select_course";
|
||||
|
||||
|
||||
}
|
||||
|
||||
@SessionCheck
|
||||
@PostMapping("/change")
|
||||
public String changeCourse(@RequestParam Long courseId, HttpSession httpSession) {
|
||||
|
||||
LoginModel loginUser = (LoginModel) httpSession.getAttribute("loginUser");
|
||||
|
||||
userService.updateCourse(loginUser.getUserId(), courseId);
|
||||
|
||||
return "redirect:/menu";
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -1,12 +0,0 @@
|
||||
package com.example.demo.app.presentation.controller;
|
||||
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
|
||||
@Controller
|
||||
public class ErrorController {
|
||||
@GetMapping("/error")
|
||||
public String showError() {
|
||||
return "error";
|
||||
}
|
||||
}
|
||||
@@ -1,77 +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 org.springframework.web.bind.annotation.RequestMapping;
|
||||
|
||||
import com.example.demo.aop.aspect.SessionCheck;
|
||||
import com.example.demo.app.domain.model.GoalModel;
|
||||
import com.example.demo.app.domain.model.LoginModel;
|
||||
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;
|
||||
|
||||
@SessionCheck
|
||||
@GetMapping("")
|
||||
public String getGoal(Model model, HttpSession session) {
|
||||
|
||||
LoginModel loginUser = (LoginModel) session.getAttribute("loginUser");
|
||||
|
||||
Long userId = loginUser.getUserId();
|
||||
|
||||
GoalModel goalModel = goalService.getGoalByUserId(userId);
|
||||
GoalForm goalForm = GoalForm.convertFrom(goalModel);
|
||||
|
||||
model.addAttribute("goalForm", goalForm);
|
||||
return "goal_view";
|
||||
}
|
||||
|
||||
@SessionCheck
|
||||
@GetMapping("/edit")
|
||||
public String editGoal(Model model, HttpSession session) {
|
||||
|
||||
LoginModel loginUser = (LoginModel) session.getAttribute("loginUser");
|
||||
Long userId = loginUser.getUserId();
|
||||
|
||||
GoalModel goalModel = goalService.getGoalByUserId(userId);
|
||||
GoalForm goalForm = GoalForm.convertFrom(goalModel);
|
||||
|
||||
model.addAttribute("goalForm", goalForm);
|
||||
return "goal_edit";
|
||||
}
|
||||
|
||||
@SessionCheck
|
||||
@PostMapping("/update")
|
||||
public String updateGoal(@ModelAttribute GoalForm goalForm, HttpSession session) {
|
||||
|
||||
LoginModel loginUser = (LoginModel) session.getAttribute("loginUser");
|
||||
|
||||
Long userId = loginUser.getUserId();
|
||||
|
||||
// 本人の目標かどうかを確認してから更新する
|
||||
GoalModel currentGoal = goalService.getGoalByUserId(userId);
|
||||
|
||||
if (!currentGoal.getGoalId().equals(goalForm.getGoalId())) {
|
||||
return "redirect:/goal"; // 他人のデータを更新しようとしたら弾く
|
||||
}
|
||||
|
||||
GoalModel goalModel = GoalModel.convertFrom(goalForm);
|
||||
goalService.updateGoal(goalModel);
|
||||
|
||||
return "redirect:/goal";
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,52 +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(@ModelAttribute LoginForm 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 "redirect:/menu";
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,70 +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.LoginModel;
|
||||
import com.example.demo.app.domain.service.PasswordResetService;
|
||||
import com.example.demo.app.presentation.form.PasswordResetForm;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
|
||||
@Controller
|
||||
@RequiredArgsConstructor
|
||||
public class PasswordResetController {
|
||||
private final PasswordResetService passwordResetService;
|
||||
|
||||
@GetMapping("/password/reset")
|
||||
public String showPasswordReset(Model model) {
|
||||
model.addAttribute("passwordResetForm", new PasswordResetForm());
|
||||
return "password_reset";
|
||||
}
|
||||
|
||||
@PostMapping("/password/reset")
|
||||
public String resetPassword(
|
||||
PasswordResetForm passwordResetForm,
|
||||
Model model,
|
||||
HttpSession session){
|
||||
|
||||
Long userId =
|
||||
(Long) session.getAttribute("passwordResetUserId");
|
||||
|
||||
if (userId == null) {
|
||||
LoginModel loginUser =
|
||||
(LoginModel) session.getAttribute("loginUser");
|
||||
|
||||
if (loginUser != null) {
|
||||
userId = loginUser.getUserId();
|
||||
}
|
||||
}
|
||||
|
||||
if (userId == null) {
|
||||
return "redirect:/login";
|
||||
}
|
||||
|
||||
boolean isReset =
|
||||
passwordResetService.resetPassword(userId, passwordResetForm);
|
||||
|
||||
System.out.println("isReset=" + isReset);
|
||||
|
||||
if(!isReset) {
|
||||
model.addAttribute("Message", "パスワードが一致しません。");
|
||||
return "password_reset";
|
||||
}
|
||||
|
||||
session.removeAttribute("passwordResetUserId");
|
||||
|
||||
LoginModel loginUser =
|
||||
(LoginModel) session.getAttribute("loginUser");
|
||||
|
||||
if (loginUser != null) {
|
||||
return "redirect:/menu";
|
||||
}
|
||||
|
||||
return "redirect:/login";
|
||||
}
|
||||
}
|
||||
@@ -1,96 +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.aop.aspect.SessionCheck;
|
||||
import com.example.demo.app.domain.model.LoginModel;
|
||||
import com.example.demo.app.domain.model.ProfileModel;
|
||||
import com.example.demo.app.domain.service.ProfileService;
|
||||
import com.example.demo.app.presentation.form.ProfileEditForm;
|
||||
import com.example.demo.app.presentation.form.ProfileForm;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
|
||||
@Controller
|
||||
@RequiredArgsConstructor
|
||||
public class ProfileController {
|
||||
private final ProfileService profileService;
|
||||
|
||||
@SessionCheck
|
||||
@GetMapping("/profile")
|
||||
public String profile(Model model, HttpSession session) {
|
||||
LoginModel loginUser = (LoginModel) session.getAttribute("loginUser");
|
||||
|
||||
ProfileModel profileModel = profileService.findOne(loginUser.getUserId());
|
||||
|
||||
ProfileForm profileForm = ProfileForm.convertForm(profileModel);
|
||||
|
||||
model.addAttribute("profileForm", profileForm);
|
||||
return "profile";
|
||||
}
|
||||
|
||||
@SessionCheck
|
||||
@GetMapping("/profile/edit")
|
||||
public String showEditProfile(
|
||||
Model model,
|
||||
HttpSession session) {
|
||||
|
||||
LoginModel loginUser =
|
||||
(LoginModel) session.getAttribute("loginUser");
|
||||
|
||||
ProfileModel profileModel =
|
||||
profileService.findOne(loginUser.getUserId());
|
||||
|
||||
ProfileEditForm profileEditForm =
|
||||
new ProfileEditForm(
|
||||
profileModel.getUserName(),
|
||||
profileModel.getMailAddress(),
|
||||
profileModel.getSaving(),
|
||||
profileModel.getAnnualIncome(),
|
||||
profileModel.getMonthlyBudget());
|
||||
|
||||
model.addAttribute("profileEditForm", profileEditForm);
|
||||
return "profile_edit";
|
||||
}
|
||||
|
||||
@PostMapping("/profile/edit")
|
||||
public String updateProfile(
|
||||
@ModelAttribute ProfileEditForm profileEditForm,
|
||||
HttpSession session) {
|
||||
|
||||
LoginModel loginUser =
|
||||
(LoginModel) session.getAttribute("loginUser");
|
||||
|
||||
profileService.update(
|
||||
loginUser.getUserId(),
|
||||
profileEditForm);
|
||||
|
||||
return "redirect:/profile";
|
||||
}
|
||||
|
||||
@PostMapping("/withdraw")
|
||||
public String withdraw(HttpSession session) {
|
||||
|
||||
LoginModel loginUser =
|
||||
(LoginModel) session.getAttribute("loginUser");
|
||||
|
||||
profileService.withdraw(loginUser.getUserId());
|
||||
|
||||
session.invalidate();
|
||||
|
||||
return "redirect:/login";
|
||||
}
|
||||
|
||||
|
||||
@PostMapping("/logout")
|
||||
public String logout(HttpSession session) {
|
||||
session.invalidate();
|
||||
return "redirect:/login";
|
||||
}
|
||||
}
|
||||
@@ -1,359 +0,0 @@
|
||||
package com.example.demo.app.presentation.controller;
|
||||
|
||||
import java.time.LocalDate;
|
||||
import java.time.YearMonth;
|
||||
import java.time.format.DateTimeFormatter;
|
||||
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.aop.aspect.SessionCheck;
|
||||
import com.example.demo.app.domain.model.LoginModel;
|
||||
import com.example.demo.app.domain.service.CategoryService;
|
||||
import com.example.demo.app.domain.service.GoalService;
|
||||
import com.example.demo.app.domain.service.TransactionService;
|
||||
import com.example.demo.app.domain.service.UserService;
|
||||
import com.example.demo.app.presentation.form.CategoryForm;
|
||||
import com.example.demo.app.presentation.form.Expense;
|
||||
import com.example.demo.app.presentation.form.GoalForm;
|
||||
import com.example.demo.app.presentation.form.Income;
|
||||
import com.example.demo.app.presentation.form.TransactionForm;
|
||||
import com.example.demo.app.presentation.form.UserForm;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
|
||||
@Controller
|
||||
@RequiredArgsConstructor
|
||||
public class TransactionController {
|
||||
|
||||
private final TransactionService transactionService;
|
||||
private final CategoryService categoryService;
|
||||
private final GoalService goalService;
|
||||
private final UserService userService;
|
||||
|
||||
// 一覧画面
|
||||
@SessionCheck
|
||||
@GetMapping("/transaction/list")
|
||||
public String transactionList(
|
||||
@RequestParam(required = false, defaultValue = "0") String years,
|
||||
@RequestParam(required = false, defaultValue = "0") String months,
|
||||
Model model,
|
||||
HttpSession session) {
|
||||
|
||||
LoginModel loginUser = (LoginModel) session.getAttribute("loginUser");
|
||||
|
||||
LocalDate today = LocalDate.now();
|
||||
|
||||
int year = years.equals("0")
|
||||
? today.getYear()
|
||||
: Integer.parseInt(years);
|
||||
|
||||
int month = months.equals("0")
|
||||
? today.getMonthValue()
|
||||
: Integer.parseInt(months);
|
||||
|
||||
YearMonth yearMonth = YearMonth.of(year, month);
|
||||
|
||||
YearMonth previousYearMonth = yearMonth.minusMonths(1);
|
||||
|
||||
int previousYear = previousYearMonth.getYear();
|
||||
int previousMonth = previousYearMonth.getMonthValue();
|
||||
|
||||
YearMonth nextYearMonth = yearMonth.plusMonths(1);
|
||||
|
||||
int nextYear = nextYearMonth.getYear();
|
||||
int nextMonth = nextYearMonth.getMonthValue();
|
||||
|
||||
LocalDate startDate = yearMonth.atDay(1);
|
||||
LocalDate endDate = yearMonth.atEndOfMonth();
|
||||
|
||||
Map<LocalDate, List<TransactionForm>> transactionFormMap = new HashMap<>();
|
||||
|
||||
transactionService
|
||||
.findAllByDate(
|
||||
startDate,
|
||||
endDate,
|
||||
loginUser.getUserId())
|
||||
.forEach((date, list) -> {
|
||||
|
||||
List<TransactionForm> transactionFormList = list.stream()
|
||||
.map(transaction -> {
|
||||
|
||||
CategoryForm categoryForm = CategoryForm.convertFrom(
|
||||
categoryService.findOne(
|
||||
transaction.getCategoryId()));
|
||||
|
||||
return TransactionForm.convertFrom(
|
||||
transaction,
|
||||
categoryForm.getCategoryName(),
|
||||
transactionService.findTotalExpense(
|
||||
startDate,
|
||||
endDate,
|
||||
loginUser.getUserId()),
|
||||
transactionService.findTotalIncome(
|
||||
startDate,
|
||||
endDate,
|
||||
loginUser.getUserId()),
|
||||
categoryForm.getTransactionType());
|
||||
})
|
||||
.collect(Collectors.toList());
|
||||
|
||||
transactionFormMap.put(date, transactionFormList);
|
||||
});
|
||||
|
||||
model.addAttribute("year", year);
|
||||
model.addAttribute("month", month);
|
||||
|
||||
model.addAttribute("previousYear", previousYear);
|
||||
model.addAttribute("previousMonth", previousMonth);
|
||||
|
||||
model.addAttribute("nextYear", nextYear);
|
||||
model.addAttribute("nextMonth", nextMonth);
|
||||
|
||||
model.addAttribute("transactionFormMap", transactionFormMap);
|
||||
|
||||
return "transaction_list";
|
||||
}
|
||||
|
||||
// 詳細画面
|
||||
@SessionCheck
|
||||
@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 -> {
|
||||
|
||||
int type = CategoryForm.convertFrom(categoryService.findOne(transaction.getCategoryId()))
|
||||
.getTransactionType();
|
||||
|
||||
TransactionForm transactionForm;
|
||||
if (type == 1) {
|
||||
|
||||
transactionForm = TransactionForm.convertFrom(
|
||||
transaction,
|
||||
CategoryForm.convertFrom(categoryService.findOne(transaction.getCategoryId()))
|
||||
.getCategoryName(),
|
||||
0,
|
||||
transactionService.findMoneyRecord(transaction.getTransactionId()),
|
||||
type);
|
||||
|
||||
} else if (type == 0) {
|
||||
transactionForm = TransactionForm.convertFrom(
|
||||
transaction,
|
||||
CategoryForm.convertFrom(categoryService.findOne(transaction.getCategoryId()))
|
||||
.getCategoryName(),
|
||||
transactionService.findMoneyRecord(transaction.getTransactionId()),
|
||||
0,
|
||||
type);
|
||||
} else {
|
||||
transactionForm = TransactionForm.convertFrom(
|
||||
transaction,
|
||||
CategoryForm.convertFrom(categoryService.findOne(transaction.getCategoryId()))
|
||||
.getCategoryName(),
|
||||
0,
|
||||
0,
|
||||
type);
|
||||
}
|
||||
|
||||
return transactionForm;
|
||||
}).collect(Collectors.toList());
|
||||
|
||||
model.addAttribute("today", todayDate);
|
||||
model.addAttribute("transactionFormList", transactionFormList);
|
||||
|
||||
return "transaction_detail";
|
||||
}
|
||||
|
||||
@SessionCheck
|
||||
@GetMapping("/transaction/create")
|
||||
public String createOneGet(@RequestParam(defaultValue = "") LocalDate today,
|
||||
Model model) {
|
||||
|
||||
if (today == null) {
|
||||
today = LocalDate.now();
|
||||
}
|
||||
|
||||
List<CategoryForm> categoryFormList = CategoryForm.convertFrom(categoryService.findAll());
|
||||
|
||||
TransactionForm transactionForm = new TransactionForm();
|
||||
transactionForm.setTransactionDate(today);
|
||||
|
||||
System.out.println(transactionForm.getCategoryName() + " " + transactionForm.getAmount());
|
||||
|
||||
model.addAttribute("transactionForm", transactionForm);
|
||||
|
||||
model.addAttribute("categoryFormList", categoryFormList);
|
||||
|
||||
model.addAttribute("today", today.format(DateTimeFormatter.ISO_LOCAL_DATE));
|
||||
|
||||
return "transaction_create";
|
||||
}
|
||||
|
||||
@SessionCheck
|
||||
@PostMapping("/transaction/create")
|
||||
public String createOnePost(@ModelAttribute TransactionForm transactionForm, @RequestParam LocalDate today,
|
||||
Model model,
|
||||
HttpSession session) {
|
||||
|
||||
LoginModel loginUser = (LoginModel) session.getAttribute("loginUser");
|
||||
transactionForm.setUserId(loginUser.getUserId());
|
||||
if (transactionService.createTransaction(TransactionForm.convertTo(transactionForm)) != 0) {
|
||||
return "error";
|
||||
}
|
||||
|
||||
return "redirect:/transaction/detail?todayDates=" + transactionForm.getTransactionDate();
|
||||
|
||||
}
|
||||
|
||||
@SessionCheck
|
||||
@GetMapping("/transaction/update")
|
||||
public String updateOneGet(@RequestParam Long transactionId, @RequestParam(defaultValue = "") LocalDate today,
|
||||
Model model) {
|
||||
|
||||
if (today == null) {
|
||||
today = LocalDate.now();
|
||||
}
|
||||
|
||||
List<CategoryForm> categoryFormList = CategoryForm.convertFrom(categoryService.findAll());
|
||||
|
||||
TransactionForm transactionForm = TransactionForm.convertFrom(
|
||||
transactionService.findByTransactionId(transactionId),
|
||||
CategoryForm.convertFrom(categoryService.findByTransactionId(transactionId)).getCategoryName(),
|
||||
transactionService.findMoneyRecord(transactionId),
|
||||
transactionService.findMoneyRecord(transactionId),
|
||||
CategoryForm.convertFrom(categoryService.findByTransactionId(transactionId)).getTransactionType());
|
||||
|
||||
System.out.println("category: " + transactionForm.getCategoryId() + "金額： " + transactionForm.getAmount());
|
||||
|
||||
model.addAttribute("transactionId", transactionId);
|
||||
|
||||
model.addAttribute("transactionForm", transactionForm);
|
||||
|
||||
model.addAttribute("categoryFormList", categoryFormList);
|
||||
|
||||
model.addAttribute("today", today);
|
||||
|
||||
return "transaction_update";
|
||||
|
||||
}
|
||||
|
||||
@SessionCheck
|
||||
@PostMapping("/transaction/update")
|
||||
public String updateOnePost(@RequestParam Long transactionId, @ModelAttribute TransactionForm transactionForm,
|
||||
@RequestParam LocalDate today, Model model,
|
||||
HttpSession session) {
|
||||
|
||||
LoginModel loginUser = (LoginModel) session.getAttribute("loginUser");
|
||||
|
||||
transactionForm.setUserId(loginUser.getUserId());
|
||||
transactionForm.setTransactionId(transactionId);
|
||||
|
||||
if (transactionService.updateTransaction(TransactionForm.convertTo(transactionForm)) != 0) {
|
||||
return "error";
|
||||
}
|
||||
|
||||
return "redirect:/transaction/detail?todayDates=" + transactionForm.getTransactionDate();
|
||||
|
||||
}
|
||||
|
||||
@SessionCheck
|
||||
@PostMapping("/transaction/delete")
|
||||
public String deleteOne(@RequestParam Long transactionId, @RequestParam LocalDate today) {
|
||||
|
||||
transactionService.deleteTransaction(transactionId);
|
||||
return "redirect:/transaction/detail?todayDates=" + today;
|
||||
}
|
||||
|
||||
@SessionCheck
|
||||
@GetMapping("/menu")
|
||||
public String menu(HttpSession session, Model model,
|
||||
@RequestParam(required = false, defaultValue = "0") String years,
|
||||
@RequestParam(required = false, defaultValue = "0") String months) {
|
||||
|
||||
LoginModel loginUser = (LoginModel) session.getAttribute("loginUser");
|
||||
|
||||
LocalDate today = LocalDate.now();
|
||||
|
||||
int year = (years.equals("0")) ? today.getYear() : Integer.parseInt(years);
|
||||
|
||||
int month = (months.equals("0")) ? today.getMonthValue() : Integer.parseInt(months);
|
||||
|
||||
YearMonth yearMonth = YearMonth.of(year, month);
|
||||
|
||||
int lastDay = yearMonth.lengthOfMonth();
|
||||
|
||||
int firstDayOfWeek = yearMonth.atDay(1).getDayOfWeek().getValue() % 7;
|
||||
|
||||
YearMonth previousYearMonth = yearMonth.minusMonths(1);
|
||||
|
||||
int previousYear = previousYearMonth.getYear();
|
||||
int previousMonth = previousYearMonth.getMonthValue();
|
||||
|
||||
YearMonth nextYearMonth = yearMonth.plusMonths(1);
|
||||
|
||||
int nextYear = nextYearMonth.getYear();
|
||||
int nextMonth = nextYearMonth.getMonthValue();
|
||||
|
||||
model.addAttribute("year", year);
|
||||
model.addAttribute("month", month);
|
||||
model.addAttribute("day", today.getDayOfMonth());
|
||||
|
||||
model.addAttribute("lastDay", lastDay);
|
||||
model.addAttribute("firstDayOfWeek", firstDayOfWeek);
|
||||
|
||||
model.addAttribute("previousYear", previousYear);
|
||||
model.addAttribute("previousMonth", previousMonth);
|
||||
|
||||
model.addAttribute("nextYear", nextYear);
|
||||
model.addAttribute("nextMonth", nextMonth);
|
||||
|
||||
LocalDate startDate = yearMonth.atDay(1);
|
||||
LocalDate endDate = yearMonth.atEndOfMonth();
|
||||
|
||||
List<Income> incomeList = transactionService.findTotalIncomeList(startDate, endDate, loginUser.getUserId());
|
||||
|
||||
List<Expense> expenseList = transactionService.findTotalExpenseList(startDate, endDate, loginUser.getUserId());
|
||||
|
||||
model.addAttribute("incomeList", incomeList);
|
||||
model.addAttribute("expenseList", expenseList);
|
||||
|
||||
int totalIncome = transactionService.findTotalIncome(startDate, endDate, loginUser.getUserId());
|
||||
|
||||
int totalExpense = transactionService.findTotalExpense(startDate, endDate, loginUser.getUserId());
|
||||
|
||||
model.addAttribute("totalIncome", totalIncome);
|
||||
model.addAttribute("totalExpense", totalExpense);
|
||||
|
||||
GoalForm goalForm = GoalForm.convertFrom(goalService.getGoalByUserId(loginUser.getUserId()));
|
||||
|
||||
UserForm userForm = UserForm.convertFrom(userService.findByUserId(loginUser.getUserId()));
|
||||
|
||||
model.addAttribute("achievementRate", goalForm.getAchievementRate());
|
||||
|
||||
model.addAttribute("currentAmount", goalForm.getCurrentAmount());
|
||||
|
||||
model.addAttribute("targetAmount", goalForm.getTargetAmount());
|
||||
|
||||
model.addAttribute("saving", userForm.getSaving());
|
||||
|
||||
model.addAttribute("deadline", goalForm.getDeadline());
|
||||
|
||||
return "menu";
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,94 +0,0 @@
|
||||
package com.example.demo.app.presentation.controller;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
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.service.CourseService;
|
||||
import com.example.demo.app.domain.service.QuestionService;
|
||||
import com.example.demo.app.domain.service.UserService;
|
||||
import com.example.demo.app.infra.entity.QuestionEntity;
|
||||
import com.example.demo.app.presentation.form.UserForm;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
|
||||
@Controller
|
||||
@RequiredArgsConstructor
|
||||
public class UserController {
|
||||
|
||||
private final UserService userService;
|
||||
|
||||
private final CourseService courseService;
|
||||
|
||||
private final QuestionService questionService;
|
||||
|
||||
|
||||
@GetMapping("/user/register")
|
||||
public String showRegister(Model model, HttpSession session) {
|
||||
UserForm userForm = new UserForm();
|
||||
|
||||
List<QuestionEntity> questionList = questionService.findAll();
|
||||
|
||||
session.setAttribute("questionList", questionList);
|
||||
|
||||
model.addAttribute("userForm", userForm);
|
||||
return "user_register";
|
||||
}
|
||||
|
||||
@PostMapping("/user/register/return")
|
||||
public String showRegisterReturn(@RequestParam(required = false) Long courseId, Model model, HttpSession session) {
|
||||
|
||||
UserForm userForm = (UserForm) session.getAttribute("userForm");
|
||||
System.out.println(
|
||||
"######################################################################3" + userForm.getBirthDate());
|
||||
|
||||
if (userForm.getUserName().equals("")) {
|
||||
userForm = new UserForm();
|
||||
userForm.setCourseId(courseId);
|
||||
}
|
||||
|
||||
if (courseId != null) {
|
||||
model.addAttribute("selectedCourseName", courseService.findById(courseId).getCourseName());
|
||||
}
|
||||
|
||||
session.setAttribute("selectedCourseName", courseService.findById(courseId).getCourseName());
|
||||
model.addAttribute("courseId", courseId);
|
||||
System.out.println(
|
||||
"######################################################################3" + userForm.getBirthDate());
|
||||
model.addAttribute("userForm", userForm);
|
||||
|
||||
return "user_register_return";
|
||||
}
|
||||
|
||||
@GetMapping("/user/register/confirm")
|
||||
public String confirmRegisterGet(@ModelAttribute UserForm userForm,
|
||||
String selectedCourseName, Model model,
|
||||
HttpSession session) {
|
||||
|
||||
model.addAttribute("selectedCourseName", (String) session.getAttribute("selectedCourseName"));
|
||||
return "user_register_confirm";
|
||||
|
||||
}
|
||||
|
||||
@PostMapping("/user/register/complete")
|
||||
public String confirmRegister(
|
||||
@ModelAttribute UserForm userForm,
|
||||
Model model,
|
||||
HttpSession session) {
|
||||
|
||||
Long courseId = courseService.findByName((String) session.getAttribute("selectedCourseName"));
|
||||
|
||||
userService.register(userForm, courseId);
|
||||
|
||||
return "redirect:/login";
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -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 Long 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,17 +0,0 @@
|
||||
package com.example.demo.app.presentation.form;
|
||||
|
||||
import java.time.LocalDate;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class Expense {
|
||||
|
||||
private LocalDate date;
|
||||
private Long amount;
|
||||
|
||||
}
|
||||
@@ -1,51 +0,0 @@
|
||||
package com.example.demo.app.presentation.form;
|
||||
|
||||
import java.time.LocalDate;
|
||||
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
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;
|
||||
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd")
|
||||
private LocalDate deadline;
|
||||
|
||||
private Integer goalComplete;
|
||||
|
||||
private Integer achievementRate; // 達成率
|
||||
|
||||
private Integer currentAmount; // 現在の資産
|
||||
|
||||
public static GoalForm convertFrom(GoalModel goalModel) {
|
||||
return new GoalForm(
|
||||
goalModel.getGoalId(),
|
||||
goalModel.getGoalTitle(),
|
||||
goalModel.getGoalSubtitle(),
|
||||
goalModel.getTargetAmount(),
|
||||
goalModel.getDeadline(),
|
||||
goalModel.getGoalComplete(),
|
||||
goalModel.getAchievementRate(),
|
||||
goalModel.getCurrentAmount());
|
||||
}
|
||||
|
||||
// public static List<GoalForm> convertFrom(List<GoalModel> goalModelList) {
|
||||
// return goalModelList.stream().map(GoalForm::convertFrom).toList();
|
||||
// }
|
||||
|
||||
}
|
||||
@@ -1,17 +0,0 @@
|
||||
package com.example.demo.app.presentation.form;
|
||||
|
||||
import java.time.LocalDate;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class Income {
|
||||
|
||||
private LocalDate date;
|
||||
private Long amount;
|
||||
|
||||
}
|
||||
@@ -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,13 +0,0 @@
|
||||
package com.example.demo.app.presentation.form;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class PasswordResetForm{
|
||||
private String password;
|
||||
private String passwordConfirm;
|
||||
}
|
||||
@@ -1,16 +0,0 @@
|
||||
package com.example.demo.app.presentation.form;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class ProfileEditForm {
|
||||
private String userName;
|
||||
private String mailAddress;
|
||||
private Integer saving;
|
||||
private Integer annualIncome;
|
||||
private Integer monthlyBudget;
|
||||
}
|
||||
@@ -1,33 +0,0 @@
|
||||
package com.example.demo.app.presentation.form;
|
||||
|
||||
import java.time.LocalDate;
|
||||
|
||||
import com.example.demo.app.domain.model.ProfileModel;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class ProfileForm {
|
||||
private Long userId;
|
||||
private String userName;
|
||||
private String mailAddress;
|
||||
private LocalDate birthDate;
|
||||
private Integer saving;
|
||||
private Integer annualIncome;
|
||||
private Integer monthlyBudget;
|
||||
|
||||
public static ProfileForm convertForm(ProfileModel profileModel) {
|
||||
return new ProfileForm(
|
||||
profileModel.getUserId(),
|
||||
profileModel.getUserName(),
|
||||
profileModel.getMailAddress(),
|
||||
profileModel.getBirthDate(),
|
||||
profileModel.getSaving(),
|
||||
profileModel.getAnnualIncome(),
|
||||
profileModel.getMonthlyBudget());
|
||||
}
|
||||
}
|
||||
@@ -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,43 +0,0 @@
|
||||
package com.example.demo.app.presentation.form;
|
||||
|
||||
import java.time.LocalDate;
|
||||
|
||||
import com.example.demo.app.domain.model.UserModel;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class UserForm {
|
||||
private String userName;
|
||||
private String mailAddress;
|
||||
private LocalDate birthDate;
|
||||
private String password;
|
||||
private Long secretQuestionId;
|
||||
private String secretAnswer;
|
||||
private Integer saving;
|
||||
private Integer annualIncome;
|
||||
private Integer monthlyBudget;
|
||||
private Long goalId;
|
||||
private Long courseId;
|
||||
|
||||
|
||||
public static UserForm convertFrom(UserModel userModel) {
|
||||
return new UserForm(
|
||||
userModel.getUserName(),
|
||||
userModel.getMailAddress(),
|
||||
userModel.getBrithDate(),
|
||||
userModel.getPassword(),
|
||||
userModel.getSecretQuestionId(),
|
||||
userModel.getSecretAnswer(),
|
||||
userModel.getSaving(),
|
||||
userModel.getAnnualIncome(),
|
||||
userModel.getMonthlyBudget(),
|
||||
userModel.getGoalId(),
|
||||
userModel.getCourseId()
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -1,9 +0,0 @@
|
||||
package com.example.demo.exception;
|
||||
|
||||
public class InsufficientPermissionException extends RuntimeException {
|
||||
|
||||
public InsufficientPermissionException(String message) {
|
||||
super(message);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,9 +0,0 @@
|
||||
package com.example.demo.exception;
|
||||
|
||||
public class NoSessionException extends RuntimeException {
|
||||
|
||||
public NoSessionException(String message) {
|
||||
super(message);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,5 +0,0 @@
|
||||
package com.example.demo.utility;
|
||||
|
||||
public class Constant {
|
||||
|
||||
}
|
||||
@@ -1,112 +0,0 @@
|
||||
body {
|
||||
margin: 0;
|
||||
padding-top:80px;
|
||||
padding-bottom:120px;
|
||||
}
|
||||
|
||||
#calendar {
|
||||
width: 100%;
|
||||
border-collapse: collapse;
|
||||
table-layout: fixed;
|
||||
}
|
||||
|
||||
#calendar th,
|
||||
#calendar td {
|
||||
border: 1px solid black;
|
||||
}
|
||||
|
||||
th {
|
||||
font-weight: bold;
|
||||
height: 35px;
|
||||
font-size: 13px;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
td {
|
||||
width: 14%;
|
||||
height: 70px;
|
||||
padding: 5px;
|
||||
text-align: left;
|
||||
vertical-align: top;
|
||||
}
|
||||
|
||||
td:hover {
|
||||
background-color: lightblue;
|
||||
}
|
||||
|
||||
.holiday {
|
||||
color: red;
|
||||
}
|
||||
|
||||
#today {
|
||||
font-weight: bold;
|
||||
background-color: bisque;
|
||||
}
|
||||
|
||||
.calendar-title {
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
|
||||
gap: 30px;
|
||||
|
||||
margin: 15px 10px;
|
||||
}
|
||||
|
||||
.calendar-date {
|
||||
display: flex;
|
||||
align-items: baseline;
|
||||
gap: 10px;
|
||||
}
|
||||
|
||||
.year {
|
||||
font-size: 20px;
|
||||
}
|
||||
|
||||
.month {
|
||||
font-size: 30px;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
.month-button {
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
|
||||
font-size: 28px;
|
||||
text-decoration: none;
|
||||
color: #333;
|
||||
|
||||
border-radius: 50%;
|
||||
}
|
||||
|
||||
.month-button:hover {
|
||||
background-color: #eee;
|
||||
}
|
||||
|
||||
.date {
|
||||
font-size: 13px;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
.income {
|
||||
color: blue;
|
||||
font-size: 10px;
|
||||
}
|
||||
|
||||
.expense {
|
||||
color: red;
|
||||
font-size: 10px;
|
||||
}
|
||||
|
||||
.total {
|
||||
margin: 15px 10px;
|
||||
padding: 10px;
|
||||
border-top: 1px solid #ddd;
|
||||
|
||||
font-size: 16px;
|
||||
text-align: right;
|
||||
}
|
||||
@@ -1,214 +0,0 @@
|
||||
/* =======================
|
||||
全体
|
||||
======================= */
|
||||
body {
|
||||
padding-top: 80px;
|
||||
padding-bottom: 80px;
|
||||
background-color: #f8f9fa;
|
||||
}
|
||||
|
||||
/* =======================
|
||||
コンテンツ
|
||||
======================= */
|
||||
.main-container {
|
||||
max-width: 480px;
|
||||
margin: 0 auto;
|
||||
padding: 0 12px;
|
||||
}
|
||||
|
||||
/* =======================
|
||||
タイトル
|
||||
======================= */
|
||||
.page-title {
|
||||
text-align: center;
|
||||
font-weight: bold;
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
|
||||
/* =======================
|
||||
ヘッダー
|
||||
======================= */
|
||||
.app-header {
|
||||
background-color: #E3F2FD;
|
||||
box-shadow: 0 2px 5px rgba(0, 0, 0, 0.1);
|
||||
}
|
||||
|
||||
.app-logo {
|
||||
font-size: 1.2rem;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
/* =======================
|
||||
フッター
|
||||
======================= */
|
||||
.app-footer {
|
||||
background-color: #E3F2FD;
|
||||
border-top: 1px solid #d0d7de;
|
||||
}
|
||||
|
||||
/* =======================
|
||||
カード
|
||||
======================= */
|
||||
.app-card {
|
||||
background-color: #ffffff;
|
||||
border-radius: 12px;
|
||||
padding: 15px;
|
||||
margin-bottom: 15px;
|
||||
box-shadow: 0 2px 5px rgba(0,0,0,0.08);
|
||||
}
|
||||
|
||||
.card {
|
||||
border-radius: 12px;
|
||||
margin-bottom: 12px;
|
||||
}
|
||||
|
||||
.card-body {
|
||||
padding: 12px;
|
||||
}
|
||||
|
||||
/* =======================
|
||||
カレンダー
|
||||
======================= */
|
||||
|
||||
#calendar {
|
||||
width: 100%;
|
||||
border-collapse: collapse;
|
||||
table-layout: fixed;
|
||||
}
|
||||
|
||||
#calendar th,
|
||||
#calendar td {
|
||||
border: 1px solid black;
|
||||
}
|
||||
|
||||
th {
|
||||
font-weight: bold;
|
||||
height: 35px;
|
||||
font-size: 13px;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
td {
|
||||
width: 14%;
|
||||
height: 70px;
|
||||
padding: 5px;
|
||||
text-align: left;
|
||||
vertical-align: top;
|
||||
}
|
||||
|
||||
td:hover {
|
||||
background-color: lightblue;
|
||||
}
|
||||
|
||||
.holiday {
|
||||
color: red;
|
||||
}
|
||||
|
||||
#today {
|
||||
font-weight: bold;
|
||||
background-color: bisque;
|
||||
}
|
||||
|
||||
.calendar-title {
|
||||
display: grid;
|
||||
grid-template-columns: 1fr auto 1fr;
|
||||
align-items: center;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.calendar-date {
|
||||
display: flex;
|
||||
align-items: baseline;
|
||||
gap: 10px;
|
||||
}
|
||||
|
||||
.year {
|
||||
font-size: 20px;
|
||||
}
|
||||
|
||||
.month {
|
||||
font-size: 30px;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
.month-button {
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
|
||||
font-size: 28px;
|
||||
text-decoration: none;
|
||||
color: #333;
|
||||
|
||||
border-radius: 50%;
|
||||
}
|
||||
|
||||
.month-button:hover {
|
||||
background-color: #eee;
|
||||
}
|
||||
|
||||
.month-button:last-child {
|
||||
justify-self: end;
|
||||
}
|
||||
|
||||
.date {
|
||||
font-size: 13px;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
.income {
|
||||
color: blue;
|
||||
font-size: 10px;
|
||||
}
|
||||
|
||||
.expense {
|
||||
color: red;
|
||||
font-size: 10px;
|
||||
}
|
||||
|
||||
.total {
|
||||
margin: 15px 10px;
|
||||
padding: 10px;
|
||||
border-top: 1px solid #ddd;
|
||||
|
||||
font-size: 16px;
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
/* =======================
|
||||
金額表示
|
||||
======================= */
|
||||
.plus {
|
||||
color: #dc3545;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
.minus {
|
||||
color: #0d6efd;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
/* =======================
|
||||
テーブル
|
||||
======================= */
|
||||
.table {
|
||||
background-color: white;
|
||||
}
|
||||
|
||||
.table th {
|
||||
vertical-align: middle;
|
||||
}
|
||||
|
||||
.table td {
|
||||
vertical-align: middle;
|
||||
}
|
||||
|
||||
/* =======================
|
||||
ボタン
|
||||
======================= */
|
||||
.btn {
|
||||
border-radius: 10px;
|
||||
}
|
||||
@@ -1,15 +0,0 @@
|
||||
.transaction-item {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
}
|
||||
|
||||
.transaction-buttons {
|
||||
display: flex;
|
||||
gap: 10px;
|
||||
margin-right: 20px;
|
||||
}
|
||||
|
||||
.transaction-buttons form {
|
||||
margin: 0;
|
||||
}
|
||||
@@ -1,111 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html xmlns:th="http://www.thymeleaf.org">
|
||||
<head>
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1" http-equiv="Content-Type">
|
||||
<title>分析画面</title>
|
||||
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.7/dist/css/bootstrap.min.css" rel="stylesheet">
|
||||
<link rel="stylesheet" th:href="@{/css/style.css}">
|
||||
</head>
|
||||
|
||||
<body>
|
||||
|
||||
<div th:replace="~{header :: header}">
|
||||
</div>
|
||||
|
||||
<div class="main-container">
|
||||
<h2 class="page-title">支出分析</h2>
|
||||
|
||||
<div class="calendar-title">
|
||||
|
||||
<a class="month-button" th:href="@{/analysis(year=${previousYear}, month=${previousMonth})}">
|
||||
←
|
||||
</a>
|
||||
|
||||
<div class="calendar-date">
|
||||
<span class="year" th:text="|${year}年|"></span>
|
||||
<span class="month" th:text="|${month}月|"></span>
|
||||
</div>
|
||||
|
||||
<a class="month-button" th:href="@{/analysis(year=${nextYear}, month=${nextMonth})}">
|
||||
→
|
||||
</a>
|
||||
|
||||
</div>
|
||||
|
||||
<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}
|
||||
? 'text-danger'
|
||||
: 'text-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}
|
||||
? 'text-danger'
|
||||
: 'text-primary'">
|
||||
</span>
|
||||
<br>
|
||||
<span th:text="${category.courseDifferenceAmount >= 0}
|
||||
? '＋' + ${category.courseDifferenceAmount}
|
||||
: ${category.courseDifferenceAmount}"
|
||||
th:class="${category.courseDifferenceAmount >= 0}
|
||||
? 'text-danger'
|
||||
: 'text-primary'">
|
||||
</span>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
</div>
|
||||
|
||||
<div th:replace="~{footer :: footer}">
|
||||
</div>
|
||||
|
||||
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.7/dist/js/bootstrap.bundle.min.js"></script>
|
||||
</body>
|
||||
</html>
|
||||
@@ -1,123 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html xmlns:th="http://www.thymeleaf.org">
|
||||
|
||||
<head>
|
||||
<meta charset="UTF-8" name="viewport" content="width=device-width, initial-scale=1" http-equiv="Content-Type">
|
||||
<title>認証</title>
|
||||
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.7/dist/css/bootstrap.min.css" rel="stylesheet">
|
||||
<link rel="stylesheet" th:href="@{/css/style.css}">
|
||||
|
||||
</head>
|
||||
|
||||
<body style="padding-top:80px; padding-bottom:80px;">
|
||||
|
||||
<div th:replace="~{header :: header}">
|
||||
</div>
|
||||
|
||||
<div class="main-container">
|
||||
|
||||
<h1 class="page-title">
|
||||
本人認証
|
||||
</h1>
|
||||
|
||||
<div class="card shadow-sm">
|
||||
|
||||
<div class="card-body">
|
||||
|
||||
<form th:action="@{/authentication}"
|
||||
th:object="${authenticationForm}"
|
||||
method="post">
|
||||
|
||||
<div class="mb-3">
|
||||
|
||||
<label for="mailAddress"
|
||||
class="form-label">
|
||||
メールアドレス
|
||||
</label>
|
||||
|
||||
<input type="email"
|
||||
id="mailAddress"
|
||||
class="form-control"
|
||||
th:field="*{mailAddress}"
|
||||
required>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="mb-3">
|
||||
|
||||
<label for="secretQuestionId"
|
||||
class="form-label">
|
||||
秘密の質問
|
||||
</label>
|
||||
|
||||
<select id="secretQuestionId"
|
||||
class="form-select"
|
||||
th:field="*{secretQuestionId}">
|
||||
|
||||
<option value="">
|
||||
選択してください
|
||||
</option>
|
||||
|
||||
<option th:each="question : ${questionList}"
|
||||
th:value="${question.secretQuestionId}"
|
||||
th:text="${question.questionText}">
|
||||
</option>
|
||||
|
||||
</select>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="mb-3">
|
||||
|
||||
<label for="secretAnswer"
|
||||
class="form-label">
|
||||
秘密の質問の回答
|
||||
</label>
|
||||
|
||||
<input type="text"
|
||||
id="secretAnswer"
|
||||
class="form-control"
|
||||
th:field="*{secretAnswer}"
|
||||
required>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="d-grid gap-2">
|
||||
|
||||
<button type="submit"
|
||||
class="btn btn-primary">
|
||||
確認
|
||||
</button>
|
||||
|
||||
</div>
|
||||
|
||||
</form>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="d-grid mt-3">
|
||||
|
||||
<form th:action="@{/login}"
|
||||
method="get">
|
||||
|
||||
<button type="submit"
|
||||
class="btn btn-outline-secondary w-100">
|
||||
戻る
|
||||
</button>
|
||||
|
||||
</form>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<script th:if="${errorMessage}"
|
||||
th:inline="javascript">
|
||||
alert(/*[[${errorMessage}]]*/);
|
||||
</script>
|
||||
|
||||
</body>
|
||||
|
||||
</html>
|
||||
@@ -1,35 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html xmlns:th="http://www.thymeleaf.org">
|
||||
<head>
|
||||
<meta charset="UTF-8" name="viewport" content="width=device-width, initial-scale=1">
|
||||
<title>エラー</title>
|
||||
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.7/dist/css/bootstrap.min.css" rel="stylesheet">
|
||||
</head>
|
||||
<body class="pb-5 pt-5">
|
||||
|
||||
<div th:replace="~{header :: header}">
|
||||
</div>
|
||||
|
||||
</head>
|
||||
<body>
|
||||
|
||||
<div th:replace="~{header :: header}">
|
||||
</div>
|
||||
|
||||
<div class="container text-center mt-5">
|
||||
|
||||
<h2 class="text-danger">
|
||||
エラーが発生しました
|
||||
</h2>
|
||||
|
||||
<p th:text="${errorMessage}"></p>
|
||||
|
||||
<a class="btn btn-primary" th:href="@{/login}">
|
||||
ログイン画面へ
|
||||
</a>
|
||||
|
||||
</div>
|
||||
|
||||
<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" name="viewport" content="width=device-width, initial-scale=1">
|
||||
<title>フッター</title>
|
||||
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.7/dist/css/bootstrap.min.css" rel="stylesheet">
|
||||
<link rel="stylesheet" th:href="@{/css/style.css}">
|
||||
</head>
|
||||
<body>
|
||||
|
||||
<footer th:fragment="footer" class="fixed-bottom border-top py-2 app-footer" style="background-color:#E3F2FD;">
|
||||
|
||||
<nav data-bs-theme="light">
|
||||
<div class="card-footer text-center">
|
||||
<div class="row">
|
||||
<div class="col border-end">
|
||||
<button type="button" class="btn btn-link text-black text-decoration-none">
|
||||
<a th:href="@{/transaction/create}">入力</a>
|
||||
</button>
|
||||
</div>
|
||||
<div class="col border-end">
|
||||
<button type="button" class="btn btn-link text-black text-decoration-none">
|
||||
<a th:href="@{/transaction/list}">一覧</a>
|
||||
</button>
|
||||
</div>
|
||||
<div class="col border-end">
|
||||
<button type="button" class="btn btn-link text-black text-decoration-none">
|
||||
<a th:href="@{/analysis}">分析</a>
|
||||
</button>
|
||||
</div>
|
||||
<div class="col border-end">
|
||||
<button type="button" class="btn btn-link text-black text-decoration-none">
|
||||
<a th:href="@{/goal}">目標</a>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</nav>
|
||||
|
||||
</footer>
|
||||
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.7/dist/js/bootstrap.bundle.min.js"></script>
|
||||
</body>
|
||||
</html>
|
||||
@@ -1,58 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html xmlns:th="http://www.thymeleaf.org">
|
||||
<head>
|
||||
<meta charset="UTF-8" name="viewport" content="width=device-width, initial-scale=1" http-equiv="Content-Type">
|
||||
<title>目標編集</title>
|
||||
|
||||
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.7/dist/css/bootstrap.min.css" rel="stylesheet">
|
||||
<link rel="stylesheet" th:href="@{/css/style.css}">
|
||||
</head>
|
||||
<body style="padding-top:80px; padding-bottom:80px;">
|
||||
|
||||
<div th:replace="~{header :: header}"></div>
|
||||
|
||||
<div class="main-container">
|
||||
|
||||
<h1 class="page-title">目標編集</h1>
|
||||
|
||||
<div class="card shadow-sm">
|
||||
|
||||
<div class="card-body">
|
||||
|
||||
<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}" required>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label>目標説明</label>
|
||||
<textarea th:field="*{goalSubtitle}" required></textarea>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label>目標金額</label>
|
||||
<input type="number" th:field="*{targetAmount}" min="0" max="1000000000" required>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label>目標達成期限</label>
|
||||
<input type="date" th:field="*{deadline}" th:min="${#temporals.format(#temporals.createNow(), 'yyyy-MM-dd')}" required>
|
||||
</div>
|
||||
|
||||
</form>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<button type="submit" class="btn btn-sm btn-primary w-100">更新する</button>
|
||||
|
||||
</div>
|
||||
|
||||
<div th:replace="~{footer :: footer}"></div>
|
||||
|
||||
|
||||
</body>
|
||||
</html>
|
||||
@@ -1,53 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html xmlns:th="http://www.thymeleaf.org">
|
||||
<head>
|
||||
<meta charset="UTF-8" name="viewport" content="width=device-width, initial-scale=1" http-equiv="Content-Type">
|
||||
<title>目標詳細</title>
|
||||
|
||||
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.7/dist/css/bootstrap.min.css" rel="stylesheet">
|
||||
<link rel="stylesheet" th:href="@{/css/style.css}">
|
||||
|
||||
</head>
|
||||
<body style="padding-top:80px; padding-bottom:80px;">
|
||||
<div th:replace="~{header :: header}"></div>
|
||||
|
||||
|
||||
<div class="main-container">
|
||||
|
||||
<h1 class="page-title">目標詳細</h1>
|
||||
|
||||
<table class="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>
|
||||
|
||||
<tr>
|
||||
<th>達成率</th>
|
||||
<td th:text="${goalForm.achievementRate} + '%'"></td>
|
||||
</tr>
|
||||
|
||||
|
||||
</table>
|
||||
|
||||
<a th:href="@{/goal/edit}" class="btn btn-sm btn-primary w-100">編集する</a>
|
||||
|
||||
</div>
|
||||
|
||||
<div th:replace="~{footer :: footer}"></div>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
@@ -1,30 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html xmlns:th="http://www.thymeleaf.org">
|
||||
<head>
|
||||
<meta charset="UTF-8" name="viewport" content="width=device-width, initial-scale=1">
|
||||
<title>ヘッダー</title>
|
||||
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.7/dist/css/bootstrap.min.css" rel="stylesheet">
|
||||
<link rel="stylesheet" th:href="@{/css/style.css}">
|
||||
</head>
|
||||
<body>
|
||||
|
||||
<header th:fragment="header" class="fixed-top">
|
||||
|
||||
<nav class="navbar app-header" style="background-color: #e3f2fd;" data-bs-theme="light">
|
||||
<div class="container-fluid">
|
||||
<a th:href="@{/menu}" class="navbar-brand fw-bold">Monegement</a>
|
||||
<div class="d-flex gap-2">
|
||||
<a class="btn btn-outline-primary btn-sm" th:href="@{/course}">
|
||||
コース
|
||||
</a>
|
||||
<a class="btn btn-outline-secondary btn-sm" th:href="@{/profile}">
|
||||
プロフィール
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</nav>
|
||||
|
||||
</header>
|
||||
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.7/dist/js/bootstrap.bundle.min.js"></script>
|
||||
</body>
|
||||
</html>
|
||||
@@ -1,101 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="ja"xmlns:th="http://www.thymeleaf.org">
|
||||
<head>
|
||||
<meta charset="UTF-8" name="viewport" content="width=device-width, initial-scale=1" http-equiv="Content-Type">
|
||||
<title>ログイン</title>
|
||||
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.7/dist/css/bootstrap.min.css" rel="stylesheet">
|
||||
<link rel="stylesheet" th:href="@{/css/style.css}">
|
||||
|
||||
</head>
|
||||
<body style="padding-top:80px; padding-bottom:80px;">
|
||||
|
||||
<div th:replace="~{header :: header}">
|
||||
</div>
|
||||
|
||||
<div class="main-container">
|
||||
|
||||
<h1 class="page-title">
|
||||
ログイン
|
||||
</h1>
|
||||
|
||||
<div class="card shadow-sm">
|
||||
|
||||
<div class="card-body">
|
||||
|
||||
<div th:if="${errorMessage}"
|
||||
class="alert alert-danger">
|
||||
|
||||
<span th:text="${errorMessage}">
|
||||
</span>
|
||||
|
||||
</div>
|
||||
|
||||
<form th:action="@{/login}"
|
||||
th:object="${loginForm}"
|
||||
method="post">
|
||||
|
||||
<div class="mb-3">
|
||||
|
||||
<label for="mailAddress"
|
||||
class="form-label">
|
||||
メールアドレス
|
||||
</label>
|
||||
|
||||
<input type="email"
|
||||
id="mailAddress"
|
||||
class="form-control"
|
||||
th:field="*{mailAddress}"
|
||||
required>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="mb-3">
|
||||
|
||||
<label for="password"
|
||||
class="form-label">
|
||||
パスワード
|
||||
</label>
|
||||
|
||||
<input type="password"
|
||||
id="password"
|
||||
class="form-control"
|
||||
th:field="*{password}"
|
||||
required>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="d-grid">
|
||||
|
||||
<button type="submit"
|
||||
class="btn btn-primary">
|
||||
ログイン
|
||||
</button>
|
||||
|
||||
</div>
|
||||
|
||||
</form>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="text-center mt-3">
|
||||
|
||||
<a th:href="@{/user/register}">
|
||||
新規会員登録
|
||||
</a>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="text-center mt-2">
|
||||
|
||||
<a th:href="@{/authentication}">
|
||||
パスワードを忘れた方
|
||||
</a>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
@@ -1,167 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html xmlns:th="http://www.thymeleaf.org">
|
||||
|
||||
<head>
|
||||
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
|
||||
<title>Calendar</title>
|
||||
|
||||
<link rel="stylesheet" th:href="@{/css/style.css}">
|
||||
|
||||
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.7/dist/css/bootstrap.min.css" rel="stylesheet">
|
||||
|
||||
</head>
|
||||
|
||||
<body>
|
||||
|
||||
<div th:replace="~{header :: header}"></div>
|
||||
|
||||
|
||||
<div class="calendar-title">
|
||||
|
||||
<a class="month-button" th:href="@{/menu(years=${previousYear}, months=${previousMonth})}">
|
||||
←
|
||||
</a>
|
||||
|
||||
<div class="calendar-date">
|
||||
<span class="year" th:text="|${year}年|"></span>
|
||||
<span class="month" th:text="|${month}月|"></span>
|
||||
</div>
|
||||
|
||||
<a class="month-button" th:href="@{/menu(years=${nextYear}, months=${nextMonth})}">
|
||||
→
|
||||
</a>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<table id="calendar">
|
||||
|
||||
<thead>
|
||||
|
||||
<tr>
|
||||
<th class="holiday">日</th>
|
||||
<th>月</th>
|
||||
<th>火</th>
|
||||
<th>水</th>
|
||||
<th>木</th>
|
||||
<th>金</th>
|
||||
<th>土</th>
|
||||
</tr>
|
||||
|
||||
</thead>
|
||||
|
||||
|
||||
<tbody>
|
||||
|
||||
<tr th:each="week : ${#numbers.sequence(0, 5)}">
|
||||
|
||||
<td th:each="weekDay : ${#numbers.sequence(0, 6)}">
|
||||
|
||||
<a th:if="${week * 7 + weekDay - firstDayOfWeek + 1 >= 1
|
||||
and week * 7 + weekDay - firstDayOfWeek + 1 <= lastDay}" th:href="@{/transaction/detail(
|
||||
todayDates=${T(java.time.LocalDate).of(year, month, week * 7 + weekDay - firstDayOfWeek + 1)}
|
||||
)}">
|
||||
|
||||
|
||||
<div
|
||||
th:if="${week * 7 + weekDay - firstDayOfWeek + 1 >= 1 and week * 7 + weekDay - firstDayOfWeek + 1 <= lastDay}">
|
||||
|
||||
<div class="date" th:text="${week * 7 + weekDay - firstDayOfWeek + 1}">
|
||||
</div>
|
||||
|
||||
<div th:each="income : ${incomeList}"
|
||||
th:if="${income.date.dayOfMonth == week * 7 + weekDay - firstDayOfWeek + 1}"
|
||||
class="income" th:text="|収入 +${income.amount}円|">
|
||||
</div>
|
||||
|
||||
<div th:each="expense : ${expenseList}"
|
||||
th:if="${expense.date.dayOfMonth == week * 7 + weekDay - firstDayOfWeek + 1}"
|
||||
class="expense" th:text="|支出 -${expense.amount}円|">
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
</a>
|
||||
|
||||
</td>
|
||||
|
||||
</tr>
|
||||
|
||||
|
||||
</tbody>
|
||||
|
||||
</table>
|
||||
|
||||
|
||||
<div class="card shadow-sm mb-3">
|
||||
|
||||
<div class="card-body">
|
||||
|
||||
<div class="d-flex justify-content-between mb-2">
|
||||
<span>収入</span>
|
||||
<span th:text="'￥' + ${totalIncome}"></span>
|
||||
</div>
|
||||
|
||||
<div class="d-flex justify-content-between">
|
||||
<span>支出</span>
|
||||
<span th:text="'￥' + ${totalExpense}"></span>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<hr class="border border-primary border-2 opacity-50">
|
||||
|
||||
<div class="card shadow-sm mb-3">
|
||||
|
||||
<div class="card-body">
|
||||
|
||||
<div class="d-flex justify-content-between mb-2">
|
||||
<span>目標資金</span>
|
||||
<span th:text="'￥' + ${targetAmount}"></span>
|
||||
</div>
|
||||
|
||||
<div class="d-flex justify-content-between mb-2">
|
||||
<span>現在高</span>
|
||||
<span th:text="'￥' + ${currentAmount}"></span>
|
||||
</div>
|
||||
|
||||
<div class="d-flex justify-content-between">
|
||||
<span>貯金額</span>
|
||||
<span th:text="'￥' + ${saving}"></span>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="card shadow-sm">
|
||||
|
||||
<div class="card-body">
|
||||
|
||||
<div class="d-flex justify-content-between mb-2">
|
||||
<span>達成率</span>
|
||||
<span th:text="${achievementRate} + '%'"
|
||||
class="badge bg-success">
|
||||
</span>
|
||||
</div>
|
||||
|
||||
<div class="d-flex justify-content-between">
|
||||
<span>達成期限</span>
|
||||
<span th:text="${deadline}"></span>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<div th:replace="~{footer :: footer}"></div>
|
||||
|
||||
</body>
|
||||
|
||||
</html>
|
||||
@@ -1,91 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="ja"xmlns:th="http://www.thymeleaf.org">
|
||||
<head>
|
||||
<meta charset="UTF-8" name="viewport" content="width=device-width, initial-scale=1" http-equiv="Content-Type">
|
||||
<title>パスワード再設定</title>
|
||||
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.7/dist/css/bootstrap.min.css" rel="stylesheet">
|
||||
<link rel="stylesheet" th:href="@{/css/style.css}">
|
||||
|
||||
</head>
|
||||
<body style="padding-top:80px; padding-bottom:80px;">
|
||||
|
||||
<div th:replace="~{header :: header}">
|
||||
</div>
|
||||
|
||||
<div class="main-container">
|
||||
|
||||
<h1 class="page-title">
|
||||
パスワード再設定
|
||||
</h1>
|
||||
|
||||
<div class="card shadow-sm">
|
||||
|
||||
<div class="card-body">
|
||||
|
||||
<form th:action="@{/password/reset}"
|
||||
th:object="${passwordResetForm}"
|
||||
method="post">
|
||||
|
||||
<div class="mb-3">
|
||||
|
||||
<label for="password"
|
||||
class="form-label">
|
||||
新しいパスワード
|
||||
</label>
|
||||
|
||||
<input type="password"
|
||||
id="password"
|
||||
class="form-control"
|
||||
th:field="*{password}"
|
||||
minlength="8"
|
||||
maxlength="255"
|
||||
required>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="mb-3">
|
||||
|
||||
<label for="passwordConfirm"
|
||||
class="form-label">
|
||||
パスワード確認
|
||||
</label>
|
||||
|
||||
<input type="password"
|
||||
id="passwordConfirm"
|
||||
class="form-control"
|
||||
th:field="*{passwordConfirm}"
|
||||
minlength="8"
|
||||
maxlength="255"
|
||||
required>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="d-grid">
|
||||
|
||||
<button type="submit"
|
||||
class="btn btn-primary">
|
||||
|
||||
再設定
|
||||
|
||||
</button>
|
||||
|
||||
</div>
|
||||
|
||||
</form>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<div th:if="${Message}"
|
||||
class="alert alert-danger mt-3">
|
||||
|
||||
<span th:text="${Message}">
|
||||
</span>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user