Skip to content

Commit

Permalink
Merge pull request #107 from BudgetBuddiesTeam/revert-92-test/#83
Browse files Browse the repository at this point in the history 
Revert "[test] 소비 업데이트시 소비목표의 변경되는 소비총액 테스트"
  • Loading branch information
@JunRain2
JunRain2 authored Aug 14, 2024
2 parents c17c3d5 + 1063901 commit 089e7fc
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 177 deletions.
4 changes: 0 additions & 4 deletions src/main/java/com/bbteam/budgetbuddies/domain/expense/dto/ExpenseUpdateRequestDto.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,11 @@
import java.time.LocalDateTime;

import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;

@Getter
@NoArgsConstructor(access = AccessLevel.PRIVATE)
@AllArgsConstructor
@Builder
public class ExpenseUpdateRequestDto {
private Long expenseId;
private Long categoryId;
Expand Down
177 changes: 4 additions & 173 deletions ...a/com/bbteam/budgetbuddies/domain/consumptiongoal/service/ConsumptionGoalServiceTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.ArgumentCaptor;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Mockito;
Expand All @@ -36,8 +35,6 @@
import com.bbteam.budgetbuddies.domain.consumptiongoal.dto.TopGoalCategoryResponseDTO;
import com.bbteam.budgetbuddies.domain.consumptiongoal.entity.ConsumptionGoal;
import com.bbteam.budgetbuddies.domain.consumptiongoal.repository.ConsumptionGoalRepository;
import com.bbteam.budgetbuddies.domain.expense.dto.ExpenseUpdateRequestDto;
import com.bbteam.budgetbuddies.domain.expense.entity.Expense;
import com.bbteam.budgetbuddies.domain.user.entity.User;
import com.bbteam.budgetbuddies.domain.user.repository.UserRepository;
import com.bbteam.budgetbuddies.enums.Gender;
Expand Down Expand Up @@ -73,6 +70,7 @@ void setUp() {
.gender(Gender.MALE)
.phoneNumber("010-1234-5678")
.build());
given(user.getId()).willReturn(-1L);
}

@Test
Expand Down Expand Up @@ -395,10 +393,8 @@ void getTopGoalCategories_Success() {
void getTopConsumptionCategories_Success() {
// given
Category defaultCategory = Mockito.spy(Category.builder().name("디폴트 카테고리").user(null).isDefault(true).build());
Category defaultCategory2 = Mockito.spy(
Category.builder().name("디폴트 카테고리2").user(null).isDefault(true).build());
Category defaultCategory3 = Mockito.spy(
Category.builder().name("디폴트 카테고리3").user(null).isDefault(true).build());
Category defaultCategory2 = Mockito.spy(Category.builder().name("디폴트 카테고리2").user(null).isDefault(true).build());
Category defaultCategory3 = Mockito.spy(Category.builder().name("디폴트 카테고리3").user(null).isDefault(true).build());

ConsumptionGoal topConsumptionGoal1 = ConsumptionGoal.builder()
.goalAmount(5000L)
Expand Down Expand Up @@ -429,8 +425,7 @@ void getTopConsumptionCategories_Success() {
List.of(topConsumptionGoal1, topConsumptionGoal2, topConsumptionGoal3));

// when
List<TopConsumptionResponseDTO> result = consumptionGoalService.getTopConsumption(3, user.getId(), 23, 25,
"MALE");
List<TopConsumptionResponseDTO> result = consumptionGoalService.getTopConsumption(3, user.getId(), 23, 25, "MALE");

// then
assertThat(result).hasSize(3);
Expand All @@ -441,168 +436,4 @@ void getTopConsumptionCategories_Success() {
assertThat(result.get(2).getCategoryName()).isEqualTo(defaultCategory3.getName());
assertThat(result.get(2).getConsumeAmount()).isEqualTo(topConsumptionGoal3.getConsumeAmount());
}

@Test
@DisplayName("지난 달, 이번 달 소비 목표가 없는 카테고리에 대한 소비 업데이트를 진행하는 경우 새로운 소비 목표를 생성해 소비 금액을 갱신")
void recalculateConsumptionAmount_notExistPreviousMonthAndThisMonthGoal() {
// given
Category existGoalCategory = Category.builder().name("유저 카테고리").user(user).isDefault(false).build();
Category notExistGoalCategory = Mockito.spy(Category.builder().name("디폴트 카테고리").isDefault(true).build());
given(notExistGoalCategory.getId()).willReturn(-1L);

Expense expense = Mockito.spy(
Expense.builder().category(existGoalCategory).expenseDate(GOAL_MONTH.atStartOfDay()).amount(1000L).build());
when(expense.getId()).thenReturn(-1L);

ExpenseUpdateRequestDto request = ExpenseUpdateRequestDto.builder()
.amount(1000L)
.expenseId(expense.getId())
.expenseDate(LocalDate.of(2024, 8, 7).atStartOfDay())
.categoryId(notExistGoalCategory.getId())
.build();

ConsumptionGoal oldGoal = ConsumptionGoal.builder().consumeAmount(1000L).category(existGoalCategory).build();
ConsumptionGoal expected = ConsumptionGoal.builder()
.goalMonth(LocalDate.of(2024, 8, 1))
.goalAmount(0L)
.consumeAmount(1000L)
.category(notExistGoalCategory)
.user(user)
.build();
// when
when(consumptionGoalRepository.findConsumptionGoalByUserAndCategoryAndGoalMonth(user, expense.getCategory(),
expense.getExpenseDate().toLocalDate().withDayOfMonth(1))).thenReturn(Optional.ofNullable(oldGoal));

when(categoryRepository.findById(request.getCategoryId())).thenReturn(Optional.of(notExistGoalCategory));
when(consumptionGoalRepository.findConsumptionGoalByUserAndCategoryAndGoalMonth(user, notExistGoalCategory,
request.getExpenseDate().toLocalDate().withDayOfMonth(1))).thenReturn(Optional.empty());

when(consumptionGoalRepository.findConsumptionGoalByUserAndCategoryAndGoalMonth(user, notExistGoalCategory,
request.getExpenseDate().minusMonths(1).toLocalDate().withDayOfMonth(1))).thenReturn(Optional.empty());

consumptionGoalService.recalculateConsumptionAmount(expense, request, user);

ArgumentCaptor<ConsumptionGoal> consumptionGoalCaptor = ArgumentCaptor.forClass(ConsumptionGoal.class);
verify(consumptionGoalRepository, times(2)).save(consumptionGoalCaptor.capture());

List<ConsumptionGoal> savedConsumptionGoals = consumptionGoalCaptor.getAllValues();

// then
assertEquals(oldGoal.getConsumeAmount(), 0L);
assertThat(savedConsumptionGoals.get(1)).usingRecursiveComparison().isEqualTo(expected);
}

@Test
@DisplayName("이번달 소비 목표가 없는 카테고리에 대한 소비 업데이트를 진행하는 경우 지난 달 소비 목표의 목표 금액을 복사한 이번 달 소비 목표를 생성해 소비 금액을 갱신")
void recalculateConsumptionAmount_notExistThisMonthGoal() {
// given
Category existGoalCategory = Category.builder().name("유저 카테고리").user(user).isDefault(false).build();
Category notExistThisMonthGoalCategory = Mockito.spy(
Category.builder().name("디폴트 카테고리").isDefault(true).build());
given(notExistThisMonthGoalCategory.getId()).willReturn(-1L);

Expense expense = Mockito.spy(
Expense.builder().category(existGoalCategory).expenseDate(GOAL_MONTH.atStartOfDay()).amount(1000L).build());
when(expense.getId()).thenReturn(-1L);

ExpenseUpdateRequestDto request = ExpenseUpdateRequestDto.builder()
.amount(1000L)
.expenseId(expense.getId())
.expenseDate(LocalDate.of(2024, 8, 7).atStartOfDay())
.categoryId(notExistThisMonthGoalCategory.getId())
.build();

ConsumptionGoal oldGoal = ConsumptionGoal.builder().consumeAmount(1000L).category(existGoalCategory).build();

ConsumptionGoal previousMonthGoal = ConsumptionGoal.builder()
.goalMonth(LocalDate.of(2024, 7, 1))
.goalAmount(3000L)
.consumeAmount(3000L)
.category(notExistThisMonthGoalCategory)
.user(user)
.build();

ConsumptionGoal expected = ConsumptionGoal.builder()
.goalMonth(LocalDate.of(2024, 8, 1))
.goalAmount(3000L)
.consumeAmount(1000L)
.category(notExistThisMonthGoalCategory)
.user(user)
.build();

// when
when(consumptionGoalRepository.findConsumptionGoalByUserAndCategoryAndGoalMonth(user, expense.getCategory(),
expense.getExpenseDate().toLocalDate().withDayOfMonth(1))).thenReturn(Optional.ofNullable(oldGoal));

when(categoryRepository.findById(request.getCategoryId())).thenReturn(
Optional.of(notExistThisMonthGoalCategory));
when(consumptionGoalRepository.findConsumptionGoalByUserAndCategoryAndGoalMonth(user,
notExistThisMonthGoalCategory, request.getExpenseDate().toLocalDate().withDayOfMonth(1))).thenReturn(
Optional.empty());

when(consumptionGoalRepository.findConsumptionGoalByUserAndCategoryAndGoalMonth(user,
notExistThisMonthGoalCategory,
request.getExpenseDate().minusMonths(1).toLocalDate().withDayOfMonth(1))).thenReturn(
Optional.ofNullable(previousMonthGoal));

consumptionGoalService.recalculateConsumptionAmount(expense, request, user);

ArgumentCaptor<ConsumptionGoal> consumptionGoalCaptor = ArgumentCaptor.forClass(ConsumptionGoal.class);
verify(consumptionGoalRepository, times(2)).save(consumptionGoalCaptor.capture());

List<ConsumptionGoal> savedConsumptionGoals = consumptionGoalCaptor.getAllValues();

// then
assertEquals(oldGoal.getConsumeAmount(), 0L);
assertThat(savedConsumptionGoals.get(1)).usingRecursiveComparison().isEqualTo(expected);
}

@Test
@DisplayName("이번달 소비 목표가 있는 경우 이번 달 소비 목표의 소비 금액을 갱신")
void recalculateConsumptionAmount_existThisMonthGoal() {
// given
Category existGoalCategory = Mockito.spy(
Category.builder().name("유저 카테고리").user(user).isDefault(false).build());
given(existGoalCategory.getId()).willReturn(-1L);

Expense expense = Mockito.spy(
Expense.builder().category(existGoalCategory).expenseDate(GOAL_MONTH.atStartOfDay()).amount(1000L).build());
when(expense.getId()).thenReturn(-1L);

ExpenseUpdateRequestDto request = ExpenseUpdateRequestDto.builder()
.amount(2000L)
.expenseId(expense.getId())
.expenseDate(LocalDate.of(2024, 8, 7).atStartOfDay())
.categoryId(existGoalCategory.getId())
.build();

ConsumptionGoal oldGoal = ConsumptionGoal.builder()
.goalMonth(LocalDate.of(2024, 8, 1))
.goalAmount(3000L)
.consumeAmount(1000L)
.category(existGoalCategory)
.user(user)
.build();

ConsumptionGoal expected = ConsumptionGoal.builder()
.goalMonth(LocalDate.of(2024, 8, 1))
.goalAmount(3000L)
.consumeAmount(2000L)
.category(existGoalCategory)
.user(user)
.build();

// when
when(consumptionGoalRepository.findConsumptionGoalByUserAndCategoryAndGoalMonth(user, expense.getCategory(),
expense.getExpenseDate().toLocalDate().withDayOfMonth(1))).thenReturn(Optional.ofNullable(oldGoal));

when(categoryRepository.findById(request.getCategoryId())).thenReturn(Optional.of(existGoalCategory));
when(consumptionGoalRepository.findConsumptionGoalByUserAndCategoryAndGoalMonth(user, existGoalCategory,
request.getExpenseDate().toLocalDate().withDayOfMonth(1))).thenReturn(Optional.ofNullable(oldGoal));

consumptionGoalService.recalculateConsumptionAmount(expense, request, user);

// then
assertThat(oldGoal).usingRecursiveComparison().isEqualTo(expected);
}
}

0 comments on commit 089e7fc

Please sign in to comment.