Merge pull request #49 from DongnaeFriend/feature/#41

⚽Refactor #41: 연령대 및 성별 처리
DongnaeFriend · Jul 29, 2023 · b942dd7 · b942dd7
2 parents 134f145 + 0065c62
commit b942dd7
Show file tree

Hide file tree

Showing 7 changed files with 102 additions and 50 deletions.
diff --git a/src/main/java/com/umc/DongnaeFriend/KakaoTokenController.java b/src/main/java/com/umc/DongnaeFriend/KakaoTokenController.java
@@ -44,36 +44,42 @@ public String kakologin(Model model, HttpServletResponse response) {
     @GetMapping("/callback")
     public String callback(Model model, @RequestParam("code") String code) throws IOException {
 
-        //------kakao POST 요청------
-        String reqURL = "https://kauth.kakao.com/oauth/token?grant_type=authorization_code&client_id=8427ba9114a5ecb09621710469748441&code=" + code;
-        URL url = new URL(reqURL);
-        HttpURLConnection conn = (HttpURLConnection) url.openConnection();
-        conn.setRequestMethod("POST");
+        try {
+//------kakao POST 요청------
+            String reqURL = "https://kauth.kakao.com/oauth/token?grant_type=authorization_code&client_id=1ad317e194df665ca44dcb82d11a7093&code=" + code;
+            URL url = new URL(reqURL);
+            HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+            conn.setRequestMethod("POST");
 
 
-        BufferedReader br = new BufferedReader(new InputStreamReader(conn.getInputStream()));
+            BufferedReader br = new BufferedReader(new InputStreamReader(conn.getInputStream()));
 
-        String line = "";
-        String result = "";
+            String line = "";
+            String result = "";
 
-        while ((line = br.readLine()) != null) {
-            result += line;
-        }
+            while ((line = br.readLine()) != null) {
+                result += line;
+            }
+
+            ObjectMapper objectMapper = new ObjectMapper();
+            Map<String, Object> jsonMap = objectMapper.readValue(result, new TypeReference<Map<String, Object>>() {
+            });
 
-        ObjectMapper objectMapper = new ObjectMapper();
-        Map<String, Object> jsonMap = objectMapper.readValue(result, new TypeReference<Map<String, Object>>() {
-        });
+            String accessToken = (String) jsonMap.get("access_token");
 
-        String accessToken = (String) jsonMap.get("access_token");
+            //-------------------------------------------------서버 로그인----------------------------------------------------
 
-        //-------------------------------------------------서버 로그인----------------------------------------------------
+            HashMap<String, Object> userInfo = kakaoService.getUserInfo(accessToken);
+            UserDto.Response response =  userService.userValidation(userInfo);
 
-        HashMap<String, Object> userInfo = kakaoService.getUserInfo(accessToken);
-        UserDto.Response response =  userService.userValidation(userInfo);
+            model.addAttribute("token","Bearer "+ response.getAccessToken());
 
-        model.addAttribute("token","Bearer "+ response.getAccessToken());
+            return "html/token";
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
 
-        return "html/token";
     }
 
 }
diff --git a/src/main/java/com/umc/DongnaeFriend/domain/type/Age.java b/src/main/java/com/umc/DongnaeFriend/domain/type/Age.java
@@ -22,4 +22,17 @@ public enum Age {
     public String getAge() {
         return this.age;
     }
+
+    public static Age fromString(String strAge) {
+        if(strAge==""){
+            return null;
+        }
+
+        for(Age age : Age.values()){
+            if((age.getAge().charAt(0))==(strAge.charAt(0))){
+                return age;
+            }
+        }
+        return null;
+    }
 }
diff --git a/src/main/java/com/umc/DongnaeFriend/domain/type/Gender.java b/src/main/java/com/umc/DongnaeFriend/domain/type/Gender.java
@@ -3,9 +3,11 @@
 import com.fasterxml.jackson.annotation.JsonValue;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 
 @Getter
 @RequiredArgsConstructor
+@Slf4j
 public enum Gender {
     MALE(0, "남성"),
     FEMALE(1, "여성");
@@ -17,4 +19,14 @@ public enum Gender {
     public String getGender() {
         return this.gender;
     }
+
+    public static Gender fromString(String strGender) {
+
+        for(Gender gender : Gender.values()){
+            if(gender.toString().equalsIgnoreCase(strGender)){
+                return strGender.equals("male")? Gender.MALE : Gender.FEMALE;
+            }
+        }
+        return null;
+    }
 }
diff --git a/src/main/java/com/umc/DongnaeFriend/domain/user/service/KakaoServiceimpl.java b/src/main/java/com/umc/DongnaeFriend/domain/user/service/KakaoServiceimpl.java
@@ -68,12 +68,15 @@ public HashMap<String, Object> getUserInfo(String access_Token) throws IOExcepti
         String nickname = properties.get("nickname").toString();
         String profileImage = properties.get("profile_image").toString();
         String email = kakao_account.get("email").toString();
+        String gender = kakao_account.getOrDefault("gender","").toString();
+        String age = kakao_account.getOrDefault("age_range","").toString();
 
         userInfo.put("id", id);
         userInfo.put("nickname", nickname);
         userInfo.put("profileImage", profileImage);
         userInfo.put("email", email);
-
+        userInfo.put("age", age);
+        userInfo.put("gender", gender);
 
         return userInfo;
     }

diff --git a/src/main/java/com/umc/DongnaeFriend/domain/user/service/UserService.java b/src/main/java/com/umc/DongnaeFriend/domain/user/service/UserService.java
@@ -1,5 +1,6 @@
 package com.umc.DongnaeFriend.domain.user.service;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.umc.DongnaeFriend.domain.type.Age;
 import com.umc.DongnaeFriend.domain.type.Gender;
 import com.umc.DongnaeFriend.domain.type.YesNo;
@@ -14,6 +15,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
 import java.util.HashMap;
 import java.util.Optional;
 
@@ -60,22 +65,13 @@ public User userRegister(HashMap<String, Object> userInfo) {
 
         Long kakaoId = (Long) userInfo.get("id");
 
-//        Optional<String> gender = Optional.ofNullable(userInfo.get("gender").toString());
-//        String strGender = "";
-//        log.info("Gender : {}", gender.get());
-//        if(gender.get()=="F"){
-//            strGender="여성";
-//        }else {
-//            strGender = "남성";
-//        }
-//        log.info("strGender : {}", strGender);
-//
-//
-//        Optional<String> age = Optional.ofNullable(userInfo.get("age").toString());
-//        String[] ageRange = age.get().split("-");
-//
-//
-//        // refreshToken userId를 claim 으로 생성 뒤, User의 필드에 넣고 User를 저장
+        String strGender =  userInfo.getOrDefault("gender", "").toString();
+        String strAge = userInfo.getOrDefault("age", "").toString();
+
+        Gender gender = Gender.fromString(strGender);
+        Age age = Age.fromString(strAge);
+
+
         String refresh_Token = jwtTokenProvider.createRefreshToken((Long) userInfo.get("id"));
 
         return userRepository.save(
@@ -85,16 +81,8 @@ public User userRegister(HashMap<String, Object> userInfo) {
 //
 //                        )
                         .email(email)
-                        //TODO : Gender 결정[O]
-                        .gender(
-//                                Gender.valueOf(strGender)
-                                Gender.MALE
-                        )
-                        //TODO : Age 결정[O]
-                        .age(
-//                                Age.valueOf(ageRange[0]+"대")
-                                Age.AGE20
-                        )
+                        .gender(gender)
+                        .age(age)
                         .townCert(YesNo.NO)
                         .townCertCnt(0)
                         .infoCert(YesNo.NO)
@@ -120,5 +108,34 @@ public String createAccessTokenFromRefreshToken(String refreshToken) {
         return accessToken;
     }
 
+    public String kakaoGetCode() {
+
+
+        try {
+            String reqURL= "https://kauth.kakao.com/oauth/authorize?response_type=code&client_id=1ad317e194df665ca44dcb82d11a7093&redirect_uri=http://localhost:8080/callback";
 
+            URL url = new URL(reqURL);
+            HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+            conn.setRequestMethod("GET");
+
+
+            BufferedReader br = new BufferedReader(new InputStreamReader(conn.getInputStream()));
+
+            String line = "";
+            String result = "";
+
+            while ((line = br.readLine()) != null) {
+                result += line;
+            }
+
+            ObjectMapper objectMapper = new ObjectMapper();
+            HashMap<String, Object> jsonMap = objectMapper.readValue(result, HashMap.class);
+
+            log.info(jsonMap.toString());
+            return "";
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
 }
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -7,9 +7,10 @@ logging:
 # Settings for local
 spring:
   datasource:
+
     url: jdbc:mysql://localhost:3306/dongnae?characterEncoding=UTF-8&serverTimezone=UTC&useLegacyDatetimeCode=false
-    username: dongnae
-    password: Tnqls9004^^
+    username:
+    password:
     driver-class-name: com.mysql.cj.jdbc.Driver
   jpa:
     hibernate.ddl-auto: create

diff --git a/src/main/resources/templates/html/index.html b/src/main/resources/templates/html/index.html
@@ -6,7 +6,7 @@
 <body>
     <div class="wrapper" style="display: flex; flex-direction: column">
         <h1>동네친구 카카오 로그인</h1>
-        <a href="https://kauth.kakao.com/oauth/authorize?response_type=code&client_id=8427ba9114a5ecb09621710469748441&redirect_uri=http://localhost:8080/callback">
+        <a href="https://kauth.kakao.com/oauth/authorize?response_type=code&client_id=1ad317e194df665ca44dcb82d11a7093&redirect_uri=http://localhost:8080/callback">
             <img src="https://developers.kakao.com/docs/static/image/ko/pc/kakaologin.png" alt="kakoLogin" style="cursor: pointer; width: 400px; height: 200px;">
         </a>