diff --git a/src/main/java/com/climeet/climeet_backend/domain/routeversion/RouteVersionService.java b/src/main/java/com/climeet/climeet_backend/domain/routeversion/RouteVersionService.java index 21e211bb..376b7887 100644 --- a/src/main/java/com/climeet/climeet_backend/domain/routeversion/RouteVersionService.java +++ b/src/main/java/com/climeet/climeet_backend/domain/routeversion/RouteVersionService.java @@ -21,7 +21,6 @@ import com.climeet.climeet_backend.global.response.code.status.ErrorStatus; import com.climeet.climeet_backend.global.response.exception.GeneralException; import com.climeet.climeet_backend.global.s3.S3Service; -import java.util.Arrays; import java.util.Comparator; import java.util.List; import java.util.Optional; @@ -165,28 +164,27 @@ public PageResponseDto> getRouteVersionFilteringRouteL } // floor Filter 적용 - if (getFilteredRouteVersionRequest.getFloorList().length != 0) { + if (getFilteredRouteVersionRequest.getFloor() != null) { routeList = routeList.stream() - .filter(route -> Arrays.stream(getFilteredRouteVersionRequest.getFloorList()) - .anyMatch(floor -> floor == route.getSector().getFloor()) - ).toList(); + .filter(route -> route.getSector().getFloor() + == getFilteredRouteVersionRequest.getFloor()) + .toList(); } // sector Filter 적용 - if (getFilteredRouteVersionRequest.getSectorIdList().length != 0) { + if (getFilteredRouteVersionRequest.getSectorId() != null) { routeList = routeList.stream() - .filter(route -> Arrays.stream(getFilteredRouteVersionRequest.getSectorIdList()) - .anyMatch(sectorId -> sectorId == route.getSector().getId()) - ).toList(); + .filter(route -> route.getSector().getId() + == getFilteredRouteVersionRequest.getSectorId()) + .toList(); } // difficulty Filter 적용 - if (getFilteredRouteVersionRequest.getDifficultyList().length != 0) { + if (getFilteredRouteVersionRequest.getDifficulty() != null) { routeList = routeList.stream() - .filter(route -> Arrays.stream(getFilteredRouteVersionRequest.getDifficultyList()) - .anyMatch( - difficulty -> difficulty == route.getDifficultyMapping().getDifficulty()) - ).toList(); + .filter(route -> route.getDifficultyMapping().getDifficulty() + == getFilteredRouteVersionRequest.getDifficulty()) + .toList(); } List routeDetailResponseList = routeList.stream() diff --git a/src/main/java/com/climeet/climeet_backend/domain/routeversion/dto/RouteVersionRequestDto.java b/src/main/java/com/climeet/climeet_backend/domain/routeversion/dto/RouteVersionRequestDto.java index f20e4831..b821e6b5 100644 --- a/src/main/java/com/climeet/climeet_backend/domain/routeversion/dto/RouteVersionRequestDto.java +++ b/src/main/java/com/climeet/climeet_backend/domain/routeversion/dto/RouteVersionRequestDto.java @@ -24,17 +24,17 @@ public static class GetFilteredRouteVersionRequest { private int page; private int size; - private int[] floorList = null; - private Long[] sectorIdList = null; - private int[] difficultyList = null; + private Integer floor; + private Long sectorId; + private Integer difficulty; @DateTimeFormat(pattern = "yyyy-MM-dd") private LocalDate timePoint; public GetFilteredRouteVersionRequest() { - this.floorList = new int[0]; - this.sectorIdList = new Long[0]; - this.difficultyList = new int[0]; + this.floor = null; + this.sectorId = null; + this.difficulty = null; this.timePoint = LocalDate.now(); } } diff --git a/src/main/java/com/climeet/climeet_backend/domain/sector/dto/SectorResponseDto.java b/src/main/java/com/climeet/climeet_backend/domain/sector/dto/SectorResponseDto.java index 9a6f4a1a..1e1d9e1b 100644 --- a/src/main/java/com/climeet/climeet_backend/domain/sector/dto/SectorResponseDto.java +++ b/src/main/java/com/climeet/climeet_backend/domain/sector/dto/SectorResponseDto.java @@ -16,12 +16,14 @@ public class SectorResponseDto { @AllArgsConstructor public static class SectorDetailResponse { + private Long sectorId; private String name; private int floor; private String sectorImageUrl; public static SectorDetailResponse toDto(Sector sector) { return SectorDetailResponse.builder() + .sectorId(sector.getId()) .name(sector.getSectorName()) .floor(sector.getFloor()) .sectorImageUrl(sector.getSectorImageUrl())