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
10 changes: 1 addition & 9 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,13 @@ public EventResponse.CreateResponse toCreateResponse(Event event, Long memberId)
.build();
}

public EventResponse.EventWithGroupsResponse toEventWithGroupsResponse(Event event, List<Group> groups, MemberEvent.MemberEventRole role, String nickname) {
public EventResponse.EventWithGroupsResponse toEventWithGroupsResponse(
Long memberId,
Event event,
List<Group> groups,
MemberEvent.MemberEventRole role,
String nickname
) {

List<EventResponse.EventWithGroupsResponse.GroupSummary> groupDtos =
groups.stream()
Expand All @@ -78,16 +84,15 @@ public EventResponse.EventWithGroupsResponse toEventWithGroupsResponse(Event eve
.groupDescription(g.getGroupDescription())
.groupImg(g.getGroupImg())
.groupNo(g.getGroupNo())
// .groupLeader(g.getGroupLeader())
.build())
.toList();

return EventResponse.EventWithGroupsResponse.builder()
.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())
Expand All @@ -96,6 +101,7 @@ public EventResponse.EventWithGroupsResponse toEventWithGroupsResponse(Event eve
.build();
}


// public EventResponse.GroupPostsResponse toGroupPostsResponse(
// Group group,
// List<Post.PostDto> posts,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ public EventResponse.EventWithGroupsResponse getEventGroups(Long memberId, Long

List<Group> groups = groupRepository.findAllByEventId(eventId);

return eventConverter.toEventWithGroupsResponse(event, groups, relation.getRole(), relation.getNickname());
return eventConverter.toEventWithGroupsResponse(memberId, event, groups, relation.getRole(), relation.getNickname());
}

// /* ============================================
Expand Down