Skip to content

Commit 450209b

Browse files
committed
refactor kookmin-sw#2 - security 패키지로 이동, 사용하지 않는 변수 삭제
MemberAccount 엔티티의 Role 삭제 why? 데이터베이스에 롤을 가지고 있을 필요 없을 것 같아 삭제함 추후에 회원 롤 관련 설계를 논의해 볼 것
1 parent f065456 commit 450209b

File tree

3 files changed

+26
-16
lines changed

3 files changed

+26
-16
lines changed

src/main/java/org/capstone/maru/domain/MemberAccount.java

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,10 @@
77
import jakarta.persistence.Table;
88
import java.util.Objects;
99
import lombok.AccessLevel;
10-
import lombok.Builder;
1110
import lombok.Getter;
1211
import lombok.NoArgsConstructor;
1312
import lombok.Setter;
1413
import lombok.ToString;
15-
import org.capstone.maru.dto.Role;
16-
import org.capstone.maru.dto.SocialType;
1714

1815
@Getter
1916
@NoArgsConstructor(access = AccessLevel.PROTECTED)
@@ -39,32 +36,25 @@ public class MemberAccount extends AuditingFields {
3936
@Column(length = 100)
4037
private String nickname;
4138

42-
private SocialType socialType;
43-
44-
private Role role;
45-
46-
@Builder
4739
private MemberAccount(
4840
String memberId,
4941
String email,
5042
String nickname,
51-
String createdBy,
52-
SocialType socialType
43+
String createdBy
5344
) {
5445
this.memberId = memberId;
5546
this.email = email;
5647
this.nickname = nickname;
5748
this.createdBy = createdBy;
5849
this.modifiedBy = createdBy;
59-
this.socialType = socialType;
6050
}
6151

6252
public static MemberAccount of(
6353
String memberId,
6454
String email,
6555
String nickname
6656
) {
67-
return new MemberAccount(memberId, email, nickname, null, null);
57+
return new MemberAccount(memberId, email, nickname, null);
6858
}
6959

7060
public static MemberAccount of(
@@ -73,7 +63,7 @@ public static MemberAccount of(
7363
String nickname,
7464
String createdBy
7565
) {
76-
return new MemberAccount(memberId, email, nickname, createdBy, null);
66+
return new MemberAccount(memberId, email, nickname, createdBy);
7767
}
7868

7969
@Override

src/main/java/org/capstone/maru/security/SharedPostPrincipal.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.capstone.maru.dto.security;
1+
package org.capstone.maru.security;
22

33
import java.util.Collection;
44
import java.util.Map;
Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,25 @@
1-
package org.capstone.maru.dto;
1+
package org.capstone.maru.security.constant;
22

3+
import lombok.Getter;
4+
import lombok.RequiredArgsConstructor;
5+
6+
@Getter
7+
@RequiredArgsConstructor
38
public enum SocialType {
4-
KAKAO, NAVER
9+
10+
KAKAO("kakao"), NAVER("naver");
11+
12+
private final String key;
13+
14+
public static SocialType of(String registrationId) {
15+
switch (registrationId) {
16+
case "kakao":
17+
return SocialType.KAKAO;
18+
case "naver":
19+
return SocialType.NAVER;
20+
default:
21+
throw new IllegalArgumentException(
22+
"Unsupported social registrationId: " + registrationId);
23+
}
24+
}
525
}

0 commit comments

Comments
 (0)