From 27c26bb65261b261997d475b2a7e1c4c11457ec1 Mon Sep 17 00:00:00 2001 From: Sejin Park <95167215+sejineer@users.noreply.github.com> Date: Thu, 18 Jan 2024 02:19:31 +0900 Subject: [PATCH] =?UTF-8?q?[FIX]:=20policy=20detail=20=ED=86=A0=ED=81=B0?= =?UTF-8?q?=20=EC=97=86=EC=9D=B4=EB=8F=84=20=EC=A1=B0=ED=9A=8C=20=EA=B0=80?= =?UTF-8?q?=EB=8A=A5=ED=95=98=EA=B2=8C=20=EB=B3=80=EA=B2=BD=20(#199)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [FEAT] BankUpload API 구현 * [FIX]: 배열 쿼리 적용 * [FIX]: 이미지 URL 안나가는 현상 수정 * [FIX]: HomePage URL도 포함 * [FIX]: 이율타입 별 데이터 조회, 정렬 수정 * [FIX]: 은행 이름으로 조회 조건 수정 * [FIX]: 대규모 패치 * [FIX]: Terms 조회 안되는 현상 수정 * [FIX]: Term 정렬 조건 FIX + 최대 금액 조건 추가 * [FIX]: Term 정렬 조건 FIX + 최대 금액 조건 추가 * [FIX]: 최대 금액 조건 오류 FIX * [FEAT]: 예금 계산기 API 구현 * [FIX]: 예금 계산기 loe -> goe 변경 * [FIX]: maxLimit null 값 0으로 대체 * [FIX]: policy detail 토큰 없이 조회로 변경 --- .../application/PolicyInfoServiceImpl.java | 5 ++- .../PolicyInfoQueryDslRepository.java | 3 +- .../PolicyInfoQueryDslRepositoryImpl.java | 35 ++++++++++++++++++- 3 files changed, 40 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/finfellows/domain/policyinfo/application/PolicyInfoServiceImpl.java b/src/main/java/com/finfellows/domain/policyinfo/application/PolicyInfoServiceImpl.java index ab7d606..99da840 100644 --- a/src/main/java/com/finfellows/domain/policyinfo/application/PolicyInfoServiceImpl.java +++ b/src/main/java/com/finfellows/domain/policyinfo/application/PolicyInfoServiceImpl.java @@ -32,7 +32,10 @@ public Page findPolicyInfos(UserPrincipal userPrincipal, St @Override public PolicyInfoDetailRes findPolicyDetail(UserPrincipal userPrincipal, Long policyId) { - return policyInfoRepository.findPolicyDetail(policyId, userPrincipal.getId()); + if(userPrincipal != null){ + return policyInfoRepository.findPolicyDetailWithAuthorization(policyId, userPrincipal.getId()); + } + return policyInfoRepository.findPolicyDetail(policyId); } @Override diff --git a/src/main/java/com/finfellows/domain/policyinfo/domain/repository/PolicyInfoQueryDslRepository.java b/src/main/java/com/finfellows/domain/policyinfo/domain/repository/PolicyInfoQueryDslRepository.java index f1c9d0a..f1061af 100644 --- a/src/main/java/com/finfellows/domain/policyinfo/domain/repository/PolicyInfoQueryDslRepository.java +++ b/src/main/java/com/finfellows/domain/policyinfo/domain/repository/PolicyInfoQueryDslRepository.java @@ -9,6 +9,7 @@ public interface PolicyInfoQueryDslRepository { Page findPolicyInfos(String searchKeyword, Pageable pageable); Page findPolicyInfosWithAuthorization(String searchKeyword, Pageable pageable, Long userId); - PolicyInfoDetailRes findPolicyDetail(Long policyId, Long userId); + PolicyInfoDetailRes findPolicyDetailWithAuthorization(Long policyId, Long userId); + PolicyInfoDetailRes findPolicyDetail(Long policyId); } diff --git a/src/main/java/com/finfellows/domain/policyinfo/domain/repository/PolicyInfoQueryDslRepositoryImpl.java b/src/main/java/com/finfellows/domain/policyinfo/domain/repository/PolicyInfoQueryDslRepositoryImpl.java index e5208f2..42462d3 100644 --- a/src/main/java/com/finfellows/domain/policyinfo/domain/repository/PolicyInfoQueryDslRepositoryImpl.java +++ b/src/main/java/com/finfellows/domain/policyinfo/domain/repository/PolicyInfoQueryDslRepositoryImpl.java @@ -87,7 +87,7 @@ public Page findPolicyInfos(String searchKeyword, Pageable } @Override - public PolicyInfoDetailRes findPolicyDetail(Long policyId, Long userId) { + public PolicyInfoDetailRes findPolicyDetailWithAuthorization(Long policyId, Long userId) { QPolicyInfoBookmark policyInfoBookmark = QPolicyInfoBookmark.policyInfoBookmark; List result = queryFactory @@ -122,6 +122,39 @@ public PolicyInfoDetailRes findPolicyDetail(Long policyId, Long userId) { return result.get(0); } + @Override + public PolicyInfoDetailRes findPolicyDetail(Long policyId) { + List result = queryFactory + .select(new QPolicyInfoDetailRes( + Expressions.constant(false), + policyInfo.polyBizSjNm, + policyInfo.polyItcnCn, + policyInfo.sporCn, + policyInfo.bizPrdCn, + policyInfo.rqutPrdCn, + policyInfo.sporScvl, + policyInfo.ageInfo, + policyInfo.prcpCn, + policyInfo.accrRqisCn, + policyInfo.majrRqisCn, + policyInfo.empmSttsCn, + policyInfo.splzRlmRqisCn, + policyInfo.aditRscn, + policyInfo.prcpLmttTrgtCn, + policyInfo.rqutProcCn, + policyInfo.jdgnPresCn, + policyInfo.rqutUrla, + policyInfo.pstnPaprCn + )) + .from(policyInfo) + .where( + policyInfo.id.eq(policyId) + ) + .fetch(); + + return result.get(0); + } + private BooleanExpression searchEq(String searchKeyword) { return searchKeyword != null ? policyInfo.polyBizSjNm.contains(searchKeyword).or(policyInfo.polyItcnCn.contains(searchKeyword)) : null; }