fix: null이슈 해결 (#129)

Author: sunwon12

src/main/java/com/flint/flint/mail/service/RateLimitService.java

@@ -19,12 +19,13 @@ public class RateLimitService {
     private final RedisUtil redisUtil;
 
     public Boolean checkAPICall(Long key) {
-        String apiCall = String.valueOf(redisUtil.findAPICallByKey(key));
+        Object apiCall = redisUtil.findAPICallByKey(key);
+
         if (apiCall == null) { //한 번도 호출 안 한 경우
-            redisUtil.saveAPICall(key, String.valueOf((int)1), Expiration);
+            redisUtil.saveAPICall(key, String.valueOf(1), Expiration);
             return true;
-        } else if (Integer.parseInt(apiCall) < MAX_API_CALL) { //10 번 미만 호출 한 경우
-            redisUtil.updateAPICall(key, String.valueOf(Integer.parseInt(apiCall) + 1));
+        } else if (Integer.parseInt((String) apiCall) < MAX_API_CALL) { //10 번 미만 호출 한 경우
+            redisUtil.updateAPICall(key, String.valueOf(Integer.parseInt((String) apiCall) + 1));
             return true;
         }
         return false; //10 번인 경우

src/main/java/com/flint/flint/member/domain/main/Member.java

@@ -53,6 +53,7 @@ public class Member extends BaseTimeEntity {
     private String providerName;
 
     @NotNull
+    @Column(unique = true)
     private String providerId;
 
     @Builder

src/main/java/com/flint/flint/security/auth/AuthenticationController.java

@@ -27,7 +27,6 @@ public class AuthenticationController {
     public ResponseForm<AuthenticationResponse> register(@Valid @RequestBody RegisterRequest registerRequest, HttpServletRequest oauth2TokenWithBearer) {
         AuthenticationResponse authenticationResponse = authenticationService.register(registerRequest, oauth2TokenWithBearer);
         return new ResponseForm<>(authenticationResponse);
-
     }
 
     @PostMapping("/login/{providerName}")

src/main/java/com/flint/flint/security/oauth/KakaoOAuth2UserAttribute.java

@@ -13,6 +13,7 @@
 
 /**
  * 카카오에서 받아오는 사용자 정보 담는 DTO
+ *
  * @Author 정순원
  * @Since 2023-08-19
  */
@@ -32,18 +33,20 @@ public Member toEntity() {
 
         return Member.builder()
                 .providerName(KAKAO_PROVIDER_ID)
-                .providerId(KAKAO_PROVIDER_ID+" "+getProviderId())//띄어쓰기 포함
+                .providerId(getProviderId())//띄어쓰기 포함
                 .email(getEmail())
                 .name(getName())
                 .gender(Gender.valueOf(getGender().toUpperCase())) //대소문자 구별하니 바꿔줘야 함
-                .authority(Authority.AUTHUSER)
+                .authority(Authority.UNAUTHUSER)
                 .birthday(getBirthday())
                 .build();
     }
 
     //TODO
     @Override
-    public String getProviderId() { return "kakao " + this.id;}
+    public String getProviderId() {
+        return KAKAO_PROVIDER_ID + "_" + this.id;
+    }
 
     @Override
     public String getEmail() {
@@ -66,17 +69,18 @@ public String getBirthday() {
     }
 
     @Override
-    public void setUserAttributesByOauthToken(String authorizionRequestHeader) {
+    public void setUserAttributesByOauthToken(String kakaoAccessToken) {
 
 
         JSONObject response = WebClient.create()
                 .get()
                 .uri("https://kapi.kakao.com/v2/user/me")
-                .headers(httpHeaders -> httpHeaders.setBearerAuth(authorizionRequestHeader))
+                .headers(httpHeaders -> httpHeaders.setBearerAuth(kakaoAccessToken))
                 .retrieve()
                 .bodyToMono(JSONObject.class)
                 .block();
+
         this.id = response.get("id").toString();
-        this.kakaoAccount = (Map<String, Object>)response.get("kakao_account");
+        this.kakaoAccount = (Map<String, Object>) response.get("kakao_account");
     }
 }

src/main/java/com/flint/flint/security/oauth/NaverOAuth2UserAttribute.java

@@ -13,6 +13,7 @@
 
 /**
  * 네이버에서 받아오는 사용자 정보 담는 DTO
+ *
  * @Author 정순원
  * @Since 2023-08-19
  */
@@ -30,11 +31,11 @@ public class NaverOAuth2UserAttribute extends OAuth2UserAttribute {
     public Member toEntity() {
         return Member.builder()
                 .providerName(NAVER_PROVIDER_ID)
-                .providerId(NAVER_PROVIDER_ID + " " + getProviderId())
+                .providerId(getProviderId())
                 .email(getEmail())
                 .name(getName())
                 .gender(Gender.valueOf(getGender().toUpperCase())) //대소문자 구별하니 바꿔줘야 함
-                .authority(Authority.AUTHUSER)
+                .authority(Authority.UNAUTHUSER)
                 .birthday(getBirthday())
                 .build();
     }
@@ -75,6 +76,6 @@ public void setUserAttributesByOauthToken(String authorizionRequestHeader) {
                 .retrieve()
                 .bodyToMono(JSONObject.class)
                 .block();
-        this.response = (Map<String, Object>)naverResponse.get("response");
+        this.response = (Map<String, Object>) naverResponse.get("response");
     }
 }