refactor: (#29) Member엔티티 필드명 수정 및 추가

woowacourse-teams · Jul 18, 2023 · 326f668 · 326f668
1 parent b9f6d3e
commit 326f668
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 16 deletions.
diff --git a/backend/src/main/java/com/votogether/domain/auth/service/KakaoOAuthClient.java b/backend/src/main/java/com/votogether/domain/auth/service/KakaoOAuthClient.java
@@ -2,9 +2,7 @@
 
 import com.votogether.domain.auth.dto.KakaoMemberResponse;
 import com.votogether.domain.auth.dto.OAuthAccessTokenResponse;
-import com.votogether.domain.member.service.MemberService;
 import lombok.Getter;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
@@ -22,14 +20,7 @@ public class KakaoOAuthClient {
 
  private static final RestTemplate restTemplate = new RestTemplate();
 
- private final MemberService memberService;
- private final MultiValueMap<String, String> info;
-
- @Autowired
- public KakaoOAuthClient(final MemberService memberService) {
- this.memberService = memberService;
- this.info = new LinkedMultiValueMap<>();
- }
+ private final MultiValueMap<String, String> info = new LinkedMultiValueMap<>();
 
  public String getAccessToken(final String code) {
  info.add("code", code);

diff --git a/backend/src/main/java/com/votogether/domain/member/entity/Member.java b/backend/src/main/java/com/votogether/domain/member/entity/Member.java
@@ -31,7 +31,10 @@ public class Member extends BaseEntity {
  private Gender gender;
 
  @Column(nullable = false)
- private String birthDate;
+ private String ageRange;
+
+ @Column(nullable = false)
+ private String birthday;
 
  @Enumerated(value = EnumType.STRING)
  @Column(length = 20, nullable = false)
@@ -46,15 +49,17 @@ public class Member extends BaseEntity {
  @Builder
  private Member(
  final String nickname,
- final String birthDate,
  final Gender gender,
+ final String ageRange,
+ final String birthday,
  final SocialType socialType,
  final String socialId,
  final Integer point
  ) {
  this.nickname = nickname;
- this.birthDate = birthDate;
  this.gender = gender;
+ this.ageRange = ageRange;
+ this.birthday = birthday;
  this.socialType = socialType;
  this.socialId = socialId;
  this.point = point;
@@ -65,7 +70,8 @@ public static Member createKakaoMember(final KakaoMemberResponse response) {
  return Member.builder()
  .nickname("익명의 손님" + nicknameNumberGenerator.generate())
  .gender(Gender.valueOf(response.kakaoAccount().gender().toUpperCase()))
- .birthDate(response.kakaoAccount().birthday())
+ .ageRange(response.kakaoAccount().ageRange())
+ .birthday(response.kakaoAccount().birthday())
  .socialType(SocialType.KAKAO)
  .socialId(String.valueOf(response.id()))
  .point(0)

diff --git a/backend/src/main/java/com/votogether/domain/member/service/MemberService.java b/backend/src/main/java/com/votogether/domain/member/service/MemberService.java
@@ -16,8 +16,10 @@ public class MemberService {
 
  @Transactional
  public Member register(final Member member) {
- final Optional<Member> maybeMember = memberRepository.findBySocialIdAndSocialType(member.getSocialId(),
- member.getSocialType());
+ final Optional<Member> maybeMember = memberRepository.findBySocialIdAndSocialType(
+ member.getSocialId(),
+ member.getSocialType()
+ );
  return maybeMember.orElseGet(() -> memberRepository.save(member));
  }