Merge pull request #282 from bankidz/dev

fix: 동등 비교 연산자 '==' => Object.equal로 수정

README.md

@@ -11,7 +11,7 @@
 
 |  AD  | Instagram |                 Web                 |                           iOS App                            |                         Android App                          |
 | :--: | :-------: | :---------------------------------: | :----------------------------------------------------------: | :----------------------------------------------------------: |
-|  -   |     -     | [bankidz.com](https://bankidz.com/) | <a href="https://play.google.com/store/apps/details?id="><img src="https://tools.applemediaservices.com/api/badges/download-on-the-app-store/black/ko-kr?size=250x83&amp;releaseDate=1654300800&h=dd4ccd7fb22c609cf9132f37bf23c390" alt="Download on the App Store" style="border-radius: 13px; width: 250px; height: 83px;"></a> | <a href='https://play.google.com/store/apps/details?id='><img alt='다운로드하기 Google Play' width='285px' src='https://play.google.com/intl/en_us/badges/static/images/badges/ko_badge_web_generic.png'/></a> |
+|  -   |     -     | [bankidz.com](https://bankidz.com/) | <a href="https://apps.apple.com/app/%EB%B1%85%ED%82%A4%EC%A6%88/id6444064518"><img src="https://tools.applemediaservices.com/api/badges/download-on-the-app-store/black/ko-kr?size=250x83&amp;releaseDate=1654300800&h=dd4ccd7fb22c609cf9132f37bf23c390" alt="Download on the App Store" style="border-radius: 13px; width: 250px; height: 83px;"></a> | <a href='https://play.google.com/store/apps/details?id=com.bankidz.bankidzapp'><img alt='다운로드하기 Google Play' width='285px' src='https://play.google.com/intl/en_us/badges/static/images/badges/ko_badge_web_generic.png'/></a> |
 </div>
 
 

src/main/java/com/ceos/bankids/controller/AppleController.java

@@ -2,6 +2,7 @@
 
 import com.ceos.bankids.domain.User;
 import com.ceos.bankids.dto.LoginDTO;
+import com.ceos.bankids.exception.BadRequestException;
 import com.ceos.bankids.mapper.AppleMapper;
 import com.ceos.bankids.mapper.UserMapper;
 import io.swagger.annotations.ApiOperation;
@@ -35,9 +36,14 @@ public void postAppleLogin(@RequestBody MultiValueMap<String, String> formData,
 
         log.info("api = 애플 로그인");
 
-        User user = appleMapper.postAppleLogin(formData);
-
-        LoginDTO loginDTO = userMapper.updateUserToken(user);
+        User user;
+        LoginDTO loginDTO;
+        try {
+            user = appleMapper.postAppleLogin(formData);
+            loginDTO = userMapper.updateUserToken(user);
+        } catch (BadRequestException e) {
+            loginDTO = new LoginDTO(null, null, null, "apple");
+        }
 
         response.sendRedirect(
             "https://bankidz.com/auth/apple/callback?isKid=" + loginDTO.getIsKid() + "&level="

src/main/java/com/ceos/bankids/mapper/AppleMapper.java

@@ -1,10 +1,12 @@
 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;
 import com.ceos.bankids.dto.oauth.AppleSubjectDTO;
 import com.ceos.bankids.dto.oauth.AppleTokenDTO;
+import com.ceos.bankids.exception.BadRequestException;
 import com.ceos.bankids.service.AppleServiceImpl;
 import com.ceos.bankids.service.UserServiceImpl;
 import java.io.IOException;
@@ -25,7 +27,7 @@ public class AppleMapper {
     private final UserServiceImpl userService;
 
     @Transactional
-    public User postAppleLogin(MultiValueMap<String, String> formData) throws IOException {
+    public User postAppleLogin(MultiValueMap<String, String> formData) throws BadRequestException {
         AppleRequest appleRequest = appleService.getAppleRequest(formData);
         AppleKeyListDTO appleKeyListDTO = appleService.getAppleIdentityToken();
         AppleSubjectDTO appleSubjectDTO = appleService.verifyIdentityToken(appleRequest,
@@ -38,6 +40,10 @@ public User postAppleLogin(MultiValueMap<String, String> formData) throws IOExce
         User user;
         if (registeredUser.isPresent()) {
             user = registeredUser.get();
+
+            if (user.getExpoToken() != null && user.getExpoToken().contains("ExponentPushToken")) {
+                throw new BadRequestException(ErrorCode.USER_ALREADY_LOGINED.getErrorCode());
+            }
         } else {
             user = userService.createNewUser(
                 appleRequest.getUsername(),

src/main/java/com/ceos/bankids/mapper/ChallengeMapper.java

@@ -85,7 +85,7 @@ public ChallengeDTO deleteChallengeMapper(User authUser, Long challengeId) {
         userRoleValidation(authUser, true);
         ChallengeUser challengeUser = challengeUserService.readChallengeUser(challengeId);
         Challenge deleteChallenge = challengeUser.getChallenge();
-        if (challengeUser.getUser().getId() != authUser.getId()) {
+        if (!Objects.equals(challengeUser.getUser().getId(), authUser.getId())) {
             throw new ForbiddenException(ErrorCode.NOT_MATCH_CHALLENGE_USER.getErrorCode());
         }
         if (deleteChallenge.getChallengeStatus() == ChallengeStatus.WALKING) {
@@ -165,7 +165,7 @@ public List<ChallengeDTO> readChallengeListMapper(User authUser, String status)
     @Transactional
     public ChallengeDTO readChallengeDetail(User authUser, Long challengeId) {
         ChallengeUser challengeUser = challengeUserService.readChallengeUser(challengeId);
-        if (authUser.getId() != challengeUser.getUser().getId()) {
+        if (!Objects.equals(authUser.getId(), challengeUser.getUser().getId())) {
             throw new ForbiddenException(ErrorCode.NOT_MATCH_CHALLENGE_USER.getErrorCode());
         }
         return challengeService.readChallengeDetail(challengeId);
@@ -208,7 +208,7 @@ public KidChallengeListDTO readKidChallengeListMapper(User authUser, Long kidId,
             challengeList.stream()
                 .filter(challenge -> challenge.getChallengeStatus() != ChallengeStatus.REJECTED)
                 .forEach(challenge -> {
-                    if (challenge.getContractUser().getId() == authUser.getId()) {
+                    if (Objects.equals(challenge.getContractUser().getId(), authUser.getId())) {
                         ChallengeListMapperDTO challengeListMapperDTO = challengeService.readPendingChallenge(
                             challenge);
                         ChallengeDTO challengeDTO = new ChallengeDTO(
@@ -232,7 +232,7 @@ public ChallengeDTO updateChallengeStatusMapper(User authUser, Long challengeId,
         ChallengeUser challengeUser = challengeUserService.readChallengeUser(challengeId);
         User user = challengeUser.getUser();
         Challenge challenge = challengeService.readChallenge(challengeId);
-        if (challenge.getContractUser().getId() != authUser.getId()) {
+        if (!Objects.equals(challenge.getContractUser().getId(), authUser.getId())) {
             throw new ForbiddenException(ErrorCode.NOT_MATCH_CONTRACT_USER.getErrorCode());
         }
         if (kidChallengeRequest.getAccept()) {

src/main/java/com/ceos/bankids/mapper/KakaoMapper.java

@@ -1,9 +1,11 @@
 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;
@@ -32,6 +34,10 @@ public User postKakaoLogin(KakaoRequest kakaoRequest) {
         User user;
         if (registeredUser.isPresent()) {
             user = registeredUser.get();
+
+            if (user.getExpoToken() != null && user.getExpoToken().contains("ExponentPushToken")) {
+                throw new BadRequestException(ErrorCode.USER_ALREADY_LOGINED.getErrorCode());
+            }
         } else {
             user = userService.createNewUser(
                 kakaoUserDTO.getKakaoAccount().getProfile().getNickname(),

src/main/java/com/ceos/bankids/mapper/UserMapper.java

@@ -62,11 +62,6 @@ public class UserMapper {
 
     @Transactional
     public UserDTO updateUserType(User user, UserTypeRequest userTypeRequest) {
-        // 이미 로그인한 유저인지 검사
-        if (user.getExpoToken() != null && user.getExpoToken().contains("ExponentPushToken")) {
-            throw new BadRequestException(ErrorCode.USER_ALREADY_LOGINED.getErrorCode());
-        }
-
         // 유저 타입이 이미 선택되었는지 검사
         if (user.getIsFemale() != null) {
             throw new BadRequestException(ErrorCode.USER_ALREADY_HAS_TYPE.getErrorCode());
@@ -111,11 +106,11 @@ public LoginDTO updateUserToken(User user) {
         LoginDTO loginDTO;
         if (updatedUser.getIsKid() == null || updatedUser.getIsKid() == false) {
             loginDTO = new LoginDTO(updatedUser.getIsKid(), newAccessToken,
-                    updatedUser.getProvider());
+                updatedUser.getProvider());
         } else {
             loginDTO = new LoginDTO(updatedUser.getIsKid(), newAccessToken,
-                    updatedUser.getKid().getLevel(),
-                    updatedUser.getProvider());
+                updatedUser.getKid().getLevel(),
+                updatedUser.getProvider());
         }
         return loginDTO;
     }
@@ -149,20 +144,20 @@ public void deleteFamilyUserIfExists(User user) {
         if (familyUser.isPresent()) {
             Family family = familyUser.get().getFamily();
             List<FamilyUser> familyUserList = familyUserService.getFamilyUserListExclude(family,
-                    user);
+                user);
 
             if (user.getIsKid()) {
                 List<Challenge> challengeList = challengeUserService.readAllChallengeUserListToChallengeList(
-                        user);
+                    user);
                 challengeUserService.deleteAllChallengeUserOfUser(user);
                 ChallengeCompleteDeleteByKidMapperDTO challengeCompleteDeleteByKidMapperDTO = challengeService.challengeCompleteDeleteByKid(
-                        challengeList);
+                    challengeList);
                 kidService.updateInitKid(user);
                 parentService.updateParentForDeleteFamilyUserByKid(familyUserList,
-                        challengeCompleteDeleteByKidMapperDTO);
+                    challengeCompleteDeleteByKidMapperDTO);
             } else {
                 List<ChallengeUser> challengeUserList = challengeUserService.getChallengeUserListByContractUser(
-                        user);
+                    user);
                 kidService.updateKidForDeleteFamilyUserByParent(challengeUserList);
                 parentService.updateInitParent(user);
                 challengeService.challengeCompleteDeleteByParent(challengeUserList);
@@ -180,12 +175,12 @@ public UserDTO deleteUserAccount(User user, WithdrawalRequest withdrawalRequest)
         if (user.getIsKid()) {
             KidBackupDTO kidBackupDTO = kidBackupService.backupKidUser(user);
             slackService.sendWithdrawalMessage("KidBackup ", kidBackupDTO.getId(),
-                    withdrawalRequest.getMessage());
+                withdrawalRequest.getMessage());
             kidService.deleteKid(user);
         } else {
             ParentBackupDTO parentBackupDTO = parentBackupService.backupParentUser(user);
             slackService.sendWithdrawalMessage("ParentBackup ", parentBackupDTO.getId(),
-                    withdrawalRequest.getMessage());
+                withdrawalRequest.getMessage());
             parentService.deleteParent(user);
         }