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

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

Browse Source
This commit is contained in:
[IIJ] Koki Oshita
2026-09-17 13:52:56 +09:00
parent 86c6910c4a 19989111ec
commit b0e675d32e
9 changed files with 194 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,7 +3,9 @@ package com.example.demo.app.domain.model;
import java.time.LocalDate;
import java.util.List;
import com.example.demo.app.infra.entity.CategoryEntity;
import com.example.demo.app.infra.entity.TransactionEntity;
import com.example.demo.app.infra.entity.UserEntity;
import lombok.AllArgsConstructor;
import lombok.Getter;
@@ -35,4 +37,13 @@ public class TransactionModel {
return transactionEntityList.stream().map(TransactionModel::convertFrom).toList();
}
public static TransactionEntity convertTo(TransactionModel transactionModel, UserEntity userEntity, CategoryEntity categoryEntity) {
return new TransactionEntity(
transactionModel.getTransactionId(),
userEntity,
categoryEntity,
transactionModel.getAmount(),
transactionModel.getTransactionDate());
}
}

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

@@ -9,4 +9,6 @@ public interface CategoryService {
public List<CategoryModel> findAll();
public CategoryModel findOne(Long categoryId);
public CategoryModel findOneByCategoryName(String categoryName);
}

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

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

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

@@ -14,7 +14,7 @@ import lombok.RequiredArgsConstructor;
@Service
@RequiredArgsConstructor
public class CategoryServiceImpl implements CategoryService{
public class CategoryServiceImpl implements CategoryService {
private final CategoryRepository categoryRepository;
@@ -36,4 +36,16 @@ public class CategoryServiceImpl implements CategoryService{
}
public CategoryModel findOneByCategoryName(String categoryName) {
CategoryEntity categoryModel = categoryRepository.findByCategoryName(categoryName);
if (categoryModel == null) {
return null;
}
return CategoryModel.convertFrom(categoryModel);
}
}

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

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

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

@@ -28,12 +28,6 @@ public class TransactionEntity {
@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;
@@ -42,4 +36,10 @@ public class TransactionEntity {
@JoinColumn(name = "category_id")
private CategoryEntity categoryEntity;
@Column(name = "amount", nullable = false)
private Integer amount;
@Column(name = "transaction_date", nullable = false)
private LocalDate transactionDate;
}

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

@@ -1,9 +1,15 @@
package com.example.demo.app.infra.repository;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import com.example.demo.app.infra.entity.CategoryEntity;
public interface CategoryRepository extends JpaRepository<CategoryEntity, Long> {
@Query("select c from CategoryEntity c where c.categoryName = :categoryName")
public CategoryEntity findByCategoryName(@Param("categoryName") String categoryName);
}

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

@@ -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.findAll(startDate, endDate, loginUser.getUserId).forEach((date, list) -> {
transactionService.findAllByDate(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()
);
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);
@@ -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 -> {
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()
);
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 "";
}
}

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

@@ -32,6 +32,7 @@ public class TransactionForm {
private Integer transactionType;
public static TransactionForm convertFrom(TransactionModel transactionModel, String categoryName, int income, int expense, int transactionType) {
return new TransactionForm(
transactionModel.getTransactionId(),
@@ -45,6 +46,7 @@ public class TransactionForm {
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();
}