From 531addb2af29642da7ca14396e08b0a0cd818de1 Mon Sep 17 00:00:00 2001 From: dev-Crayon Date: Wed, 1 May 2024 15:39:48 +0900 Subject: [PATCH] =?UTF-8?q?[Hotfix]:=20=ED=91=B8=EC=8B=9C=EC=95=8C?= =?UTF-8?q?=EB=A6=BC=20=EC=A0=84=EC=86=A1=20=EB=A1=9C=EC=A7=81=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/application/SocialService.java | 10 ++------ .../SobokSobok/auth/domain/Platform.java | 10 -------- .../io/sobok/SobokSobok/auth/domain/User.java | 11 +-------- .../SobokSobok/auth/ui/AuthController.java | 19 ++------------- .../external/firebase/FCMPushService.java | 24 ------------------- 5 files changed, 5 insertions(+), 69 deletions(-) delete mode 100644 src/main/java/io/sobok/SobokSobok/auth/domain/Platform.java diff --git a/src/main/java/io/sobok/SobokSobok/auth/application/SocialService.java b/src/main/java/io/sobok/SobokSobok/auth/application/SocialService.java index 9ec64c9..318a810 100644 --- a/src/main/java/io/sobok/SobokSobok/auth/application/SocialService.java +++ b/src/main/java/io/sobok/SobokSobok/auth/application/SocialService.java @@ -1,6 +1,5 @@ package io.sobok.SobokSobok.auth.application; -import io.sobok.SobokSobok.auth.domain.Platform; import io.sobok.SobokSobok.auth.domain.Role; import io.sobok.SobokSobok.auth.domain.SocialInfo; import io.sobok.SobokSobok.auth.domain.User; @@ -29,7 +28,7 @@ public class SocialService { private final JwtProvider jwtProvider; @Transactional - public SocialSignupResponse signup(SocialSignupRequest request, Platform platform) { + public SocialSignupResponse signup(SocialSignupRequest request) { if (userRepository.existsBySocialInfoSocialId(request.socialId())) { throw new ConflictException(ErrorCode.ALREADY_EXISTS_USER); } @@ -45,7 +44,6 @@ public SocialSignupResponse signup(SocialSignupRequest request, Platform platfor .build()) .deviceToken(request.deviceToken()) .roles(Role.USER.name()) - .platform(platform) .build()); Jwt jwt = jwtProvider.getUserJwt(signupUser.getSocialInfo().getSocialId()); @@ -60,7 +58,7 @@ public SocialSignupResponse signup(SocialSignupRequest request, Platform platfor } @Transactional - public SocialLoginResponse login(SocialLoginRequest request, Platform platform) { + public SocialLoginResponse login(SocialLoginRequest request) { Optional optionalLoginUser = userRepository.findBySocialInfoSocialId( request.socialId()); @@ -71,10 +69,6 @@ public SocialLoginResponse login(SocialLoginRequest request, Platform platform) loginUser.updateDeviceToken(request.deviceToken()); } - if (!platform.equals(loginUser.getPlatform())) { - loginUser.updatePlatform(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 deleted file mode 100644 index 085f696..0000000 --- a/src/main/java/io/sobok/SobokSobok/auth/domain/Platform.java +++ /dev/null @@ -1,10 +0,0 @@ -package io.sobok.SobokSobok.auth.domain; - -import lombok.Getter; - -@Getter -public enum Platform { - - Android, - iOS -} diff --git a/src/main/java/io/sobok/SobokSobok/auth/domain/User.java b/src/main/java/io/sobok/SobokSobok/auth/domain/User.java index 74dded9..d6d91b7 100644 --- a/src/main/java/io/sobok/SobokSobok/auth/domain/User.java +++ b/src/main/java/io/sobok/SobokSobok/auth/domain/User.java @@ -49,27 +49,18 @@ public class User extends BaseEntity implements UserDetails { @Column private String leaveReason; - @Column(nullable = false) - @Enumerated(EnumType.STRING) - private Platform platform; - @Builder - public User(String username, SocialInfo socialInfo, String deviceToken, String roles, Platform platform) { + public User(String username, SocialInfo socialInfo, String deviceToken, String roles) { this.username = username; this.socialInfo = socialInfo; this.deviceToken = deviceToken; this.roles = roles; - this.platform = platform; } public void updateDeviceToken(String newDeviceToken) { this.deviceToken = newDeviceToken; } - public void updatePlatform(Platform newPlatform) { - this.platform = newPlatform; - } - public void changeUsername(String username) { this.username = username; } diff --git a/src/main/java/io/sobok/SobokSobok/auth/ui/AuthController.java b/src/main/java/io/sobok/SobokSobok/auth/ui/AuthController.java index 7e6863e..570665e 100644 --- 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,10 @@ 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.ErrorCode; import io.sobok.SobokSobok.exception.SuccessCode; -import io.sobok.SobokSobok.exception.model.BadRequestException; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; @@ -33,16 +30,14 @@ public class AuthController { description = "사용자의 소셜 정보로 소복소복에 회원가입하는 API 입니다." ) public ResponseEntity> signup( - @RequestHeader(name = "User-Agent") String userAgent, @RequestBody @Valid final SocialSignupRequest request ) { - Platform platform = getDevicePlatform(userAgent); return ResponseEntity .status(HttpStatus.CREATED) .body(ApiResponse.success( SuccessCode.SOCIAL_SIGNUP_SUCCESS, - socialService.signup(request, platform) + socialService.signup(request) )); } @@ -52,12 +47,10 @@ public ResponseEntity> signup( description = "사용자의 소셜 정보로 소복소복에 로그인하는 API 입니다." ) public ResponseEntity> login( - @RequestHeader(name = "User-Agent") String userAgent, @RequestParam final String socialId, @RequestParam final String deviceToken ) { - Platform platform = getDevicePlatform(userAgent); return ResponseEntity .status(HttpStatus.OK) .body(ApiResponse.success( @@ -65,7 +58,7 @@ public ResponseEntity> login( socialService.login(SocialLoginRequest.builder() .socialId(socialId) .deviceToken(deviceToken) - .build(), platform) + .build()) )); } @@ -118,12 +111,4 @@ public ResponseEntity> leave( SuccessCode.USER_LEAVE_SUCCESS )); } - - private Platform getDevicePlatform(String userAgent) { - if (userAgent.toLowerCase().contains("android")) { - return Platform.Android; - } else { - return Platform.iOS; - } - } } diff --git a/src/main/java/io/sobok/SobokSobok/external/firebase/FCMPushService.java b/src/main/java/io/sobok/SobokSobok/external/firebase/FCMPushService.java index d918510..7037fb9 100644 --- a/src/main/java/io/sobok/SobokSobok/external/firebase/FCMPushService.java +++ b/src/main/java/io/sobok/SobokSobok/external/firebase/FCMPushService.java @@ -55,30 +55,6 @@ public void sendNotificationByToken(PushNotificationRequest request) { sendMessageToFirebase(message, user.getId()); } - private void sendNotification(User user, PushNotificationRequest request) { - Notification notification = Notification.builder() - .setTitle(request.title()) - .setBody(request.body()) - .build(); - - Message message = Message.builder() - .setToken(user.getDeviceToken()) - .setNotification(notification) - .build(); - - sendMessageToFirebase(message, request.userId()); - } - - private void sendDataMessage(User user, PushNotificationRequest request) { - Message message = Message.builder() - .putData("title", request.title()) - .putData("body", request.body()) - .setToken(user.getDeviceToken()) - .build(); - - sendMessageToFirebase(message, request.userId()); - } - private void sendMessageToFirebase(Message message, Long userId) { try { firebaseMessaging.send(message);