refactor: 자녀의 돈길 리스트 가져오기 API에서 거절당한 돈길은 보여주지 않기 #234

bankidz · Sep 23, 2022 · 611f550 · 611f550
1 parent 899e513
commit 611f550
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/src/main/java/com/ceos/bankids/mapper/ChallengeMapper.java b/src/main/java/com/ceos/bankids/mapper/ChallengeMapper.java
@@ -192,16 +192,18 @@ public KidChallengeListDTO readKidChallengeListMapper(User authUser, Long kidId,
                 }
             });
         } 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);
-                }
-            });
+            challengeList.stream()
+                .filter(challenge -> challenge.getChallengeStatus() != ChallengeStatus.REJECTED)
+                .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);
+                    }
+                });
         }
         return new KidChallengeListDTO(kidUser,
             challengeDTOList);