From 534fc2683d384c7df691544e474937260b27a0ef Mon Sep 17 00:00:00 2001 From: s-choi Date: Thu, 17 Sep 2026 10:57:53 +0900 Subject: [PATCH] =?UTF-8?q?[EDIT]=20Form=E3=82=AF=E3=83=A9=E3=82=B9?= =?UTF-8?q?=E3=81=B8=E3=83=95=E3=82=A3=E3=83=BC=E3=83=AB=E3=83=89=E3=82=92?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0=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 --- .../presentation/form/TransactionForm.java | 31 ++++++++++++++++--- 1 file changed, 26 insertions(+), 5 deletions(-) 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 0f571c7..d43c944 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 @@ -23,18 +23,39 @@ public class TransactionForm { private Integer amount; private LocalDate transactionDate; - - public static TransactionForm convertFrom(TransactionModel transactionModel) { + + private String categoryName; + + private Integer income; + + private Integer expense; + + private Integer transactionType; + + public static TransactionForm convertFrom(TransactionModel transactionModel, String categoryName, int income, int expense, int transactionType) { return new TransactionForm( transactionModel.getTransactionId(), transactionModel.getUserId(), transactionModel.getCategoryId(), transactionModel.getAmount(), - transactionModel.getTransactionDate()); + transactionModel.getTransactionDate(), + categoryName, + income, + expense, + transactionType); } - public static List convertFrom(List transactionModelList) { - return transactionModelList.stream().map(TransactionForm::convertFrom).toList(); + 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(); } + public static TransactionModel convertTo(TransactionForm transactionForm) { + return new TransactionModel( + transactionForm.getTransactionId(), + transactionForm.getUserId(), + transactionForm.getCategoryId(), + transactionForm.getAmount(), + transactionForm.getTransactionDate()); + } + }