Skip to content

main <- develop #201

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 2, 2025
Merged

main <- develop #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1206329
Feat: 새로 추가된 운영 시간 없는 건물 반영
dlwls423 May 29, 2025
15cec23
Merge pull request #199 from DevKor-github/fix/operating
dlwls423 May 29, 2025
c1521fa
Fix: 검색 시 즐겨찾기 여부 반환 오류 수정
dlwls423 Jun 2, 2025
3ac4c66
Merge pull request #200 from DevKor-github/fix/search
dlwls423 Jun 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/main/java/devkor/com/teamcback/domain/operatingtime/service/OperatingService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ public class OperatingService {
private static final List<Long> alwaysOpenBuildings = List.of(0L, 23L, 27L, 60L);

// 출입 권한 필요 혹은 정보가 없는 건물
private static final List<Long> alwaysAccessRequiredOrWithoutInfoBuildings = List.of(1L, 16L, 17L, 19L, 29L, 31L, 35L, 36L, 37L, 38L, 52L, 54L);
private static final List<Long> alwaysAccessRequiredOrWithoutInfoBuildings = List.of(1L, 16L, 17L, 19L, 29L, 31L, 35L, 36L, 37L, 38L, 52L, 54L,
62L, 63L, 64L, 65L, 66L, 67L, 68L, 69L, 70L, 71L, 72L);
private static final String DEFAULT_OPERATING_TIME = "00:00-23:59";

/**
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/devkor/com/teamcback/domain/search/contoller/SearchController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ public CommonResponse<SearchMaskIndexByPlaceRes> searchMaskIndexByPlace(
})
@GetMapping("/buildings/{buildingId}")
public CommonResponse<SearchBuildingDetailRes> searchBuildingDetail(
@Parameter(description = "사용자정보", required = false)
@Parameter(description = "사용자정보")
@AuthenticationPrincipal UserDetailsImpl userDetail,
@Parameter(name = "buildingId", description = "건물 id", example = "1", required = true)
@PathVariable Long buildingId) {
Expand All @@ -209,7 +209,7 @@ public CommonResponse<SearchBuildingDetailRes> searchBuildingDetail(
})
@GetMapping("/place/{placeId}")
public CommonResponse<SearchPlaceDetailRes> searchPlaceDetail(
@Parameter(description = "사용자정보", required = false)
@Parameter(description = "사용자정보")
@AuthenticationPrincipal UserDetailsImpl userDetail,
@Parameter(name = "placeId", description = "placeId", example = "1", required = true)
@PathVariable Long placeId) {
Expand Down
7 changes: 6 additions & 1 deletion src/main/java/devkor/com/teamcback/global/jwt/JwtAuthorizationFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,12 @@ public class JwtAuthorizationFilter extends OncePerRequestFilter {
new AntPathRequestMatcher("/api/migration"),
new AntPathRequestMatcher("/api/koyeon/**"),
new AntPathRequestMatcher("/api/routes/**"),
new AntPathRequestMatcher("/api/search/**", HttpMethod.GET.name()),
new AntPathRequestMatcher("/api/search", HttpMethod.GET.name()),
new AntPathRequestMatcher("/api/search/buildings", HttpMethod.GET.name()),
new AntPathRequestMatcher("/api/search/buildings/**/facilities/**", HttpMethod.GET.name()),
new AntPathRequestMatcher("/api/search/buildings/**/floor/**", HttpMethod.GET.name()),
new AntPathRequestMatcher("/api/search/facilities", HttpMethod.GET.name()),
new AntPathRequestMatcher("/api/search/place/**/mask", HttpMethod.GET.name()),
new AntPathRequestMatcher("/api/users/login/**"));

private final JwtUtil jwtUtil;
Expand Down
Loading