[EDIT] 改行・コード位置を調整しました。

This commit is contained in:
s-choi
2026-09-17 13:48:08 +09:00
parent 4f49c24c99
commit 19989111ec
2 changed files with 10 additions and 8 deletions

View File

@@ -27,6 +27,14 @@ public class TransactionEntity {
@GeneratedValue(strategy = GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "transaction_id") @Column(name = "transaction_id")
private Long transactionId; private Long transactionId;
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "user_id")
private UserEntity userEntity;
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "category_id")
private CategoryEntity categoryEntity;
@Column(name = "amount", nullable = false) @Column(name = "amount", nullable = false)
private Integer amount; private Integer amount;
@@ -34,12 +42,4 @@ public class TransactionEntity {
@Column(name = "transaction_date", nullable = false) @Column(name = "transaction_date", nullable = false)
private LocalDate transactionDate; 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;
} }

View File

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