refactor: 자녀 돈길리스트 가져오기 API 리팩토링 #229

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

@@ -7,13 +7,15 @@
 import com.ceos.bankids.controller.request.KidChallengeRequest;
 import com.ceos.bankids.domain.Challenge;
 import com.ceos.bankids.domain.ChallengeUser;
+import com.ceos.bankids.domain.Kid;
 import com.ceos.bankids.domain.User;
 import com.ceos.bankids.dto.AchievedChallengeDTO;
 import com.ceos.bankids.dto.AchievedChallengeListDTO;
 import com.ceos.bankids.dto.ChallengeDTO;
 import com.ceos.bankids.dto.ChallengeListMapperDTO;
 import com.ceos.bankids.dto.ChallengePostDTO;
 import com.ceos.bankids.dto.KidAchievedChallengeListDTO;
+import com.ceos.bankids.dto.KidChallengeListDTO;
 import com.ceos.bankids.dto.KidWeekDTO;
 import com.ceos.bankids.dto.WeekDTO;
 import com.ceos.bankids.exception.BadRequestException;
@@ -176,20 +178,58 @@ public CommonResponse<List<ChallengeDTO>> getListChallenge(
 
         return CommonResponse.onSuccess(challengeDTOList);
     }
-//
-//    @ApiOperation(value = "자녀의 돈길 리스트 가져오기")
-//    @GetMapping(value = "/kid/{kidId}", produces = "application/json; charset=utf-8")
-//    public CommonResponse<KidChallengeListDTO> getListKidChallenge(
-//        @AuthenticationPrincipal User authUser, @PathVariable Long kidId,
-//        @RequestParam String status) {
-//
-//        log.info("api = 자녀의 돈길 리스트 가져오기, user = {}, kidId = {}, status = {}",
-//            authUser.getUsername(), kidId, status);
-//        KidChallengeListDTO kidChallengeList = challengeService.readKidChallenge(authUser, kidId,
-//            status);
-//
-//        return CommonResponse.onSuccess(kidChallengeList);
-//    }
+
+    @ApiOperation(value = "자녀의 돈길 리스트 가져오기")
+    @GetMapping(value = "/kid/{kidId}", produces = "application/json; charset=utf-8")
+    public CommonResponse<KidChallengeListDTO> getListKidChallenge(
+        @AuthenticationPrincipal User authUser, @PathVariable Long kidId,
+        @RequestParam String status) {
+
+        log.info("api = 자녀의 돈길 리스트 가져오기, user = {}, kidId = {}, status = {}",
+            authUser.getUsername(), kidId, status);
+        Kid kid = kidService.getKid(kidId);
+        User kidUser = kid.getUser();
+        List<ChallengeDTO> challengeDTOList = new ArrayList<>();
+        List<Challenge> challengeList = challengeUserService.getChallengeUserList(kidUser,
+            status);
+        if (Objects.equals(status, "walking")) {
+            challengeList.forEach(challenge -> {
+                ChallengeListMapperDTO challengeListMapperDTO = challengeService.readWalkingChallenge(
+                    challenge);
+                if (challengeListMapperDTO.getChangeStatus()
+                    && challenge.getChallengeStatus() == ChallengeStatus.ACHIEVED) {
+                    notificationService.challengeAchievedNotification(challenge.getContractUser(),
+                        challenge.getChallengeUser());
+                    kidService.userLevelUp(challenge.getContractUser(),
+                        authUser);
+                } else if (challengeListMapperDTO.getChangeStatus()
+                    && challenge.getChallengeStatus() == ChallengeStatus.FAILED) {
+                    notificationService.challengeFailedNotification(challenge.getContractUser(),
+                        challenge.getChallengeUser());
+                }
+                if (challenge.getChallengeStatus() != ChallengeStatus.ACHIEVED) {
+                    ChallengeDTO challengeDTO = new ChallengeDTO(
+                        challengeListMapperDTO.getChallenge(),
+                        challengeListMapperDTO.getProgressDTOList(), null);
+                    challengeDTOList.add(challengeDTO);
+                }
+            });
+        } else if (Objects.equals(status, "pending")) {
+            challengeList.forEach(challenge -> {
+                if (challenge.getContractUser().getId() == authUser.getId()) {
+                    ChallengeListMapperDTO challengeListMapperDTO = challengeService.readPendingChallenge(
+                        challenge);
+                    ChallengeDTO challengeDTO = new ChallengeDTO(
+                        challengeListMapperDTO.getChallenge(),
+                        null, challenge.getComment());
+                    challengeDTOList.add(challengeDTO);
+                }
+            });
+        }
+        KidChallengeListDTO kidChallengeListDTO = new KidChallengeListDTO(kidUser,
+            challengeDTOList);
+        return CommonResponse.onSuccess(kidChallengeListDTO);
+    }
 
     @ApiOperation(value = "자녀의 돈길 수락 / 거절")
     @PatchMapping(value = "/{challengeId}", produces = "application/json; charset=utf-8")

src/main/java/com/ceos/bankids/service/ChallengeService.java

@@ -26,11 +26,6 @@ public interface ChallengeService {
 
     public ChallengeDTO deletePendingChallenge(User user, ChallengeUser challengeUser);
 
-//    public List<ChallengeDTO> readChallengeList(User user, List<Challenge> challengeList,
-//        String status);
-
-//    public KidChallengeListDTO readKidChallenge(User user, Long kidId, String status);
-
     public ChallengeDTO updateChallengeStatus(User user, Long challengeId,
         KidChallengeRequest kidChallengeRequest) throws IOException;
 

src/main/java/com/ceos/bankids/service/ChallengeServiceImpl.java

@@ -169,17 +169,7 @@ public ChallengeListMapperDTO readWalkingChallenge(Challenge challenge) {
             return new ChallengeListMapperDTO(challenge, progressDTOList, true);
         } else if (diffWeeks > challenge.getWeeks()) {
             challenge.setChallengeStatus(achieved);
-//                    Long userLevel = userLevelUp(kid.getAchievedChallenge() + 1);
-//                    kid.setAchievedChallenge(kid.getAchievedChallenge() + 1);
-//                    if (!Objects.equals(userLevel, kid.getLevel())) {
-//                        notificationController.kidLevelUpNotification(
-//                            challenge.getContractUser(), user, kid.getLevel(), userLevel);
-//                        kid.setLevel(userLevel);
-//                    }
             challengeRepository.save(challenge);
-//                    kidRepository.save(kid);
-//                    notificationController.achieveChallengeNotification(
-//                        challenge.getContractUser(), r);
             return new ChallengeListMapperDTO(challenge, progressDTOList, true);
         }
         return new ChallengeListMapperDTO(challenge, progressDTOList, false);

src/main/java/com/ceos/bankids/service/KidService.java

@@ -1,5 +1,6 @@
 package com.ceos.bankids.service;
 
+import com.ceos.bankids.domain.Kid;
 import com.ceos.bankids.domain.User;
 import org.springframework.stereotype.Service;
 
@@ -14,4 +15,6 @@ public interface KidService {
 
     public void userLevelUp(User contractUser, User user);
 
+    public Kid getKid(Long kidId);
+
 }

src/main/java/com/ceos/bankids/service/KidServiceImpl.java

@@ -117,4 +117,11 @@ public void userLevelUp(User contractUser, User user) {
 
     }
 
+    @Transactional(readOnly = true)
+    @Override
+    public Kid getKid(Long kidId) {
+        return kidRepository.findById(kidId)
+            .orElseThrow(() -> new BadRequestException(ErrorCode.NOT_EXIST_KID.getErrorCode()));
+    }
+
 }