Merge pull request #165 from Next-Room/feature/google-login

[REFACTOR] 구글 로그인 응답 구조 변경

Author: eunsol-an

src/main/java/com/nextroom/nextRoomServer/domain/Shop.java

@@ -108,4 +108,8 @@ public void setAllUseTimerUrl(boolean active) {
         this.themes.forEach(theme -> Optional.ofNullable(theme.getTimerImageUrl())
                 .ifPresent(it -> theme.setUseTimerUrl(active)));
     }
+
+    public boolean isNotCompleteSignUp() {
+        return this.name == null || this.name.isEmpty();
+    }
 }

src/main/java/com/nextroom/nextRoomServer/dto/AuthDto.java

@@ -22,6 +22,8 @@
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
+import static com.nextroom.nextRoomServer.util.Timestamped.dateTimeFormatter;
+
 public class AuthDto {
     private static final String ADMIN_CODE_REGEX = "[0-9]{5}";
     private static final String PASSWORD_CONDITION_MIN_LENGTH_REGEX = ".{8,}";
@@ -77,6 +79,15 @@ public static class SignUpResponseDto {
         private String adminCode;
         private String createdAt;
         private String modifiedAt;
+
+        public static AuthDto.SignUpResponseDto toSignUpResponseDto(Shop shop) {
+            return SignUpResponseDto.builder()
+                    .email(shop.getEmail())
+                    .name(shop.getName())
+                    .adminCode(shop.getAdminCode())
+                    .createdAt(dateTimeFormatter(shop.getCreatedAt()))
+                    .modifiedAt(dateTimeFormatter(shop.getModifiedAt())).build();
+        }
     }
 
     @Getter
@@ -108,16 +119,13 @@ public static class LogInResponseDto {
         private long accessTokenExpiresIn;
         private String refreshToken;
 
-        private String email;
-        private String googleSub;
-
+        private Long shopId;
         private Boolean isComplete;
 
         public static AuthDto.LogInResponseDto toLogInResponseDto(Shop shop, TokenDto tokenDto) {
-            return new LogInResponseDtoBuilder()
+            return LogInResponseDto.builder()
                     .isComplete(true)
-                    .email(shop.getEmail())
-                    .googleSub(shop.getGoogleSub())
+                    .shopId(shop.getId())
                     .shopName(shop.getName())
                     .adminCode(shop.getAdminCode())
                     .grantType(tokenDto.getGrantType())
@@ -128,10 +136,9 @@ public static AuthDto.LogInResponseDto toLogInResponseDto(Shop shop, TokenDto to
         }
 
         public static AuthDto.LogInResponseDto toShopInfoResponseDto(Shop shop) {
-            return new LogInResponseDtoBuilder()
+            return LogInResponseDto.builder()
                     .isComplete(false)
-                    .email(shop.getEmail())
-                    .googleSub(shop.getGoogleSub())
+                    .shopId(shop.getId())
                     .build();
         }
     }
@@ -181,7 +188,7 @@ public static class GoogleInfoResponseDto {
         private String email;
 
         public static AuthDto.GoogleInfoResponseDto toGoogleInfoResponseDto(String id, String email) {
-            return new GoogleInfoResponseDtoBuilder()
+            return GoogleInfoResponseDto.builder()
                     .id(id)
                     .email(email)
                     .build();

src/main/java/com/nextroom/nextRoomServer/service/AuthService.java

@@ -2,7 +2,6 @@
 
 import static com.nextroom.nextRoomServer.enums.UserStatus.*;
 import static com.nextroom.nextRoomServer.exceptions.StatusCode.*;
-import static com.nextroom.nextRoomServer.util.Timestamped.*;
 
 import java.time.Duration;
 import java.util.stream.Collectors;
@@ -58,12 +57,7 @@ public AuthDto.SignUpResponseDto signUp(AuthDto.SignUpRequestDto request) {
         Shop shop = shopRepository.save(request.toShop(passwordEncoder, createAdminCode()));
         createSubscription(shop);
 
-        return AuthDto.SignUpResponseDto.builder()
-            .email(shop.getEmail())
-            .name(shop.getName())
-            .adminCode(shop.getAdminCode())
-            .createdAt(dateTimeFormatter(shop.getCreatedAt()))
-            .modifiedAt(dateTimeFormatter(shop.getModifiedAt())).build();
+        return AuthDto.SignUpResponseDto.toSignUpResponseDto(shop);
     }
 
     private String createAdminCode() {
@@ -109,7 +103,7 @@ public AuthDto.LogInResponseDto login(@RequestBody AuthDto.LogInRequestDto reque
     public AuthDto.LogInResponseDto googleLogin(AuthDto.GoogleLogInRequestDto request) {
         AuthDto.GoogleInfoResponseDto userInfo = googleClient.getUserInfo(request);
         Shop shop = this.save(userInfo);
-        if (shop.getName() == null || shop.getName().isEmpty()) {
+        if (shop.isNotCompleteSignUp()) {
             return AuthDto.LogInResponseDto.toShopInfoResponseDto(shop);
         }