From b74d052b30d691ea90cec663dbad8fff78e78ade Mon Sep 17 00:00:00 2001 From: yekyeong Date: Fri, 21 Jan 2022 17:58:54 +0900 Subject: [PATCH 1/2] =?UTF-8?q?refactor=20:=20response=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/response/DefaultUserInfoResponse.java | 32 ++--------- .../user/dto/response/UserResponse.java | 54 +++++++++++++++++++ 2 files changed, 58 insertions(+), 28 deletions(-) create mode 100644 src/main/java/org/slams/server/user/dto/response/UserResponse.java diff --git a/src/main/java/org/slams/server/user/dto/response/DefaultUserInfoResponse.java b/src/main/java/org/slams/server/user/dto/response/DefaultUserInfoResponse.java index 82605406..b0939ea6 100644 --- a/src/main/java/org/slams/server/user/dto/response/DefaultUserInfoResponse.java +++ b/src/main/java/org/slams/server/user/dto/response/DefaultUserInfoResponse.java @@ -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 positions; - private LocalDateTime createdAt; - private LocalDateTime updatedAt; + private UserResponse user; private List notifications; - public DefaultUserInfoResponse(Long userId, String email, String nickname, - String profileImage, String description, Role role, - Proficiency proficiency, List positions, - LocalDateTime createdAt, LocalDateTime updatedAt, - List 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(UserResponse user, List notifications) { + this.user = user; this.notifications = notifications; } public static DefaultUserInfoResponse toResponse(User user, List 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(UserResponse.toResponse(user), notifications); } } diff --git a/src/main/java/org/slams/server/user/dto/response/UserResponse.java b/src/main/java/org/slams/server/user/dto/response/UserResponse.java new file mode 100644 index 00000000..1bc65f08 --- /dev/null +++ b/src/main/java/org/slams/server/user/dto/response/UserResponse.java @@ -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 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 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()); + } + +} From 9e479d57c7116277c6b65fe3c5ea5974a53ac84f Mon Sep 17 00:00:00 2001 From: yekyeong Date: Mon, 24 Jan 2022 17:46:45 +0900 Subject: [PATCH 2/2] =?UTF-8?q?refactor=20:=20DefaultUserDto=EB=A5=BC=20?= =?UTF-8?q?=EB=A7=8C=EB=93=A4=EC=96=B4=20response=EC=97=90=20=EC=A0=81?= =?UTF-8?q?=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../user/dto/response/DefaultUserDto.java | 51 +++++++++++++++++++ .../dto/response/DefaultUserInfoResponse.java | 6 +-- 2 files changed, 54 insertions(+), 3 deletions(-) create mode 100644 src/main/java/org/slams/server/user/dto/response/DefaultUserDto.java diff --git a/src/main/java/org/slams/server/user/dto/response/DefaultUserDto.java b/src/main/java/org/slams/server/user/dto/response/DefaultUserDto.java new file mode 100644 index 00000000..c8735025 --- /dev/null +++ b/src/main/java/org/slams/server/user/dto/response/DefaultUserDto.java @@ -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 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 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()); + } + +} diff --git a/src/main/java/org/slams/server/user/dto/response/DefaultUserInfoResponse.java b/src/main/java/org/slams/server/user/dto/response/DefaultUserInfoResponse.java index b0939ea6..c783e522 100644 --- a/src/main/java/org/slams/server/user/dto/response/DefaultUserInfoResponse.java +++ b/src/main/java/org/slams/server/user/dto/response/DefaultUserInfoResponse.java @@ -18,16 +18,16 @@ @NoArgsConstructor(access = AccessLevel.PRIVATE) public class DefaultUserInfoResponse { - private UserResponse user; + private DefaultUserDto user; private List notifications; - private DefaultUserInfoResponse(UserResponse user, List notifications) { + private DefaultUserInfoResponse(DefaultUserDto user, List notifications) { this.user = user; this.notifications = notifications; } public static DefaultUserInfoResponse toResponse(User user, List notifications) { - return new DefaultUserInfoResponse(UserResponse.toResponse(user), notifications); + return new DefaultUserInfoResponse(DefaultUserDto.toDto(user), notifications); } }