diff --git a/backend/src/main/java/com/twtw/backend/domain/place/mapper/PlaceMapper.java b/backend/src/main/java/com/twtw/backend/domain/place/mapper/PlaceMapper.java index 35110093..1e9d8469 100644 --- a/backend/src/main/java/com/twtw/backend/domain/place/mapper/PlaceMapper.java +++ b/backend/src/main/java/com/twtw/backend/domain/place/mapper/PlaceMapper.java @@ -2,6 +2,7 @@ import com.twtw.backend.domain.place.entity.Place; import com.twtw.backend.domain.plan.dto.client.PlaceDetails; + import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.MappingConstants; diff --git a/backend/src/main/java/com/twtw/backend/domain/plan/entity/Plan.java b/backend/src/main/java/com/twtw/backend/domain/plan/entity/Plan.java index d176067a..27b63873 100644 --- a/backend/src/main/java/com/twtw/backend/domain/plan/entity/Plan.java +++ b/backend/src/main/java/com/twtw/backend/domain/plan/entity/Plan.java @@ -7,6 +7,7 @@ import com.twtw.backend.global.audit.AuditListener; import com.twtw.backend.global.audit.Auditable; import com.twtw.backend.global.audit.BaseTime; + import jakarta.persistence.CascadeType; import jakarta.persistence.Column; import jakarta.persistence.Embedded; @@ -19,15 +20,18 @@ import jakarta.persistence.ManyToOne; import jakarta.persistence.OneToMany; import jakarta.persistence.OneToOne; -import java.util.HashSet; -import java.util.Set; -import java.util.UUID; + import lombok.AccessLevel; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; + import org.hibernate.annotations.Where; +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; + @Getter @Entity @Where(clause = "deleted_at is null") diff --git a/backend/src/test/java/com/twtw/backend/domain/plan/controller/PlanControllerTest.java b/backend/src/test/java/com/twtw/backend/domain/plan/controller/PlanControllerTest.java index d4d38b38..8fdd196f 100644 --- a/backend/src/test/java/com/twtw/backend/domain/plan/controller/PlanControllerTest.java +++ b/backend/src/test/java/com/twtw/backend/domain/plan/controller/PlanControllerTest.java @@ -2,6 +2,7 @@ import static com.twtw.backend.support.docs.ApiDocsUtils.getDocumentRequest; import static com.twtw.backend.support.docs.ApiDocsUtils.getDocumentResponse; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.BDDMockito.given; import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.document; diff --git a/backend/src/test/java/com/twtw/backend/domain/plan/service/PlanServiceTest.java b/backend/src/test/java/com/twtw/backend/domain/plan/service/PlanServiceTest.java index a97385d8..bd966a7a 100644 --- a/backend/src/test/java/com/twtw/backend/domain/plan/service/PlanServiceTest.java +++ b/backend/src/test/java/com/twtw/backend/domain/plan/service/PlanServiceTest.java @@ -18,12 +18,14 @@ import com.twtw.backend.fixture.place.PlaceDetailsFixture; import com.twtw.backend.fixture.plan.PlanEntityFixture; import com.twtw.backend.support.service.LoginTest; -import java.util.Optional; -import java.util.UUID; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; +import java.util.Optional; +import java.util.UUID; + @DisplayName("PlanService의") class PlanServiceTest extends LoginTest { @@ -35,7 +37,8 @@ class PlanServiceTest extends LoginTest { @DisplayName("목적지 검색이 수행되는가") void searchPlanDestination() { // given - final SearchDestinationRequest given = new SearchDestinationRequest("스타벅스", 123.321, 123.123, 1, CategoryGroupCode.CE7); + final SearchDestinationRequest given = + new SearchDestinationRequest("스타벅스", 123.321, 123.123, 1, CategoryGroupCode.CE7); // when final PlanDestinationResponse result = planService.searchPlanDestination(given); @@ -52,7 +55,10 @@ void savePlan() { final UUID groupId = groupRepository.save(GroupEntityFixture.HDJ_GROUP.toEntity()).getId(); // when - final PlanResponse planResponse = planService.savePlan(new SavePlanRequest(groupId, PlaceDetailsFixture.FIRST_PLACE.toPlaceDetails())); + final PlanResponse planResponse = + planService.savePlan( + new SavePlanRequest( + groupId, PlaceDetailsFixture.FIRST_PLACE.toPlaceDetails())); // then final Optional result = planRepository.findById(planResponse.getPlanId()); diff --git a/backend/src/test/java/com/twtw/backend/fixture/place/PlaceDetailsFixture.java b/backend/src/test/java/com/twtw/backend/fixture/place/PlaceDetailsFixture.java index c4c3b0cb..4e93833f 100644 --- a/backend/src/test/java/com/twtw/backend/fixture/place/PlaceDetailsFixture.java +++ b/backend/src/test/java/com/twtw/backend/fixture/place/PlaceDetailsFixture.java @@ -1,14 +1,32 @@ package com.twtw.backend.fixture.place; import com.twtw.backend.domain.place.entity.CategoryGroupCode; - import com.twtw.backend.domain.plan.dto.client.PlaceDetails; + import lombok.RequiredArgsConstructor; @RequiredArgsConstructor public enum PlaceDetailsFixture { - FIRST_PLACE("스타벅스", 30, "http://someUrlToPlaceDetails", "카페", "주소", "도로명주소", CategoryGroupCode.CE7, 123.123, 321.321), - SECOND_PLACE("별다방", 20, "http://someUrlToPlaceInMap", "숙박", "밥좀주소", "도로명좀주소", CategoryGroupCode.AD5, 345.543, 543.345); + FIRST_PLACE( + "스타벅스", + 30, + "http://someUrlToPlaceDetails", + "카페", + "주소", + "도로명주소", + CategoryGroupCode.CE7, + 123.123, + 321.321), + SECOND_PLACE( + "별다방", + 20, + "http://someUrlToPlaceInMap", + "숙박", + "밥좀주소", + "도로명좀주소", + CategoryGroupCode.AD5, + 345.543, + 543.345); private final String placeName; private final Integer distance; @@ -21,6 +39,15 @@ public enum PlaceDetailsFixture { private final Double y; public PlaceDetails toPlaceDetails() { - return new PlaceDetails(placeName, distance, placeUrl, categoryName, addressName, roadAddressName, categoryGroupCode, x, y); + return new PlaceDetails( + placeName, + distance, + placeUrl, + categoryName, + addressName, + roadAddressName, + categoryGroupCode, + x, + y); } }