Merge pull request #200 from FinFellows/develop

[FIX]: policy detail 토큰 없이도 조회 가능하게 변경 (#199)
FinFellows · Jan 17, 2024 · ee597f6 · ee597f6
2 parents 17a6690 + 27c26bb
commit ee597f6
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 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
@@ -32,7 +32,10 @@ public Page<SearchPolicyInfoRes> 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/...java/com/finfellows/domain/policyinfo/domain/repository/PolicyInfoQueryDslRepository.java b/...java/com/finfellows/domain/policyinfo/domain/repository/PolicyInfoQueryDslRepository.java
@@ -9,6 +9,7 @@ public interface PolicyInfoQueryDslRepository {
 
     Page<SearchPolicyInfoRes> findPolicyInfos(String searchKeyword, Pageable pageable);
     Page<SearchPolicyInfoRes> 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/.../com/finfellows/domain/policyinfo/domain/repository/PolicyInfoQueryDslRepositoryImpl.java b/.../com/finfellows/domain/policyinfo/domain/repository/PolicyInfoQueryDslRepositoryImpl.java
@@ -87,7 +87,7 @@ public Page<SearchPolicyInfoRes> findPolicyInfos(String searchKeyword, Pageable
     }
 
     @Override
-    public PolicyInfoDetailRes findPolicyDetail(Long policyId, Long userId) {
+    public PolicyInfoDetailRes findPolicyDetailWithAuthorization(Long policyId, Long userId) {
         QPolicyInfoBookmark policyInfoBookmark = QPolicyInfoBookmark.policyInfoBookmark;
 
         List<PolicyInfoDetailRes> result = queryFactory
@@ -122,6 +122,39 @@ public PolicyInfoDetailRes findPolicyDetail(Long policyId, Long userId) {
         return result.get(0);
     }
 
+    @Override
+    public PolicyInfoDetailRes findPolicyDetail(Long policyId) {
+        List<PolicyInfoDetailRes> 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;
     }