Merge branch 's-morimto' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into k-kobayashi

# Conflicts:
#	src/main/java/com/example/demo/app/presentation/controller/UserController.java
#	src/main/resources/templates/login.html
#	src/main/resources/templates/password_reset.html

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

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

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

@@ -5,6 +5,8 @@ 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 {
 
@@ -14,10 +16,16 @@ public interface TransactionService {
 	
 	public int findTotalIncome(LocalDate startDate, LocalDate endDate, Long userId);
 	
-	public int findTotalexpense(LocalDate startDate, LocalDate endDate, Long userId);
+	public int findTotalExpense(LocalDate startDate, LocalDate endDate, Long userId);
 	
 	public int createTransaction(TransactionModel transactionModel);
 	
 	public int updateTransaction(TransactionModel transactionModel);
 	
+	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);
+	
 }

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

@@ -1,8 +0,0 @@
-package com.example.demo.app.domain.service;
-
-import com.example.demo.app.presentation.form.UserForm;
-
-public interface UserService {
-
-    void register(UserForm userForm);
-}

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

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

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

@@ -16,6 +16,8 @@ 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;
 
@@ -27,19 +29,38 @@ public class TransactionServiceImpl implements TransactionService {
 	private final UserRepository userRepository;
 	private final CategoryRepository categoryRepository;
 
-	public Map<LocalDate, List<TransactionModel>> findAllByDate(LocalDate startDate, LocalDate endDate, Long userId) {
+	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);
 
-		List<TransactionModel> transactionModelList = TransactionModel
-				.convertFrom(transactionEntityList);
+		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));
+				.collect(Collectors.groupingBy(
+						TransactionModel::getTransactionDate));
+
+		System.out.println("Map = " + transactionModelMap);
 
 		return transactionModelMap;
-
 	}
 
 	public int findTotalIncome(LocalDate startDate, LocalDate endDate, Long userId) {
@@ -48,9 +69,21 @@ public class TransactionServiceImpl implements TransactionService {
 
 	}
 
-	public int findTotalexpense(LocalDate startDate, LocalDate endDate, Long userId) {
+	public int findTotalExpense(LocalDate startDate, LocalDate endDate, Long userId) {
 
-		return transactionRepository.findTotalIncome(startDate, endDate, 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);
 
 	}
 
@@ -91,7 +124,7 @@ public class TransactionServiceImpl implements TransactionService {
 		if (!transactionRepository.existsById(transactionModel.getTransactionId())) {
 			return -1;
 		}
-		
+
 		Optional<UserEntity> userEntityOptional = userRepository.findById(transactionModel.getUserId());
 
 		if (userEntityOptional.isEmpty()) {
@@ -115,4 +148,9 @@ public class TransactionServiceImpl implements TransactionService {
 		}
 
 	}
+
+	public void deleteTransaction(Long transactionId) {
+		transactionRepository.deleteById(transactionId);
+	}
+
 }

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

@@ -1,58 +0,0 @@
-package com.example.demo.app.domain.service.impl;
-
-import org.springframework.stereotype.Service;
-
-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) {
-
-        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.setAnnualIncome(userForm.getAnnualIncome());
-        userEntity.setMonthlyBudget(userForm.getMonthlyBudget());
-
-        QuestionEntity questionEntity =
-                questionRepository.findById(userForm.getSecretQuestionId()).orElse(null);
-
-        GoalEntity goalEntity =
-                goalRepository.findById(userForm.getGoalId()).orElse(null);
-
-        CourseEntity courseEntity =
-                courseRepository.findById(userForm.getCourseId()).orElse(null);
-
-        userEntity.setQuestionEntity(questionEntity);
-        userEntity.setGoalEntity(goalEntity);
-        userEntity.setCourseEntity(courseEntity);
-
-        userEntity.setDeleteFlag(0);
-
-        userRepository.save(userEntity);
-    }
-}

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

@@ -7,21 +7,31 @@ 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 = :transactionDate")
+	@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 sum(t.amount) from TransactionEntity t inner join CategoryEntity c on t.categoryEntity.categoryId = c.categoryId where (t.userEntity.userId = :userId and t.transactionDate between :startDate and :endDate) and c.transactionType = 0")
+	@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 sum(t.amount) from TransactionEntity t inner join CategoryEntity c on t.categoryEntity.categoryId = c.categoryId where (t.userEntity.userId = :userId and t.transactionDate between :startDate and :endDate) and c.transactionType = 1")
+	@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 sum(t.amount) from TransactionEntity t where t.userEntity.userId = :userId and t.categoryEntity.categoryId = :categoryId and t.transactionDate between :startDate and :endDate")
+	@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);
+	
+	
 }

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

@@ -24,15 +24,15 @@ public class AnalysisController {
 	public String showAnalysis(Model model, HttpSession session) {
 		
 		//ログインユーザーの取得（セッション）
-		LoginModel loginUser = (LoginModel) session.getAttribute("loginUser");
-		
+        LoginModel loginUser = (LoginModel) session.getAttribute("loginUser");
+        
 		//分析結果の取得(Service)
-		AnalysisModel analysisModel = analysisService.getAnalysis(loginUser.getUserId());
-		
-		AnalysisForm analysisForm = AnalysisForm.convertFrom(analysisModel);
-
+        AnalysisModel analysisModel = analysisService.getAnalysis(loginUser.getUserId());
+        
+        AnalysisForm analysisForm = AnalysisForm.convertFrom(analysisModel);
+        
 		//model格納
-		model.addAttribute("analysisForm", analysisForm);
+        model.addAttribute("analysisForm", analysisForm);
 		
 		return "analysis";
 	}

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

@@ -21,11 +21,7 @@ public class LoginController {
     private final LoginService loginService;
 
     @GetMapping("/login")
-    public String showLogin(Model model) {
-
-        model.addAttribute(
-                "loginForm",
-                new LoginForm());
+    public String showLogin(@ModelAttribute LoginForm loginForm) {
 
         return "login";
     }
@@ -50,6 +46,7 @@ public class LoginController {
 
         session.setAttribute("loginUser", loginModel);
 
-        return "menu";
+        return "redirect:/menu";
     }
+    
 }

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

@@ -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.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) {
-            return "redirect:/login";
-        }
-
-        boolean isReset =
-                passwordResetService.resetPassword(
-                        userId,
-                        passwordResetForm);
-
-        if (!isReset) {
-            model.addAttribute(
-                    "errorMessage",
-                    "パスワードが一致していません。");
-
-            return "password_reset";
-        }
-
-        session.removeAttribute("passwordResetUserId");
-
-        return "redirect:/login";
-    }
-}

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

@@ -1,6 +1,7 @@
 package com.example.demo.app.presentation.controller;
 
 import java.time.LocalDate;
+import java.time.YearMonth;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -19,6 +20,8 @@ import com.example.demo.app.domain.model.LoginModel;
 import com.example.demo.app.domain.service.CategoryService;
 import com.example.demo.app.domain.service.TransactionService;
 import com.example.demo.app.presentation.form.CategoryForm;
+import com.example.demo.app.presentation.form.Expense;
+import com.example.demo.app.presentation.form.Income;
 import com.example.demo.app.presentation.form.TransactionForm;
 
 import lombok.RequiredArgsConstructor;
@@ -29,8 +32,8 @@ public class TransactionController {
 
 	private final TransactionService transactionService;
 	private final CategoryService categoryService;
-	// 一覧画面
 
+	// 一覧画面
 	@GetMapping("/transaction/list")
 	public String transactionList(@RequestParam(required = false) LocalDate startDates,
 			@RequestParam(required = false) LocalDate endDates, Model model,
@@ -47,19 +50,24 @@ public class TransactionController {
 
 		transactionService.findAllByDate(startDate, endDate, loginUser.getUserId()).forEach((date, list) -> {
 			List<TransactionForm> transactionFormList = list.stream().map(transaction -> {
+				System.out.println(transaction.getTransactionDate());
 				TransactionForm transactionForm = TransactionForm.convertFrom(
 						transaction,
 						CategoryForm.convertFrom(categoryService.findOne(transaction.getCategoryId()))
 								.getCategoryName(),
-						transactionService.findTotalexpense(startDate, endDate, loginUser.getUserId()),
+						transactionService.findTotalExpense(startDate, endDate, loginUser.getUserId()),
 						transactionService.findTotalIncome(startDate, endDate, loginUser.getUserId()),
 						CategoryForm.convertFrom(categoryService.findOne(transaction.getCategoryId()))
 								.getTransactionType());
+				System.out.println("startDate = " + startDate);
+				System.out.println("endDate = " + endDate);
 				return transactionForm;
 			}).collect(Collectors.toList());
 			transactionFormMap.put(date, transactionFormList);
 		});
-
+		
+		
+		
 		model.addAttribute("transactionFormMap", transactionFormMap);
 
 		return "transaction_list";
@@ -81,32 +89,40 @@ public class TransactionController {
 							transaction,
 							CategoryForm.convertFrom(categoryService.findOne(transaction.getCategoryId()))
 									.getCategoryName(),
-							transactionService.findTotalexpense(todayDate, todayDate, loginUser.getUserId()),
+							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("today", todayDate);
 		model.addAttribute("transactionFormList", transactionFormList);
 
-		return "";
+		return "transaction_detail";
 	}
 
 	@GetMapping("/transaction/create")
-	public String createOneGet(@ModelAttribute TransactionForm transactionForm) {
+	public String createOneGet(@ModelAttribute TransactionForm transactionForm, @RequestParam LocalDate today, Model model) {
 
-		return "";
+		List<CategoryForm> categoryFormList = CategoryForm.convertFrom(categoryService.findAll());
+		
+		model.addAttribute("categoryFormList", categoryFormList);
+		model.addAttribute("today", today);
+		
+		return "transaction_create";
 	}
 
 	@PostMapping("/transaction/create")
-	public String createOnePost(@ModelAttribute TransactionForm transactionForm, Model model) {
-
+	public String createOnePost(@ModelAttribute TransactionForm transactionForm, @RequestParam LocalDate today, Model model, HttpSession session) {
+		LoginModel loginUser = (LoginModel) session.getAttribute("loginUser");
+		transactionForm.setUserId(loginUser.getUserId());
+		transactionForm.setTransactionDate(today);
 		if (transactionService.createTransaction(TransactionForm.convertTo(transactionForm)) != 0) {
 			return "error";
 		}
 
-		return "";
+		return "redirect:/transaction/detail?todayDates=" + today;
 
 	}
 
@@ -127,4 +143,62 @@ public class TransactionController {
 
 	}
 
+	@PostMapping("/transaction/delete")
+	public String deleteOne(@RequestParam Long transactionId, @RequestParam LocalDate today) {
+		
+		transactionService.deleteTransaction(transactionId);
+		return "redirect:/transaction/detail?todayDates=" + today;
+	}
+	
+	@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);
+
+		System.out.println("year : " + year + "month : " + month);
+		
+        YearMonth yearMonth = YearMonth.of(year, month);
+        
+        int lastDay = yearMonth.lengthOfMonth();
+
+        int firstDayOfWeek =
+                yearMonth.atDay(1).getDayOfWeek().getValue() % 7;
+
+        model.addAttribute("year", year);
+        model.addAttribute("month", month);
+        model.addAttribute("day", today.getDayOfMonth());
+
+        model.addAttribute("lastDay", lastDay);
+        model.addAttribute("firstDayOfWeek", firstDayOfWeek);
+
+        LocalDate startDate = LocalDate.now().withDayOfMonth(1);
+
+		LocalDate endDate = LocalDate.now().withDayOfMonth(LocalDate.now().lengthOfMonth());
+        
+        
+		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);
+		
+		
+    	return "menu";
+    }
+	
+	
 }

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

@@ -13,20 +13,23 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 public class AnalysisForm {
 
-	private Integer currentMonthTotalAmount;
-	private Integer previousMonthTotalAmount;
-	private Integer totalDifferenceAmount;
-	private List<CategoryAnalysisForm> categoryAnalysisFormList;
-	
-	public static AnalysisForm convertFrom(
-	        AnalysisModel analysisModel) {
+    private Integer currentMonthTotalAmount;
 
-	    return new AnalysisForm(
-	            analysisModel.getCurrentMonthTotalAmount(),
-	            analysisModel.getPreviousMonthTotalAmount(),
-	            analysisModel.getTotalDifferenceAmount(),
-	            CategoryAnalysisForm.convertFrom(
-	                    analysisModel.getCategoryAnalysisModelList()));
-	}
+    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()));
+    }
 }

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

@@ -12,8 +12,8 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 @NoArgsConstructor
 public class CategoryAnalysisForm {
-	
-	private String categoryName;
+
+    private String categoryName;
 
     private Integer currentMonthAmount;
 
@@ -24,25 +24,24 @@ public class CategoryAnalysisForm {
     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();
-    		}
 
+    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();
+    }
 }

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

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

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

@@ -1,5 +1,7 @@
 package com.example.demo.app.presentation.form;
 
+import java.time.LocalDate;
+
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -7,7 +9,9 @@ import lombok.NoArgsConstructor;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class PasswordResetForm {
-    private String password;
-    private String passwordConfirm;
+public class Income {
+
+	private LocalDate date;
+    private Long amount;
+
 }

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

@@ -1,24 +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 UserForm {
-    private String userName;
-    private String mailAddress;
-    private String password;
-    private Long secretQuestionId;
-    private String SecretAnswer;
-    private LocalDate birthDate;
-    private Integer saving;
-    private Integer annualIncome;
-    private Integer monthlyBudget;
-    private Long goalId;
-    private Long courseId;
-}

src/main/resources/application.properties

@@ -1,6 +1,6 @@
 spring.application.name=Monegement
 
-spring.datasource.url=jdbc:mysql://localhost:3306/springdb
+spring.datasource.url=jdbc:mysql://localhost:3306/rezo_spring
 spring.datasource.username=rezouser
 spring.datasource.password=Rezo_0000
 

src/main/resources/static/css/menu.css

@@ -0,0 +1,15 @@
+table, th, td {border: 1px solid black; border-collapse: collapse;}
+
+td:hover{background-color: lightblue;}
+
+th{font-weight: bold; height: 50px;}
+
+td{text-align: left; vertical-align: text-top; width: 200px; height: 100px; padding: 10px}
+
+.holiday{color: red;}
+
+#today{font-weight: bold; background-color: bisque;}
+
+.year{font-size: 30px;}
+
+.month{font-size: 50px; font-weight: bold;}

src/main/resources/templates/analysis.html

@@ -1,18 +1,21 @@
 <!DOCTYPE html>
 <html xmlns:th="http://www.thymeleaf.org">
 <head>
-<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
+<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">
 </head>
 <body>
 	
+	<div th:replace="~{header :: header}">
+	</div>
+	
 	<h2 class="text-center">支出分析</h2>
 	
 	<table class="table text-center">
         <thead>
 	        <tr>
-                <th scope="col"></th>
+                <th scope="col">カテゴリ別</th>
 			    <th scope="col">支出</th>
 			    <th scope="col">前月比</th>
 			</tr>
@@ -42,11 +45,7 @@
 	    <tr>
 	      <th scope="col">カテゴリ別</th>
 	      <th scope="col">支出</th>
-	      <th scope="col">
-			前月比
-			<br>
-			コース比
-		  </th>
+	      <th scope="col">前月比<br>コース比</th>
 	    </tr>
 	  </thead>
 	  <tbody>

src/main/resources/templates/header.html

@@ -0,0 +1,29 @@
+<!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>
+	
+	<header th:fragment="header">
+
+		<nav class="navbar" 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>

src/main/resources/templates/login.html

@@ -13,10 +13,9 @@
 		<div th:if="${errorMessage}" th:text="${errorMessage}"></div>
 		<form th:action="@{/login}" th:object="${loginForm}" method="post">
 			<div>
-				<label for="mailAddress">メールアドレス</label>
+				<label for="emailAddress">メールアドレス</label>
 				
 				<input type="email"
-				id="mailAddress"
 				th:field="*{mailAddress}"
 				required>
 			</div>
@@ -25,7 +24,6 @@
 				<label for="password">パスワード</label>
 				
 				<input type="password"
-				id="password"
 				th:field="*{password}"
 				required>
 			</div>
@@ -36,11 +34,11 @@
 		</form>
 		
 		<div>
-			<a th:href="@{user/register}">新規会員登録</a>
+			<a href="@{user/register}">新規会員登録</a>
 		</div>
 		
 		<div>
-			<a th:href="@{/authentication}">パスワードを忘れた方</a>
+			<a href="@{password/authentication}">パスワードを忘れた方</a>
 		</div>
 	</main>
 </body>

src/main/resources/templates/menu.html

@@ -0,0 +1,72 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+
+<head>
+    <meta charset="UTF-8">
+    <title>Calendar</title>
+    <link rel="stylesheet" th:href="@{/css/menu.css}">
+</head>
+
+<body>
+
+    <span class="year" th:text="|${year}年|"></span>
+    <span class="month" th:text="|${month}月|"></span>
+
+    <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)}">
+
+                    <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}円|"
+                             style="color: blue;">
+                        </div>
+
+                        <div th:each="expense : ${expenseList}"
+                             th:if="${expense.date.dayOfMonth == week * 7 + weekDay - firstDayOfWeek + 1}"
+                             class="expense"
+                             th:text="|支出 -${expense.amount}円|"
+                             style="color: red;">
+                        </div>
+
+                    </div>
+
+                </td>
+
+            </tr>
+
+        </tbody>
+    </table>
+
+    <div>
+        <h2>
+            <span th:text="|収入：${totalIncome}|"></span>
+            <span th:text="|支出：${totalExpense}|"></span>
+        </h2>
+    </div>
+
+</body>
+
+</html>

src/main/resources/templates/password_reset.html

@@ -1,42 +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="@{/password_reset}" th:object="${passwordResetForm}" method="post">
-			<div>
-				<label for="password">新しいパスワード</label>
-				<input type="password"
-				id="password"
-				th:field="*{password}"
-				minlength="8"
-				maxlength="255"
-				required>
-			</div>
-			
-			<div>
-				<label for="passwordConfirm">パスワード確認</label>
-				<input type="password"
-				id="passwordConfirm"
-				th:field="*{passwordConfirm}"
-				minlength="8"
-				maxlength="255"
-				required>
-			</div>
-			
-			<button type="submit">再設定</button>
-		</form>
-		
-		<div th:if="${errorMessage}">
-		    <p th:text="${errorMessage}"></p>
-		</div>
-	</main>
-</body>
-</html>

src/main/resources/templates/transaction_create.html

@@ -0,0 +1,68 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+	<meta charset="UTF-8">
+	<title>Insert title here</title>
+</head>
+
+<body>
+	<h1>取引登録</h1>
+
+	<form th:action="@{/transaction/create}" th:object="${transactionForm}" method="post">
+
+		<div>
+			<label for="transactionDate">日付</label>
+			<input type="date" id="transactionDate" th:field="*{transactionDate}">
+		</div>
+
+		<br>
+
+		<div>
+			<label for="transactionType">収入・支出</label>
+
+			<select id="transactionType" th:field="*{transactionType}">
+
+				<option value="">選択してください</option>
+				<option value="1">支出</option>
+				<option value="2">収入</option>
+
+			</select>
+		</div>
+
+		<br>
+
+		<div>
+			<label for="categoryId">カテゴリ</label>
+
+			<select id="categoryId" th:field="*{categoryId}">
+
+				<option value="">選択してください</option>
+
+				<option th:each="category : ${categoryFormList}" th:value="${category.categoryId}"
+					th:text="${category.categoryName}">
+				</option>
+
+			</select>
+		</div>
+
+		<br>
+
+		<div>
+			<label for="amount">金額</label>
+
+			<input type="number" id="amount" th:field="*{amount}" min="0" placeholder="金額を入力してください">
+		</div>
+
+		<br>
+		<input type="hidden" name="today" id="today" th:value="${today}">
+
+		<button type="submit">登録</button>
+
+	</form>
+
+
+
+</body>
+
+</html>

src/main/resources/templates/transaction_detail.html

@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+
+<head>
+	<meta charset="UTF-8">
+	<title>収支詳細</title>
+</head>
+
+<body>
+	<h1 th:text="${today}"></h1>
+
+	<div>
+		<ul>
+			<li th:each="transactionForm : ${transactionFormList}">
+				<p>カテゴリ名：<span th:text="${transactionForm.categoryName}"></span>
+					<br>金額：<span th:text="${transactionForm.amount}"></span>
+				</p>
+				<form th:action="@{/transaction/delete}" method="post">
+					<input type="hidden" name="today" id="today" th:value="${today}">
+					<input type="hidden" name="transactionId" id="transactionId" value="${transactionForm.transactionId}">
+
+					<button type="submit">削除</button>
+				</form>
+				<hr />
+			</li>
+		</ul>
+	</div>
+
+
+	<form th:action="@{/transaction/create}" method="get">
+		<input type="hidden" name="today" id="today" th:value="${today}">
+
+		<button type="submit">新規登録</button>
+	</form>
+
+</body>
+
+</html>

src/main/resources/templates/transaction_list.html

@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+
+<head>
+	<meta charset="UTF-8">
+	<title>一覧</title>
+</head>
+
+<body>
+
+	<div th:each="transactionForm : ${transactionFormMap}">
+
+		<a th:href="@{/transaction/detail(todayDates=${transactionForm.key})}">
+			<h3 th:text="${transactionForm.key}"></h3>
+		</a>
+		<ul>
+			<li th:each="transaction : ${transactionForm.value}">
+				<p>カテゴリ名：<span th:text="${transaction.categoryName}"></span>
+					<br>金額：<span th:text="${transaction.amount}"></span>
+				</p>
+				<hr />
+			</li>
+		</ul>
+
+	</div>
+
+</body>
+
+</html>

src/main/resources/templates/user_register_confirm.html

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="ja"xmlns:th="http://www.thymeleaf.org">
+<html>
 <head>
 <meta charset="UTF-8">
 <title>新規会員登録確認</title>