Skip to content

refactor/user 101 - 앱 실행 시 내정보/알림 조회 api response 수정 #104

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

Draft
KwonYeKyeong wants to merge 2 commits into
base: develop
Choose a base branch
from
Draft

refactor/user 101 - 앱 실행 시 내정보/알림 조회 api response 수정 #104

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
b74d052
refactor : response 수정
KwonYeKyeong Jan 21, 2022
9e479d5
refactor : DefaultUserDto를 만들어 response에 적용
KwonYeKyeong Jan 24, 2022
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
51 changes: 51 additions & 0 deletions src/main/java/org/slams/server/user/dto/response/DefaultUserDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
package org.slams.server.user.dto.response;

import lombok.AccessLevel;
import lombok.Getter;
import lombok.NoArgsConstructor;
import org.slams.server.user.entity.Position;
import org.slams.server.user.entity.Proficiency;
import org.slams.server.user.entity.Role;
import org.slams.server.user.entity.User;

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

@Getter
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public class DefaultUserDto {

private Long id;
private String email;
private String nickname;
private String profileImage;
private String description;
private Role role;
private Proficiency proficiency;
private List<Position> positions = new ArrayList<>();
private LocalDateTime createdAt;
private LocalDateTime updatedAt;

private DefaultUserDto(Long id, String email, String nickname, String profileImage,
String description, Role role, Proficiency proficiency, List<Position> positions,
LocalDateTime createdAt, LocalDateTime updatedAt) {
this.id = id;
this.email = email;
this.nickname = nickname;
this.profileImage = profileImage;
this.description = description;
this.role = role;
this.proficiency = proficiency;
this.positions = positions;
this.createdAt = createdAt;
this.updatedAt = updatedAt;
}

public static DefaultUserDto toDto(User user){
return new DefaultUserDto(user.getId(), user.getEmail(), user.getNickname(), user.getProfileImage(),
user.getDescription(), user.getRole(), user.getProficiency(), user.getPositions(),
user.getCreatedAt(), user.getUpdateAt());
}

}
32 changes: 4 additions & 28 deletions src/main/java/org/slams/server/user/dto/response/DefaultUserInfoResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,40 +18,16 @@
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public class DefaultUserInfoResponse {

private Long userId;
private String email;
private String nickname;
private String profileImage;
private String description;
private Role role;
private Proficiency proficiency;
private List<Position> positions;
private LocalDateTime createdAt;
private LocalDateTime updatedAt;
private DefaultUserDto user;
private List<NotificationResponse> notifications;

public DefaultUserInfoResponse(Long userId, String email, String nickname,
String profileImage, String description, Role role,
Proficiency proficiency, List<Position> positions,
LocalDateTime createdAt, LocalDateTime updatedAt,
List<NotificationResponse> notifications) {
this.userId = userId;
this.email = email;
this.nickname = nickname;
this.profileImage = profileImage;
this.description = description;
this.role = role;
this.proficiency = proficiency;
this.positions = positions;
this.createdAt = createdAt;
this.updatedAt = updatedAt;
private DefaultUserInfoResponse(DefaultUserDto user, List<NotificationResponse> notifications) {
this.user = user;
this.notifications = notifications;
}

public static DefaultUserInfoResponse toResponse(User user, List<NotificationResponse> notifications) {
return new DefaultUserInfoResponse(user.getId(), user.getEmail(), user.getNickname(), user.getProfileImage(),
user.getDescription(), user.getRole(), user.getProficiency(), user.getPositions(),
user.getCreatedAt(), user.getUpdateAt(), notifications);
return new DefaultUserInfoResponse(DefaultUserDto.toDto(user), notifications);
}

}
54 changes: 54 additions & 0 deletions src/main/java/org/slams/server/user/dto/response/UserResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
package org.slams.server.user.dto.response;

import lombok.AccessLevel;
import lombok.Getter;
import lombok.NoArgsConstructor;
import org.slams.server.user.entity.Position;
import org.slams.server.user.entity.Proficiency;
import org.slams.server.user.entity.Role;
import org.slams.server.user.entity.User;

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

@Getter
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public class UserResponse {

private Long id;
private String socialId;
private String email;
private String nickname;
private String profileImage;
private String description;
private Role role;
private Proficiency proficiency;
private List<Position> positions = new ArrayList<>();
private LocalDateTime createdAt;
private LocalDateTime updatedAt;

private UserResponse(Long id, String socialId, String email, String nickname,
String profileImage, String description,
Role role, Proficiency proficiency, List<Position> positions,
LocalDateTime createdAt, LocalDateTime updatedAt) {
this.id = id;
this.socialId = socialId;
this.email = email;
this.nickname = nickname;
this.profileImage = profileImage;
this.description = description;
this.role = role;
this.proficiency = proficiency;
this.positions = positions;
this.createdAt = createdAt;
this.updatedAt = updatedAt;
}

public static UserResponse toResponse(User user){
return new UserResponse(user.getId(), user.getSocialId(), user.getEmail(), user.getNickname(),
user.getProfileImage(), user.getDescription(), user.getRole(), user.getProficiency(), user.getPositions(),
user.getCreatedAt(), user.getUpdateAt());
}

}