From 8292fb3be9ac3e40b37970d8b52e31cc43104c3a Mon Sep 17 00:00:00 2001 From: baekjaehyuk Date: Sun, 11 May 2025 21:07:25 +0900 Subject: [PATCH 1/4] =?UTF-8?q?TB-27/feat:=20=EC=97=94=ED=8B=B0=ED=8B=B0?= =?UTF-8?q?=20=ED=95=84=EB=93=9C=20=EC=B6=94=EA=B0=80=20=EB=B0=8F=20?= =?UTF-8?q?=EC=98=81=EC=88=98=EC=A6=9D=20=EA=B0=80=EA=B2=A9=20=EB=8F=99?= =?UTF-8?q?=EC=9D=BC=20=EA=B2=80=EC=A6=9D=20=EB=A1=9C=EC=A7=81=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 영수증 수정할 경우에도 적용, 영수증 조회 시에 boolean 값으로 반환 --- .../in/web/dto/response/ReceiptDetailResponse.java | 4 +++- .../in/web/dto/response/ReceiptResponse.java | 4 +++- .../out/persistence/entity/ReceiptEntity.java | 3 +++ .../application/service/CreateReceiptService.java | 8 ++++---- .../application/service/UpdateReceiptService.java | 5 ++++- .../com/ClubAccount_BE/receipt/domain/Receipt.java | 9 ++++++++- .../receipt/domain/service/ReceiptEditor.java | 13 +++++++++++++ .../receipt/mapper/ReceiptMapper.java | 5 ++++- 8 files changed, 42 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/ClubAccount_BE/receipt/adapter/in/web/dto/response/ReceiptDetailResponse.java b/src/main/java/com/ClubAccount_BE/receipt/adapter/in/web/dto/response/ReceiptDetailResponse.java index f25ec01..c7122c0 100644 --- a/src/main/java/com/ClubAccount_BE/receipt/adapter/in/web/dto/response/ReceiptDetailResponse.java +++ b/src/main/java/com/ClubAccount_BE/receipt/adapter/in/web/dto/response/ReceiptDetailResponse.java @@ -16,7 +16,8 @@ public record ReceiptDetailResponse( BigDecimal amount, String etc, String receiptImageUrl, - List receiptItems + List receiptItems, + boolean isAmountMatched ) { public static ReceiptDetailResponse of(Receipt receipt) { @@ -29,6 +30,7 @@ public static ReceiptDetailResponse of(Receipt receipt) { .etc(receipt.getEtc()) .receiptImageUrl(receipt.getReceiptImageUrl()) .receiptItems(ReceiptItemResponse.of(receipt.getReceiptItems())) + .isAmountMatched(receipt.isAmountMatched()) .build(); } } diff --git a/src/main/java/com/ClubAccount_BE/receipt/adapter/in/web/dto/response/ReceiptResponse.java b/src/main/java/com/ClubAccount_BE/receipt/adapter/in/web/dto/response/ReceiptResponse.java index a20e5e3..b9c02a5 100644 --- a/src/main/java/com/ClubAccount_BE/receipt/adapter/in/web/dto/response/ReceiptResponse.java +++ b/src/main/java/com/ClubAccount_BE/receipt/adapter/in/web/dto/response/ReceiptResponse.java @@ -14,7 +14,8 @@ public record ReceiptResponse( LocalDate date, BigDecimal amount, String etc, - String receiptImageUrl + String receiptImageUrl, + boolean isAmountMatched ) { public static ReceiptResponse of(Receipt receipt) { @@ -26,6 +27,7 @@ public static ReceiptResponse of(Receipt receipt) { .amount(receipt.getAmount()) .etc(receipt.getEtc()) .receiptImageUrl(receipt.getReceiptImageUrl()) + .isAmountMatched(receipt.isAmountMatched()) .build(); } } diff --git a/src/main/java/com/ClubAccount_BE/receipt/adapter/out/persistence/entity/ReceiptEntity.java b/src/main/java/com/ClubAccount_BE/receipt/adapter/out/persistence/entity/ReceiptEntity.java index ce84a89..a3a2ad6 100644 --- a/src/main/java/com/ClubAccount_BE/receipt/adapter/out/persistence/entity/ReceiptEntity.java +++ b/src/main/java/com/ClubAccount_BE/receipt/adapter/out/persistence/entity/ReceiptEntity.java @@ -61,6 +61,9 @@ public class ReceiptEntity extends TimeBaseEntity { private String receiptImageUrl; + @Column(nullable = false) + private boolean isAmountMatched; + @Builder.Default @OneToMany(mappedBy = "receipt", cascade = CascadeType.ALL, orphanRemoval = true) private List receiptItems = new ArrayList<>(); diff --git a/src/main/java/com/ClubAccount_BE/receipt/application/service/CreateReceiptService.java b/src/main/java/com/ClubAccount_BE/receipt/application/service/CreateReceiptService.java index a28da30..eee0f01 100644 --- a/src/main/java/com/ClubAccount_BE/receipt/application/service/CreateReceiptService.java +++ b/src/main/java/com/ClubAccount_BE/receipt/application/service/CreateReceiptService.java @@ -8,6 +8,7 @@ import com.ClubAccount_BE.receipt.application.port.out.UploadReceiptPort; import com.ClubAccount_BE.receipt.domain.Receipt; import com.ClubAccount_BE.receipt.domain.ReceiptItem; +import com.ClubAccount_BE.receipt.domain.service.ReceiptEditor; import com.ClubAccount_BE.receipt.domain.service.ReceiptItemEditor; import com.ClubAccount_BE.user.domain.User; import java.util.List; @@ -22,9 +23,8 @@ public class CreateReceiptService implements CreateReceiptUseCase { private final CreateReceiptPort createReceiptPort; - private final UploadReceiptPort uploadReceiptPort; - + private final ReceiptEditor receiptEditor; private final ReceiptItemEditor receiptItemEditor; @Override @@ -33,7 +33,6 @@ public Long createReceipt( MultipartFile image, ReceiptRequest receiptRequest ) { - Receipt receipt = Receipt.create( user, receiptRequest.category(), @@ -43,8 +42,9 @@ public Long createReceipt( receiptRequest.etc(), image == null ? DEFAULT_IMAGE : uploadReceiptPort.uploadReceipt(image) ); - List receiptItems = receiptItemEditor.toReceiptItems(receiptRequest, receipt); + boolean isAmountMatched = receiptEditor.checkAmountMatch(receipt, receiptItems); + receipt.checkAmountMatched(isAmountMatched); return createReceiptPort.createReceipt(receipt, receiptItems); } } diff --git a/src/main/java/com/ClubAccount_BE/receipt/application/service/UpdateReceiptService.java b/src/main/java/com/ClubAccount_BE/receipt/application/service/UpdateReceiptService.java index 57de395..2904e4f 100644 --- a/src/main/java/com/ClubAccount_BE/receipt/application/service/UpdateReceiptService.java +++ b/src/main/java/com/ClubAccount_BE/receipt/application/service/UpdateReceiptService.java @@ -5,6 +5,7 @@ import com.ClubAccount_BE.receipt.application.port.out.UpdateReceiptPort; import com.ClubAccount_BE.receipt.domain.Receipt; import com.ClubAccount_BE.receipt.domain.ReceiptItem; +import com.ClubAccount_BE.receipt.domain.service.ReceiptEditor; import com.ClubAccount_BE.receipt.domain.service.ReceiptItemEditor; import com.ClubAccount_BE.user.domain.User; import java.util.List; @@ -18,7 +19,7 @@ public class UpdateReceiptService implements UpdateReceiptUseCase { private final UpdateReceiptPort updateReceiptPort; - + private final ReceiptEditor receiptEditor; private final ReceiptItemEditor receiptItemEditor; @Override @@ -38,6 +39,8 @@ public Long updateReceipt( ); List receiptItems = receiptItemEditor.toReceiptItems(receiptRequest, receipt); + boolean isAmountMatched = receiptEditor.checkAmountMatch(receipt, receiptItems); + receipt.checkAmountMatched(isAmountMatched); return updateReceiptPort.updateReceipt(receiptId, receipt, receiptItems); } } diff --git a/src/main/java/com/ClubAccount_BE/receipt/domain/Receipt.java b/src/main/java/com/ClubAccount_BE/receipt/domain/Receipt.java index 5bde06c..d44a872 100644 --- a/src/main/java/com/ClubAccount_BE/receipt/domain/Receipt.java +++ b/src/main/java/com/ClubAccount_BE/receipt/domain/Receipt.java @@ -20,6 +20,7 @@ public class Receipt { private final String etc; private final String receiptImageUrl; private final List receiptItems; + private boolean isAmountMatched; @Builder private Receipt( @@ -31,7 +32,8 @@ private Receipt( BigDecimal amount, String etc, String receiptImageUrl, - List receiptItems + List receiptItems, + boolean isAmountMatched ) { this.id = id; this.user = user; @@ -42,6 +44,7 @@ private Receipt( this.etc = etc; this.receiptImageUrl = receiptImageUrl; this.receiptItems = receiptItems; + this.isAmountMatched = isAmountMatched; } public static Receipt create( @@ -83,4 +86,8 @@ public static Receipt update( .etc(etc) .build(); } + + public void checkAmountMatched(boolean isAmountMatched) { + this.isAmountMatched = isAmountMatched; + } } diff --git a/src/main/java/com/ClubAccount_BE/receipt/domain/service/ReceiptEditor.java b/src/main/java/com/ClubAccount_BE/receipt/domain/service/ReceiptEditor.java index c854a98..73f3660 100644 --- a/src/main/java/com/ClubAccount_BE/receipt/domain/service/ReceiptEditor.java +++ b/src/main/java/com/ClubAccount_BE/receipt/domain/service/ReceiptEditor.java @@ -2,7 +2,9 @@ import com.ClubAccount_BE.receipt.domain.DetailCategoryResult; import com.ClubAccount_BE.receipt.domain.Receipt; +import com.ClubAccount_BE.receipt.domain.ReceiptItem; import com.ClubAccount_BE.receipt.domain.type.ReceiptCategory; +import java.math.BigDecimal; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -11,6 +13,17 @@ @Service public class ReceiptEditor { + /** + * 영수증 금액과 영수증 아이템 금액 비교 + */ + public boolean checkAmountMatch(Receipt receipt, List items) { + BigDecimal total = items.stream() + .map(ReceiptItem::getTotalPrice) + .reduce(BigDecimal.ZERO, BigDecimal::add); + + return total.compareTo(receipt.getAmount()) == 0; + } + /** * 영수증 카테고리 비율 계산 */ diff --git a/src/main/java/com/ClubAccount_BE/receipt/mapper/ReceiptMapper.java b/src/main/java/com/ClubAccount_BE/receipt/mapper/ReceiptMapper.java index c524a8a..374dbce 100644 --- a/src/main/java/com/ClubAccount_BE/receipt/mapper/ReceiptMapper.java +++ b/src/main/java/com/ClubAccount_BE/receipt/mapper/ReceiptMapper.java @@ -15,7 +15,9 @@ public static ReceiptEntity toEntity(Receipt receipt) { .amount(receipt.getAmount()) .date(receipt.getDate()) .etc(receipt.getEtc()) - .receiptImageUrl(receipt.getReceiptImageUrl()).build(); + .receiptImageUrl(receipt.getReceiptImageUrl()) + .isAmountMatched(receipt.isAmountMatched()) + .build(); } public static Receipt toDomain(ReceiptEntity receiptEntity) { @@ -32,6 +34,7 @@ public static Receipt toDomain(ReceiptEntity receiptEntity) { .map(ReceiptItemMapper::toDomain) .toList() ) + .isAmountMatched(receiptEntity.isAmountMatched()) .build(); } } From cb35fdff7ded04f01df7f5a1a0bb9fe95970d0c5 Mon Sep 17 00:00:00 2001 From: baekjaehyuk Date: Sun, 11 May 2025 22:19:17 +0900 Subject: [PATCH 2/4] =?UTF-8?q?TB-27/refactor:=20=EB=8B=A4=EB=8C=80?= =?UTF-8?q?=EC=9D=BC=20=EC=97=B0=EA=B4=80=EA=B4=80=EA=B3=84=20=ED=8E=B8?= =?UTF-8?q?=EC=9D=98=EB=A9=94=EC=84=9C=EB=93=9C=20=EB=A1=9C=EC=A7=81=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../receipt/adapter/out/ReceiptRepositoryAdapter.java | 9 +++++++-- .../adapter/out/persistence/entity/ReceiptEntity.java | 10 +--------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/ClubAccount_BE/receipt/adapter/out/ReceiptRepositoryAdapter.java b/src/main/java/com/ClubAccount_BE/receipt/adapter/out/ReceiptRepositoryAdapter.java index 7f96838..7bcc6dc 100644 --- a/src/main/java/com/ClubAccount_BE/receipt/adapter/out/ReceiptRepositoryAdapter.java +++ b/src/main/java/com/ClubAccount_BE/receipt/adapter/out/ReceiptRepositoryAdapter.java @@ -10,6 +10,7 @@ import com.ClubAccount_BE.receipt.application.port.out.UpdateReceiptPort; import com.ClubAccount_BE.receipt.domain.Receipt; import com.ClubAccount_BE.receipt.domain.ReceiptItem; +import com.ClubAccount_BE.receipt.mapper.ReceiptItemMapper; import com.ClubAccount_BE.receipt.mapper.ReceiptMapper; import com.ClubAccount_BE.user.domain.User; import java.time.LocalDate; @@ -29,7 +30,9 @@ public class ReceiptRepositoryAdapter @Override public Long createReceipt(Receipt receipt, List receiptItems) { ReceiptEntity receiptEntity = ReceiptMapper.toEntity(receipt); - receiptEntity.replaceReceiptItem(receiptItems); + receiptItems.stream() + .map(ReceiptItemMapper::toEntity) + .forEach(receiptEntity::addReceiptItem); return receiptRepository .save(receiptEntity) .getId(); @@ -74,7 +77,9 @@ public Long updateReceipt( .orElseThrow(() -> new ApiException(RECEIPT_NOT_FOUND)); receiptEntity.updateReceipt(receipt); - receiptEntity.replaceReceiptItem(receiptItems); + receiptItems.stream() + .map(ReceiptItemMapper::toEntity) + .forEach(receiptEntity::addReceiptItem); return receiptEntity.getId(); } } diff --git a/src/main/java/com/ClubAccount_BE/receipt/adapter/out/persistence/entity/ReceiptEntity.java b/src/main/java/com/ClubAccount_BE/receipt/adapter/out/persistence/entity/ReceiptEntity.java index a3a2ad6..2e4bc36 100644 --- a/src/main/java/com/ClubAccount_BE/receipt/adapter/out/persistence/entity/ReceiptEntity.java +++ b/src/main/java/com/ClubAccount_BE/receipt/adapter/out/persistence/entity/ReceiptEntity.java @@ -2,9 +2,7 @@ import com.ClubAccount_BE.core.entity.TimeBaseEntity; import com.ClubAccount_BE.receipt.domain.Receipt; -import com.ClubAccount_BE.receipt.domain.ReceiptItem; import com.ClubAccount_BE.receipt.domain.type.ReceiptCategory; -import com.ClubAccount_BE.receipt.mapper.ReceiptItemMapper; import com.ClubAccount_BE.user.adapter.out.persistence.entity.UserEntity; import jakarta.persistence.CascadeType; import jakarta.persistence.Column; @@ -74,6 +72,7 @@ public void updateReceipt(Receipt receipt) { this.amount = receipt.getAmount(); this.date = receipt.getDate(); this.etc = receipt.getEtc(); + this.receiptItems.clear(); } public void addReceiptItem(ReceiptItemEntity receiptItem) { @@ -82,11 +81,4 @@ public void addReceiptItem(ReceiptItemEntity receiptItem) { receiptItem.addReceipt(this); } } - - public void replaceReceiptItem(List receiptItems) { - this.receiptItems.clear(); - receiptItems.stream() - .map(ReceiptItemMapper::toEntity) - .forEach(this::addReceiptItem); - } } From 6cdc009d4e517e18e60ab3c08ff7675cfcbea77d Mon Sep 17 00:00:00 2001 From: baekjaehyuk Date: Sun, 11 May 2025 23:34:36 +0900 Subject: [PATCH 3/4] =?UTF-8?q?TB-27/refactor:=20=EB=A9=94=EC=84=9C?= =?UTF-8?q?=EB=93=9C=20=EB=84=A4=EC=9D=B4=EB=B0=8D=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../receipt/application/service/CreateReceiptService.java | 2 +- .../receipt/application/service/UpdateReceiptService.java | 2 +- src/main/java/com/ClubAccount_BE/receipt/domain/Receipt.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/ClubAccount_BE/receipt/application/service/CreateReceiptService.java b/src/main/java/com/ClubAccount_BE/receipt/application/service/CreateReceiptService.java index eee0f01..826e905 100644 --- a/src/main/java/com/ClubAccount_BE/receipt/application/service/CreateReceiptService.java +++ b/src/main/java/com/ClubAccount_BE/receipt/application/service/CreateReceiptService.java @@ -44,7 +44,7 @@ public Long createReceipt( ); List receiptItems = receiptItemEditor.toReceiptItems(receiptRequest, receipt); boolean isAmountMatched = receiptEditor.checkAmountMatch(receipt, receiptItems); - receipt.checkAmountMatched(isAmountMatched); + receipt.updateAmountMatched(isAmountMatched); return createReceiptPort.createReceipt(receipt, receiptItems); } } diff --git a/src/main/java/com/ClubAccount_BE/receipt/application/service/UpdateReceiptService.java b/src/main/java/com/ClubAccount_BE/receipt/application/service/UpdateReceiptService.java index 2904e4f..e0420fe 100644 --- a/src/main/java/com/ClubAccount_BE/receipt/application/service/UpdateReceiptService.java +++ b/src/main/java/com/ClubAccount_BE/receipt/application/service/UpdateReceiptService.java @@ -40,7 +40,7 @@ public Long updateReceipt( List receiptItems = receiptItemEditor.toReceiptItems(receiptRequest, receipt); boolean isAmountMatched = receiptEditor.checkAmountMatch(receipt, receiptItems); - receipt.checkAmountMatched(isAmountMatched); + receipt.updateAmountMatched(isAmountMatched); return updateReceiptPort.updateReceipt(receiptId, receipt, receiptItems); } } diff --git a/src/main/java/com/ClubAccount_BE/receipt/domain/Receipt.java b/src/main/java/com/ClubAccount_BE/receipt/domain/Receipt.java index d44a872..7b7249a 100644 --- a/src/main/java/com/ClubAccount_BE/receipt/domain/Receipt.java +++ b/src/main/java/com/ClubAccount_BE/receipt/domain/Receipt.java @@ -87,7 +87,7 @@ public static Receipt update( .build(); } - public void checkAmountMatched(boolean isAmountMatched) { + public void updateAmountMatched(boolean isAmountMatched) { this.isAmountMatched = isAmountMatched; } } From bb7cc229435326846ab1aa6cfee4c75d549e4fd3 Mon Sep 17 00:00:00 2001 From: baekjaehyuk Date: Mon, 12 May 2025 01:58:35 +0900 Subject: [PATCH 4/4] =?UTF-8?q?TB-27/refactor:=20=ED=95=84=EB=93=9C?= =?UTF-8?q?=EB=AA=85=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../in/web/dto/response/ReceiptDetailResponse.java | 4 ++-- .../adapter/in/web/dto/response/ReceiptResponse.java | 4 ++-- .../adapter/out/persistence/entity/ReceiptEntity.java | 2 +- .../com/ClubAccount_BE/receipt/domain/Receipt.java | 10 +++++----- .../ClubAccount_BE/receipt/mapper/ReceiptMapper.java | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/ClubAccount_BE/receipt/adapter/in/web/dto/response/ReceiptDetailResponse.java b/src/main/java/com/ClubAccount_BE/receipt/adapter/in/web/dto/response/ReceiptDetailResponse.java index c7122c0..6fb6737 100644 --- a/src/main/java/com/ClubAccount_BE/receipt/adapter/in/web/dto/response/ReceiptDetailResponse.java +++ b/src/main/java/com/ClubAccount_BE/receipt/adapter/in/web/dto/response/ReceiptDetailResponse.java @@ -17,7 +17,7 @@ public record ReceiptDetailResponse( String etc, String receiptImageUrl, List receiptItems, - boolean isAmountMatched + boolean amountMatched ) { public static ReceiptDetailResponse of(Receipt receipt) { @@ -30,7 +30,7 @@ public static ReceiptDetailResponse of(Receipt receipt) { .etc(receipt.getEtc()) .receiptImageUrl(receipt.getReceiptImageUrl()) .receiptItems(ReceiptItemResponse.of(receipt.getReceiptItems())) - .isAmountMatched(receipt.isAmountMatched()) + .amountMatched(receipt.isAmountMatched()) .build(); } } diff --git a/src/main/java/com/ClubAccount_BE/receipt/adapter/in/web/dto/response/ReceiptResponse.java b/src/main/java/com/ClubAccount_BE/receipt/adapter/in/web/dto/response/ReceiptResponse.java index b9c02a5..05f5398 100644 --- a/src/main/java/com/ClubAccount_BE/receipt/adapter/in/web/dto/response/ReceiptResponse.java +++ b/src/main/java/com/ClubAccount_BE/receipt/adapter/in/web/dto/response/ReceiptResponse.java @@ -15,7 +15,7 @@ public record ReceiptResponse( BigDecimal amount, String etc, String receiptImageUrl, - boolean isAmountMatched + boolean amountMatched ) { public static ReceiptResponse of(Receipt receipt) { @@ -27,7 +27,7 @@ public static ReceiptResponse of(Receipt receipt) { .amount(receipt.getAmount()) .etc(receipt.getEtc()) .receiptImageUrl(receipt.getReceiptImageUrl()) - .isAmountMatched(receipt.isAmountMatched()) + .amountMatched(receipt.isAmountMatched()) .build(); } } diff --git a/src/main/java/com/ClubAccount_BE/receipt/adapter/out/persistence/entity/ReceiptEntity.java b/src/main/java/com/ClubAccount_BE/receipt/adapter/out/persistence/entity/ReceiptEntity.java index 2e4bc36..22674ec 100644 --- a/src/main/java/com/ClubAccount_BE/receipt/adapter/out/persistence/entity/ReceiptEntity.java +++ b/src/main/java/com/ClubAccount_BE/receipt/adapter/out/persistence/entity/ReceiptEntity.java @@ -60,7 +60,7 @@ public class ReceiptEntity extends TimeBaseEntity { private String receiptImageUrl; @Column(nullable = false) - private boolean isAmountMatched; + private boolean amountMatched; @Builder.Default @OneToMany(mappedBy = "receipt", cascade = CascadeType.ALL, orphanRemoval = true) diff --git a/src/main/java/com/ClubAccount_BE/receipt/domain/Receipt.java b/src/main/java/com/ClubAccount_BE/receipt/domain/Receipt.java index 7b7249a..cb7bcf0 100644 --- a/src/main/java/com/ClubAccount_BE/receipt/domain/Receipt.java +++ b/src/main/java/com/ClubAccount_BE/receipt/domain/Receipt.java @@ -20,7 +20,7 @@ public class Receipt { private final String etc; private final String receiptImageUrl; private final List receiptItems; - private boolean isAmountMatched; + private boolean amountMatched; @Builder private Receipt( @@ -33,7 +33,7 @@ private Receipt( String etc, String receiptImageUrl, List receiptItems, - boolean isAmountMatched + boolean amountMatched ) { this.id = id; this.user = user; @@ -44,7 +44,7 @@ private Receipt( this.etc = etc; this.receiptImageUrl = receiptImageUrl; this.receiptItems = receiptItems; - this.isAmountMatched = isAmountMatched; + this.amountMatched = amountMatched; } public static Receipt create( @@ -87,7 +87,7 @@ public static Receipt update( .build(); } - public void updateAmountMatched(boolean isAmountMatched) { - this.isAmountMatched = isAmountMatched; + public void updateAmountMatched(boolean amountMatched) { + this.amountMatched = amountMatched; } } diff --git a/src/main/java/com/ClubAccount_BE/receipt/mapper/ReceiptMapper.java b/src/main/java/com/ClubAccount_BE/receipt/mapper/ReceiptMapper.java index 374dbce..b23282c 100644 --- a/src/main/java/com/ClubAccount_BE/receipt/mapper/ReceiptMapper.java +++ b/src/main/java/com/ClubAccount_BE/receipt/mapper/ReceiptMapper.java @@ -16,7 +16,7 @@ public static ReceiptEntity toEntity(Receipt receipt) { .date(receipt.getDate()) .etc(receipt.getEtc()) .receiptImageUrl(receipt.getReceiptImageUrl()) - .isAmountMatched(receipt.isAmountMatched()) + .amountMatched(receipt.isAmountMatched()) .build(); } @@ -34,7 +34,7 @@ public static Receipt toDomain(ReceiptEntity receiptEntity) { .map(ReceiptItemMapper::toDomain) .toList() ) - .isAmountMatched(receiptEntity.isAmountMatched()) + .amountMatched(receiptEntity.isAmountMatched()) .build(); } }