Hotfix: 초기 회비 금액 설정

Leets-Official · Jul 31, 2024 · a948c8f · a948c8f
1 parent 10dc3aa
commit a948c8f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/src/main/java/leets/weeth/domain/account/dto/AccountDTO.java b/src/main/java/leets/weeth/domain/account/dto/AccountDTO.java
@@ -9,14 +9,15 @@ public class AccountDTO {
     public record Response(
             Long id,
             String description,
-            Integer total,
+            Integer totalAmount,
+            Integer currentAmount,
             Integer cardinal,
             List<ReceiptDTO.Response> receipts
     ) {}
 
     public record Save(
             String description,
-            @NotNull Integer total,
+            @NotNull Integer totalAmount,
             @NotNull Integer cardinal
     ) {}
 }
diff --git a/src/main/java/leets/weeth/domain/account/entity/Account.java b/src/main/java/leets/weeth/domain/account/entity/Account.java
@@ -1,7 +1,6 @@
 package leets.weeth.domain.account.entity;
 
 import jakarta.persistence.*;
-import leets.weeth.domain.account.dto.ReceiptDTO;
 import leets.weeth.global.common.entity.BaseEntity;
 import lombok.*;
 
@@ -22,20 +21,22 @@ public class Account extends BaseEntity {
 
     private String description;
 
-    private Integer total;
+    private Integer totalAmount;
+
+    private Integer currentAmount;
 
     private Integer cardinal;
 
     @OneToMany(mappedBy = "account", cascade = CascadeType.REMOVE, orphanRemoval = true)
     private List<Receipt> receipts = new ArrayList<>();
 
     public void spend(Receipt receipt) {
-        this.total -= receipt.getAmount();
+        this.currentAmount -= receipt.getAmount();
         this.receipts.add(receipt);
     }
 
     public void cancel(Receipt receipt) {
-        this.total += receipt.getAmount();
+        this.currentAmount += receipt.getAmount();
         this.receipts.remove(receipt);
     }
 }
diff --git a/src/main/java/leets/weeth/domain/account/mapper/AccountMapper.java b/src/main/java/leets/weeth/domain/account/mapper/AccountMapper.java
@@ -13,6 +13,7 @@ public interface AccountMapper {
     @Mapping(target = "receipts", expression = "java( mapToReceiptDTO(account, receiptMapper) )")
     AccountDTO.Response to(Account account, @Context ReceiptMapper receiptMapper);
 
+    @Mapping(target = "currentAmount", source = "totalAmount")
     Account from(AccountDTO.Save dto);
 
     @Named("mapToReceiptDTO")