Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[feat] 로그인한 유저 정보 불러오기 API에 단체 추가 #40

Merged
merged 1 commit into from
Jan 10, 2024
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
4 changes: 4 additions & 0 deletions src/main/java/org/pingle/pingleserver/domain/User.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import org.pingle.pingleserver.domain.enums.URole;

import java.time.LocalDateTime;
import java.util.List;

@Entity
@Getter
Expand Down Expand Up @@ -41,6 +42,9 @@ public class User {

private LocalDateTime deletedAt;

@OneToMany(mappedBy = "user")
private List<UserTeam> userTeams;

@Builder
public User(String serialId, String name, String email, Provider provider, URole role, String refreshToken) {
this.serialId = serialId;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package org.pingle.pingleserver.dto.response;

import org.pingle.pingleserver.domain.UserTeam;

public record SimpleGroupInfo(Long id, String name) {
public static SimpleGroupInfo of(UserTeam userTeam) {
return new SimpleGroupInfo(userTeam.getTeam().getId(), userTeam.getTeam().getName());
}
}
Original file line number Diff line number Diff line change
@@ -1,10 +1,21 @@
package org.pingle.pingleserver.dto.response;

import org.pingle.pingleserver.domain.User;
import org.pingle.pingleserver.domain.UserTeam;
import org.pingle.pingleserver.domain.enums.Provider;

public record UserInfoResponse(Long id, String name, String email, Provider provider){
import java.util.List;
import java.util.stream.Collectors;

public record UserInfoResponse(Long id, String name, String email, Provider provider, List<SimpleGroupInfo> groups){
public static UserInfoResponse of(User user){
return new UserInfoResponse(user.getId(), user.getName(), user.getEmail(), user.getProvider());
return new UserInfoResponse(user.getId(), user.getName(),
user.getEmail(), user.getProvider(), getSimpleGroupsInfo(user.getUserTeams()));
}

private static List<SimpleGroupInfo> getSimpleGroupsInfo(List<UserTeam> userTeams){
return userTeams.stream()
.map(SimpleGroupInfo::of)
.collect(Collectors.toList());
}
}