diff --git a/backend/pium/src/main/java/com/official/pium/domain/PetPlant.java b/backend/pium/src/main/java/com/official/pium/domain/PetPlant.java index 5f4c154f..f47ce3c8 100644 --- a/backend/pium/src/main/java/com/official/pium/domain/PetPlant.java +++ b/backend/pium/src/main/java/com/official/pium/domain/PetPlant.java @@ -1,7 +1,7 @@ package com.official.pium.domain; import com.official.pium.domain.vo.PetPlantState; -import com.official.pium.domain.vo.WaterDate; +import com.official.pium.domain.vo.WaterDetail; import jakarta.persistence.Column; import jakarta.persistence.Embedded; import jakarta.persistence.Entity; @@ -62,7 +62,7 @@ public class PetPlant extends BaseEntity { private LocalDate birthDate; @Embedded - private WaterDate waterDate; + private WaterDetail waterDetail; @Min(MIN_WATER_CYCLE) @Max(MAX_WATER_CYCLE) @@ -78,7 +78,7 @@ private PetPlant( String imageUrl, PetPlantState petPlantState, LocalDate birthDate, - WaterDate waterDate, + WaterDetail waterDetail, Integer waterCycle ) { this.dictionaryPlant = dictionaryPlant; @@ -87,7 +87,7 @@ private PetPlant( this.imageUrl = imageUrl; this.petPlantState = petPlantState; this.birthDate = birthDate; - this.waterDate = waterDate; + this.waterDetail = waterDetail; this.waterCycle = waterCycle; } @@ -102,7 +102,7 @@ public Long calculateDaySince(LocalDate currentDate) { * - 0 : 오늘 할 일 - 음수 : 할 일 - 양수 : 지각 */ public Long calculateDday(LocalDate currentDate) { - return waterDate.calculateDday(currentDate); + return waterDetail.calculateDday(currentDate); } public void updatePetPlant( @@ -118,9 +118,9 @@ public void updatePetPlant( validateLocalDate(birthDate); validateLocalDate(lastWaterDate); validateImageUrl(imageUrl); - waterDate.changeLastWaterDate(lastWaterDate); + waterDetail.changeLastWaterDate(lastWaterDate); if (!Objects.equals(waterCycle, this.waterCycle)) { - waterDate.plusNextWaterDate(waterCycle); + waterDetail.plusNextWaterDate(waterCycle); } this.nickname = nickname; this.petPlantState = petPlantState; @@ -154,11 +154,11 @@ private void validateImageUrl(String imageUrl) { } public void water(LocalDate newWaterDate) { - waterDate.water(newWaterDate, this.waterCycle); + waterDetail.water(newWaterDate, this.waterCycle); } public void changeNextWaterDate(LocalDate newWaterDate) { - waterDate.changeNextWaterDate(newWaterDate); + waterDetail.changeNextWaterDate(newWaterDate); } public boolean isNotOwnerOf(Member member) { @@ -166,7 +166,7 @@ public boolean isNotOwnerOf(Member member) { } public boolean isDifferentLastWaterDate(LocalDate lastWaterDate) { - return waterDate.isDifferentLastWaterDate(lastWaterDate); + return waterDetail.isDifferentLastWaterDate(lastWaterDate); } @Override diff --git a/backend/pium/src/main/java/com/official/pium/domain/vo/WaterDate.java b/backend/pium/src/main/java/com/official/pium/domain/vo/WaterDetail.java similarity index 95% rename from backend/pium/src/main/java/com/official/pium/domain/vo/WaterDate.java rename to backend/pium/src/main/java/com/official/pium/domain/vo/WaterDetail.java index 7794b3a0..83c0e018 100644 --- a/backend/pium/src/main/java/com/official/pium/domain/vo/WaterDate.java +++ b/backend/pium/src/main/java/com/official/pium/domain/vo/WaterDetail.java @@ -13,7 +13,7 @@ @Getter @Embeddable @NoArgsConstructor(access = AccessLevel.PROTECTED) -public class WaterDate { +public class WaterDetail { @NotNull @Column(name = "next_water_date", nullable = false) @@ -24,7 +24,7 @@ public class WaterDate { private LocalDate lastWaterDate; @Builder - private WaterDate(LocalDate nextWaterDate, LocalDate lastWaterDate) { + private WaterDetail(LocalDate nextWaterDate, LocalDate lastWaterDate) { this.nextWaterDate = nextWaterDate; this.lastWaterDate = lastWaterDate; } diff --git a/backend/pium/src/main/java/com/official/pium/event/history/PetPlantHistory.java b/backend/pium/src/main/java/com/official/pium/event/history/PetPlantHistory.java index ae111a6b..525ca154 100644 --- a/backend/pium/src/main/java/com/official/pium/event/history/PetPlantHistory.java +++ b/backend/pium/src/main/java/com/official/pium/event/history/PetPlantHistory.java @@ -39,7 +39,7 @@ public static PetPlantHistory from(PetPlant petPlant) { .light(petPlant.getPetPlantState().getLight()) .wind(petPlant.getPetPlantState().getWind()) .waterCycle(petPlant.getWaterCycle().toString()) - .lastWaterDate(petPlant.getWaterDate().getLastWaterDate().toString()) + .lastWaterDate(petPlant.getWaterDetail().getLastWaterDate().toString()) .build(); } diff --git a/backend/pium/src/main/java/com/official/pium/service/PetPlantService.java b/backend/pium/src/main/java/com/official/pium/service/PetPlantService.java index d19cbf07..62c4008a 100644 --- a/backend/pium/src/main/java/com/official/pium/service/PetPlantService.java +++ b/backend/pium/src/main/java/com/official/pium/service/PetPlantService.java @@ -173,7 +173,7 @@ private void publishPetPlantHistories(PetPlant petPlant, PetPlantHistory previou previousPetPlantHistory.generateUpdateLastWaterDateHistoryEvent( petPlant.getId(), - petPlant.getWaterDate().getLastWaterDate() + petPlant.getWaterDetail().getLastWaterDate() ).ifPresent(publisher::publishEvent); } diff --git a/backend/pium/src/main/java/com/official/pium/service/ReminderService.java b/backend/pium/src/main/java/com/official/pium/service/ReminderService.java index d268a3b8..788f5748 100644 --- a/backend/pium/src/main/java/com/official/pium/service/ReminderService.java +++ b/backend/pium/src/main/java/com/official/pium/service/ReminderService.java @@ -37,9 +37,9 @@ public void water(ReminderCreateRequest reminderCreateRequest, Long petPlantId, checkOwner(petPlant, member); - LocalDate previousWaterDate = petPlant.getWaterDate().getLastWaterDate(); + LocalDate previousWaterDate = petPlant.getWaterDetail().getLastWaterDate(); petPlant.water(reminderCreateRequest.getWaterDate()); - LocalDate currentWaterDate = petPlant.getWaterDate().getLastWaterDate(); + LocalDate currentWaterDate = petPlant.getWaterDetail().getLastWaterDate(); publisher.publishEvent( HistoryEvent.of(petPlantId, previousWaterDate, currentWaterDate, HistoryType.LAST_WATER_DATE, diff --git a/backend/pium/src/main/java/com/official/pium/service/dto/PetPlantCreateRequest.java b/backend/pium/src/main/java/com/official/pium/service/dto/PetPlantCreateRequest.java index 0d1f7f0d..01bdb821 100644 --- a/backend/pium/src/main/java/com/official/pium/service/dto/PetPlantCreateRequest.java +++ b/backend/pium/src/main/java/com/official/pium/service/dto/PetPlantCreateRequest.java @@ -1,7 +1,7 @@ package com.official.pium.service.dto; import com.official.pium.domain.vo.PetPlantState; -import com.official.pium.domain.vo.WaterDate; +import com.official.pium.domain.vo.WaterDetail; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.PastOrPresent; @@ -59,8 +59,8 @@ public PetPlantState toPetPlantState() { .build(); } - public WaterDate toWaterDate() { - return WaterDate.builder() + public WaterDetail toWaterDate() { + return WaterDetail.builder() .lastWaterDate(lastWaterDate) .nextWaterDate(LocalDate.now().plusDays(waterCycle)) .build(); diff --git a/backend/pium/src/main/java/com/official/pium/service/dto/PetPlantResponse.java b/backend/pium/src/main/java/com/official/pium/service/dto/PetPlantResponse.java index 4a24f773..5b6de66e 100644 --- a/backend/pium/src/main/java/com/official/pium/service/dto/PetPlantResponse.java +++ b/backend/pium/src/main/java/com/official/pium/service/dto/PetPlantResponse.java @@ -52,10 +52,10 @@ public static PetPlantResponse of(PetPlant petPlant, Long dday, Long daySince) { .light(petPlant.getPetPlantState().getLight()) .wind(petPlant.getPetPlantState().getWind()) .birthDate(petPlant.getBirthDate()) - .lastWaterDate(petPlant.getWaterDate().getLastWaterDate()) + .lastWaterDate(petPlant.getWaterDetail().getLastWaterDate()) .waterCycle(petPlant.getWaterCycle()) .dday(dday) - .nextWaterDate(petPlant.getWaterDate().getNextWaterDate()) + .nextWaterDate(petPlant.getWaterDetail().getNextWaterDate()) .daySince(daySince) .dictionaryPlant(PetPlantResponse.DictionaryPlantResponse.builder() .id(dictionaryPlant.getId()) @@ -77,10 +77,10 @@ public static PetPlantResponse of(PetPlant petPlant, Long dday, Long daySince, .light(petPlant.getPetPlantState().getLight()) .wind(petPlant.getPetPlantState().getWind()) .birthDate(petPlant.getBirthDate()) - .lastWaterDate(petPlant.getWaterDate().getLastWaterDate()) + .lastWaterDate(petPlant.getWaterDetail().getLastWaterDate()) .waterCycle(petPlant.getWaterCycle()) .dday(dday) - .nextWaterDate(petPlant.getWaterDate().getNextWaterDate()) + .nextWaterDate(petPlant.getWaterDetail().getNextWaterDate()) .daySince(daySince) .dictionaryPlant(PetPlantResponse.DictionaryPlantResponse.builder() .id(dictionaryPlant.getId()) diff --git a/backend/pium/src/main/java/com/official/pium/service/dto/ReminderResponse.java b/backend/pium/src/main/java/com/official/pium/service/dto/ReminderResponse.java index 1ce1b8d7..0ae9937f 100644 --- a/backend/pium/src/main/java/com/official/pium/service/dto/ReminderResponse.java +++ b/backend/pium/src/main/java/com/official/pium/service/dto/ReminderResponse.java @@ -34,8 +34,8 @@ public static ReminderResponse of(PetPlant petPlant, Long dday) { .nickName(petPlant.getNickname()) .dictionaryPlantName(petPlant.getDictionaryPlant().getClassification().getName()) .dday(dday) - .nextWaterDate(petPlant.getWaterDate().getNextWaterDate()) - .lastWaterDate(petPlant.getWaterDate().getLastWaterDate()) + .nextWaterDate(petPlant.getWaterDetail().getNextWaterDate()) + .lastWaterDate(petPlant.getWaterDetail().getLastWaterDate()) .build(); } } diff --git a/backend/pium/src/test/java/com/official/pium/acceptance/PetPlantApiTest.java b/backend/pium/src/test/java/com/official/pium/acceptance/PetPlantApiTest.java index 2481dbb1..c23703a7 100644 --- a/backend/pium/src/test/java/com/official/pium/acceptance/PetPlantApiTest.java +++ b/backend/pium/src/test/java/com/official/pium/acceptance/PetPlantApiTest.java @@ -574,7 +574,7 @@ class 반려_식물_수정_시_ { .lastWaterDate(LocalDate.of(2022, 4, 1)) .build(); - LocalDate firstWaterDate = petPlant.getWaterDate().getLastWaterDate().plusDays(2); + LocalDate firstWaterDate = petPlant.getWaterDetail().getLastWaterDate().plusDays(2); 반려_식물_물주기(petPlant.getId(), firstWaterDate); LocalDate secondWaterDate = firstWaterDate.plusDays(3); 반려_식물_물주기(petPlant.getId(), secondWaterDate); @@ -608,7 +608,7 @@ class 반려_식물_수정_시_ { .lastWaterDate(LocalDate.of(2022, 4, 1)) .build(); - LocalDate firstWaterDate = petPlant.getWaterDate().getLastWaterDate().plusDays(1); + LocalDate firstWaterDate = petPlant.getWaterDetail().getLastWaterDate().plusDays(1); 반려_식물_물주기(petPlant.getId(), firstWaterDate); LocalDate secondWaterDate = firstWaterDate.plusDays(3); 반려_식물_물주기(petPlant.getId(), secondWaterDate); diff --git a/backend/pium/src/test/java/com/official/pium/acceptance/ReminderApiTest.java b/backend/pium/src/test/java/com/official/pium/acceptance/ReminderApiTest.java index 4b659622..5133974c 100644 --- a/backend/pium/src/test/java/com/official/pium/acceptance/ReminderApiTest.java +++ b/backend/pium/src/test/java/com/official/pium/acceptance/ReminderApiTest.java @@ -127,7 +127,7 @@ class 물주기_수행_시_ { String sessionId = 로그인_요청(); PetPlant petPlant = petPlantSupport.builder().build(); - ReminderCreateRequest request = 리마인더_물주기_요청(petPlant.getWaterDate().getLastWaterDate().plusDays(1)); + ReminderCreateRequest request = 리마인더_물주기_요청(petPlant.getWaterDetail().getLastWaterDate().plusDays(1)); RestAssured .given() diff --git a/backend/pium/src/test/java/com/official/pium/domain/HistoryTest.java b/backend/pium/src/test/java/com/official/pium/domain/HistoryTest.java index afc6abcb..4dc66c1b 100644 --- a/backend/pium/src/test/java/com/official/pium/domain/HistoryTest.java +++ b/backend/pium/src/test/java/com/official/pium/domain/HistoryTest.java @@ -4,7 +4,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import com.official.pium.domain.vo.PetPlantState; -import com.official.pium.domain.vo.WaterDate; +import com.official.pium.domain.vo.WaterDetail; import java.time.LocalDate; import org.assertj.core.api.SoftAssertions; import org.junit.jupiter.api.DisplayNameGeneration; @@ -82,7 +82,7 @@ private History generateHistory(LocalDate lastWaterDate) { .waterCycle(5) .birthDate(LocalDate.of(2021, 7, 1)) .waterDate( - WaterDate.builder() + WaterDetail.builder() .lastWaterDate(lastWaterDate) .nextWaterDate(lastWaterDate.plusDays(5)) .build() diff --git a/backend/pium/src/test/java/com/official/pium/domain/PetPlantTest.java b/backend/pium/src/test/java/com/official/pium/domain/PetPlantTest.java index adfea9c9..3be26811 100644 --- a/backend/pium/src/test/java/com/official/pium/domain/PetPlantTest.java +++ b/backend/pium/src/test/java/com/official/pium/domain/PetPlantTest.java @@ -5,7 +5,7 @@ import static org.assertj.core.api.SoftAssertions.assertSoftly; import com.official.pium.domain.vo.PetPlantState; -import com.official.pium.domain.vo.WaterDate; +import com.official.pium.domain.vo.WaterDetail; import com.official.pium.fixture.MemberFixture; import com.official.pium.fixture.PetPlantFixture; import java.time.LocalDate; @@ -58,7 +58,7 @@ class PetPlantTest { .waterCycle(7) .birthDate(LocalDate.of(2022, 7, 1)) .waterDate( - WaterDate.builder() + WaterDetail.builder() .lastWaterDate(LocalDate.of(2022, 7, 1)) .nextWaterDate(LocalDate.of(2022, 7, 8)) .build() @@ -121,7 +121,7 @@ class 반려_식물_정보_수정 { .waterCycle(7) .birthDate(LocalDate.of(2022, 7, 1)) .waterDate( - WaterDate.builder() + WaterDetail.builder() .lastWaterDate(LocalDate.of(2022, 7, 1)) .nextWaterDate(LocalDate.now().minusDays(3)) .build() @@ -142,8 +142,8 @@ class 반려_식물_정보_수정 { "https://testimage.com" ); - assertThat(petPlant.getWaterDate().getNextWaterDate()) - .isEqualTo(petPlant.getWaterDate().getLastWaterDate().plusDays(petPlant.getWaterCycle())); + assertThat(petPlant.getWaterDetail().getNextWaterDate()) + .isEqualTo(petPlant.getWaterDetail().getLastWaterDate().plusDays(petPlant.getWaterCycle())); } @ParameterizedTest @@ -359,7 +359,7 @@ class 반려_식물_정보_수정 { .waterCycle(7) .birthDate(LocalDate.of(2022, 7, 1)) .waterDate( - WaterDate.builder() + WaterDetail.builder() .lastWaterDate(LocalDate.of(2022, 7, 1)) .nextWaterDate(baseDate.minusDays(days)) .build() @@ -370,7 +370,7 @@ class 반려_식물_정보_수정 { petPlant.changeNextWaterDate(newWaterDate); - assertThat(petPlant.getWaterDate().getNextWaterDate()).isEqualTo(newWaterDate); + assertThat(petPlant.getWaterDetail().getNextWaterDate()).isEqualTo(newWaterDate); } @ParameterizedTest(name = "오늘 할 일을 {0}일 뒤로 미루기") @@ -390,17 +390,17 @@ class 반려_식물_정보_수정 { .waterCycle(7) .birthDate(LocalDate.of(2022, 7, 1)) .waterDate( - WaterDate.builder() + WaterDetail.builder() .lastWaterDate(LocalDate.of(2022, 7, 1)) .nextWaterDate(LocalDate.now()) .build() ) .build(); - LocalDate newWaterDate = petPlant.getWaterDate().getNextWaterDate().plusDays(days); + LocalDate newWaterDate = petPlant.getWaterDetail().getNextWaterDate().plusDays(days); petPlant.changeNextWaterDate(newWaterDate); - assertThat(petPlant.getWaterDate().getNextWaterDate()).isEqualTo(newWaterDate); + assertThat(petPlant.getWaterDetail().getNextWaterDate()).isEqualTo(newWaterDate); } @ParameterizedTest(name = "{0}일 뒤의 물주기를 {1}일 뒤로 미루기") @@ -419,17 +419,17 @@ class 반려_식물_정보_수정 { ) .waterCycle(7) .birthDate(LocalDate.of(2022, 7, 1)) - .waterDate(WaterDate.builder() + .waterDate(WaterDetail.builder() .lastWaterDate(LocalDate.of(2022, 7, 1)) .nextWaterDate(LocalDate.now().plusDays(days)) .build()) .build(); - LocalDate newWaterDate = petPlant.getWaterDate().getNextWaterDate().plusDays(plusDays); + LocalDate newWaterDate = petPlant.getWaterDetail().getNextWaterDate().plusDays(plusDays); petPlant.changeNextWaterDate(newWaterDate); - assertThat(petPlant.getWaterDate().getNextWaterDate()).isEqualTo(newWaterDate); + assertThat(petPlant.getWaterDetail().getNextWaterDate()).isEqualTo(newWaterDate); } @ParameterizedTest(name = "미루는 날짜가 오늘보다 {0}일 전이면 예외 발생") @@ -438,7 +438,7 @@ class 반려_식물_정보_수정 { PetPlant petPlant = PetPlantFixture.산세베리아; assertThatThrownBy( - () -> petPlant.changeNextWaterDate(petPlant.getWaterDate().getNextWaterDate().minusDays(days))) + () -> petPlant.changeNextWaterDate(petPlant.getWaterDetail().getNextWaterDate().minusDays(days))) .isInstanceOf(IllegalArgumentException.class) .hasMessageContaining("오늘과 그 이전 날짜로 물주기 날짜를 변경할 수는 없습니다."); } @@ -461,18 +461,18 @@ class 반려_식물_정보_수정 { .waterCycle(7) .birthDate(LocalDate.of(2022, 7, 1)) .waterDate( - WaterDate.builder() + WaterDetail.builder() .lastWaterDate(LocalDate.of(2022, 7, 1)) .nextWaterDate(now.plusDays(days)) .build() ) .build(); - LocalDate newWaterDate = petPlant.getWaterDate().getNextWaterDate().minusDays(minusDays); + LocalDate newWaterDate = petPlant.getWaterDetail().getNextWaterDate().minusDays(minusDays); petPlant.changeNextWaterDate(newWaterDate); - assertThat(petPlant.getWaterDate().getNextWaterDate()).isEqualTo(newWaterDate); + assertThat(petPlant.getWaterDetail().getNextWaterDate()).isEqualTo(newWaterDate); } @ParameterizedTest(name = "미루는 날짜가 오늘보다 {0}일 전이면 예외 발생") @@ -481,7 +481,7 @@ class 반려_식물_정보_수정 { PetPlant petPlant = PetPlantFixture.산세베리아; assertThatThrownBy( - () -> petPlant.changeNextWaterDate(petPlant.getWaterDate().getNextWaterDate().minusDays(days))) + () -> petPlant.changeNextWaterDate(petPlant.getWaterDetail().getNextWaterDate().minusDays(days))) .isInstanceOf(IllegalArgumentException.class) .hasMessageContaining("오늘과 그 이전 날짜로 물주기 날짜를 변경할 수는 없습니다."); } @@ -496,8 +496,8 @@ class 반려_식물_정보_수정 { assertThat(petPlant) .extracting( - p -> p.getWaterDate().getNextWaterDate(), - p -> p.getWaterDate().getLastWaterDate() + p -> p.getWaterDetail().getNextWaterDate(), + p -> p.getWaterDetail().getLastWaterDate() ) .isEqualTo(List.of(newNextWaterDate, newWaterDate)); } @@ -538,7 +538,7 @@ class 반려_식물_정보_수정 { .waterCycle(7) .birthDate(LocalDate.of(2022, 7, 1)) .waterDate( - WaterDate.builder() + WaterDetail.builder() .lastWaterDate(LocalDate.of(2023, 7, 1)) .nextWaterDate(LocalDate.of(2023, 7, 17)) .build() @@ -565,7 +565,7 @@ class 반려_식물_정보_수정 { .waterCycle(7) .birthDate(LocalDate.of(2022, 7, 1)) .waterDate( - WaterDate.builder() + WaterDetail.builder() .lastWaterDate(LocalDate.of(2023, 7, 1)) .nextWaterDate(LocalDate.of(2023, 7, 17)) .build() @@ -593,7 +593,7 @@ class 반려_식물_정보_수정 { .waterCycle(7) .birthDate(LocalDate.of(2022, 7, 1)) .waterDate( - WaterDate.builder() + WaterDetail.builder() .lastWaterDate(lastWaterDate) .nextWaterDate(LocalDate.of(2022, 7, 17)) .build() @@ -621,7 +621,7 @@ class 반려_식물_정보_수정 { .waterCycle(7) .birthDate(LocalDate.of(2022, 7, 1)) .waterDate( - WaterDate.builder() + WaterDetail.builder() .lastWaterDate(lastWaterDate) .nextWaterDate(LocalDate.of(2022, 7, 17)) .build() diff --git a/backend/pium/src/test/java/com/official/pium/fixture/PetPlantFixture.java b/backend/pium/src/test/java/com/official/pium/fixture/PetPlantFixture.java index d30779c2..773521de 100644 --- a/backend/pium/src/test/java/com/official/pium/fixture/PetPlantFixture.java +++ b/backend/pium/src/test/java/com/official/pium/fixture/PetPlantFixture.java @@ -5,7 +5,7 @@ import com.official.pium.domain.PetPlant; import com.official.pium.domain.vo.PetPlantState; -import com.official.pium.domain.vo.WaterDate; +import com.official.pium.domain.vo.WaterDetail; import com.official.pium.service.dto.DataResponse; import com.official.pium.service.dto.PetPlantCreateRequest; import com.official.pium.service.dto.PetPlantResponse; @@ -31,7 +31,7 @@ public class PetPlantFixture { .waterCycle(7) .birthDate(LocalDate.of(2022, 7, 1)) .waterDate( - WaterDate.builder() + WaterDetail.builder() .lastWaterDate(LocalDate.of(2022, 7, 1)) .nextWaterDate(LocalDate.of(2022, 7, 8)) .build() diff --git a/backend/pium/src/test/java/com/official/pium/repository/GardenRepositoryTest.java b/backend/pium/src/test/java/com/official/pium/repository/GardenRepositoryTest.java index ee5f8f06..1e7f86e1 100644 --- a/backend/pium/src/test/java/com/official/pium/repository/GardenRepositoryTest.java +++ b/backend/pium/src/test/java/com/official/pium/repository/GardenRepositoryTest.java @@ -10,7 +10,7 @@ import com.official.pium.domain.PetPlant; import com.official.pium.domain.vo.GardenPlantState; import com.official.pium.domain.vo.PetPlantState; -import com.official.pium.domain.vo.WaterDate; +import com.official.pium.domain.vo.WaterDetail; import java.time.LocalDate; import java.util.ArrayList; import java.util.Comparator; @@ -178,7 +178,7 @@ private PetPlant createPetPlant() { ) .birthDate(LocalDate.of(2020, 1, 3)) .waterDate( - WaterDate.builder() + WaterDetail.builder() .nextWaterDate(LocalDate.of(2020, 1, 3)) .lastWaterDate(LocalDate.of(2020, 1, 3)) .build() diff --git a/backend/pium/src/test/java/com/official/pium/repository/HistoryRepositoryTest.java b/backend/pium/src/test/java/com/official/pium/repository/HistoryRepositoryTest.java index b5bf4e83..17572cb0 100644 --- a/backend/pium/src/test/java/com/official/pium/repository/HistoryRepositoryTest.java +++ b/backend/pium/src/test/java/com/official/pium/repository/HistoryRepositoryTest.java @@ -16,7 +16,7 @@ import com.official.pium.domain.vo.Property; import com.official.pium.domain.vo.Temperature; import com.official.pium.domain.vo.WaterCycle; -import com.official.pium.domain.vo.WaterDate; +import com.official.pium.domain.vo.WaterDetail; import java.time.LocalDate; import java.util.List; import org.junit.jupiter.api.BeforeEach; @@ -169,7 +169,7 @@ private PetPlant savePetPlant(Member member, DictionaryPlant dictionaryPlant) { ) .birthDate(LocalDate.of(2021, 6, 4)) .waterDate( - WaterDate.builder() + WaterDetail.builder() .nextWaterDate(LocalDate.of(2021, 6, 4)) .lastWaterDate(LocalDate.of(2021, 6, 4)) .build() diff --git a/backend/pium/src/test/java/com/official/pium/repository/PetPlantRepositoryTest.java b/backend/pium/src/test/java/com/official/pium/repository/PetPlantRepositoryTest.java index b2f949ee..7f8fddb9 100644 --- a/backend/pium/src/test/java/com/official/pium/repository/PetPlantRepositoryTest.java +++ b/backend/pium/src/test/java/com/official/pium/repository/PetPlantRepositoryTest.java @@ -8,7 +8,7 @@ import com.official.pium.domain.Member; import com.official.pium.domain.PetPlant; import com.official.pium.domain.vo.PetPlantState; -import com.official.pium.domain.vo.WaterDate; +import com.official.pium.domain.vo.WaterDetail; import java.time.LocalDate; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayNameGeneration; @@ -88,7 +88,7 @@ private PetPlant createPetPlant() { ) .birthDate(LocalDate.of(2020, 1, 3)) .waterDate( - WaterDate.builder() + WaterDetail.builder() .nextWaterDate(LocalDate.of(2020, 1, 3)) .lastWaterDate(LocalDate.of(2020, 1, 3)) .build() diff --git a/backend/pium/src/test/java/com/official/pium/service/PetPlantServiceTest.java b/backend/pium/src/test/java/com/official/pium/service/PetPlantServiceTest.java index 079ed483..acd33924 100644 --- a/backend/pium/src/test/java/com/official/pium/service/PetPlantServiceTest.java +++ b/backend/pium/src/test/java/com/official/pium/service/PetPlantServiceTest.java @@ -212,7 +212,7 @@ class 반려_식물_수정_시 { assertThat(updatedPetPlant.getPetPlantState().getWind()).isEqualTo(updateRequest.getWind()); assertThat(updatedPetPlant.getWaterCycle()).isEqualTo(updateRequest.getWaterCycle()); assertThat(updatedPetPlant.getBirthDate()).isEqualTo(updateRequest.getBirthDate()); - assertThat(updatedPetPlant.getWaterDate().getLastWaterDate()).isEqualTo( + assertThat(updatedPetPlant.getWaterDetail().getLastWaterDate()).isEqualTo( updateRequest.getLastWaterDate()); assertThat(updatedPetPlant.getImageUrl()).isNotEqualTo(petPlantImageUrl); } @@ -298,7 +298,7 @@ class 반려_식물_수정_시 { .build(); historySupport.builder().petPlant(petPlant).build(); - LocalDate firstDate = petPlant.getWaterDate().getLastWaterDate().plusDays(1); + LocalDate firstDate = petPlant.getWaterDetail().getLastWaterDate().plusDays(1); ReminderCreateRequest createRequest = ReminderCreateRequest.builder() .waterDate(firstDate) .build(); @@ -336,7 +336,7 @@ class 반려_식물_수정_시 { .lastWaterDate(baseDate) .build(); - LocalDate firstDate = petPlant.getWaterDate().getLastWaterDate().plusDays(1); + LocalDate firstDate = petPlant.getWaterDetail().getLastWaterDate().plusDays(1); ReminderCreateRequest createRequest = ReminderCreateRequest.builder() .waterDate(firstDate) .build(); diff --git a/backend/pium/src/test/java/com/official/pium/service/ReminderServiceTest.java b/backend/pium/src/test/java/com/official/pium/service/ReminderServiceTest.java index 5d60c246..1b22a5e3 100644 --- a/backend/pium/src/test/java/com/official/pium/service/ReminderServiceTest.java +++ b/backend/pium/src/test/java/com/official/pium/service/ReminderServiceTest.java @@ -11,7 +11,7 @@ import com.official.pium.domain.Member; import com.official.pium.domain.PetPlant; import com.official.pium.domain.vo.PetPlantState; -import com.official.pium.domain.vo.WaterDate; +import com.official.pium.domain.vo.WaterDetail; import com.official.pium.repository.HistoryRepository; import com.official.pium.repository.PetPlantRepository; import com.official.pium.service.dto.DataResponse; @@ -60,7 +60,7 @@ void setUp() { void 정상적인_물주기_시_다음_물주기_날짜와_마지막으로_물을_준_날짜를_변경() { PetPlant petPlant1 = petPlantSupport.builder().member(member).lastWaterDate(LocalDate.of(2022, 3, 4)).build(); ReminderCreateRequest request = ReminderCreateRequest.builder() - .waterDate(petPlant1.getWaterDate().getLastWaterDate().plusDays(2)) + .waterDate(petPlant1.getWaterDetail().getLastWaterDate().plusDays(2)) .build(); reminderService.water(request, petPlant1.getId(), member); @@ -71,8 +71,8 @@ void setUp() { assertSoftly(softly -> { softly.assertThat(updatedPetPlant) .extracting( - petPlant -> petPlant.getWaterDate().getNextWaterDate(), - petPlant -> petPlant.getWaterDate().getLastWaterDate() + petPlant -> petPlant.getWaterDetail().getNextWaterDate(), + petPlant -> petPlant.getWaterDetail().getLastWaterDate() ) .isEqualTo(List.of(newWaterDate.plusDays(petPlant1.getWaterCycle()), newWaterDate)); softly.assertThat(historyRepository.findAll()) @@ -100,7 +100,7 @@ void setUp() { @ValueSource(ints = {0, 1, 2, 3, 4, 5}) void 마지막으로_물준_날짜_이전에_물주면_예외_발생(int days) { ReminderCreateRequest request = ReminderCreateRequest.builder() - .waterDate(petPlant.getWaterDate().getLastWaterDate().minusDays(days)) + .waterDate(petPlant.getWaterDetail().getLastWaterDate().minusDays(days)) .build(); assertThatThrownBy( @@ -113,7 +113,7 @@ void setUp() { void 반려_식물의_사용자와_물주기를_요청한_사용자가_다르면_예외_발생() { Member otherMember = memberSupport.builder().kakaoId(54321L).build(); ReminderCreateRequest request = ReminderCreateRequest.builder() - .waterDate(petPlant.getWaterDate().getLastWaterDate().plusDays(3)) + .waterDate(petPlant.getWaterDetail().getLastWaterDate().plusDays(3)) .build(); assertThatThrownBy( @@ -134,7 +134,7 @@ void setUp() { PetPlant updatedPetPlant = petPlantRepository.findById(petPlant.getId()).get(); - assertThat(updatedPetPlant.getWaterDate().getNextWaterDate()).isEqualTo(newWaterDate); + assertThat(updatedPetPlant.getWaterDetail().getNextWaterDate()).isEqualTo(newWaterDate); } @ParameterizedTest(name = "오늘보다 {0}일 전 날짜로 물주기를 미루면 예외 발생") @@ -155,7 +155,7 @@ void setUp() { void 반려_식물의_사용자와_미루기를_요청한_사용자가_다르면_예외_발생() { Member otherMember = memberSupport.builder().kakaoId(524321L).build(); ReminderUpdateRequest request = ReminderUpdateRequest.builder() - .nextWaterDate(petPlant.getWaterDate().getNextWaterDate().plusDays(1)) + .nextWaterDate(petPlant.getWaterDetail().getNextWaterDate().plusDays(1)) .build(); assertThatThrownBy( @@ -196,7 +196,7 @@ void setUp() { // when List expected = petPlantRepository.findAllByWaterNotification( - sourcePetPlant.getWaterDate().getNextWaterDate()); + sourcePetPlant.getWaterDetail().getNextWaterDate()); // then assertThat(expected) @@ -212,7 +212,7 @@ void setUp() { // when List expected = petPlantRepository.findAllByWaterNotification( - sourcePetPlant.getWaterDate().getNextWaterDate().minusDays(5)); + sourcePetPlant.getWaterDetail().getNextWaterDate().minusDays(5)); // then assertThat(expected).isEmpty(); @@ -231,7 +231,7 @@ private PetPlant savePetPlantWithNextWaterDate(LocalDate nextWaterDate) { .wind("testWind") .build()) .birthDate(LocalDate.of(2000, 7, 1)) - .waterDate(WaterDate.builder() + .waterDate(WaterDetail.builder() .nextWaterDate(nextWaterDate) .lastWaterDate(LocalDate.of(2022, 7, 1)) .build()) diff --git a/backend/pium/src/test/java/com/official/pium/support/PetPlantSupport.java b/backend/pium/src/test/java/com/official/pium/support/PetPlantSupport.java index a3f51bdf..23f36d06 100644 --- a/backend/pium/src/test/java/com/official/pium/support/PetPlantSupport.java +++ b/backend/pium/src/test/java/com/official/pium/support/PetPlantSupport.java @@ -4,7 +4,7 @@ import com.official.pium.domain.Member; import com.official.pium.domain.PetPlant; import com.official.pium.domain.vo.PetPlantState; -import com.official.pium.domain.vo.WaterDate; +import com.official.pium.domain.vo.WaterDetail; import com.official.pium.fixture.DictionaryPlantFixture; import com.official.pium.fixture.MemberFixture; import com.official.pium.repository.DictionaryPlantRepository; @@ -71,7 +71,7 @@ public PetPlant build() { ) .birthDate(LocalDate.of(2000, 6, 14)) .waterDate( - WaterDate.builder() + WaterDetail.builder() .nextWaterDate(LocalDate.of(2020, 2, 3)) .lastWaterDate(LocalDate.of(2022, 3, 4)) .build()