Skip to content

Commit 1260918

Browse files
committed
feat: Member 수정과 MemberSignUpDto 추가 (#4)
1 parent 3764f16 commit 1260918

File tree

2 files changed

+36
-7
lines changed

2 files changed

+36
-7
lines changed
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
package com.project.mapdagu.domain.member.dto;
2+
3+
import com.project.mapdagu.domain.member.entity.Member;
4+
import com.project.mapdagu.domain.member.entity.Role;
5+
6+
public record MemberSignUpDto(String nickname, String email, String password,
7+
String userName, int imageNum, String intro) {
8+
9+
public Member toEntity() {
10+
return Member.builder()
11+
.nickname(nickname)
12+
.email(email)
13+
.password(password)
14+
.userName(userName)
15+
.imageNum(imageNum)
16+
.intro(intro)
17+
.role(Role.USER)
18+
.build();
19+
}
20+
}

src/main/java/com/project/mapdagu/domain/member/entity/Member.java

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import com.project.mapdagu.common.entity.BaseTimeEntity;
44
import jakarta.persistence.*;
55
import lombok.*;
6+
import org.springframework.security.crypto.password.PasswordEncoder;
67

78
@Getter
89
@NoArgsConstructor(access = AccessLevel.PROTECTED)
@@ -13,26 +14,34 @@ public class Member extends BaseTimeEntity {
1314
@Id
1415
@GeneratedValue(strategy = GenerationType.IDENTITY)
1516
private Long id;
17+
private String nickname;
1618
private String email;
1719
private String password;
18-
private String nickname;
20+
private String userName;
21+
private int imageNum;
22+
private String intro;
23+
private int scoville;
24+
private int level;
1925
@Enumerated(EnumType.STRING)
2026
private Role role;
2127
@Enumerated(EnumType.STRING)
2228
private SocialType socialType; // KAKAO, NAVER, GOOGLE
2329
private String socialId; // 로그인한 소셜 타입 식별자 값 (일반 로그인의 경우 null)
24-
private String userName;
25-
private String imageNum;
2630

2731
@Builder
28-
public Member(String email, String password, String nickname, Role role, SocialType socialType, String socialId, String userName, String imageNum) {
32+
public Member(String nickname, String email, String password, String userName, int imageNum, String intro, Role role, SocialType socialType, String socialId) {
33+
this.nickname = nickname;
2934
this.email = email;
3035
this.password = password;
31-
this.nickname = nickname;
36+
this.userName = userName;
37+
this.imageNum = imageNum;
38+
this.intro = intro;
3239
this.role = role;
3340
this.socialType = socialType;
3441
this.socialId = socialId;
35-
this.userName = userName;
36-
this.imageNum = imageNum;
42+
}
43+
44+
public void passwordEncode(PasswordEncoder passwordEncoder) {
45+
this.password = passwordEncoder.encode(this.password);
3746
}
3847
}

0 commit comments

Comments
 (0)