From 19989111ec3c4db10ed2def73253dadaef82336d Mon Sep 17 00:00:00 2001 From: s-choi Date: Thu, 17 Sep 2026 13:48:08 +0900 Subject: [PATCH] =?UTF-8?q?[EDIT]=20=E6=94=B9=E8=A1=8C=E3=83=BB=E3=82=B3?= =?UTF-8?q?=E3=83=BC=E3=83=89=E4=BD=8D=E7=BD=AE=E3=82=92=E8=AA=BF=E6=95=B4?= =?UTF-8?q?=E3=81=97=E3=81=BE=E3=81=97=E3=81=9F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demo/app/infra/entity/TransactionEntity.java | 16 ++++++++-------- .../app/presentation/form/TransactionForm.java | 2 ++ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/example/demo/app/infra/entity/TransactionEntity.java b/src/main/java/com/example/demo/app/infra/entity/TransactionEntity.java index fd811c5..bbad50d 100644 --- a/src/main/java/com/example/demo/app/infra/entity/TransactionEntity.java +++ b/src/main/java/com/example/demo/app/infra/entity/TransactionEntity.java @@ -27,6 +27,14 @@ public class TransactionEntity { @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "transaction_id") 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) private Integer amount; @@ -34,12 +42,4 @@ public class TransactionEntity { @Column(name = "transaction_date", nullable = false) 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; - } diff --git a/src/main/java/com/example/demo/app/presentation/form/TransactionForm.java b/src/main/java/com/example/demo/app/presentation/form/TransactionForm.java index d43c944..376f633 100644 --- a/src/main/java/com/example/demo/app/presentation/form/TransactionForm.java +++ b/src/main/java/com/example/demo/app/presentation/form/TransactionForm.java @@ -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 convertFrom(List transactionModelList, String categoryName, int income, int expense, int transactionType ) { return transactionModelList.stream().map(transactionModel -> TransactionForm.convertFrom(transactionModel, categoryName, income, expense, transactionType)).toList(); }