Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,10 @@ public class ProjectController {
content = @Content(schema = @Schema(implementation = MeetupDetailResponse.class)))
})
public ResponseEntity<BaseResponse> getMeetupProjects(
@RequestParam(required = false) String batch,
@RequestParam(required = false) Integer cardinal,
@RequestParam(defaultValue = "desc") String order) {
return ResponseEntity.ok(new BaseResponse(meetupService.getMeetupProjects(order, cardinal)));
return ResponseEntity.ok(new BaseResponse(meetupService.getMeetupProjects(order, cardinal, batch)));
}

@GetMapping("/meetup/{meetup_id}")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public class MeetupService {
private final MeetupRepository meetupRepository;
private final MeetupTeamRepository meetupTeamRepository;

public MeetupResponse getMeetupProjects(String order, Integer cardinal) {
public MeetupResponse getMeetupProjects(String order, Integer cardinal, String batch) {
List<MeetupProject> findProjects;
if (cardinal != null) {
// If a cardinal is provided, filter projects by the given cardinal value.
Expand All @@ -35,6 +35,16 @@ public MeetupResponse getMeetupProjects(String order, Integer cardinal) {
}
}

if ("OB".equalsIgnoreCase(batch)) {
findProjects = findProjects.stream()
.filter(p -> p.getMeetupId().equals(55L))
.collect(Collectors.toList());
} else if ("YB".equalsIgnoreCase(batch)) {
findProjects = findProjects.stream()
.filter(p -> !p.getMeetupId().equals(55L))
.collect(Collectors.toList());
}

List<MeetupDetailResponse> meetupDetailResponses = findProjects.stream()
.map(p -> {
List<String> tags = p.getTags().stream()
Expand Down
Loading