google 유저 추가정보 구현

kdt-8-4 · Dec 6, 2023 · 95734bd · 95734bd
1 parent eb6b2af
commit 95734bd
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 14 deletions.
diff --git a/user/src/main/java/com/weather/user/controller/UserController.java b/user/src/main/java/com/weather/user/controller/UserController.java
@@ -1,9 +1,7 @@
 package com.weather.user.controller;
 
 import com.weather.user.dto.GoogleUserDTO;
-import com.weather.user.dto.MailCodeDTO;
 import com.weather.user.dto.UserDTO;
-import com.weather.user.service.MailService;
 import com.weather.user.service.UserService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
@@ -31,6 +29,16 @@ public ResponseEntity<UserDTO> google(@RequestBody GoogleUserDTO googleUserDTO)
         return new ResponseEntity<>(result, HttpStatus.OK);
     }
 
+    @PostMapping("/login/google/additional")
+    public ResponseEntity<UserDTO> googleAdditional(@RequestBody UserDTO userDTO) throws Exception {
+        log.info(" ㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡ google controller ㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡ");
+        log.info("userDTO: " + userDTO);
+
+        UserDTO result = userService.googleUserAdditional(userDTO);
+
+        return new ResponseEntity<>(result, HttpStatus.OK);
+    }
+
     @PostMapping("/signup/email")
     public ResponseEntity<JSONObject> verifyEmail(@RequestBody UserDTO userDTO) {
         log.info(" ㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡ verifyEmail controller ㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡ");

diff --git a/user/src/main/java/com/weather/user/dto/UserDTO.java b/user/src/main/java/com/weather/user/dto/UserDTO.java
@@ -9,7 +9,7 @@
 public class UserDTO {
     private int id;
 
-    private String email, name, nickname, phone, image, password, token;
+    private String email, name, nickname, image, password, token;
 
     private boolean fromSocial, status;
 }
diff --git a/user/src/main/java/com/weather/user/entity/User.java b/user/src/main/java/com/weather/user/entity/User.java
@@ -33,9 +33,9 @@ public void addRole(UserRole role) {
         roleSet.add(role);
     }
 
-    public void changeNickname(String nickname) {
-        this.nickname = nickname;
-    }
+    public void changeNickname(String nickname) { this.nickname = nickname; }
+
+    public void changeName(String name) { this.name = name; }
 
     public void changeImage(String image) {
         this.image = image;

diff --git a/user/src/main/java/com/weather/user/service/UserService.java b/user/src/main/java/com/weather/user/service/UserService.java
@@ -22,13 +22,14 @@ public interface UserService {
 
     UserDTO googleUserCheck(GoogleUserDTO googleUserDTO);
 
+    UserDTO googleUserAdditional(UserDTO userDTO) throws Exception;
+
     default User dtoToEntity(UserDTO userDTO) {
         User user = User.builder()
                 .email(userDTO.getEmail())
                 .name(userDTO.getName())
                 .nickname(userDTO.getNickname())
                 .password(userDTO.getPassword())
-                .phone(userDTO.getPhone())
                 .image(userDTO.getImage())
                 .fromSocial(userDTO.isFromSocial())
                 .status(userDTO.isStatus()).build();
@@ -43,7 +44,6 @@ default UserDTO entityToDTO(User user) {
                 .name(user.getName())
                 .nickname(user.getNickname())
                 .password(user.getPassword())
-                .phone(user.getPhone())
                 .image(user.getImage())
                 .fromSocial(user.isFromSocial())
                 .status(user.isStatus()).build();

diff --git a/user/src/main/java/com/weather/user/service/UserServiceImpl.java b/user/src/main/java/com/weather/user/service/UserServiceImpl.java
@@ -139,23 +139,40 @@ public UserDTO googleUserCheck(GoogleUserDTO googleUserDTO) {
         Optional<User> optionalUser = userRepository.findByEmail(email, true);
 
         if(optionalUser.isPresent()) {
-            User socialUser = optionalUser.get();
-            UserDTO result = entityToDTO(socialUser);
+            User user = optionalUser.get();
+            UserDTO result = entityToDTO(user);
             return result;
         } else {
-            User socialUser = User.builder()
+            User user = User.builder()
                     .email(email)
                     .password(passwordEncoder.encode("1234"))
                     .image(image)
                     .fromSocial(true)
                     .status(true)
                     .build();
-            socialUser.addRole(UserRole.USER);
+            user.addRole(UserRole.USER);
+
+            userRepository.save(user);
+
+            UserDTO result = entityToDTO(user);
+            return result;
+        }
+    }
 
-            userRepository.save(socialUser);
+    @Override
+    public UserDTO googleUserAdditional(UserDTO userDTO) throws Exception{
+        log.info("ㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡ");
+        Optional<User> optionalUser = userRepository.findByEmail(userDTO.getEmail(), true);
 
-            UserDTO result = entityToDTO(socialUser);
+        if(optionalUser.isPresent()) {
+            User user = optionalUser.get();
+            user.changeNickname(userDTO.getNickname());
+            user.changeName(userDTO.getName());
+            userRepository.save(user);
+            UserDTO result = entityToDTO(user);
             return result;
+        } else {
+            throw new Exception("잘못 된 접근입니다.");
         }
     }
 }