Merge pull request #139 from prgrms-web-devcourse-final-project/develop

DooHyoJeong · web-flow · commit 9300d1b3a93e · 2025-09-29T18:04:48.000+09:00
chore[qdrant]: 변수 수정
diff --git a/.github/workflows/CI-CD_Pipeline.yml b/.github/workflows/CI-CD_Pipeline.yml
@@ -239,7 +239,7 @@ jobs:
           aws-region: ${{ secrets.AWS_REGION }}
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          instance-ids: "i-04e6cdbebfead7150"
+          instance-ids: "i-083c532175a61cd43"
           working-directory: /
           comment: Deploy
           command: |
@@ -270,8 +270,8 @@ jobs:
             PROD_REDIS_PORT=6379
             PROD_REDIS_PASSWORD=${{ secrets.REDIS_PASSWORD }}
             
-            SPRING_AI_VECTORSTORE_QDRANT_HOST=qdrant_1
-            SPRING_AI_VECTORSTORE_QDRANT_PORT=6334
+            PROD_QDRANT_HOST=qdrant_1
+            PROD_QDRANT_PORT=6334
             
             send_email_address=${{ secrets.SEND_EMAIL_ADDRESS }}
             email_address=${{ secrets.EMAIL_ADDRESS }}
diff --git a/backend/src/main/java/com/ai/lawyer/domain/law/controller/LawController.java b/backend/src/main/java/com/ai/lawyer/domain/law/controller/LawController.java
@@ -6,13 +6,15 @@
 import com.ai.lawyer.domain.law.service.LawService;
 import com.ai.lawyer.global.dto.PageResponseDto;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 @RestController
 @RequiredArgsConstructor
+@Tag(name = "법령", description = "법령 API")
 @RequestMapping("/api/law")
 public class LawController {
 
diff --git a/backend/src/main/java/com/ai/lawyer/domain/law/dto/LawsDto.java b/backend/src/main/java/com/ai/lawyer/domain/law/dto/LawsDto.java
@@ -23,4 +23,6 @@ public class LawsDto {
     private LocalDate promulgationDate; // 공포일자
 
     private LocalDate enforcementDate; // 시행일자
+
+    private String firstJoContent; // 조
 }
diff --git a/backend/src/main/java/com/ai/lawyer/domain/law/repository/LawRepositoryCustomImpl.java b/backend/src/main/java/com/ai/lawyer/domain/law/repository/LawRepositoryCustomImpl.java
@@ -2,9 +2,14 @@
 
 import com.ai.lawyer.domain.law.dto.LawSearchRequestDto;
 import com.ai.lawyer.domain.law.dto.LawsDto;
+import com.ai.lawyer.domain.law.entity.QJang;
+import com.ai.lawyer.domain.law.entity.QJo;
 import com.ai.lawyer.domain.law.entity.QLaw;
 import com.querydsl.core.BooleanBuilder;
+import com.querydsl.core.Tuple;
 import com.querydsl.core.types.Projections;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.jpa.JPAExpressions;
 import com.querydsl.jpa.impl.JPAQuery;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import lombok.RequiredArgsConstructor;
@@ -14,8 +19,13 @@
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Repository;
 import org.springframework.util.StringUtils;
+import com.querydsl.core.types.dsl.StringTemplate;
 
+
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 @Repository
 @RequiredArgsConstructor
@@ -24,6 +34,8 @@ public class LawRepositoryCustomImpl implements LawRepositoryCustom {
     private final JPAQueryFactory queryFactory;
 
     private QLaw law = QLaw.law;
+    private QJang jang = QJang.jang;
+    private QJo jo = QJo.jo;
 
     @Override
     public Page<LawsDto> searchLaws(LawSearchRequestDto searchRequest) {
@@ -70,6 +82,7 @@ public Page<LawsDto> searchLaws(LawSearchRequestDto searchRequest) {
 
         Pageable pageable = PageRequest.of(searchRequest.getPageNumber(), searchRequest.getPageSize());
 
+
         // DTO 프로젝션 조회
         JPAQuery<LawsDto> query = queryFactory
                 .select(Projections.constructor(
@@ -80,7 +93,8 @@ public Page<LawsDto> searchLaws(LawSearchRequestDto searchRequest) {
                         law.getMinistry(),
                         law.getPromulgationNumber(),
                         law.getPromulgationDate(),
-                        law.getEnforcementDate()
+                        law.getEnforcementDate(),
+                        Expressions.nullExpression(String.class)
                 ))
                 .from(law)
                 .where(builder)
@@ -89,6 +103,35 @@ public Page<LawsDto> searchLaws(LawSearchRequestDto searchRequest) {
 
         List<LawsDto> content = query.fetch();
 
+        if (content.isEmpty()) {
+            return new PageImpl<>(content, pageable, 0);
+        }
+
+        // 2. 조회한 법령 ID 목록 추출
+        List<Long> lawIds = content.stream()
+                .map(LawsDto::getId)
+                .collect(Collectors.toList());
+
+// 3. 법령별 첫 번째 조 내용 조회 - 반복문으로 각각 조회
+        Map<Long, String> firstJoContentMap = new HashMap<>();
+        for (Long lawId : lawIds) {
+            String firstJoContent = queryFactory
+                    .select(jo.getContent())
+                    .from(jo)
+                    .join(jo.getJang(), jang)
+                    .where(jang.getLaw().getId().eq(lawId))
+                    .orderBy(jang.getId().asc(), jo.getId().asc())
+                    .limit(1)
+                    .fetchOne();
+            firstJoContentMap.put(lawId, firstJoContent);
+        }
+
+        // 4. 조회 결과에 firstJoContent 세팅
+        content.forEach(dto -> {
+            String contentVal = firstJoContentMap.get(dto.getId());
+            dto.setFirstJoContent(contentVal != null ? contentVal : "");
+        });
+
         // 전체 개수 조회
         Long total = queryFactory
                 .select(law.count())
diff --git a/backend/src/main/java/com/ai/lawyer/domain/lawWord/controller/LawWordController.java b/backend/src/main/java/com/ai/lawyer/domain/lawWord/controller/LawWordController.java
@@ -3,6 +3,7 @@
 import com.ai.lawyer.domain.lawWord.service.LawWordService;
 import com.ai.lawyer.domain.precedent.entity.Precedent;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -13,6 +14,7 @@
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/api/law-word")
+@Tag(name = "법령 용어", description = "법령 용어 API")
 public class LawWordController {
 
     private final LawWordService lawWordService;
diff --git a/backend/src/main/java/com/ai/lawyer/domain/precedent/controller/PrecedentController.java b/backend/src/main/java/com/ai/lawyer/domain/precedent/controller/PrecedentController.java
@@ -6,6 +6,7 @@
 import com.ai.lawyer.domain.precedent.service.PrecedentService;
 import com.ai.lawyer.global.dto.PageResponseDto;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.http.ResponseEntity;
@@ -14,6 +15,7 @@
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/api/precedent")
+@Tag(name = "판례", description = "판례 API")
 public class PrecedentController {
 
     private final PrecedentService precedentService;
diff --git a/backend/src/main/java/com/ai/lawyer/domain/precedent/dto/PrecedentSummaryListDto.java b/backend/src/main/java/com/ai/lawyer/domain/precedent/dto/PrecedentSummaryListDto.java
@@ -12,4 +12,5 @@ public class PrecedentSummaryListDto {
     private String caseName;        // 사건명
     private String caseNumber;      // 사건번호
     private LocalDate sentencingDate; // 선고일자
+    private String contents;
 }
diff --git a/backend/src/main/java/com/ai/lawyer/domain/precedent/repository/PrecedentRepositoryImpl.java b/backend/src/main/java/com/ai/lawyer/domain/precedent/repository/PrecedentRepositoryImpl.java
@@ -5,6 +5,8 @@
 import com.ai.lawyer.domain.precedent.entity.QPrecedent;
 import com.querydsl.core.BooleanBuilder;
 import com.querydsl.core.types.Projections;
+import com.querydsl.core.types.dsl.CaseBuilder;
+import com.querydsl.core.types.dsl.StringExpression;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.*;
@@ -53,20 +55,66 @@ public Page<PrecedentSummaryListDto> searchPrecedentsByKeyword(PrecedentSearchRe
             return new PageImpl<>(Collections.emptyList(), pageable, 0);
         }
 
+        // CLOB 필드 조건: null 또는 빈 문자열("") 체크
+        StringExpression contents = new CaseBuilder()
+                // summaryOfTheJudgment가 null도 아니고, 빈 문자열도 아닐 때
+                .when(precedent.getSummaryOfTheJudgment().isNotNull()
+                        .and(precedent.getSummaryOfTheJudgment().ne("")))
+                .then(precedent.getSummaryOfTheJudgment())
+                // notice가 null도 아니고, 빈 문자열도 아닐 때
+                .when(precedent.getNotice().isNotNull()
+                        .and(precedent.getNotice().ne("")))
+                .then(precedent.getNotice())
+                // 그 외에는 precedentContent 전체
+                .otherwise(precedent.getPrecedentContent());
+
+
         // 2) 데이터 조회
         List<PrecedentSummaryListDto> content = queryFactory
                 .select(Projections.constructor(PrecedentSummaryListDto.class,
                         precedent.getId(),
                         precedent.getCaseName(),
                         precedent.getCaseNumber(),
-                        precedent.getSentencingDate()))
+                        precedent.getSentencingDate(),
+                        contents
+                ))
                 .from(precedent)
                 .where(builder)
                 .offset(pageable.getOffset())
                 .limit(pageable.getPageSize())
                 .orderBy(precedent.getSentencingDate().desc())
                 .fetch();
 
+        // Java에서 후처리: 빈 문자열 체크 및 【주문】부분 추출
+        content.forEach(dto -> {
+            String processedContents = processContents(dto.getContents());
+            dto.setContents(processedContents);
+        });
+
         return new PageImpl<>(content, pageable, total);
     }
+
+    private String processContents(String contents) {
+        if (contents == null || contents.trim().isEmpty()) {
+            return "";
+        }
+
+        // 이미 summaryOfTheJudgment나 notice가 있는 경우
+        if (!contents.contains("【주    문】")) {
+            return contents;
+        }
+
+        // precedentContent에서 【주문】부터 【이유】까지 추출
+        String startTag = "【주    문】";
+        String endTag = "【이    유】";
+
+        int startIndex = contents.indexOf(startTag);
+        int endIndex = contents.indexOf(endTag);
+
+        if (startIndex != -1 && endIndex != -1 && endIndex > startIndex) {
+            return contents.substring(startIndex, endIndex).trim();
+        }
+
+        return contents;
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -23,4 +23,6 @@ public class LawsDto {`
`23`	`23`	`private LocalDate promulgationDate; // 공포일자`
`24`	`24`
`25`	`25`	`private LocalDate enforcementDate; // 시행일자`
	`26`	`+`
	`27`	`+ private String firstJoContent; // 조`
`26`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,4 +12,5 @@ public class PrecedentSummaryListDto {`
`12`	`12`	`private String caseName; // 사건명`
`13`	`13`	`private String caseNumber; // 사건번호`
`14`	`14`	`private LocalDate sentencingDate; // 선고일자`
	`15`	`+ private String contents;`
`15`	`16`	`}`