18 Commits

Author SHA1 Message Date
kkazuya
e361e02aa8 [ADD] Category, Course, AllocationのRepositoryを作成しました。 2026-09-16 16:34:31 +09:00
kkazuya
837a82ef9a Merge branch 'n-kawahito' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into k-kobayashi 2026-09-16 16:30:49 +09:00
38b2c1b2cb Merge branch 's-choi' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into n-kawahito 2026-09-16 15:44:09 +09:00
16477f4ba1 [ADD]支出分析の総支出の比較を行う際にレイヤー間でのデータ転送を行うため、AnalysisModelを作成しました。 2026-09-16 15:43:41 +09:00
ad717036b4 [DELETE]AnalysisModelの削除 2026-09-16 15:41:18 +09:00
c7098f2ec3 Revert "Revert "[ADD]支出分析のカテゴリーごとの比較を行う際にレイヤー間でのデータ転送を行うため、CategoryAnalysisModelを作成しました。""
This reverts commit 67cd3e27ca.
2026-09-16 15:38:39 +09:00
67cd3e27ca Revert "[ADD]支出分析のカテゴリーごとの比較を行う際にレイヤー間でのデータ転送を行うため、CategoryAnalysisModelを作成しました。"
This reverts commit b2662693c2.
2026-09-16 15:38:17 +09:00
b2662693c2 [ADD]支出分析のカテゴリーごとの比較を行う際にレイヤー間でのデータ転送を行うため、CategoryAnalysisModelを作成しました。 2026-09-16 15:37:57 +09:00
s-choi
e8eef1aa73 Merge remote-tracking branch 'origin/k-kobayashi' into s-choi 2026-09-16 15:27:09 +09:00
kkazuya
40ada62856 Merge branch 'n-kawahito' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into k-kobayashi 2026-09-16 15:26:29 +09:00
acd31c9f2a Merge branch 's-choi' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into n-kawahito 2026-09-16 15:17:55 +09:00
842f2b55f8 [ADD]支出分析のためのAnalysisRepositoryを作成しました。 2026-09-16 15:16:48 +09:00
s-choi
c093fcad24 [RENAME] 収支Controllerの名前をSelectTransactionControllerからTransactionControllerに変更しました。 2026-09-16 15:08:26 +09:00
s-choi
bae92ded58 [ADD] 収支のためのService及び実装クラスを作成しました。 2026-09-16 15:07:45 +09:00
s-choi
210579de68 [ADD] 収支のためのRepositoryを作成しました。 2026-09-16 15:07:28 +09:00
s-choi
05797d47d4 [EDIT] 収支Entityの主キーの型を修正しました。 2026-09-16 15:03:28 +09:00
s-choi
0561541bec [ADD] 収支のためのFormを作成しました。 2026-09-16 15:03:04 +09:00
s-choi
a800606bb2 [ADD] 収支のためのModelを作成しました。 2026-09-16 15:02:35 +09:00
13 changed files with 172 additions and 4 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -26,7 +26,7 @@ public class TransactionEntity {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "transaction_id")
private Integer transactionId;
private Long transactionId;
@Column(name = "amount", nullable = false)
private Integer amount;

View File

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

View File

@@ -0,0 +1,22 @@
package com.example.demo.app.infra.repository;
import java.time.LocalDate;
import java.util.List;
import com.example.demo.app.infra.entity.AllocationEntity;
import com.example.demo.app.infra.entity.TransactionEntity;
import com.example.demo.app.infra.entity.UserEntity;
public interface AnalysisRepository {
List<TransactionEntity> findExpenseByPeriod(
Integer userId,
LocalDate startDate,
LocalDate endDate);
List<AllocationEntity> findAllocationByCourseId(
Integer courseId);
UserEntity findUserByUserId(
Integer userId);
}

View File

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

View File

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

View File

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

View File

@@ -2,10 +2,16 @@ 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 SelectTransactionController {
public class TransactionController {
private final TransactionService transactionService;
}

View File

@@ -1,5 +1,10 @@
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;
@@ -9,6 +14,27 @@ import lombok.NoArgsConstructor;
@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();
}
}