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()); + } + }