Merge pull request #285 from bankidz/dev

[v1.1.10] 유저 로직 관련 수정 버전
bankidz · Jan 1, 2023 · 1f9a1df · 1f9a1df
2 parents c8ae44a + d58e7de
commit 1f9a1df
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 28 deletions.
diff --git a/src/main/java/com/ceos/bankids/controller/request/ExpoRequest.java b/src/main/java/com/ceos/bankids/controller/request/ExpoRequest.java
@@ -1,7 +1,6 @@
 package com.ceos.bankids.controller.request;
 
 import io.swagger.annotations.ApiModelProperty;
-import javax.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.EqualsAndHashCode;
@@ -18,6 +17,6 @@
 public class ExpoRequest {
 
     @ApiModelProperty(example = "ExponentPushToken[asdfasdfasdf]")
-    @NotNull(message = "expoToken may not be null")
+//    @NotNull(message = "expoToken may not be null")
     private String expoToken;
 }
diff --git a/src/main/java/com/ceos/bankids/mapper/AppleMapper.java b/src/main/java/com/ceos/bankids/mapper/AppleMapper.java
@@ -1,6 +1,5 @@
 package com.ceos.bankids.mapper;
 
-import com.ceos.bankids.constant.ErrorCode;
 import com.ceos.bankids.controller.request.AppleRequest;
 import com.ceos.bankids.domain.User;
 import com.ceos.bankids.dto.oauth.AppleKeyListDTO;
@@ -31,36 +30,36 @@ public User postAppleLogin(MultiValueMap<String, String> formData) throws BadReq
         AppleRequest appleRequest = appleService.getAppleRequest(formData);
         AppleKeyListDTO appleKeyListDTO = appleService.getAppleIdentityToken();
         AppleSubjectDTO appleSubjectDTO = appleService.verifyIdentityToken(appleRequest,
-            appleKeyListDTO);
+                appleKeyListDTO);
         AppleTokenDTO appleTokenDTO = appleService.getAppleAccessToken(appleRequest, "login");
 
         Optional<User> registeredUser = userService.findUserByAuthenticationCodeNullable(
-            appleSubjectDTO.getAuthenticationCode());
+                appleSubjectDTO.getAuthenticationCode());
 
         User user;
         if (registeredUser.isPresent()) {
             user = registeredUser.get();
 
-            if (user.getExpoToken() != null && user.getExpoToken().contains("ExponentPushToken")) {
-                throw new BadRequestException(ErrorCode.USER_ALREADY_LOGINED.getErrorCode());
-            }
+//            if (user.getExpoToken() != null && user.getExpoToken().contains("ExponentPushToken")) {
+//                throw new BadRequestException(ErrorCode.USER_ALREADY_LOGINED.getErrorCode());
+//            }
         } else {
             user = userService.createNewUser(
-                appleRequest.getUsername(),
-                appleSubjectDTO.getAuthenticationCode(),
-                "apple");
+                    appleRequest.getUsername(),
+                    appleSubjectDTO.getAuthenticationCode(),
+                    "apple");
         }
 
         return user;
     }
 
     public void postAppleRevoke(MultiValueMap<String, String> formData,
-        HttpServletResponse response) throws IOException {
+            HttpServletResponse response) throws IOException {
         try {
             AppleRequest appleRequest = appleService.getAppleRequest(formData);
             AppleKeyListDTO appleKeyListDTO = appleService.getAppleIdentityToken();
             AppleSubjectDTO appleSubjectDTO = appleService.verifyIdentityToken(appleRequest,
-                appleKeyListDTO);
+                    appleKeyListDTO);
             AppleTokenDTO appleTokenDTO = appleService.getAppleAccessToken(appleRequest, "revoke");
             Object appleResponse = appleService.revokeAppleAccount(appleTokenDTO);
 

diff --git a/src/main/java/com/ceos/bankids/mapper/ChallengeMapper.java b/src/main/java/com/ceos/bankids/mapper/ChallengeMapper.java
@@ -188,7 +188,7 @@ public KidChallengeListDTO readKidChallengeListMapper(User authUser, Long kidId,
                     challenge);
                 if (challengeListMapperDTO.getChangeStatus()
                     && challenge.getChallengeStatus() == ChallengeStatus.ACHIEVED) {
-                    notificationService.challengeAchievedNotification(authUser,
+                    notificationService.challengeAchievedNotification(kidUser,
                         challenge.getContractUser(), challenge);
                     kidService.userLevelUp(challenge.getContractUser(),
                         kidUser);

diff --git a/src/main/java/com/ceos/bankids/mapper/KakaoMapper.java b/src/main/java/com/ceos/bankids/mapper/KakaoMapper.java
@@ -1,11 +1,9 @@
 package com.ceos.bankids.mapper;
 
-import com.ceos.bankids.constant.ErrorCode;
 import com.ceos.bankids.controller.request.KakaoRequest;
 import com.ceos.bankids.domain.User;
 import com.ceos.bankids.dto.oauth.KakaoTokenDTO;
 import com.ceos.bankids.dto.oauth.KakaoUserDTO;
-import com.ceos.bankids.exception.BadRequestException;
 import com.ceos.bankids.service.KakaoServiceImpl;
 import com.ceos.bankids.service.UserServiceImpl;
 import java.util.Optional;
@@ -29,20 +27,20 @@ public User postKakaoLogin(KakaoRequest kakaoRequest) {
         KakaoUserDTO kakaoUserDTO = kakaoService.getKakaoUserCode(kakaoTokenDTO);
 
         Optional<User> registeredUser = userService.findUserByAuthenticationCodeNullable(
-            kakaoUserDTO.getAuthenticationCode());
+                kakaoUserDTO.getAuthenticationCode());
 
         User user;
         if (registeredUser.isPresent()) {
             user = registeredUser.get();
 
-            if (user.getExpoToken() != null && user.getExpoToken().contains("ExponentPushToken")) {
-                throw new BadRequestException(ErrorCode.USER_ALREADY_LOGINED.getErrorCode());
-            }
+//            if (user.getExpoToken() != null && user.getExpoToken().contains("ExponentPushToken")) {
+//                throw new BadRequestException(ErrorCode.USER_ALREADY_LOGINED.getErrorCode());
+//            }
         } else {
             user = userService.createNewUser(
-                kakaoUserDTO.getKakaoAccount().getProfile().getNickname(),
-                kakaoUserDTO.getAuthenticationCode(),
-                "kakao");
+                    kakaoUserDTO.getKakaoAccount().getProfile().getNickname(),
+                    kakaoUserDTO.getAuthenticationCode(),
+                    "kakao");
         }
 
         return user;

diff --git a/src/main/java/com/ceos/bankids/service/ExpoNotificationServiceImpl.java b/src/main/java/com/ceos/bankids/service/ExpoNotificationServiceImpl.java
@@ -87,15 +87,17 @@ public NotificationListDTO readNotificationList(User user, Long lastId) {
     public NotificationDTO updateNotification(User user, Long notificationId) {
         Notification notification = notificationRepository.findById(notificationId).orElseThrow(
             () -> new BadRequestException(ErrorCode.NOT_EXIST_NOTIFICATION_ERROR.getErrorCode()));
-        if (notification.getIsRead()) {
-            throw new BadRequestException(ErrorCode.ALREADY_READ_NOTIFICATION_ERROR.getErrorCode());
-        }
+//        if (notification.getIsRead()) {
+//            throw new BadRequestException(ErrorCode.ALREADY_READ_NOTIFICATION_ERROR.getErrorCode());
+//        }
         if (!Objects.equals(notification.getUser().getId(), user.getId())) {
             throw new ForbiddenException(
                 ErrorCode.NOT_MATCH_NOTIFICATION_USER_ERROR.getErrorCode());
         }
-        notification.setIsRead(true);
-        notificationRepository.save(notification);
+        if (!notification.getIsRead()) {
+            notification.setIsRead(true);
+            notificationRepository.save(notification);
+        }
         return new NotificationDTO(notification);
     }