diff --git a/src/main/java/eventee/server/event/domain/event/controller/EventController.java b/src/main/java/eventee/server/event/domain/event/controller/EventController.java index 67e72f6..0ac4c29 100644 --- a/src/main/java/eventee/server/event/domain/event/controller/EventController.java +++ b/src/main/java/eventee/server/event/domain/event/controller/EventController.java @@ -99,15 +99,26 @@ public BaseResponse verifyEventPasswo return BaseResponse.of(SuccessCode.SUCCESS, response); } - @Operation(summary = "이벤트 멤버 가져오기") - @GetMapping("/admin/members") + @Operation(summary = "이벤트 멤버 ID값 가져오기") + @GetMapping("/admin/members/id") public BaseResponse> getMembers(HttpServletRequest request, @RequestParam Long eventId,Authentication authentication){ Long memberId = (Long) authentication.getPrincipal(); if (memberId == null) { throw new JwtHandler(JwtErrorCode.JWT_MISSING_TOKEN); } - List response = eventService.getMembersByEvent(eventId); + List response = eventService.getMembersIdByEvent(eventId); + return BaseResponse.onSuccess(response); + } + + @Operation(summary = "이벤트 멤버 ID값 가져오기") + @GetMapping("/admin/members/nickname") + public BaseResponse> getMembers(@RequestParam Long eventId,Authentication authentication){ + Long memberId = (Long) authentication.getPrincipal(); + if (memberId == null) { + throw new JwtHandler(JwtErrorCode.JWT_MISSING_TOKEN); + } + List response = eventService.getMembersNamesByEvent(eventId); return BaseResponse.onSuccess(response); } diff --git a/src/main/java/eventee/server/event/domain/event/service/EventService.java b/src/main/java/eventee/server/event/domain/event/service/EventService.java index 2dee319..802e82e 100644 --- a/src/main/java/eventee/server/event/domain/event/service/EventService.java +++ b/src/main/java/eventee/server/event/domain/event/service/EventService.java @@ -19,7 +19,9 @@ public interface EventService { EventResponse.EventPasswordVerifyResponse verifyEventPassword(EventRequest.PasswordVerifyRequest request); - List getMembersByEvent(long eventId); + List getMembersIdByEvent(long eventId); + List getMembersNamesByEvent(long eventId); + void kickMember(EventRequest.KickMemberRequest request, Long memberId); EventResponse.UpdateEventResponse updateEventInfo(UpdateRequest request, Long memberId); diff --git a/src/main/java/eventee/server/event/domain/event/service/EventServiceImpl.java b/src/main/java/eventee/server/event/domain/event/service/EventServiceImpl.java index c316165..13793a6 100644 --- a/src/main/java/eventee/server/event/domain/event/service/EventServiceImpl.java +++ b/src/main/java/eventee/server/event/domain/event/service/EventServiceImpl.java @@ -199,7 +199,7 @@ public EventResponse.EventPasswordVerifyResponse verifyEventPassword(EventReques 7. 이벤트 참여자 목록 ============================================ */ @Transactional(readOnly = true) - public List getMembersByEvent(long eventId) { + public List getMembersIdByEvent(long eventId) { Event event = eventRepository.findByIdAndIsDeletedFalse(eventId) .orElseThrow(() -> new EventHandler(EventErrorStatus.EVENT_NOT_FOUND)); @@ -215,6 +215,21 @@ public List getMembersByEvent(long eventId) { .toList(); } + public List getMembersNamesByEvent(long eventId){ + Event event = eventRepository.findByIdAndIsDeletedFalse(eventId) + .orElseThrow(() -> new EventHandler(EventErrorStatus.EVENT_NOT_FOUND)); + + List relations = memberEventRepository + .findMemberEventsByEventAndIsDeletedFalse(event); + + //fixme 호출한대로 그냥 출력하기 + + + return relations.stream() + .map(MemberEvent::getNickname) + .toList(); + } + /* ============================================ 8. 강퇴 ============================================ */