[BE] 요청한 주소와 비슷한 주소 검색 기능 구현Dev (#369)

be/src/main/java/codesquad/secondhand/controller/LocationController.java

@@ -3,6 +3,7 @@
 import static codesquad.secondhand.exception.code.CommonResponseCode.*;
 
 import java.util.List;
+import java.util.Set;
 
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -11,6 +12,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import codesquad.secondhand.dto.ResponseListDto;
+import codesquad.secondhand.dto.ResponseSetDto;
 import codesquad.secondhand.dto.location.LocationDto;
 import codesquad.secondhand.dto.location.LocationIdDto;
 import codesquad.secondhand.entity.Location;
@@ -34,9 +36,9 @@ public ResponseListDto<LocationDto> showLocations() {
 	}
 
 	@PostMapping
-	public ResponseListDto<Location> searchLocationId(@RequestBody List<LocationIdDto> locationIdDtoList) {
-		List<Location> list = locationService.findLocationId(locationIdDtoList);
-		return ResponseListDto.of(RESPONSE_SUCCESS, list);
+	public ResponseSetDto<Location> searchLocationId(@RequestBody List<LocationIdDto> locationIdDtoList) {
+		Set<Location> set = locationService.findLocationId(locationIdDtoList);
+		return ResponseSetDto.of(RESPONSE_SUCCESS, set);
 	}
 
 }

be/src/main/java/codesquad/secondhand/dto/ResponseSetDto.java

@@ -0,0 +1,27 @@
+package codesquad.secondhand.dto;
+
+import java.util.Set;
+
+import codesquad.secondhand.exception.code.Code;
+import lombok.Getter;
+
+@Getter
+public class ResponseSetDto<T> {
+	private final boolean success;
+	private final int status;
+	private final int code;
+	private final String message;
+	private final Set<T> data;
+
+	public ResponseSetDto(Code code, Set<T> data) {
+		this.success = code.isSuccess();
+		this.status = code.getStatus();
+		this.code = code.getCode();
+		this.message = code.getMessage();
+		this.data = data;
+	}
+
+	public static <T> codesquad.secondhand.dto.ResponseSetDto<T> of(Code code, Set<T> data) {
+		return new codesquad.secondhand.dto.ResponseSetDto<>(code, data);
+	}
+}

be/src/main/java/codesquad/secondhand/repository/LocationRepository.java

@@ -7,5 +7,5 @@
 import codesquad.secondhand.entity.Location;
 
 public interface LocationRepository extends JpaRepository<Location, Long> {
-	Optional<Location> findLocationByCityAndDistrictAndTown(String city, String district, String town);
+	Optional<Location> findLocationByCityAndDistrictAndTownLike(String city, String district, String town);
 }

be/src/main/java/codesquad/secondhand/service/LocationService.java

@@ -1,7 +1,9 @@
 package codesquad.secondhand.service;
 
-import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 import org.springframework.stereotype.Service;
@@ -30,13 +32,22 @@ public List<LocationDto> showAllLocations() {
 			.collect(Collectors.toList());
 	}
 
-	public List<Location> findLocationId(List<LocationIdDto> locationIdDtoList) {
-		List<Location> list = new ArrayList<>();
+	public Set<Location> findLocationId(List<LocationIdDto> locationIdDtoList) {
+		Set<Location> list = new HashSet<>();
 
 		for (LocationIdDto l : locationIdDtoList) {
 			String[] locationString = l.getLocationString().split(" ");
-			Location location = locationRepository.findLocationByCityAndDistrictAndTown(locationString[0],
-				locationString[1], locationString[2]).orElseThrow();
+			log.info(Arrays.toString(locationString));
+			String townQuery = locationString[2];
+			for (int i = 0; i < townQuery.length(); i++) {
+				if (Character.isDigit(townQuery.charAt(i))) {
+					townQuery = townQuery.substring(0, i) + "%";
+					break;
+				}
+			}
+			log.info(townQuery);
+			Location location = locationRepository.findLocationByCityAndDistrictAndTownLike(locationString[0],
+				locationString[1], townQuery).orElseThrow();
 			list.add(location);
 		}
 		return list;