From 7cf279e7aec46444d03017c2b54806329d16d1b3 Mon Sep 17 00:00:00 2001 From: dangnak2 <80161984+dangnak2@users.noreply.github.com> Date: Mon, 20 Nov 2023 17:42:40 +0900 Subject: [PATCH] =?UTF-8?q?[PDS-191]=20feat:=20=EB=A1=9C=EA=B7=B8=EC=9D=B8?= =?UTF-8?q?=EC=8B=9C=20fcm=20=ED=86=A0=ED=81=B0=20=ED=95=A0=EB=8B=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../example/pladialmserver/user/dto/request/EmailPWReq.java | 2 ++ .../java/com/example/pladialmserver/user/entity/User.java | 4 ++++ .../com/example/pladialmserver/user/service/UserService.java | 2 ++ 3 files changed, 8 insertions(+) diff --git a/src/main/java/com/example/pladialmserver/user/dto/request/EmailPWReq.java b/src/main/java/com/example/pladialmserver/user/dto/request/EmailPWReq.java index aa24327c..1dc78fc0 100644 --- a/src/main/java/com/example/pladialmserver/user/dto/request/EmailPWReq.java +++ b/src/main/java/com/example/pladialmserver/user/dto/request/EmailPWReq.java @@ -17,4 +17,6 @@ public class EmailPWReq { @Pattern(message = "U0003", regexp = "^(?=.*[A-Za-z])(?=.*\\d)(?=.*[@$!%*#?&])[A-Za-z\\d@$!%*#?&]{8,15}$") @NotBlank(message = "U0005") private String password; + @Schema(type = "String", description = "푸쉬 알림 토큰", example = "eAnBcQicRUaSkPCm638VIG...") + private String fcmToken; } diff --git a/src/main/java/com/example/pladialmserver/user/entity/User.java b/src/main/java/com/example/pladialmserver/user/entity/User.java index b7121129..8cfe8783 100644 --- a/src/main/java/com/example/pladialmserver/user/entity/User.java +++ b/src/main/java/com/example/pladialmserver/user/entity/User.java @@ -123,4 +123,8 @@ public boolean checkRole(Role role) { return this.role == role; } + public void updateFcmToken(String fcmToken) { + this.fcmToken = fcmToken; + } + } diff --git a/src/main/java/com/example/pladialmserver/user/service/UserService.java b/src/main/java/com/example/pladialmserver/user/service/UserService.java index 124cab66..207cdc94 100644 --- a/src/main/java/com/example/pladialmserver/user/service/UserService.java +++ b/src/main/java/com/example/pladialmserver/user/service/UserService.java @@ -48,9 +48,11 @@ public class UserService { private final EmailUtil emailUtil; // 로그인 + @Transactional public TokenDto login(EmailPWReq loginReq) { User user = userRepository.findByEmailAndIsEnable(loginReq.getEmail(), true).orElseThrow(() -> new BaseException(USER_NOT_FOUND)); if(!passwordEncoder.matches(loginReq.getPassword(), user.getPassword())) throw new BaseException(INVALID_PASSWORD); + if (StringUtils.hasText(loginReq.getFcmToken())) user.updateFcmToken(loginReq.getFcmToken()); return jwtUtil.createToken(user.getUserId(), user.getRole()); }