fix : Home API 에서 신청마감일이 가까운 정책이 없을 때, error 발생 로직 수정

TeamZenefit · Jan 5, 2024 · 92bfedb · 92bfedb
1 parent d9b8ef1
commit 92bfedb
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/main/java/com/cmc/zenefitserver/domain/user/application/UserService.java b/src/main/java/com/cmc/zenefitserver/domain/user/application/UserService.java
@@ -155,7 +155,14 @@ public HomeInfoResponseDto getHomeInfo(User user) {
         LocalDate currentTime = LocalDate.now();
         List<HomeInfoResponseDto.HomePolicyInfo> endDateHomePolicyInfoList = Arrays.stream(SupportPolicyType.values())
                 .map(type -> {
-                    Policy findPolicy = policyRepository.findMostImminentNonAppliedPolicy(user.getUserId(), type, currentTime, PageRequest.of(0, 1)).get(0);
+                    List<Policy> nonAppliedPolicy = policyRepository.findMostImminentNonAppliedPolicy(user.getUserId(), type, currentTime, PageRequest.of(0, 1));
+                    Policy findPolicy = null;
+                    if (nonAppliedPolicy.size() == 0) {
+                        findPolicy = policyRepository.findAllBySupportPolicyTypesContains(type).get(0);
+                    }
+                    if (nonAppliedPolicy.size() != 0) {
+                        findPolicy = nonAppliedPolicy.get(0);
+                    }
                     HomeInfoResponseDto.HomePolicyInfo homePolicyInfo = HomeInfoResponseDto.HomePolicyInfo.builder()
                             .policyId(findPolicy.getId())
                             .policyName(findPolicy.getPolicyName())