Skip to content

Commit

Permalink
2.1.3 ver (#69)
Browse files Browse the repository at this point in the history
  • Loading branch information
ozzing authored May 22, 2023
2 parents 62c6c38 + d1def4a commit f5acb43
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ dependencies {

// jwt
implementation 'io.jsonwebtoken:jjwt-api:0.11.5'
runtimeOnly group: 'io.jsonwebtoken', name: 'jjwt-impl', version: '0.11.2'
runtimeOnly group: 'io.jsonwebtoken', name: 'jjwt-jackson', version: '0.11.2'
runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.5'
runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.11.5'

// DB
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,13 +110,14 @@ public PlaygroundAuthInfo.RefreshedToken refreshPlaygroundToken(AuthRequest.Acce

public PlaygroundAuthInfo.MainView getPlaygroundUserForMainView(String accessToken) {
val playgroundProfile = this.getPlaygroundMemberProfile(accessToken);
val profileImage = playgroundProfile.getProfileImage() == null ? "" : playgroundProfile.getProfileImage();
val generationList = playgroundProfile.getActivities().stream()
.map(activity -> activity.getCardinalActivities().get(0).getGeneration()).collect(Collectors.toList());
Collections.sort(generationList, Collections.reverseOrder());
val mainViewUser = PlaygroundAuthInfo.MainViewUser.builder()
.status(this.getStatus(generationList))
.name(playgroundProfile.getName())
.profileImage(playgroundProfile.getProfileImage())
.profileImage(profileImage)
.generationList(generationList)
.build();
return PlaygroundAuthInfo.MainView.builder().user(mainViewUser).build();
Expand Down

0 comments on commit f5acb43

Please sign in to comment.