diff --git a/build.gradle b/build.gradle index aa1a5b3..5d1fa0f 100644 --- a/build.gradle +++ b/build.gradle @@ -35,7 +35,7 @@ repositories { dependencies { // 공통 모듈 - implementation "eventee.server:common:v0.6.0" + implementation "eventee.server:common:v0.6.3" // 스프링 스타터 implementation 'org.springframework.boot:spring-boot-starter' @@ -49,14 +49,6 @@ dependencies { compileOnly 'org.projectlombok:lombok' annotationProcessor 'org.projectlombok:lombok' -// //jwt -// implementation 'io.jsonwebtoken:jjwt-api:0.12.5' -// implementation 'io.jsonwebtoken:jjwt-impl:0.12.5' -// implementation 'io.jsonwebtoken:jjwt-jackson:0.12.5' -// -// //oauth -// implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' - //swagger implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:2.5.0" diff --git a/src/main/java/eventee/server/event/domain/event/converter/EventConverter.java b/src/main/java/eventee/server/event/domain/event/converter/EventConverter.java index 9c7d191..4499aee 100644 --- a/src/main/java/eventee/server/event/domain/event/converter/EventConverter.java +++ b/src/main/java/eventee/server/event/domain/event/converter/EventConverter.java @@ -68,7 +68,13 @@ public EventResponse.CreateResponse toCreateResponse(Event event, Long memberId) .build(); } - public EventResponse.EventWithGroupsResponse toEventWithGroupsResponse(Event event, List groups, MemberEvent.MemberEventRole role, String nickname) { + public EventResponse.EventWithGroupsResponse toEventWithGroupsResponse( + Long memberId, + Event event, + List groups, + MemberEvent.MemberEventRole role, + String nickname + ) { List groupDtos = groups.stream() @@ -78,7 +84,6 @@ public EventResponse.EventWithGroupsResponse toEventWithGroupsResponse(Event eve .groupDescription(g.getGroupDescription()) .groupImg(g.getGroupImg()) .groupNo(g.getGroupNo()) -// .groupLeader(g.getGroupLeader()) .build()) .toList(); @@ -86,8 +91,8 @@ public EventResponse.EventWithGroupsResponse toEventWithGroupsResponse(Event eve .eventId(event.getId()) .eventTitle(event.getTitle()) .eventDescription(event.getDescription()) - .eventRole(role.name()) - .nickname(nickname) + .eventRole(role.name()) // ⭐ HOST / MEMBER + .nickname(nickname) // ⭐ 이벤트 닉네임 .thumbnailUrl(event.getThumbnailUrl()) .startAt(event.getStartAt()) .endAt(event.getEndAt()) @@ -96,6 +101,7 @@ public EventResponse.EventWithGroupsResponse toEventWithGroupsResponse(Event eve .build(); } + // public EventResponse.GroupPostsResponse toGroupPostsResponse( // Group group, // List posts, 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 13793a6..eca2440 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 @@ -123,7 +123,7 @@ public EventResponse.EventWithGroupsResponse getEventGroups(Long memberId, Long List groups = groupRepository.findAllByEventId(eventId); - return eventConverter.toEventWithGroupsResponse(event, groups, relation.getRole(), relation.getNickname()); + return eventConverter.toEventWithGroupsResponse(memberId, event, groups, relation.getRole(), relation.getNickname()); } // /* ============================================