Merge pull request #253 from bankidz/dev

v1.1.2 버전 배포
bankidz · Oct 11, 2022 · f41ad97 · f41ad97
2 parents 49f30d2 + 336a38c
commit f41ad97
Show file tree

Hide file tree

Showing 13 changed files with 7,159 additions and 3,411 deletions.
diff --git a/src/main/java/com/ceos/bankids/controller/AppleController.java b/src/main/java/com/ceos/bankids/controller/AppleController.java
@@ -56,6 +56,6 @@ public void postAppleRevoke(@RequestBody MultiValueMap<String, String> formData,
 
         appleMapper.postAppleRevoke(formData, response);
 
-        response.sendRedirect("https://bankidz.com/manage/withdraw/callback?isError=false");
+        response.sendRedirect("https://bankidz.com/mypage/manage/withdraw/callback?isError=false");
     }
 }
diff --git a/src/main/java/com/ceos/bankids/controller/ChallengeController.java b/src/main/java/com/ceos/bankids/controller/ChallengeController.java
@@ -1,6 +1,8 @@
 package com.ceos.bankids.controller;
 
 import com.ceos.bankids.config.CommonResponse;
+import com.ceos.bankids.controller.request.ChallengeRequest;
+import com.ceos.bankids.controller.request.KidChallengeRequest;
 import com.ceos.bankids.domain.User;
 import com.ceos.bankids.dto.AchievedChallengeDTO;
 import com.ceos.bankids.dto.AchievedChallengeListDTO;
@@ -11,8 +13,6 @@
 import com.ceos.bankids.dto.ProgressDTO;
 import com.ceos.bankids.dto.WeekDTO;
 import com.ceos.bankids.mapper.ChallengeMapper;
-import com.ceos.bankids.controller.request.ChallengeRequest;
-import com.ceos.bankids.controller.request.KidChallengeRequest;
 import io.swagger.annotations.ApiOperation;
 import java.util.List;
 import javax.validation.Valid;

diff --git a/src/main/java/com/ceos/bankids/domain/Challenge.java b/src/main/java/com/ceos/bankids/domain/Challenge.java
@@ -48,7 +48,6 @@ public class Challenge extends AbstractTimestamp {
 
     @Column(nullable = false)
     @Enumerated(EnumType.STRING)
-    @ColumnDefault("PENDING")
     private ChallengeStatus challengeStatus;
 
     @Column(nullable = false)

diff --git a/src/main/java/com/ceos/bankids/mapper/ChallengeMapper.java b/src/main/java/com/ceos/bankids/mapper/ChallengeMapper.java
@@ -66,16 +66,15 @@ public ChallengeDTO createChallengeMapper(User authUser, ChallengeRequest challe
 
         // 실제 돈길 저장로직
         ChallengePostDTO challengePostDTO = new ChallengePostDTO(challengeRequest, contractUser);
-        ChallengeDTO challengeDTO = challengeService.createChallenge(authUser, challengePostDTO);
-        Challenge challenge = challengeService.readChallenge(challengeDTO.getId());
+        Challenge newChallenge = challengeService.createChallenge(authUser, challengePostDTO);
         ChallengeUser challengeUser = challengeUserService.createdChallengeUser(authUser,
-            challenge);
+            newChallenge);
         parentService.updateParentForCreateChallenge(contractUser);
 
         // 저장로직 성공시 알림 로직
         notificationService.createPendingChallengeNotification(contractUser, challengeUser);
 
-        return challengeDTO;
+        return new ChallengeDTO(newChallenge, null, null);
     }
 
     // 돈길 삭제 API Mapper
@@ -154,7 +153,6 @@ public List<ChallengeDTO> readChallengeListMapper(User authUser, String status)
                 challengeDTOList.add(challengeDTO);
             });
         }
-
         return challengeDTOList;
     }
 
@@ -178,7 +176,7 @@ public KidChallengeListDTO readKidChallengeListMapper(User authUser, Long kidId,
                     notificationService.challengeAchievedNotification(authUser,
                         challenge.getContractUser(), challenge);
                     kidService.userLevelUp(challenge.getContractUser(),
-                        authUser);
+                        kidUser);
                 } else if (challengeListMapperDTO.getChangeStatus()
                     && challenge.getChallengeStatus() == ChallengeStatus.FAILED) {
                     notificationService.challengeFailedNotification(challenge.getContractUser(),
@@ -293,8 +291,10 @@ public KidAchievedChallengeListDTO readKidAchievedChallengeListMapper(User authU
         Kid kid = kidService.getKid(kidId);
         User kidUser = kid.getUser();
         familyUserService.checkSameFamily(authUser, kidUser);
-        List<Challenge> achievedChallengeUserList = challengeUserService.readAchievedChallengeUserList(
-            kidUser);
+        List<Challenge> achievedChallengeUserList = challengeUserService.readKidAchievedChallengeUserList(
+            authUser, kidUser);
+        System.out.println(
+            "achievedChallengeUserList.size() = " + achievedChallengeUserList.size());
 
         return challengeService.readKidAchievedChallenge(
             authUser, achievedChallengeUserList, interestPayment, kidId);

diff --git a/src/main/java/com/ceos/bankids/repository/ChallengeUserRepository.java b/src/main/java/com/ceos/bankids/repository/ChallengeUserRepository.java
@@ -1,5 +1,6 @@
 package com.ceos.bankids.repository;
 
+import com.ceos.bankids.constant.ChallengeStatus;
 import com.ceos.bankids.domain.ChallengeUser;
 import java.util.List;
 import java.util.Optional;
@@ -12,4 +13,7 @@ public interface ChallengeUserRepository extends JpaRepository<ChallengeUser, Lo
     public List<ChallengeUser> findByUserId(Long userId);
 
     public List<ChallengeUser> findByChallenge_ContractUserId(Long contractUserId);
+
+    public List<ChallengeUser> findByUserIdAndChallenge_ChallengeStatus(Long userId,
+        ChallengeStatus challengeStatus);
 }
diff --git a/src/main/java/com/ceos/bankids/service/ChallengeService.java b/src/main/java/com/ceos/bankids/service/ChallengeService.java
@@ -19,7 +19,7 @@
 @Service
 public interface ChallengeService {
 
-    public ChallengeDTO createChallenge(User user, ChallengePostDTO challengePostDTO);
+    public Challenge createChallenge(User user, ChallengePostDTO challengePostDTO);
 
     public ChallengeDTO deleteWalkingChallenge(User user, ChallengeUser challengeUser);
 

diff --git a/src/main/java/com/ceos/bankids/service/ChallengeServiceImpl.java b/src/main/java/com/ceos/bankids/service/ChallengeServiceImpl.java
@@ -68,7 +68,7 @@ static int getCurrentWeek(Calendar nowCal, Calendar createdAtCal, int currentWee
     // 돈길 생성 API
     @Transactional
     @Override
-    public ChallengeDTO createChallenge(User user, ChallengePostDTO challengeRequest) {
+    public Challenge createChallenge(User user, ChallengePostDTO challengeRequest) {
 
         String category = challengeRequest.getChallengeCategory();
         String name = challengeRequest.getItemName();
@@ -93,7 +93,7 @@ public ChallengeDTO createChallenge(User user, ChallengePostDTO challengeRequest
             .filename(challengeRequest.getFileName()).build();
         challengeRepository.save(newChallenge);
 
-        return new ChallengeDTO(newChallenge, null, null);
+        return newChallenge;
     }
 
     // 돈길 삭제 API (2주에 한번)
@@ -242,7 +242,7 @@ public AchievedChallengeListDTO readAchievedChallenge(List<Challenge> achievedCh
             } else if (Objects.equals(interestPayment, "unPaid")) {
                 return !challenge.getIsInterestPayment();
             } else {
-                return challenge.getChallengeStatus() == achieved;
+                throw new BadRequestException(ErrorCode.QUERY_PARAM_ERROR.getErrorCode());
             }
         }).collect(Collectors.toList());
         List<AchievedChallengeDTO> achievedChallengeDTOList = challengeList.stream()
@@ -310,9 +310,7 @@ public ProgressDTO updateProgress(Challenge challenge) {
         if (progress.getIsAchieved()) {
             throw new BadRequestException(ErrorCode.ALREADY_WALK_PROGRESS.getErrorCode());
         }
-        if (diffWeeks > challenge.getWeeks()) {
-            throw new BadRequestException(ErrorCode.NOT_EXIST_PROGRESS.getErrorCode());
-        } else if (diffWeeks.equals(challenge.getWeeks())) {
+        if (diffWeeks.equals(challenge.getWeeks())) {
             challenge.setChallengeStatus(achieved);
         }
         progress.setIsAchieved(true);

diff --git a/src/main/java/com/ceos/bankids/service/ChallengeUserService.java b/src/main/java/com/ceos/bankids/service/ChallengeUserService.java
@@ -17,6 +17,8 @@ public interface ChallengeUserService {
 
     public List<Challenge> readAchievedChallengeUserList(User authUser);
 
+    public List<Challenge> readKidAchievedChallengeUserList(User authUser, User kidUser);
+
     public List<Challenge> readAllChallengeUserListToChallengeList(User authUser);
 
     public void deleteAllChallengeUserOfUser(User authUser);

diff --git a/src/main/java/com/ceos/bankids/service/ChallengeUserServiceImpl.java b/src/main/java/com/ceos/bankids/service/ChallengeUserServiceImpl.java
@@ -70,6 +70,17 @@ public List<Challenge> readAchievedChallengeUserList(User authUser) {
                 Collectors.toList());
     }
 
+    @Transactional(readOnly = true)
+    @Override
+    public List<Challenge> readKidAchievedChallengeUserList(User authUser, User kidUser) {
+        return cuRepo.findByUserId(kidUser.getId())
+            .stream().map(ChallengeUser::getChallenge)
+            .filter(challenge -> challenge.getChallengeStatus() == ChallengeStatus.ACHIEVED
+                && challenge.getContractUser().getId() == authUser.getId())
+            .collect(
+                Collectors.toList());
+    }
+
     @Override
     @Transactional(readOnly = true)
     public List<Challenge> readAllChallengeUserListToChallengeList(User authUser) {
@@ -87,10 +98,12 @@ public void deleteAllChallengeUserOfUser(User authUser) {
 
     @Transactional(readOnly = true)
     public void checkMaxChallengeCount(User user) {
-        List<Challenge> walkingChallengeList = cuRepo.findByUserId(user.getId()).stream()
-            .map(ChallengeUser::getChallenge)
-            .filter(challenge -> challenge.getChallengeStatus() == ChallengeStatus.WALKING).collect(
-                Collectors.toList());
+//        List<Challenge> walkingChallengeList = cuRepo.findByUserId(user.getId()).stream()
+//            .map(ChallengeUser::getChallenge)
+//            .filter(challenge -> challenge.getChallengeStatus() == ChallengeStatus.WALKING).collect(
+//                Collectors.toList());
+        List<ChallengeUser> walkingChallengeList = cuRepo.findByUserIdAndChallenge_ChallengeStatus(
+            user.getId(), ChallengeStatus.WALKING);
         if (walkingChallengeList.size() >= 5) {
             throw new ForbiddenException(ErrorCode.CHALLENGE_COUNT_OVER_FIVE.getErrorCode());
         }

diff --git a/src/main/java/com/ceos/bankids/service/ExpoNotificationServiceImpl.java b/src/main/java/com/ceos/bankids/service/ExpoNotificationServiceImpl.java
@@ -402,7 +402,8 @@ public void newFamilyUserNotification(User newFamilyUser, List<FamilyUser> famil
 
     private Boolean checkServiceOptIn(User user, String title, String body,
         NotificationCategory notificationCategory, String linkUrl) {
-        if (!user.getServiceOptIn() || !user.getExpoToken().startsWith("ExponentPushToken")) {
+        if ((!user.getServiceOptIn() || !user.getExpoToken().startsWith("ExponentPushToken"))
+            || user.getExpoToken() == null) {
             Notification notification = Notification.builder().user(user).title(title).message(body)
                 .notificationCategory(notificationCategory).linkUrl(linkUrl)
                 .build();

diff --git a/src/main/java/com/ceos/bankids/service/FamilyUserServiceImpl.java b/src/main/java/com/ceos/bankids/service/FamilyUserServiceImpl.java
@@ -88,8 +88,6 @@ public List<FamilyUser> getFamilyUserListExclude(Family family, User user) {
     public User getContractUser(User user, Boolean isMom) {
         FamilyUser familyUser = familyUserRepository.findByUserId(user.getId())
             .orElseThrow(() -> new BadRequestException(ErrorCode.NOT_EXIST_FAMILY.getErrorCode()));
-//        Family family = fRepo.findByCode(familyUser.getFamily().getCode())
-//            .orElseThrow(() -> new BadRequestException(ErrorCode.NOT_EXIST_FAMILY.getErrorCode()));
         return familyUserRepository.findByFamilyAndUserNot(familyUser.getFamily(), user).stream()
             .map(FamilyUser::getUser)
             .filter(user1 -> user1.getIsFemale() == isMom && !user1.getIsKid())