Merge remote-tracking branch 'origin/k-kobayashi' into s-choi

This reverts commit 67cd3e27ca.

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

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

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

@@ -0,0 +1,21 @@
+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;
+}

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

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

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

@@ -0,0 +1,22 @@
+package com.example.demo.app.domain.model;
+
+import java.time.LocalDate;
+
+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;
+	
+}

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

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

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

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

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

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

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

@@ -0,0 +1,5 @@
+package com.example.demo.app.domain.service;
+
+public interface TransactionService {
+
+}

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

@@ -0,0 +1,25 @@
+package com.example.demo.app.domain.service.impl;
+
+import java.util.List;
+
+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.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());
+		
+	}
+	
+}

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

@@ -0,0 +1,10 @@
+package com.example.demo.app.domain.service.impl;
+
+import org.springframework.stereotype.Service;
+
+import com.example.demo.app.domain.service.TransactionService;
+
+@Service
+public class TransactionServiceImpl implements TransactionService{
+
+}

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

@@ -0,0 +1,36 @@
+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;
+
+}

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

@@ -0,0 +1,40 @@
+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;
+}

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

@@ -0,0 +1,44 @@
+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;
+	 
+}

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

@@ -0,0 +1,47 @@
+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;
+
+}

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

@@ -0,0 +1,35 @@
+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;
+	
+}

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

@@ -0,0 +1,45 @@
+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;
+
+}

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

@@ -0,0 +1,76 @@
+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")
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class UserEntity {
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name = "user_id")
+	private Integer 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> transactionEntity;
+	
+	@ManyToOne(fetch = FetchType.LAZY)
+	@JoinColumn(name = "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;
+	
+}

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,30 @@
+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";
+	}
+	
+}

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

@@ -0,0 +1,17 @@
+package com.example.demo.app.presentation.controller;
+
+import org.springframework.stereotype.Controller;
+
+import com.example.demo.app.domain.service.TransactionService;
+
+import lombok.RequiredArgsConstructor;
+
+@Controller
+@RequiredArgsConstructor
+public class TransactionController {
+	
+	private final TransactionService transactionService;
+	
+	
+	
+}

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

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

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

@@ -0,0 +1,40 @@
+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;
+
+	public static TransactionForm convertFrom(TransactionModel transactionModel) {
+		return new TransactionForm(
+				transactionModel.getTransactionId(),
+				transactionModel.getUserId(),
+				transactionModel.getCategoryId(),
+				transactionModel.getAmount(),
+				transactionModel.getTransactionDate());
+	}
+
+	public static List<TransactionForm> convertFrom(List<TransactionModel> transactionModelList) {
+		return transactionModelList.stream().map(TransactionForm::convertFrom).toList();
+	}
+
+}

src/main/java/com/example/demo/utility/Constant.java

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