Merge pull request #247 from JNU-econovation/feature/BE-91

[REFACTOR] Optional 구문 수정 및 기본 board 는 true 반환
JNU-econovation · Sep 9, 2024 · 425c756 · 425c756
2 parents c27cfda + 55fe7ce
commit 425c756
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/server/Recruit-Api/src/main/java/com/econovation/recruit/api/card/service/CardService.java b/server/Recruit-Api/src/main/java/com/econovation/recruit/api/card/service/CardService.java
@@ -77,12 +77,16 @@ public List<BoardCardResponseDto> getByNavigationId(Integer navigationId, Intege
 
         boards = boards.stream()
                 .filter(
-                        board ->
-                                Optional.ofNullable(board.getCardId())
-                                .map(id -> answerIdByCardIdMap.getOrDefault(id, null))
-                                .map(id -> yearByAnswerIdMap.getOrDefault(id, null))
-                                .map(y -> y.equals(year))
-                                .orElse(false))
+                        board ->{
+                            if(board.getId()==1 || board.getId()==2 || board.getId()==3) {
+                                return true;
+                            }
+                            return Optional.ofNullable(board.getCardId())
+                                    .map(answerIdByCardIdMap::get)
+                                    .map(yearByAnswerIdMap::get)
+                                    .map(y -> y.equals(year))
+                                    .orElse(false);
+                        })
                 .toList();
 
         cards =