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

Compare commits

base: 2026_09_5H_Spring_KIZAKI:54512e411ad663a4105b261b815ef1db8adf8151
Branches Tags
2026_09_5H_Spring_KIZAKI:master 2026_09_5H_Spring_KIZAKI:n-kawahito 2026_09_5H_Spring_KIZAKI:s-choi 2026_09_5H_Spring_KIZAKI:s-morimoto 2026_09_5H_Spring_KIZAKI:k-oshita 2026_09_5H_Spring_KIZAKI:k-kobayashi 2026_09_5H_Spring_KIZAKI:s-morimto 2026_09_5H_Spring_KIZAKI:s-kikuchi
..
compare: 2026_09_5H_Spring_KIZAKI:s-kikuchi
Branches Tags
2026_09_5H_Spring_KIZAKI:master 2026_09_5H_Spring_KIZAKI:n-kawahito 2026_09_5H_Spring_KIZAKI:s-choi 2026_09_5H_Spring_KIZAKI:s-morimoto 2026_09_5H_Spring_KIZAKI:k-oshita 2026_09_5H_Spring_KIZAKI:k-kobayashi 2026_09_5H_Spring_KIZAKI:s-morimto 2026_09_5H_Spring_KIZAKI:s-kikuchi

1 Commits
54512e411a ... s-kikuchi

Author SHA1 Message Date
ITC-PC-105\s-kikuchi
5f9287765d テスト 2026-09-17 10:25:14 +09:00
38 changed files with 0 additions and 1299 deletions
Expand all files Collapse all files

0
kikuchi.txt Normal file
View File

20
src/main/java/com/example/demo/app/domain/model/AnalysisModel.java
View File

@@ -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;
}

21
src/main/java/com/example/demo/app/domain/model/CategoryAnalysisModel.java
View File

@@ -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 previousMonthDifferenceAmount;
private Integer courseLimitAmount;
private Integer courseDifferenceAmount;
}

30
src/main/java/com/example/demo/app/domain/model/CategoryModel.java
View File

@@ -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();
}
}

10
src/main/java/com/example/demo/app/domain/model/LoginModel.java
View File

@@ -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;
}

38
src/main/java/com/example/demo/app/domain/model/TransactionModel.java
View File

@@ -1,38 +0,0 @@
package com.example.demo.app.domain.model;
import java.time.LocalDate;
import java.util.List;
import com.example.demo.app.infra.entity.TransactionEntity;
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();
}
}

25
src/main/java/com/example/demo/app/domain/model/UserModel.java
View File

@@ -1,25 +0,0 @@
package com.example.demo.app.domain.model;
import java.time.LocalDate;
import lombok.AllArgsConstructor;
import lombok.Getter;
@Getter
@AllArgsConstructor
public class UserModel {
private Long userId;
private String userName;
private String emailAddress;
private String password;
private Integer secretQuestionId;
private String secretAnswer;
private LocalDate brithDate;
private Integer saving;
private Integer annualIncome;
private Integer monthlyBudget;
private Integer goalId;
private Integer courseId;
private Integer deleteFlag;
}

9
src/main/java/com/example/demo/app/domain/service/AnalysisService.java
View File

@@ -1,9 +0,0 @@
package com.example.demo.app.domain.service;
import com.example.demo.app.domain.model.AnalysisModel;
public interface AnalysisService {
AnalysisModel getAnalysis(Long userId);
}

39
src/main/java/com/example/demo/app/domain/service/AnalysisServiceImpl.java
View File

@@ -1,39 +0,0 @@
package com.example.demo.app.domain.service;
import org.springframework.stereotype.Service;
import com.example.demo.app.domain.model.AnalysisModel;
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) {
// ユーザー情報取得、月別使用可能資金取得
// 今月の期間取得
// 前月の期間取得
// 今月の支出取得
// 前月の支出取得
// コース配分取得
// カテゴリ別集計
// 前月との差額集計
//総支出算出
// コース限度額算出、コース別差額算出
// CategoryAnalysisModel生成
// AnalysisModelの生成
return null;
}
}

12
src/main/java/com/example/demo/app/domain/service/CategoryService.java
View File

@@ -1,12 +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);
}

9
src/main/java/com/example/demo/app/domain/service/LoginService.java
View File

@@ -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);
}

19
src/main/java/com/example/demo/app/domain/service/TransactionService.java
View File

@@ -1,19 +0,0 @@
package com.example.demo.app.domain.service;
import java.time.LocalDate;
import java.util.List;
import java.util.Map;
import com.example.demo.app.domain.model.TransactionModel;
public interface TransactionService {
public Map<LocalDate, List<TransactionModel>> findAllByDate(LocalDate startDate, LocalDate endDate, Long userId);
public List<TransactionModel> findByUserIdAndDate(LocalDate todayDate, Long userId);
public int findTotalIncome(LocalDate startDate, LocalDate endDate, Long userId);
public int findTotalexpense(LocalDate startDate, LocalDate endDate, Long userId);
}

39
src/main/java/com/example/demo/app/domain/service/impl/CategoryServiceImpl.java
View File

@@ -1,39 +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());
}
}

31
src/main/java/com/example/demo/app/domain/service/impl/LoginServiceImpl.java
View File

@@ -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());
}
}

55
src/main/java/com/example/demo/app/domain/service/impl/TransactionServiceImpl.java
View File

@@ -1,55 +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.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.TransactionEntity;
import com.example.demo.app.infra.repository.TransactionRepository;
import lombok.RequiredArgsConstructor;
@Service
@RequiredArgsConstructor
public class TransactionServiceImpl implements TransactionService {
private final TransactionRepository transactionRepository;
public Map<LocalDate, List<TransactionModel>> findAllByDate(LocalDate startDate, LocalDate endDate, Long userId) {
List<TransactionEntity> transactionEntityList = transactionRepository.findAllByDateAndUserId(startDate, endDate,
userId);
List<TransactionModel> transactionModelList = TransactionModel
.convertFrom(transactionEntityList);
Map<LocalDate, List<TransactionModel>> transactionModelMap = transactionModelList.stream()
.collect(Collectors.groupingBy(TransactionModel::getTransactionDate));
return transactionModelMap;
}
public int findTotalIncome(LocalDate startDate, LocalDate endDate, Long userId) {
return transactionRepository.findTotalIncome(startDate, endDate, userId);
}
public int findTotalexpense(LocalDate startDate, LocalDate endDate, Long userId) {
return transactionRepository.findTotalIncome(startDate, endDate, userId);
}
public List<TransactionModel> findByUserIdAndDate(LocalDate todayDate, Long userId) {
return TransactionModel.convertFrom(transactionRepository.findByUserIdAndDate(todayDate, userId));
}
}

36
src/main/java/com/example/demo/app/infra/entity/AllocationEntity.java
View File

@@ -1,36 +0,0 @@
package com.example.demo.app.infra.entity;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.FetchType;
import jakarta.persistence.Id;
import jakarta.persistence.JoinColumn;
import jakarta.persistence.ManyToOne;
import jakarta.persistence.OneToOne;
import jakarta.persistence.Table;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@Entity
@Table(name = "allocation")
@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;
}

40
src/main/java/com/example/demo/app/infra/entity/CategoryEntity.java
View File

@@ -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")
@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;
}

44
src/main/java/com/example/demo/app/infra/entity/CourseEntity.java
View File

@@ -1,44 +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.OneToMany;
import jakarta.persistence.OneToOne;
import jakarta.persistence.Table;
import org.springframework.data.annotation.Id;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@Entity
@Table(name = "course")
@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;
@OneToOne(mappedBy = "courseEntity")
private List<AllocationEntity> allocationEntity;
}

47
src/main/java/com/example/demo/app/infra/entity/GoalEntity.java
View File

@@ -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")
@Data
@NoArgsConstructor
@AllArgsConstructor
public class GoalEntity {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "goal_id")
private Integer goalId;
@Column(name = "goal_title", nullable = true)
private String goalTitle;
@Column(name = "goal_subtitle", nullable = true)
private String goalSubtitle;
@Column(name = "target_amount", nullable = false)
private Integer targetAmount;
@Column(name = "deadline", nullable = false)
private LocalDate deadline;
@Column(name = "goal_complete", nullable = false)
private Integer goalComplete;
@OneToOne(mappedBy = "goalEntity")
private UserEntity userEntity;
}

35
src/main/java/com/example/demo/app/infra/entity/QuestionEntity.java
View File

@@ -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")
@Data
@NoArgsConstructor
@AllArgsConstructor
public class QuestionEntity {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "secret_question_id")
private Integer secretQuestionId;
@Column(name = "question_text", nullable = false)
private String questionText;
@OneToMany(mappedBy = "QuestionEntity")
private List<UserEntity> userEntity;
}

45
src/main/java/com/example/demo/app/infra/entity/TransactionEntity.java
View File

@@ -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")
@Data
@NoArgsConstructor
@AllArgsConstructor
public class TransactionEntity {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "transaction_id")
private Long transactionId;
@Column(name = "amount", nullable = false)
private Integer amount;
@Column(name = "transaction_date", nullable = false)
private LocalDate transactionDate;
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "user_id")
private UserEntity userEntity;
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "category_id")
private CategoryEntity categoryEntity;
}

76
src/main/java/com/example/demo/app/infra/entity/UserEntity.java
View File

@@ -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;
}

9
src/main/java/com/example/demo/app/infra/repository/AllocationRepository.java
View File

@@ -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.AllocationEntity;
public interface AllocationRepository extends JpaRepository<AllocationEntity, Long>{
}

9
src/main/java/com/example/demo/app/infra/repository/CategoryRepository.java
View File

@@ -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.CategoryEntity;
public interface CategoryRepository extends JpaRepository<CategoryEntity, Long> {
}

9
src/main/java/com/example/demo/app/infra/repository/CourseRepository.java
View File

@@ -1,9 +0,0 @@
package com.example.demo.app.infra.repository;
import org.springframework.data.jpa.repository.JpaRepository;
import com.example.demo.app.infra.entity.CourseEntity;
public interface CourseRepository extends JpaRepository<CourseEntity, Long> {
}

9
src/main/java/com/example/demo/app/infra/repository/QuestionRepository.java
View File

@@ -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> {
}

25
src/main/java/com/example/demo/app/infra/repository/TransactionRepository.java
View File

@@ -1,25 +0,0 @@
package com.example.demo.app.infra.repository;
import java.time.LocalDate;
import java.util.List;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import com.example.demo.app.infra.entity.TransactionEntity;
public interface TransactionRepository extends JpaRepository<TransactionEntity, Long> {
@Query("select t from TransactionEntity t where t.userEntity.userId = :userId and t.transactionDate = :transactionDate")
public List<TransactionEntity> findByUserIdAndDate(LocalDate todayDate, Long userId);
@Query("select t from TransactionEntity t where (t.transactionDate between :startDate and :endDate) and (t.userId = :userId) order by t.transactionDate asc")
public List<TransactionEntity> findAllByDateAndUserId(LocalDate startDate, LocalDate endDate, Long userId);
@Query("select sum(t.amount) from TransactionEntity t inner join CategoryEntity c on t.categoryId = c.categoryId where (t.userId = :userId and t.transactionDate between :startDate and :endDate) and c.transactionType = 0")
public Integer findTotalExpense(LocalDate startDate, LocalDate endDate, Long userId);
@Query("select sum(t.amount) from TransactionEntity t inner join CategoryEntity c on t.categoryId = c.categoryId where (t.userId = :userId and t.transactionDate between :startDate and :endDate) and c.transactionType = 1")
public Integer findTotalIncome(LocalDate startDate, LocalDate endDate, Long userId);
}

20
src/main/java/com/example/demo/app/infra/repository/UserRepository.java
View File

@@ -1,20 +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);
}

30
src/main/java/com/example/demo/app/presentation/controller/AnalysisController.java
View File

@@ -1,30 +0,0 @@
package com.example.demo.app.presentation.controller;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping;
import com.example.demo.app.domain.service.AnalysisService;
import lombok.RequiredArgsConstructor;
@Controller
@RequiredArgsConstructor
public class AnalysisController {
private final AnalysisService analysisService;
@GetMapping("/analysis")
public String showAnalysis(Model model) {
//ログインユーザーの取得（セッション）
//分析結果の取得(Service)
//model格納
return "analysis";
}
}

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

@@ -1,55 +0,0 @@
package com.example.demo.app.presentation.controller;
import jakarta.servlet.http.HttpSession;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.PostMapping;
import com.example.demo.app.domain.model.LoginModel;
import com.example.demo.app.domain.service.LoginService;
import com.example.demo.app.presentation.form.LoginForm;
import lombok.RequiredArgsConstructor;
@Controller
@RequiredArgsConstructor
public class LoginController {
private final LoginService loginService;
@GetMapping("/login")
public String showLogin(Model model) {
model.addAttribute(
"loginForm",
new LoginForm());
return "login";
}
@PostMapping("/login")
public String login(
@ModelAttribute LoginForm loginForm,
Model model,
HttpSession session) {
LoginModel loginModel = loginService.login(
loginForm.getMailAddress(),
loginForm.getPassword());
if (loginModel == null) {
model.addAttribute(
"errorMessage",
"Email address or password is incorrect.");
return "login";
}
session.setAttribute("loginUser", loginModel);
return "menu";
}
}

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

@@ -1,83 +0,0 @@
package com.example.demo.app.presentation.controller;
import java.time.LocalDate;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import jakarta.servlet.http.HttpSession;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestParam;
import com.example.demo.app.domain.service.CategoryService;
import com.example.demo.app.domain.service.TransactionService;
import com.example.demo.app.presentation.form.CategoryForm;
import com.example.demo.app.presentation.form.TransactionForm;
import lombok.RequiredArgsConstructor;
@Controller
@RequiredArgsConstructor
public class TransactionController {
private final TransactionService transactionService;
private final CategoryService categoryService;
// 一覧画面
@GetMapping("/transaction/list")
public String transactionList(@RequestParam LocalDate startDate, @RequestParam LocalDate endDate, Model model,
HttpSession session) {
LoginUser loginUser = (LoginUser) session.getAttribute("loginUser");
Map<LocalDate, List<TransactionForm>> transactionFormMap = new HashMap<>();
transactionService.findAll(startDate, endDate, loginUser.getUserId).forEach((date, list) -> {
List<TransactionForm> transactionFormList = list.stream().map(transaction -> {
TransactionForm transactionForm = TransactionForm.convertFrom(
transaction,
CategoryForm.convertFrom(categoryService.findOne(transaction.getCategoryId())).getCategoryName(),
transactionService.findTotalexpense(startDate, endDate, loginUser.getUserId),
transactionService.findTotalIncome(startDate, endDate, loginUser.getUserId),
CategoryForm.convertFrom(categoryService.findOne(transaction.getCategoryId())).getTransactionType()
);
return transactionForm;
}).collect(Collectors.toList());
transactionFormMap.put(date, transactionFormList);
});
model.addAttribute("transactionFormMap", transactionFormMap);
return "transactionList";
}
// 詳細画面
@GetMapping()
public String findOne(@RequestParam LocalDate todayDate, Model model, HttpSession session) {
LoginUser loginUser = (LoginUser) session.getAttribute("loginUser");
List<TransactionForm> transactionFormList = transactionService.findByUserIdAndDate(todayDate, ((LoginUser)session.getAttribute("loginUser")).getUserId).stream().map(transaction -> {
TransactionForm transactionForm = TransactionForm.convertFrom(
transaction,
CategoryForm.convertFrom(categoryService.findOne(transaction.getCategoryId())).getCategoryName(),
transactionService.findTotalexpense(todayDate, todayDate, loginUser.getUserId),
transactionService.findTotalIncome(todayDate, todayDate, loginUser.getUserId),
CategoryForm.convertFrom(categoryService.findOne(transaction.getCategoryId())).getTransactionType()
);
return transactionForm;
}).collect(Collectors.toList());
model.addAttribute("transactionFormList", transactionFormList);
return "";
}
}

28
src/main/java/com/example/demo/app/presentation/form/CategoryForm.java
View File

@@ -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();
}
}

15
src/main/java/com/example/demo/app/presentation/form/LoginForm.java
View File

@@ -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;
}

61
src/main/java/com/example/demo/app/presentation/form/TransactionForm.java
View File

@@ -1,61 +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());
}
}

5
src/main/java/com/example/demo/utility/Constant.java
View File

@@ -1,5 +0,0 @@
package com.example.demo.utility;
public class Constant {
}

47
src/main/resources/templates/login.html
View File

@@ -1,47 +0,0 @@
<!DOCTYPE html>
<html lang="ja"xmlns:th="http://www.thymeleaf.org">
<head>
<meta charset="UTF-8">
<title>ログイン</title>
</head>
<body>
<header></header>
<main>
<h1>ログイン</h1>
<div th:if="${errorMessage}" th:text="${errorMessage}"></div>
<form th:action="@{/login}" th:object="${loginForm}" method="post">
<div>
<label for="emailAddress">メールアドレス</label>
<input type="email"
id="emailAddress"
th:field="{emailAddress}"
required>
</div>
<div>
<label for="password">パスワード</label>
<input type="password"
id="password"
th:field="{password}"
required>
</div>
<div>
<button type="submit">ログイン</button>
</div>
</form>
<div>
<a href="@{user/register}">新規会員登録</a>
</div>
<div>
<a href="@{password/authentication}">パスワードを忘れた方</a>
</div>
</main>
</body>
</html>

136
src/main/resources/templates/user_register.html
View File

@@ -1,136 +0,0 @@
<!DOCTYPE html>
<html lang="ja"xmlns:th="http://www.thymeleaf.org">
<head>
<meta charset="UTF-8">
<title>新規会員登録</title>
</head>
<body>
<header></header>
<main>
<h1>新規会員登録</h1>
<form th:action="@{/user/register/confirm}" th:object="${userForm}" method="post">
<div>
<label for="userName">氏名</label>
<input type="text"
id="userName"
th:field="*{userName}"
maxlength="100"
required>
</div>
<div>
<label for="mailAddress">メールアドレス</label>
<input type="email"
id="mailAddress"
th:field="*{mailAddress}"
maxlength="255"
required>
</div>
<div>
<label for="birthDate">生年月日</label>
<input type="date"
id="birthDate"
th:field="*{birthDate}"
required>
</div>
<div>
<label for="password">パスワード</label>
<input type="password"
id="password"
th:field="*{password}"
minlength="8"
maxlength="255"
required>
</div>
<div>
<label for="secretQuestionId">秘密の質問</label>
<select id="secretQuestionId"
th:field="*{secretQuestionId}"
required>
<option value="">選択してください</option>
<option th:each="question : ${questionList}"
th:value="${question.secretQuestionId}"
th:text="${question.questionText}">
</option>
</select>
</div>
<div>
<label for="secretAnswer">秘密の質問の回答</label>
<input type="text"
id="secretAnswer"
th:field="*{secretAnswer}"
maxlength="100"
required>
</div>
<div>
<label for="saving">貯蓄金</label>
<input type="number"
id="saving"
th:field="*{saving}"
min="0"
required>
</div>
<div>
<label for="annualIncome">年収</label>
<input type="number"
id="annualIncome"
th:field="*{annualIncome}"
min="0"
required>
</div>
<div>
<label for="monthlyBudget">月別使用可能金額</label>
<input type="number"
id="monthlyBudget"
th:field="*{monthlyBudget}"
min="0"
required>
</div>
<div>
<label for="goalId">目標</label>
<select id="goalId"
th:field="*{goalId}"
required>
<option value="">選択してください</option>
<option th:each="goal : ${goalList}"
th:value="${goal.goalId}"
th:text="${goal.goalTitle}">
</option>
</select>
</div>
<div>
<label for="courseId">コース</label>
<select id="courseId"
th:field="*{courseId}"
required>
<option value="">選択してください</option>
<option th:each="course : ${courseList}"
th:value="${course.courseId}"
th:text="${course.courseName}">
</option>
</select>
</div>
<div>
<button type="submit">作成</button>
</div>
</form>
<form th:action="@{/login}" method="get">
<button type="submit">戻る</button>
</form>
</main>
</body>
</html>

78
src/main/resources/templates/user_register_confirm.html
View File

@@ -1,78 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<title>新規会員登録確認</title>
</head>
<body>
<header></header>
<main>
<h1>新規会員登録確認</h1>
<div>
<p>氏名</p>
<p th:text="${session.userForm.userName}" readonly></p>
</div>
<div>
<p>メールアドレス</p>
<p th:text="${session.userForm.mailAddress}" readonly></p>
</div>
<div>
<p>生年月日</p>
<p th:text="${session.userForm.barthDate}" readonly></p>
</div>
<div>
<p>パスワード</p>
<p>********</p>
</div>
<div>
<p>秘密の質問</p>
<p th:text="${session.userForm.secretQuestionId}" readonly></p>
</div>
<div>
<p>秘密の質問の回答</p>
<p th:text="${session.userForm.secretAnswer}" readonly></p>
</div>
<div>
<p>貯蓄金</p>
<p th:text="${session.userForm.saving}" readonly></p>
</div>
<div>
<p>年収</p>
<p th:text="${session.userForm.annualIncome}" readonly></p>
</div>
<div>
<p>月別使用可能額</p>
<p th:text="${session.userForm.monthlyBudget}" readonly></p>
</div>
<div>
<p>目標</p>
<p th:text="${session.userForm.goalId}" readonly></p>
</div>
<div>
<p>コース</p>
<p th:text="${session.userForm.courseId}" readonly></p>
</div>
<div>
<form th:action="@{/user/register}" method="get">
<button type="submit">戻る</button>
</form>
</div>
<form th:action="@{/user/register/complete}" method="post">
<button type="submit">確定</button>
</form>
</main>
</body>
</html>