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 @@ -44,7 +44,9 @@ public SettlementHeaderResponse findByHeader(Long settlementId) {

return SettlementHeaderResponse.of(settlement.getName(), totalAmount, settlement.getDeadline(),
settlement.getBank(),
settlement.getAccountNumber());
settlement.getAccountNumber(),
settlement.getCreatedAt(),
settlement.getCompletedAt());
}

@Transactional(readOnly = true)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,13 @@ public record SettlementHeaderResponse(
Long totalAmount,
LocalDateTime deadline,
String bank,
String accountNumber
String accountNumber,
LocalDateTime createdAt,
LocalDateTime completedAt
) {
public static SettlementHeaderResponse of(String groupName, Long totalAmount, LocalDateTime deadline, String bank,
String accountNumber) {
return new SettlementHeaderResponse(groupName, totalAmount, deadline, bank, accountNumber);
String accountNumber, LocalDateTime createdAt, LocalDateTime completedAt) {
return new SettlementHeaderResponse(groupName, totalAmount, deadline, bank, accountNumber, createdAt,
completedAt);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ void getHeader() throws Exception {
// given
SettlementHeaderResponse response = SettlementHeaderResponse.of("모또 모임", 10000L,
LocalDateTime.now().plusDays(1), "우리은행",
"1111-1111");
"1111-1111", LocalDateTime.now(), null);

given(querySettlementService.findIdByCode("code")).willReturn(100L);
given(querySettlementService.findBySettlementHeader(100L)).willReturn(response);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,8 @@ void FindOne_Failure_WhenGroupNotFound() {
void FindBySettlementHeader_Success() {
// Given
SettlementHeaderResponse expectedResponse = new SettlementHeaderResponse(settlement.getName(), 1000L,
LocalDateTime.now().plusDays(1), settlement.getBank(), settlement.getAccountNumber());
LocalDateTime.now().plusDays(1), settlement.getBank(), settlement.getAccountNumber(),
settlement.getCreatedAt(), settlement.getCompletedAt());
when(cacheExecutor.execute(anyString(), any(), any())).thenReturn(expectedResponse);

// When
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,8 @@ void findByHeader_Success() {
when(mockSettlement.getName()).thenReturn("모임 이름");
when(mockSettlement.getBank()).thenReturn("은행");
when(mockSettlement.getAccountNumber()).thenReturn("1234-1234");
when(mockSettlement.getCreatedAt()).thenReturn(LocalDateTime.of(2026, 5, 10, 12, 0));
when(mockSettlement.getCompletedAt()).thenReturn(LocalDateTime.of(2026, 5, 11, 12, 0));
when(settlementRepository.getById(anyLong())).thenReturn(mockSettlement);

Long totalAmount = 1000L;
Expand All @@ -109,6 +111,8 @@ void findByHeader_Success() {
assertThat(result.totalAmount()).isEqualTo(1000L);
assertThat(result.bank()).isEqualTo("은행");
assertThat(result.accountNumber()).isEqualTo("1234-1234");
assertThat(result.createdAt()).isEqualTo(LocalDateTime.of(2026, 5, 10, 12, 0));
assertThat(result.completedAt()).isEqualTo(LocalDateTime.of(2026, 5, 11, 12, 0));
verify(settlementRepository, times(1)).getById(groupId);
verify(expenseRepository, times(1)).sumAmountBySettlement(mockSettlement);
}
Expand Down
Loading