Skip to content

Commit e9e1b05

Browse files
committed
feat: emoji 필드 추가
1 parent 60dab1f commit e9e1b05

2 files changed

Lines changed: 13 additions & 7 deletions

File tree

auth/src/main/java/com/jocketdan/auth/dto/UserResponse.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import com.jocketdan.auth.entity.User;
44

5-
public record UserResponse(String email, String nickname, String provider) {
5+
public record UserResponse(String email, String nickname, String provider, String emoji) {
66
public static UserResponse of(User user) {
7-
return new UserResponse(user.getEmail(), user.getNickname(), String.valueOf(user.getProvider()));
7+
return new UserResponse(user.getEmail(), user.getNickname(), String.valueOf(user.getProvider()), user.getEmoji());
88
}
99
}

auth/src/main/java/com/jocketdan/auth/entity/User.java

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import jakarta.persistence.GenerationType;
1111
import jakarta.persistence.Id;
1212
import jakarta.persistence.Table;
13-
import lombok.AccessLevel;
1413
import lombok.AllArgsConstructor;
1514
import lombok.Getter;
1615
import lombok.NoArgsConstructor;
@@ -31,7 +30,7 @@ public class User extends BaseTimeEntity {
3130

3231
private String password; // 자체 회원가입한 유저만 저장 -> 소셜 로그인의 경우 토큰으로 처리
3332

34-
@Column(nullable = false)
33+
@Column(unique = true, nullable = false, length = 20)
3534
private String nickname;
3635

3736
@Column(nullable = false)
@@ -52,24 +51,31 @@ public class User extends BaseTimeEntity {
5251
@Column(nullable = false)
5352
private boolean credentialsNonExpired = true;
5453

54+
@Column(length = 10)
55+
private String emoji;
56+
5557
public static User signup(String email, String password, String nickname, String role, AuthProvider provider) {
5658
User user = new User();
5759
user.email = email;
5860
user.password = password;
5961
user.nickname = nickname;
6062
user.role = role;
6163
user.provider = provider;
64+
user.emoji = "👤";
6265
return user;
6366
}
6467
public void changeIdForTest(Long id){
6568
this.id = id;
6669
}
70+
public void changePassword(String password){
71+
this.password = password;
72+
}
6773

6874
public void changeNickname(String name){
6975
this.nickname = name;
7076
}
71-
public void changePassword(String password){
72-
this.password = password;
73-
}
7477

78+
public void changeEmoji(String emoji) {
79+
this.emoji = emoji.trim();
80+
}
7581
}

0 commit comments

Comments
 (0)