Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
BigDecimal amount,
String etc,
String receiptImageUrl,
List<ReceiptItemResponse> receiptItems
List<ReceiptItemResponse> receiptItems,
boolean amountMatched
) {

public static ReceiptDetailResponse of(Receipt receipt) {
Expand All @@ -29,6 +30,7 @@
.etc(receipt.getEtc())
.receiptImageUrl(receipt.getReceiptImageUrl())
.receiptItems(ReceiptItemResponse.of(receipt.getReceiptItems()))
.amountMatched(receipt.isAmountMatched())

Check warning on line 33 in src/main/java/com/ClubAccount_BE/receipt/adapter/in/web/dto/response/ReceiptDetailResponse.java

View check run for this annotation

Codecov / codecov/patch

src/main/java/com/ClubAccount_BE/receipt/adapter/in/web/dto/response/ReceiptDetailResponse.java#L33

Added line #L33 was not covered by tests
.build();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
LocalDate date,
BigDecimal amount,
String etc,
String receiptImageUrl
String receiptImageUrl,
boolean amountMatched
) {

public static ReceiptResponse of(Receipt receipt) {
Expand All @@ -26,6 +27,7 @@
.amount(receipt.getAmount())
.etc(receipt.getEtc())
.receiptImageUrl(receipt.getReceiptImageUrl())
.amountMatched(receipt.isAmountMatched())

Check warning on line 30 in src/main/java/com/ClubAccount_BE/receipt/adapter/in/web/dto/response/ReceiptResponse.java

View check run for this annotation

Codecov / codecov/patch

src/main/java/com/ClubAccount_BE/receipt/adapter/in/web/dto/response/ReceiptResponse.java#L30

Added line #L30 was not covered by tests
.build();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -29,7 +30,9 @@
@Override
public Long createReceipt(Receipt receipt, List<ReceiptItem> receiptItems) {
ReceiptEntity receiptEntity = ReceiptMapper.toEntity(receipt);
receiptEntity.replaceReceiptItem(receiptItems);
receiptItems.stream()
.map(ReceiptItemMapper::toEntity)
.forEach(receiptEntity::addReceiptItem);

Check warning on line 35 in src/main/java/com/ClubAccount_BE/receipt/adapter/out/ReceiptRepositoryAdapter.java

View check run for this annotation

Codecov / codecov/patch

src/main/java/com/ClubAccount_BE/receipt/adapter/out/ReceiptRepositoryAdapter.java#L33-L35

Added lines #L33 - L35 were not covered by tests
return receiptRepository
.save(receiptEntity)
.getId();
Expand Down Expand Up @@ -74,7 +77,9 @@
.orElseThrow(() -> new ApiException(RECEIPT_NOT_FOUND));

receiptEntity.updateReceipt(receipt);
receiptEntity.replaceReceiptItem(receiptItems);
receiptItems.stream()
.map(ReceiptItemMapper::toEntity)
.forEach(receiptEntity::addReceiptItem);

Check warning on line 82 in src/main/java/com/ClubAccount_BE/receipt/adapter/out/ReceiptRepositoryAdapter.java

View check run for this annotation

Codecov / codecov/patch

src/main/java/com/ClubAccount_BE/receipt/adapter/out/ReceiptRepositoryAdapter.java#L80-L82

Added lines #L80 - L82 were not covered by tests
return receiptEntity.getId();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -61,6 +59,9 @@

private String receiptImageUrl;

@Column(nullable = false)
private boolean amountMatched;

@Builder.Default
@OneToMany(mappedBy = "receipt", cascade = CascadeType.ALL, orphanRemoval = true)
private List<ReceiptItemEntity> receiptItems = new ArrayList<>();
Expand All @@ -71,6 +72,7 @@
this.amount = receipt.getAmount();
this.date = receipt.getDate();
this.etc = receipt.getEtc();
this.receiptItems.clear();

Check warning on line 75 in src/main/java/com/ClubAccount_BE/receipt/adapter/out/persistence/entity/ReceiptEntity.java

View check run for this annotation

Codecov / codecov/patch

src/main/java/com/ClubAccount_BE/receipt/adapter/out/persistence/entity/ReceiptEntity.java#L75

Added line #L75 was not covered by tests
}

public void addReceiptItem(ReceiptItemEntity receiptItem) {
Expand All @@ -79,11 +81,4 @@
receiptItem.addReceipt(this);
}
}

public void replaceReceiptItem(List<ReceiptItem> receiptItems) {
this.receiptItems.clear();
receiptItems.stream()
.map(ReceiptItemMapper::toEntity)
.forEach(this::addReceiptItem);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand All @@ -33,7 +33,6 @@
MultipartFile image,
ReceiptRequest receiptRequest
) {

Receipt receipt = Receipt.create(
user,
receiptRequest.category(),
Expand All @@ -43,8 +42,9 @@
receiptRequest.etc(),
image == null ? DEFAULT_IMAGE : uploadReceiptPort.uploadReceipt(image)
);

List<ReceiptItem> receiptItems = receiptItemEditor.toReceiptItems(receiptRequest, receipt);
boolean isAmountMatched = receiptEditor.checkAmountMatch(receipt, receiptItems);
receipt.updateAmountMatched(isAmountMatched);

Check warning on line 47 in src/main/java/com/ClubAccount_BE/receipt/application/service/CreateReceiptService.java

View check run for this annotation

Codecov / codecov/patch

src/main/java/com/ClubAccount_BE/receipt/application/service/CreateReceiptService.java#L46-L47

Added lines #L46 - L47 were not covered by tests
return createReceiptPort.createReceipt(receipt, receiptItems);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -18,7 +19,7 @@
public class UpdateReceiptService implements UpdateReceiptUseCase {

private final UpdateReceiptPort updateReceiptPort;

private final ReceiptEditor receiptEditor;
private final ReceiptItemEditor receiptItemEditor;

@Override
Expand All @@ -38,6 +39,8 @@
);

List<ReceiptItem> receiptItems = receiptItemEditor.toReceiptItems(receiptRequest, receipt);
boolean isAmountMatched = receiptEditor.checkAmountMatch(receipt, receiptItems);
receipt.updateAmountMatched(isAmountMatched);

Check warning on line 43 in src/main/java/com/ClubAccount_BE/receipt/application/service/UpdateReceiptService.java

View check run for this annotation

Codecov / codecov/patch

src/main/java/com/ClubAccount_BE/receipt/application/service/UpdateReceiptService.java#L42-L43

Added lines #L42 - L43 were not covered by tests
return updateReceiptPort.updateReceipt(receiptId, receipt, receiptItems);
}
}
9 changes: 8 additions & 1 deletion src/main/java/com/ClubAccount_BE/receipt/domain/Receipt.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
private final String etc;
private final String receiptImageUrl;
private final List<ReceiptItem> receiptItems;
private boolean amountMatched;

@Builder
private Receipt(
Expand All @@ -31,7 +32,8 @@
BigDecimal amount,
String etc,
String receiptImageUrl,
List<ReceiptItem> receiptItems
List<ReceiptItem> receiptItems,
boolean amountMatched
) {
this.id = id;
this.user = user;
Expand All @@ -42,6 +44,7 @@
this.etc = etc;
this.receiptImageUrl = receiptImageUrl;
this.receiptItems = receiptItems;
this.amountMatched = amountMatched;
}

public static Receipt create(
Expand Down Expand Up @@ -83,4 +86,8 @@
.etc(etc)
.build();
}

public void updateAmountMatched(boolean amountMatched) {
this.amountMatched = amountMatched;
}

Check warning on line 92 in src/main/java/com/ClubAccount_BE/receipt/domain/Receipt.java

View check run for this annotation

Codecov / codecov/patch

src/main/java/com/ClubAccount_BE/receipt/domain/Receipt.java#L91-L92

Added lines #L91 - L92 were not covered by tests
}
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -11,6 +13,17 @@
@Service
public class ReceiptEditor {

/**
* 영수증 금액과 영수증 아이템 금액 비교
*/
public boolean checkAmountMatch(Receipt receipt, List<ReceiptItem> items) {
BigDecimal total = items.stream()
.map(ReceiptItem::getTotalPrice)
.reduce(BigDecimal.ZERO, BigDecimal::add);

Check warning on line 22 in src/main/java/com/ClubAccount_BE/receipt/domain/service/ReceiptEditor.java

View check run for this annotation

Codecov / codecov/patch

src/main/java/com/ClubAccount_BE/receipt/domain/service/ReceiptEditor.java#L20-L22

Added lines #L20 - L22 were not covered by tests

return total.compareTo(receipt.getAmount()) == 0;
}

/**
* 영수증 카테고리 비율 계산
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@
.amount(receipt.getAmount())
.date(receipt.getDate())
.etc(receipt.getEtc())
.receiptImageUrl(receipt.getReceiptImageUrl()).build();
.receiptImageUrl(receipt.getReceiptImageUrl())
.amountMatched(receipt.isAmountMatched())
.build();
}

public static Receipt toDomain(ReceiptEntity receiptEntity) {
Expand All @@ -32,6 +34,7 @@
.map(ReceiptItemMapper::toDomain)
.toList()
)
.amountMatched(receiptEntity.isAmountMatched())

Check warning on line 37 in src/main/java/com/ClubAccount_BE/receipt/mapper/ReceiptMapper.java

View check run for this annotation

Codecov / codecov/patch

src/main/java/com/ClubAccount_BE/receipt/mapper/ReceiptMapper.java#L37

Added line #L37 was not covered by tests
.build();
}
}