Skip to content

Commit 2137e71

Browse files
authored
Merge pull request #21 from kusitms-com/feat/#18-exhibition
feat: (#18) YB/OB 임의로 구분할 수 있게끔 수정한다
2 parents 88a315f + 7da56b9 commit 2137e71

2 files changed

Lines changed: 13 additions & 2 deletions

File tree

src/main/java/com/kusitms/website/domain/project/ProjectController.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,10 @@ public class ProjectController {
3434
content = @Content(schema = @Schema(implementation = MeetupDetailResponse.class)))
3535
})
3636
public ResponseEntity<BaseResponse> getMeetupProjects(
37+
@RequestParam(required = false) String batch,
3738
@RequestParam(required = false) Integer cardinal,
3839
@RequestParam(defaultValue = "desc") String order) {
39-
return ResponseEntity.ok(new BaseResponse(meetupService.getMeetupProjects(order, cardinal)));
40+
return ResponseEntity.ok(new BaseResponse(meetupService.getMeetupProjects(order, cardinal, batch)));
4041
}
4142

4243
@GetMapping("/meetup/{meetup_id}")

src/main/java/com/kusitms/website/domain/project/service/MeetupService.java

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public class MeetupService {
2121
private final MeetupRepository meetupRepository;
2222
private final MeetupTeamRepository meetupTeamRepository;
2323

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

38+
if ("OB".equalsIgnoreCase(batch)) {
39+
findProjects = findProjects.stream()
40+
.filter(p -> p.getMeetupId().equals(55L))
41+
.collect(Collectors.toList());
42+
} else if ("YB".equalsIgnoreCase(batch)) {
43+
findProjects = findProjects.stream()
44+
.filter(p -> !p.getMeetupId().equals(55L))
45+
.collect(Collectors.toList());
46+
}
47+
3848
List<MeetupDetailResponse> meetupDetailResponses = findProjects.stream()
3949
.map(p -> {
4050
List<String> tags = p.getTags().stream()

0 commit comments

Comments
 (0)