From 7da56b9f0a64c389374ae43cf5b228e92c03b0fc Mon Sep 17 00:00:00 2001 From: EunjinWoo Date: Tue, 27 May 2025 18:43:12 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20(#18)=20YB/OB=20=EC=9E=84=EC=9D=98?= =?UTF-8?q?=EB=A1=9C=20=EA=B5=AC=EB=B6=84=ED=95=A0=20=EC=88=98=20=EC=9E=88?= =?UTF-8?q?=EA=B2=8C=EB=81=94=20=EC=88=98=EC=A0=95=ED=95=9C=EB=8B=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../website/domain/project/ProjectController.java | 3 ++- .../domain/project/service/MeetupService.java | 12 +++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/kusitms/website/domain/project/ProjectController.java b/src/main/java/com/kusitms/website/domain/project/ProjectController.java index 23ccd35..7215c27 100644 --- a/src/main/java/com/kusitms/website/domain/project/ProjectController.java +++ b/src/main/java/com/kusitms/website/domain/project/ProjectController.java @@ -34,9 +34,10 @@ public class ProjectController { content = @Content(schema = @Schema(implementation = MeetupDetailResponse.class))) }) public ResponseEntity 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}") diff --git a/src/main/java/com/kusitms/website/domain/project/service/MeetupService.java b/src/main/java/com/kusitms/website/domain/project/service/MeetupService.java index 560318f..2317b83 100644 --- a/src/main/java/com/kusitms/website/domain/project/service/MeetupService.java +++ b/src/main/java/com/kusitms/website/domain/project/service/MeetupService.java @@ -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 findProjects; if (cardinal != null) { // If a cardinal is provided, filter projects by the given cardinal value. @@ -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 meetupDetailResponses = findProjects.stream() .map(p -> { List tags = p.getTags().stream()