From 17c930bc8e69a2122cb2426744d15be3669ca160 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EC=8A=B9=EC=A7=84?= Date: Wed, 15 Nov 2023 10:51:47 +0900 Subject: [PATCH 1/2] =?UTF-8?q?[TEST]=20PlanService=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../backend/domain/group/entity/Group.java | 4 + .../domain/place/mapper/PlaceMapper.java | 16 +-- .../plan/client/SearchDestinationClient.java | 6 +- .../domain/plan/dto/client/PlaceDetails.java | 6 +- .../dto/client/SearchDestinationRequest.java | 4 +- .../twtw/backend/domain/plan/entity/Plan.java | 24 ++-- .../domain/plan/entity/PlanMember.java | 4 + .../exception/InvalidPlanMemberException.java | 10 ++ .../place/controller/PlaceControllerTest.java | 12 +- .../plan/controller/PlanControllerTest.java | 13 +- .../domain/plan/service/PlanServiceTest.java | 121 ++++++++++++++++++ .../fixture/place/PlaceDetailsFixture.java | 10 +- 12 files changed, 183 insertions(+), 47 deletions(-) create mode 100644 backend/src/main/java/com/twtw/backend/domain/plan/exception/InvalidPlanMemberException.java create mode 100644 backend/src/test/java/com/twtw/backend/domain/plan/service/PlanServiceTest.java diff --git a/backend/src/main/java/com/twtw/backend/domain/group/entity/Group.java b/backend/src/main/java/com/twtw/backend/domain/group/entity/Group.java index a887afbb..c910f8a3 100644 --- a/backend/src/main/java/com/twtw/backend/domain/group/entity/Group.java +++ b/backend/src/main/java/com/twtw/backend/domain/group/entity/Group.java @@ -60,4 +60,8 @@ public Group(String name, String groupImage, UUID leaderId) { this.groupImage = groupImage; this.leaderId = leaderId; } + + public void addToGroup(final Plan plan) { + this.groupPlans.add(plan); + } } 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 6b7df5ef..35110093 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,27 +2,15 @@ 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; -import org.mapstruct.Named; @Mapper(componentModel = MappingConstants.ComponentModel.SPRING) public interface PlaceMapper { - @Mapping(target = "distance", source = "distance", qualifiedByName = "convertInteger") + @Mapping(target = "distance") Place toEntity(PlaceDetails detail); - @Mapping(target = "distance", source = "distance", qualifiedByName = "convertString") + @Mapping(target = "distance") PlaceDetails toPlaceResponse(Place place); - - @Named("convertInteger") - default Integer convertInteger(String distance) { - return Integer.parseInt(distance); - } - - @Named("convertString") - default String convertString(Integer distance) { - return String.valueOf(distance); - } } diff --git a/backend/src/main/java/com/twtw/backend/domain/plan/client/SearchDestinationClient.java b/backend/src/main/java/com/twtw/backend/domain/plan/client/SearchDestinationClient.java index 9da6a0e6..a6b96169 100644 --- a/backend/src/main/java/com/twtw/backend/domain/plan/client/SearchDestinationClient.java +++ b/backend/src/main/java/com/twtw/backend/domain/plan/client/SearchDestinationClient.java @@ -50,11 +50,11 @@ private URI getUri(final SearchDestinationRequest request, final UriBuilder uriB .queryParam("size", MAX_SIZE_PER_REQUEST); final CategoryGroupCode categoryGroupCode = request.getCategoryGroupCode(); - final String x = request.getX(); - final String y = request.getY(); + final Double x = request.getX(); + final Double y = request.getY(); if (x != null && y != null) { - builder.queryParam("x", x).queryParam("y", y); + builder.queryParam("x", Double.toString(x)).queryParam("y", Double.toString(y)); } if (categoryGroupCode.isNone()) { return builder.build(); diff --git a/backend/src/main/java/com/twtw/backend/domain/plan/dto/client/PlaceDetails.java b/backend/src/main/java/com/twtw/backend/domain/plan/dto/client/PlaceDetails.java index 476ac215..1def6001 100644 --- a/backend/src/main/java/com/twtw/backend/domain/plan/dto/client/PlaceDetails.java +++ b/backend/src/main/java/com/twtw/backend/domain/plan/dto/client/PlaceDetails.java @@ -13,12 +13,12 @@ @AllArgsConstructor public class PlaceDetails { private String placeName; - private String distance; + private Integer distance; private String placeUrl; private String categoryName; private String addressName; private String roadAddressName; private CategoryGroupCode categoryGroupCode; - private String x; - private String y; + private Double x; + private Double y; } diff --git a/backend/src/main/java/com/twtw/backend/domain/plan/dto/client/SearchDestinationRequest.java b/backend/src/main/java/com/twtw/backend/domain/plan/dto/client/SearchDestinationRequest.java index ff2bc834..466ce7a6 100644 --- a/backend/src/main/java/com/twtw/backend/domain/plan/dto/client/SearchDestinationRequest.java +++ b/backend/src/main/java/com/twtw/backend/domain/plan/dto/client/SearchDestinationRequest.java @@ -13,8 +13,8 @@ @AllArgsConstructor public class SearchDestinationRequest { private String query; - private String x; - private String y; + private Double x; + private Double y; private Integer page; private CategoryGroupCode categoryGroupCode; } 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 6442e720..d176067a 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 @@ -3,10 +3,10 @@ import com.twtw.backend.domain.group.entity.Group; import com.twtw.backend.domain.member.entity.Member; import com.twtw.backend.domain.place.entity.Place; +import com.twtw.backend.domain.plan.exception.InvalidPlanMemberException; 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,18 +19,15 @@ 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") @@ -72,15 +69,22 @@ public void addMember(final Member member) { } public void deleteMember(final Member member) { - this.planMembers.remove(member); + this.planMembers.remove(findPlanMember(member)); + } + + private PlanMember findPlanMember(final Member member) { + return this.planMembers.stream() + .filter(planMember -> planMember.hasSameMember(member)) + .findAny() + .orElseThrow(InvalidPlanMemberException::new); } public void addPlace(final Place place) { this.place = place; } - public void addGroup(Group group) { + public void addGroup(final Group group) { this.group = group; - group.getGroupPlans().add(this); + this.group.addToGroup(this); } } diff --git a/backend/src/main/java/com/twtw/backend/domain/plan/entity/PlanMember.java b/backend/src/main/java/com/twtw/backend/domain/plan/entity/PlanMember.java index 09318160..aee5f4d4 100644 --- a/backend/src/main/java/com/twtw/backend/domain/plan/entity/PlanMember.java +++ b/backend/src/main/java/com/twtw/backend/domain/plan/entity/PlanMember.java @@ -54,4 +54,8 @@ public PlanMember(final Plan plan, final Member member) { this.plan = plan; this.member = member; } + + public boolean hasSameMember(final Member member) { + return this.member.equals(member); + } } diff --git a/backend/src/main/java/com/twtw/backend/domain/plan/exception/InvalidPlanMemberException.java b/backend/src/main/java/com/twtw/backend/domain/plan/exception/InvalidPlanMemberException.java new file mode 100644 index 00000000..ef79b742 --- /dev/null +++ b/backend/src/main/java/com/twtw/backend/domain/plan/exception/InvalidPlanMemberException.java @@ -0,0 +1,10 @@ +package com.twtw.backend.domain.plan.exception; + +public class InvalidPlanMemberException extends IllegalArgumentException { + + private static final String MESSAGE = "계획에 추가되지 않은 멤버입니다."; + + public InvalidPlanMemberException() { + super(MESSAGE); + } +} diff --git a/backend/src/test/java/com/twtw/backend/domain/place/controller/PlaceControllerTest.java b/backend/src/test/java/com/twtw/backend/domain/place/controller/PlaceControllerTest.java index 75efb839..13861c49 100644 --- a/backend/src/test/java/com/twtw/backend/domain/place/controller/PlaceControllerTest.java +++ b/backend/src/test/java/com/twtw/backend/domain/place/controller/PlaceControllerTest.java @@ -39,24 +39,24 @@ void searchSurroundPlace() throws Exception { List.of( new PlaceDetails( "이디야커피 안성죽산점", - "435", + 435, "http://place.map.kakao.com/1562566188", "음식점 > 카페 > 커피전문점 > 이디야커피", "경기 안성시 죽산면 죽산리 118-3", "경기 안성시 죽산면 죽주로 287-1", CategoryGroupCode.CE7, - "127.426865189637", - "37.0764635355795"), + 127.426865189637, + 37.0764635355795), new PlaceDetails( "카페 온마이마인드", - "345", + 345, "https://place.map.kakao.com/1625295668", "음식점 > 카페", "경기 안성시 죽산면 죽산리 414", "경기 안성시 죽산면 죽산초교길 36-4", CategoryGroupCode.CE7, - "127.420430538256", - "37.0766874564297")), + 127.420430538256, + 37.0766874564297)), false); given(placeService.searchSurroundPlace(any())).willReturn(expected); 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 db37f274..d4d38b38 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,7 +2,6 @@ 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; @@ -40,24 +39,24 @@ void searchPlanDestination() throws Exception { List.of( new PlaceDetails( "이디야커피 안성죽산점", - "435", + 435, "http://place.map.kakao.com/1562566188", "음식점 > 카페 > 커피전문점 > 이디야커피", "경기 안성시 죽산면 죽산리 118-3", "경기 안성시 죽산면 죽주로 287-1", CategoryGroupCode.CE7, - "127.426865189637", - "37.0764635355795"), + 127.426865189637, + 37.0764635355795), new PlaceDetails( "카페 온마이마인드", - "345", + 345, "https://place.map.kakao.com/1625295668", "음식점 > 카페", "경기 안성시 죽산면 죽산리 414", "경기 안성시 죽산면 죽산초교길 36-4", CategoryGroupCode.CE7, - "127.420430538256", - "37.0766874564297")), + 127.420430538256, + 37.0766874564297)), false); given(planService.searchPlanDestination(any())).willReturn(expected); 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 new file mode 100644 index 00000000..a97385d8 --- /dev/null +++ b/backend/src/test/java/com/twtw/backend/domain/plan/service/PlanServiceTest.java @@ -0,0 +1,121 @@ +package com.twtw.backend.domain.plan.service; + +import static org.assertj.core.api.Assertions.assertThat; + +import com.twtw.backend.domain.group.repository.GroupRepository; +import com.twtw.backend.domain.member.entity.Member; +import com.twtw.backend.domain.place.entity.CategoryGroupCode; +import com.twtw.backend.domain.plan.dto.client.SearchDestinationRequest; +import com.twtw.backend.domain.plan.dto.request.PlanMemberRequest; +import com.twtw.backend.domain.plan.dto.request.SavePlanRequest; +import com.twtw.backend.domain.plan.dto.response.PlanDestinationResponse; +import com.twtw.backend.domain.plan.dto.response.PlanInfoResponse; +import com.twtw.backend.domain.plan.dto.response.PlanResponse; +import com.twtw.backend.domain.plan.entity.Plan; +import com.twtw.backend.domain.plan.repository.PlanRepository; +import com.twtw.backend.fixture.group.GroupEntityFixture; +import com.twtw.backend.fixture.member.MemberEntityFixture; +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; + +@DisplayName("PlanService의") +class PlanServiceTest extends LoginTest { + + @Autowired private PlanService planService; + @Autowired private GroupRepository groupRepository; + @Autowired private PlanRepository planRepository; + + @Test + @DisplayName("목적지 검색이 수행되는가") + void searchPlanDestination() { + // given + final SearchDestinationRequest given = new SearchDestinationRequest("스타벅스", 123.321, 123.123, 1, CategoryGroupCode.CE7); + + // when + final PlanDestinationResponse result = planService.searchPlanDestination(given); + + // then + assertThat(result.getResults()).isNotNull(); + } + + @Test + @DisplayName("계획 저장이 수행되는가") + void savePlan() { + // given + final Plan plan = PlanEntityFixture.FIRST_PLACE.toEntity(loginUser); + final UUID groupId = groupRepository.save(GroupEntityFixture.HDJ_GROUP.toEntity()).getId(); + + // when + final PlanResponse planResponse = planService.savePlan(new SavePlanRequest(groupId, PlaceDetailsFixture.FIRST_PLACE.toPlaceDetails())); + + // then + final Optional result = planRepository.findById(planResponse.getPlanId()); + assertThat(result).isPresent(); + } + + @Test + @DisplayName("계획 참여가 수행되는가") + void joinPlan() { + // given + final Member member = memberRepository.save(MemberEntityFixture.FIRST_MEMBER.toEntity()); + final Plan plan = PlanEntityFixture.FIRST_PLACE.toEntity(member); + final Plan savedPlan = planRepository.save(plan); + final UUID planId = savedPlan.getId(); + + // when + planService.joinPlan(new PlanMemberRequest(planId)); + + // then + final Plan result = planRepository.findById(planId).orElseThrow(); + assertThat(result.getPlanMembers()).hasSize(2); + } + + @Test + @DisplayName("계획 나가기가 수행되는가") // TODO: 계획에 1명 있는데 나가는 경우 생각해보기 + void outPlan() { + // given + final Plan plan = PlanEntityFixture.SECOND_PLACE.toEntity(loginUser); + final UUID planId = planRepository.save(plan).getId(); + + // when + planService.outPlan(new PlanMemberRequest(planId)); + + // then + final Plan result = planRepository.findById(planId).orElseThrow(); + assertThat(result.getPlanMembers()).isEmpty(); + } + + @Test + @DisplayName("PK로 계획 조회가 수행되는가") + void getPlanById() { + // given + final Plan plan = PlanEntityFixture.FIRST_PLACE.toEntity(loginUser); + final UUID planId = planRepository.save(plan).getId(); + + // when + final PlanInfoResponse result = planService.getPlanById(planId); + + // then + assertThat(result.getPlanId()).isEqualTo(planId); + } + + @Test + @DisplayName("삭제가 수행되는가") + void deletePlan() { + // given + final Plan plan = PlanEntityFixture.SECOND_PLACE.toEntity(loginUser); + final UUID planId = planRepository.save(plan).getId(); + + // when + planService.deletePlan(planId); + + // then + assertThat(planRepository.findById(planId)).isEmpty(); + } +} 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 6be913ee..c4c3b0cb 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 @@ -2,14 +2,16 @@ 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); private final String placeName; - private final String distance; + private final Integer distance; private final String placeUrl; private final String categoryName; private final String addressName; @@ -17,4 +19,8 @@ public enum PlaceDetailsFixture { private final CategoryGroupCode categoryGroupCode; private final Double x; private final Double y; + + public PlaceDetails toPlaceDetails() { + return new PlaceDetails(placeName, distance, placeUrl, categoryName, addressName, roadAddressName, categoryGroupCode, x, y); + } } From 1e67206261e43bb637b2e06a28e74d9e36d5a394 Mon Sep 17 00:00:00 2001 From: github-actions <> Date: Wed, 15 Nov 2023 01:52:19 +0000 Subject: [PATCH 2/2] Google Java Format --- .../domain/place/mapper/PlaceMapper.java | 1 + .../twtw/backend/domain/plan/entity/Plan.java | 10 ++++-- .../plan/controller/PlanControllerTest.java | 1 + .../domain/plan/service/PlanServiceTest.java | 14 +++++--- .../fixture/place/PlaceDetailsFixture.java | 35 ++++++++++++++++--- 5 files changed, 50 insertions(+), 11 deletions(-) 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); } }