[Feat]: 회원가입 및 로그인 시 platform 필드 추가 (#144)

iOS, ANDROID 구분용 필드 추가 Related to: #143
TeamSobokSobok · Jul 1, 2024 · 0d39410 · 0d39410
1 parent dc2e723
commit 0d39410
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 5 deletions.
diff --git a/src/main/java/io/sobok/SobokSobok/auth/application/SocialService.java b/src/main/java/io/sobok/SobokSobok/auth/application/SocialService.java
@@ -44,6 +44,7 @@ public SocialSignupResponse signup(SocialSignupRequest request) {
                         .build())
                 .deviceToken(request.deviceToken())
                 .roles(Role.USER.name())
+                .platform(request.platform())
                 .build());
 
         Jwt jwt = jwtProvider.getUserJwt(signupUser.getSocialInfo().getSocialId());
@@ -69,6 +70,10 @@ public SocialLoginResponse login(SocialLoginRequest request) {
                 loginUser.updateDeviceToken(request.deviceToken());
             }
 
+            if (!request.platform().equals(loginUser.getPlatform())) {
+                loginUser.updatePlatform(request.platform());
+            }
+
             Jwt jwt = jwtProvider.getUserJwt(loginUser.getSocialInfo().getSocialId());
 
             return SocialLoginResponse.builder()

diff --git a/src/main/java/io/sobok/SobokSobok/auth/domain/Platform.java b/src/main/java/io/sobok/SobokSobok/auth/domain/Platform.java
@@ -0,0 +1,11 @@
+package io.sobok.SobokSobok.auth.domain;
+
+import lombok.Getter;
+
+@Getter
+public enum Platform {
+
+    iOS,
+    ANDROID,
+    ;
+}
diff --git a/src/main/java/io/sobok/SobokSobok/auth/domain/User.java b/src/main/java/io/sobok/SobokSobok/auth/domain/User.java
@@ -49,12 +49,17 @@ public class User extends BaseEntity implements UserDetails {
     @Column
     private String leaveReason;
 
+    @Column
+    @Enumerated(EnumType.STRING)
+    private Platform platform;
+
     @Builder
-    public User(String username, SocialInfo socialInfo, String deviceToken, String roles) {
+    public User(String username, SocialInfo socialInfo, String deviceToken, String roles, Platform platform) {
         this.username = username;
         this.socialInfo = socialInfo;
         this.deviceToken = deviceToken;
         this.roles = roles;
+        this.platform = platform;
     }
 
     public void updateDeviceToken(String newDeviceToken) {
@@ -65,6 +70,10 @@ public void changeUsername(String username) {
         this.username = username;
     }
 
+    public void updatePlatform(Platform platform) {
+        this.platform = platform;
+    }
+
     public void deleteUser(String leaveReason) {
         this.deviceToken = null;
         this.username = null;

diff --git a/src/main/java/io/sobok/SobokSobok/auth/ui/AuthController.java b/src/main/java/io/sobok/SobokSobok/auth/ui/AuthController.java
@@ -2,13 +2,15 @@
 
 import io.sobok.SobokSobok.auth.application.AuthService;
 import io.sobok.SobokSobok.auth.application.SocialService;
+import io.sobok.SobokSobok.auth.domain.Platform;
 import io.sobok.SobokSobok.auth.domain.User;
 import io.sobok.SobokSobok.auth.ui.dto.*;
 import io.sobok.SobokSobok.common.dto.ApiResponse;
 import io.sobok.SobokSobok.exception.SuccessCode;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotBlank;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -48,8 +50,9 @@ public ResponseEntity<ApiResponse<SocialSignupResponse>> signup(
     )
     public ResponseEntity<ApiResponse<SocialLoginResponse>> login(
             @RequestParam final String socialId,
-            @RequestParam final String deviceToken
-    ) {
+            @RequestParam final String deviceToken,
+            @RequestParam final Platform platform
+            ) {
 
         return ResponseEntity
                 .status(HttpStatus.OK)
@@ -58,6 +61,7 @@ public ResponseEntity<ApiResponse<SocialLoginResponse>> login(
                         socialService.login(SocialLoginRequest.builder()
                                 .socialId(socialId)
                                 .deviceToken(deviceToken)
+                                .platform(platform)
                                 .build())
                 ));
     }

diff --git a/src/main/java/io/sobok/SobokSobok/auth/ui/dto/SocialLoginRequest.java b/src/main/java/io/sobok/SobokSobok/auth/ui/dto/SocialLoginRequest.java
@@ -1,6 +1,8 @@
 package io.sobok.SobokSobok.auth.ui.dto;
 
+import io.sobok.SobokSobok.auth.domain.Platform;
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
 import lombok.Builder;
 
 @Builder
@@ -10,6 +12,10 @@ public record SocialLoginRequest(
         String socialId,
 
         @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
-        String deviceToken
+        String deviceToken,
+
+        @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
+        @NotNull
+        Platform platform
 ) {
 }
diff --git a/src/main/java/io/sobok/SobokSobok/auth/ui/dto/SocialSignupRequest.java b/src/main/java/io/sobok/SobokSobok/auth/ui/dto/SocialSignupRequest.java
@@ -1,7 +1,9 @@
 package io.sobok.SobokSobok.auth.ui.dto;
 
+import io.sobok.SobokSobok.auth.domain.Platform;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 
 public record SocialSignupRequest(
 
@@ -15,6 +17,10 @@ public record SocialSignupRequest(
 
         @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
         @NotBlank
-        String deviceToken
+        String deviceToken,
+
+        @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
+        @NotNull
+        Platform platform
 ) {
 }