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.

Sign up for GitHub

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

Jump to bottom

feat: 사용자 정보 응답과 패널 정보 응답을 수정한다 #72

Merged
merged 2 commits into from
Aug 28, 2023
Merged

feat: 사용자 정보 응답과 패널 정보 응답을 수정한다 #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aca84ce
feat: 사용자 정보 응답에 `id`와 `provider`를 추가한다 (#66)
soomanbaek Aug 28, 2023
45ec520
feat: 패널 정보 응답에 `id`와 `provider`를 추가한다 (#66)
soomanbaek Aug 28, 2023
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
7 changes: 7 additions & 0 deletions src/main/java/blacktokkies/toquiz/domain/member/dto/response/AuthenticateResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package blacktokkies.toquiz.domain.member.dto.response;

import blacktokkies.toquiz.domain.member.domain.Member;
import blacktokkies.toquiz.domain.model.Provider;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
Expand All @@ -13,16 +14,22 @@
@NoArgsConstructor
@AllArgsConstructor
public class AuthenticateResponse {
private Long id;
private String email;
private String nickname;
private Provider provider;
private LocalDateTime createdAt;
private LocalDateTime updatedAt;
private String accessToken;

public static AuthenticateResponse toDto(Member member, String accessToken){
return AuthenticateResponse.builder()
.id(member.getId())
.email(member.getEmail())
.provider(member.getProvider())
.nickname(member.getNickname())
.createdAt(member.getCreatedDate())
.updatedAt(member.getUpdatedDate())
.accessToken(accessToken)
.build();
}
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/blacktokkies/toquiz/domain/member/dto/response/MemberInfoResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
@NoArgsConstructor
@AllArgsConstructor
public class MemberInfoResponse {
private Long id;
private String email;
private String nickname;
private Provider provider;
Expand All @@ -22,6 +23,7 @@ public class MemberInfoResponse {

public static MemberInfoResponse toDto(Member member){
return MemberInfoResponse.builder()
.id(member.getId())
.email(member.getEmail())
.nickname(member.getNickname())
.provider(member.getProvider())
Expand Down
11 changes: 9 additions & 2 deletions src/main/java/blacktokkies/toquiz/domain/panel/dto/response/PanelResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public class PanelResponse {
private String sid;
private String title;
private String description;
private Long authorId;
private Author author;
private long scarpNum;
private boolean isArchived;
private LocalDateTime createdAt;
Expand All @@ -27,11 +27,18 @@ public static PanelResponse toDto(Panel panel){
.sid(panel.getSid())
.title(panel.getTitle())
.description(panel.getDescription())
.authorId(panel.getMember().getId())
.author(new Author(panel.getMember().getId(), panel.getMember().getNickname()))
.isArchived(panel.isArchived())
.scarpNum(panel.getScarpNum())
.createdAt(panel.getCreatedDate())
.updatedAt(panel.getUpdatedDate())
.build();
}

@Getter
@AllArgsConstructor
private static class Author{
private Long id;
private String nickname;
}
}