Skip to content
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

Jump to bottom

fix: 북마크기능에 모든 모임이 조회되도록 변경 #207

Merged
merged 1 commit into from
Feb 12, 2024
Merged

fix: 북마크기능에 모든 모임이 조회되도록 변경 #207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/main/java/net/teumteum/meeting/controller/MeetingController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public MeetingResponse getMeetingById(@PathVariable("meetingId") Long meetingId)
@ResponseStatus(HttpStatus.OK)
public PageDto<MeetingsResponse> getMeetingsByCondition(
Pageable pageable,
@RequestParam(value = "isOpen") boolean isOpen,
@RequestParam(value = "isOpen", required = false) Boolean isOpen,
@RequestParam(value = "topic", required = false) Topic topic,
@RequestParam(value = "meetingAreaStreet", required = false) String meetingAreaStreet,
@RequestParam(value = "participantUserId", required = false) Long participantUserId,
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/teumteum/meeting/service/MeetingService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ public void deleteMeeting(Long meetingId, Long userId) {

@Transactional(readOnly = true)
public PageDto<MeetingsResponse> getMeetingsBySpecification(Pageable pageable, Topic topic, String meetingAreaStreet,
Long participantUserId, String searchWord, Boolean isBookmarked, boolean isOpen, Long userId) {
Long participantUserId, String searchWord, Boolean isBookmarked, Boolean isOpen, Long userId) {

Specification<Meeting> spec = MeetingSpecification.withIsOpen(isOpen);

Expand All @@ -110,7 +110,7 @@ public PageDto<MeetingsResponse> getMeetingsBySpecification(Pageable pageable, T
.or(MeetingSpecification.withSearchWordInIntroduction(searchWord))
.and(MeetingSpecification.withIsOpen(isOpen));
} else if (Boolean.TRUE.equals(isBookmarked)) {
spec = spec.and(MeetingSpecification.withBookmarkedUserId(userId));
spec = MeetingSpecification.withBookmarkedUserId(userId);
}

var meetings = meetingRepository.findAll(spec, pageable);
Expand Down
Loading