Skip to content
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

[Refactor: 일반 로그인 사용자와 소셜 로그인 사용자의 구분을 위한 리팩토링 #236

Merged
merged 1 commit into from
Aug 6, 2024
Merged

[Refactor: 일반 로그인 사용자와 소셜 로그인 사용자의 구분을 위한 리팩토링 #236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion src/main/java/sumcoda/boardbuddy/dto/MemberResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import sumcoda.boardbuddy.enumerate.MemberType;

import java.util.List;
import java.util.Map;
Expand All @@ -28,16 +29,20 @@ public static class ProfileDTO {

private Boolean isPhoneNumberVerified;

private MemberType memberType;

private String profileImageS3SavedURL;


@Builder
public ProfileDTO(String nickname, String sido, String sgg, String emd, String phoneNumber, Boolean isPhoneNumberVerified, String profileImageS3SavedURL) {
public ProfileDTO(String nickname, String sido, String sgg, String emd, String phoneNumber, Boolean isPhoneNumberVerified, MemberType memberType, String profileImageS3SavedURL) {
this.nickname = nickname;
this.sido = sido;
this.sgg = sgg;
this.emd = emd;
this.phoneNumber = phoneNumber;
this.isPhoneNumberVerified = isPhoneNumberVerified;
this.memberType = memberType;
this.profileImageS3SavedURL = profileImageS3SavedURL;
}
}
Expand Down
11 changes: 9 additions & 2 deletions src/main/java/sumcoda/boardbuddy/entity/Member.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import sumcoda.boardbuddy.enumerate.MemberType;
import sumcoda.boardbuddy.enumerate.Role;

import java.util.ArrayList;
Expand Down Expand Up @@ -130,6 +131,10 @@ public class Member {
// 랭킹 산정을 위한 점수
private Double rankScore;

// ex) REGULAR, SOCIAL
@Column(nullable = false)
private MemberType memberType;

// 사용자의 권한을 나타내기위한 role
// ex) ADMIN, USER
@Column(nullable = false)
Expand Down Expand Up @@ -163,7 +168,7 @@ public class Member {
private List<BadgeImage> badgeImages = new ArrayList<>();

@Builder
public Member(String username, String password, String nickname, String email, String phoneNumber, String sido, String sgg, String emd, Integer radius, Double buddyScore, Integer joinCount, Integer monthlyExcellentCount, Integer totalExcellentCount, Integer monthlyGoodCount, Integer totalGoodCount, Integer monthlyBadCount, Integer totalBadCount, Integer monthlyNoShowCount, Integer monthlySendReviewCount, String description, Integer rank, Double rankScore, Role role, ProfileImage profileImage) {
public Member(String username, String password, String nickname, String email, String phoneNumber, String sido, String sgg, String emd, Integer radius, Double buddyScore, Integer joinCount, Integer monthlyExcellentCount, Integer totalExcellentCount, Integer monthlyGoodCount, Integer totalGoodCount, Integer monthlyBadCount, Integer totalBadCount, Integer monthlyNoShowCount, Integer monthlySendReviewCount, String description, Integer rank, Double rankScore, MemberType memberType, Role role, ProfileImage profileImage) {
this.username = username;
this.password = password;
this.nickname = nickname;
Expand All @@ -186,12 +191,13 @@ public Member(String username, String password, String nickname, String email, S
this.description = description;
this.rank = rank;
this.rankScore = rankScore;
this.memberType = memberType;
this.role = role;
this.assignProfileImage(profileImage);
}

// 직접 빌더 패턴의 생성자를 활용하지 말고 해당 메서드를 활용하여 엔티티 생성
public static Member buildMember(String username, String password, String nickname, String email, String phoneNumber, String sido, String sgg, String emd, Integer radius, Double buddyScore, Integer joinCount, Integer monthlyExcellentCount, Integer totalExcellentCount, Integer monthlyGoodCount, Integer totalGoodCount, Integer monthlyBadCount, Integer totalBadCount, Integer monthlyNoShowCount, Integer monthlySendReviewCount, String description, Integer rank, Double rankScore, Role role, ProfileImage profileImage) {
public static Member buildMember(String username, String password, String nickname, String email, String phoneNumber, String sido, String sgg, String emd, Integer radius, Double buddyScore, Integer joinCount, Integer monthlyExcellentCount, Integer totalExcellentCount, Integer monthlyGoodCount, Integer totalGoodCount, Integer monthlyBadCount, Integer totalBadCount, Integer monthlyNoShowCount, Integer monthlySendReviewCount, String description, Integer rank, Double rankScore, MemberType memberType, Role role, ProfileImage profileImage) {
return Member.builder()
.username(username)
.password(password)
Expand All @@ -215,6 +221,7 @@ public static Member buildMember(String username, String password, String nickna
.description(description)
.rank(rank)
.rankScore(rankScore)
.memberType(memberType)
.role(role)
.profileImage(profileImage)
.build();
Expand Down
16 changes: 16 additions & 0 deletions src/main/java/sumcoda/boardbuddy/enumerate/MemberType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package sumcoda.boardbuddy.enumerate;

import com.fasterxml.jackson.annotation.JsonValue;
import lombok.Getter;
import lombok.RequiredArgsConstructor;

@Getter
@RequiredArgsConstructor
public enum MemberType {

REGULAR("regular"),
SOCIAL("social");

@JsonValue
private final String value;
}
2 changes: 2 additions & 0 deletions src/main/java/sumcoda/boardbuddy/handler/auth/CustomAuthenticationSuccessHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import org.springframework.security.web.authentication.AuthenticationSuccessHandler;
import org.springframework.stereotype.Component;
import sumcoda.boardbuddy.dto.MemberResponse;
import sumcoda.boardbuddy.enumerate.MemberType;
import sumcoda.boardbuddy.exception.auth.AuthenticationMissingException;
import sumcoda.boardbuddy.repository.member.MemberRepository;

Expand Down Expand Up @@ -53,6 +54,7 @@ public void onAuthenticationSuccess(HttpServletRequest request, HttpServletRespo
.sgg(profileDTO.getSgg())
.emd(profileDTO.getEmd())
.isPhoneNumberVerified(profileDTO.getPhoneNumber() != null)
.memberType(profileDTO.getMemberType())
.profileImageS3SavedURL(profileDTO.getProfileImageS3SavedURL())
.build();

Expand Down
1 change: 1 addition & 0 deletions src/main/java/sumcoda/boardbuddy/repository/member/MemberRepositoryCustomImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ public Optional<MemberResponse.ProfileDTO> findMemberDTOByUsername(String userna
member.sgg,
member.emd,
member.phoneNumber,
member.memberType,
profileImage.profileImageS3SavedURL
))
.from(member)
Expand Down
1 change: 1 addition & 0 deletions src/main/java/sumcoda/boardbuddy/service/AuthService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ public MemberResponse.ProfileDTO isAuthenticated(String username) {
.sgg(profileDTO.getSgg())
.emd(profileDTO.getEmd())
.isPhoneNumberVerified(profileDTO.getPhoneNumber() != null)
.memberType(profileDTO.getMemberType())
.profileImageS3SavedURL(profileDTO.getProfileImageS3SavedURL())
.build();
}
Expand Down
54 changes: 28 additions & 26 deletions src/main/java/sumcoda/boardbuddy/service/CustomOAuth2UserService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import org.springframework.stereotype.Service;
import sumcoda.boardbuddy.dto.auth.oauth2.*;
import sumcoda.boardbuddy.entity.Member;
import sumcoda.boardbuddy.enumerate.MemberType;
import sumcoda.boardbuddy.enumerate.Role;
import sumcoda.boardbuddy.exception.auth.ClientRegistrationRetrievalException;
import sumcoda.boardbuddy.exception.auth.SocialUserInfoRetrievalException;
Expand Down Expand Up @@ -77,32 +78,33 @@ public OAuth2User loadUser(OAuth2UserRequest userRequest) throws OAuth2Authentic

// 만약 신규 로그인 회원이라면
if (findMember == null) {
Member member = Member.builder()
.username(username)
.password(bCryptPasswordEncoder.encode(oAuth2UserInfo.getEmail()))
.nickname(oAuth2UserInfo.getName() + randomNumber)
.email(oAuth2UserInfo.getEmail())
.phoneNumber(null)
.sido(null)
.sgg(null)
.emd(null)
.radius(2)
.buddyScore(50.0)
.joinCount(0)
.monthlyExcellentCount(0)
.totalExcellentCount(0)
.monthlyGoodCount(0)
.totalGoodCount(0)
.monthlyBadCount(0)
.totalBadCount(0)
.monthlyNoShowCount(0)
.monthlySendReviewCount(0)
.description(null)
.rank(null)
.rankScore(0.0)
.role(Role.USER)
.profileImage(null)
.build();
Member member = Member.buildMember(
username,
bCryptPasswordEncoder.encode(oAuth2UserInfo.getEmail()),
oAuth2UserInfo.getName() + randomNumber,
oAuth2UserInfo.getEmail(),
null,
null,
null,
null,
2,
50.0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
null,
null,
0.0,
MemberType.SOCIAL,
Role.USER,
null
);

memberRepository.save(member);

Expand Down
3 changes: 3 additions & 0 deletions src/main/java/sumcoda/boardbuddy/service/MemberService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import sumcoda.boardbuddy.dto.*;
import sumcoda.boardbuddy.entity.Member;
import sumcoda.boardbuddy.entity.ProfileImage;
import sumcoda.boardbuddy.enumerate.MemberType;
import sumcoda.boardbuddy.enumerate.Role;
import sumcoda.boardbuddy.exception.member.*;
import sumcoda.boardbuddy.exception.publicDistrict.PublicDistrictRetrievalException;
Expand Down Expand Up @@ -108,6 +109,7 @@ public void registerMember(MemberRequest.RegisterDTO registerDTO) {
null,
null,
0.0,
MemberType.REGULAR,
Role.USER,
null)).getId();

Expand Down Expand Up @@ -156,6 +158,7 @@ public void createAdminAccount() {
null,
null,
0.0,
MemberType.REGULAR,
Role.USER,
null)
);
Expand Down