Skip to content

Commit ac7b9c1

Browse files
committed
Revert "feat: 사용자 위치 파라미터명을 userLat과 userLng로 변경"
This reverts commit 1652f3e.
1 parent e43a3c1 commit ac7b9c1

4 files changed

Lines changed: 13 additions & 55 deletions

File tree

src/main/java/com/zimdugo/locker/application/filter/LockerSearchFilterFactory.java

Lines changed: 0 additions & 35 deletions
This file was deleted.

src/main/java/com/zimdugo/locker/application/pin/LockerPinQuery.java

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
package com.zimdugo.locker.application.pin;
22

3-
import com.zimdugo.locker.application.filter.IndoorOutdoorFilterType;
4-
import com.zimdugo.locker.application.filter.LockerFacilityFilterType;
5-
import com.zimdugo.locker.application.filter.LockerSizeFilterType;
63
import java.util.Set;
74

85
public record LockerPinQuery(
@@ -11,12 +8,12 @@ public record LockerPinQuery(
118
double neLat,
129
double neLng,
1310
double zoomLevel,
14-
Double userLat,
15-
Double userLng,
11+
Double latitude,
12+
Double longitude,
1613
String keyword,
17-
Set<LockerSizeFilterType> sizeTypes,
18-
Set<IndoorOutdoorFilterType> indoorOutdoorTypes,
19-
Set<LockerFacilityFilterType> lockerTypes
14+
Set<String> sizeTypes,
15+
Set<String> indoorOutdoorTypes,
16+
Set<String> lockerTypes
2017
) {
2118
public LockerPinQuery(
2219
double swLat,

src/main/java/com/zimdugo/locker/application/pin/LockerPinQueryService.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.zimdugo.locker.application.pin;
22

3-
import com.zimdugo.locker.application.filter.LockerSearchFilterFactory;
43
import com.zimdugo.locker.application.common.LocationValidator;
54
import com.zimdugo.locker.application.search.LockerSearchResultQueryService;
65
import com.zimdugo.locker.application.result.search.LockerSearchItemResult;
@@ -30,9 +29,9 @@ public class LockerPinQueryService {
3029
private final LockerSearchResultQueryService lockerSearchResultQueryService;
3130

3231
public LockerPinResult getPins(Long userId, LockerPinQuery query) {
33-
LocationValidator.validateBounds(query.swLat(), query.swLng(), query.neLat(), query.neLng()); //좌표 검증
32+
LocationValidator.validateBounds(query.swLat(), query.swLng(), query.neLat(), query.neLng());
3433

35-
LockerSearchFilter filter = LockerSearchFilterFactory.create(
34+
LockerSearchFilter filter = LockerSearchFilter.from(
3635
query.sizeTypes(),
3736
query.indoorOutdoorTypes(),
3837
query.lockerTypes()
@@ -59,14 +58,14 @@ public LockerPinResult getPins(Long userId, LockerPinQuery query) {
5958
}
6059

6160
private LockerPinResult getSearchPins(Long userId, LockerPinQuery query, LockerSearchFilter filter) {
62-
if (query.userLat() == null || query.userLng() == null) {
61+
if (query.latitude() == null || query.longitude() == null) {
6362
return LockerPinResult.empty();
6463
}
6564

6665
List<LockerSearchItemResult> items = lockerSearchResultQueryService.getDisplayableSearchItemsForPins(
6766
userId,
68-
query.userLat(),
69-
query.userLng(),
67+
query.latitude(),
68+
query.longitude(),
7069
query.keyword(),
7170
filter
7271
);

src/main/java/com/zimdugo/locker/entrypoint/dto/request/pin/LockerPinRequest.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
package com.zimdugo.locker.entrypoint.dto.request.pin;
22

33
import com.zimdugo.locker.application.pin.LockerPinQuery;
4-
import com.zimdugo.locker.application.filter.IndoorOutdoorFilterType;
5-
import com.zimdugo.locker.application.filter.LockerFacilityFilterType;
6-
import com.zimdugo.locker.application.filter.LockerSizeFilterType;
74
import io.swagger.v3.oas.annotations.Parameter;
85
import io.swagger.v3.oas.annotations.media.Schema;
96
import jakarta.validation.constraints.DecimalMax;
@@ -57,13 +54,13 @@ public record LockerPinRequest(
5754
String keyword,
5855

5956
@Parameter(description = "보관함 크기 필터")
60-
Set<LockerSizeFilterType> sizeTypes,
57+
Set<String> sizeTypes,
6158

6259
@Parameter(description = "실내/실외 필터")
63-
Set<IndoorOutdoorFilterType> indoorOutdoorTypes,
60+
Set<String> indoorOutdoorTypes,
6461

6562
@Parameter(description = "보관함 유형 필터")
66-
Set<LockerFacilityFilterType> lockerTypes
63+
Set<String> lockerTypes
6764
) {
6865
public LockerPinQuery toQuery() {
6966
return new LockerPinQuery(

0 commit comments

Comments
 (0)