[EDIT] 収支の登録・修正機能を追加しました。日付のDefault値を設定し、Session

Attribute・オブジェクトの型を修正しました。

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

@@ -16,4 +16,8 @@ public interface TransactionService {
 	
 	public int findTotalexpense(LocalDate startDate, LocalDate endDate, Long userId);
 	
+	public int createTransaction(TransactionModel transactionModel);
+	
+	public int updateTransaction(TransactionModel transactionModel);
+	
 }

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

@@ -3,14 +3,19 @@ package com.example.demo.app.domain.service.impl;
 import java.time.LocalDate;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 import org.springframework.stereotype.Service;
 
 import com.example.demo.app.domain.model.TransactionModel;
 import com.example.demo.app.domain.service.TransactionService;
+import com.example.demo.app.infra.entity.CategoryEntity;
 import com.example.demo.app.infra.entity.TransactionEntity;
+import com.example.demo.app.infra.entity.UserEntity;
+import com.example.demo.app.infra.repository.CategoryRepository;
 import com.example.demo.app.infra.repository.TransactionRepository;
+import com.example.demo.app.infra.repository.UserRepository;
 
 import lombok.RequiredArgsConstructor;
 
@@ -19,6 +24,8 @@ import lombok.RequiredArgsConstructor;
 public class TransactionServiceImpl implements TransactionService {
 
 	private final TransactionRepository transactionRepository;
+	private final UserRepository userRepository;
+	private final CategoryRepository categoryRepository;
 
 	public Map<LocalDate, List<TransactionModel>> findAllByDate(LocalDate startDate, LocalDate endDate, Long userId) {
 
@@ -40,6 +47,7 @@ public class TransactionServiceImpl implements TransactionService {
 		return transactionRepository.findTotalIncome(startDate, endDate, userId);
 
 	}
+
 	public int findTotalexpense(LocalDate startDate, LocalDate endDate, Long userId) {
 
 		return transactionRepository.findTotalIncome(startDate, endDate, userId);
@@ -52,4 +60,59 @@ public class TransactionServiceImpl implements TransactionService {
 
 	}
 
+	public int createTransaction(TransactionModel transactionModel) {
+
+		Optional<UserEntity> userEntityOptional = userRepository.findById(transactionModel.getUserId());
+
+		if (userEntityOptional.isEmpty()) {
+			return -1;
+		}
+
+		Optional<CategoryEntity> categoryEntityOptional = categoryRepository.findById(transactionModel.getCategoryId());
+		if (categoryEntityOptional.isEmpty()) {
+			return -1;
+		}
+
+		TransactionEntity transactionEntity = TransactionModel.convertTo(
+				transactionModel,
+				userEntityOptional.get(),
+				categoryEntityOptional.get());
+		if (transactionRepository.save(transactionEntity) != null) {
+			return 0;
+
+		} else {
+			return -1;
+		}
+
+	}
+
+	public int updateTransaction(TransactionModel transactionModel) {
+
+		if (!transactionRepository.existsById(transactionModel.getTransactionId())) {
+			return -1;
+		}
+		
+		Optional<UserEntity> userEntityOptional = userRepository.findById(transactionModel.getUserId());
+
+		if (userEntityOptional.isEmpty()) {
+			return -1;
+		}
+
+		Optional<CategoryEntity> categoryEntityOptional = categoryRepository.findById(transactionModel.getCategoryId());
+		if (categoryEntityOptional.isEmpty()) {
+			return -1;
+		}
+
+		TransactionEntity transactionEntity = TransactionModel.convertTo(
+				transactionModel,
+				userEntityOptional.get(),
+				categoryEntityOptional.get());
+		if (transactionRepository.save(transactionEntity) != null) {
+			return 0;
+
+		} else {
+			return -1;
+		}
+
+	}
 }

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

@@ -11,8 +11,11 @@ import jakarta.servlet.http.HttpSession;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import com.example.demo.app.domain.model.LoginModel;
 import com.example.demo.app.domain.service.CategoryService;
 import com.example.demo.app.domain.service.TransactionService;
 import com.example.demo.app.presentation.form.CategoryForm;
@@ -26,27 +29,32 @@ 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,
+	public String transactionList(@RequestParam(required = false) LocalDate startDates,
+			@RequestParam(required = false) LocalDate endDates, Model model,
 			HttpSession session) {
 
-		LoginUser loginUser = (LoginUser) session.getAttribute("loginUser");
+		LocalDate startDate = (startDates == null) ? LocalDate.now().withDayOfMonth(1) : startDates;
+
+		LocalDate endDate = (endDates == null) ? LocalDate.now().withDayOfMonth(LocalDate.now().lengthOfMonth())
+				: endDates;
+
+		LoginModel loginUser = (LoginModel) session.getAttribute("loginUser");
 
 		Map<LocalDate, List<TransactionForm>> transactionFormMap = new HashMap<>();
 
-		
+		transactionService.findAllByDate(startDate, endDate, loginUser.getUserId()).forEach((date, list) -> {
-		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(),
+						CategoryForm.convertFrom(categoryService.findOne(transaction.getCategoryId()))
-						transactionService.findTotalexpense(startDate, endDate, loginUser.getUserId),
+								.getCategoryName(),
-						transactionService.findTotalIncome(startDate, endDate, loginUser.getUserId),
+						transactionService.findTotalexpense(startDate, endDate, loginUser.getUserId()),
-						CategoryForm.convertFrom(categoryService.findOne(transaction.getCategoryId())).getTransactionType()
+						transactionService.findTotalIncome(startDate, endDate, loginUser.getUserId()),
-						);
+						CategoryForm.convertFrom(categoryService.findOne(transaction.getCategoryId()))
+								.getTransactionType());
 				return transactionForm;
 			}).collect(Collectors.toList());
 			transactionFormMap.put(date, transactionFormList);
@@ -59,25 +67,64 @@ public class TransactionController {
 
 	// 詳細画面
 	@GetMapping()
-	public String findOne(@RequestParam LocalDate todayDate, Model model, HttpSession session) {
+	public String findOne(@RequestParam(required = false) LocalDate todayDates, Model model, HttpSession session) {
 
-		LoginUser loginUser = (LoginUser) session.getAttribute("loginUser");
+		LocalDate todayDate = (todayDates == null) ? LocalDate.now() : todayDates;
 		
-		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());
 		
+		LoginModel loginUser = (LoginModel) session.getAttribute("loginUser");
+
+		List<TransactionForm> transactionFormList = transactionService
+				.findByUserIdAndDate(todayDate, loginUser.getUserId()).stream()
+				.map(transaction -> {
+					TransactionForm transactionForm = TransactionForm.convertFrom(
+							transaction,
+							CategoryForm.convertFrom(categoryService.findOne(transaction.getCategoryId()))
+									.getCategoryName(),
+							transactionService.findTotalexpense(todayDate, todayDate, loginUser.getUserId()),
+							transactionService.findTotalIncome(todayDate, todayDate, loginUser.getUserId()),
+							CategoryForm.convertFrom(categoryService.findOne(transaction.getCategoryId()))
+									.getTransactionType());
+					return transactionForm;
+				}).collect(Collectors.toList());
 
 		model.addAttribute("transactionFormList", transactionFormList);
 
 		return "";
 	}
 
+	@GetMapping("")
+	public String createOneGet(@ModelAttribute TransactionForm transactionForm) {
+
+		return "";
+	}
+
+	@PostMapping()
+	public String createOnePost(@ModelAttribute TransactionForm transactionForm, Model model) {
+
+		if (transactionService.createTransaction(TransactionForm.convertTo(transactionForm)) != 0) {
+			return "error";
+		}
+
+		return "";
+
+	}
+
+	@GetMapping("")
+	public String updateOneGet(@ModelAttribute TransactionForm transactionForm) {
+
+		return "";
+	}
+
+	@PostMapping()
+	public String updateOnePost(@ModelAttribute TransactionForm transactionForm, Model model) {
+
+		if (transactionService.updateTransaction(TransactionForm.convertTo(transactionForm)) != 0) {
+			return "error";
+		}
+
+		return "";
+
+	}
+
 }