Merge pull request #99 from Capstone-OpenStep/feature/#89-xp-api

Refactor: 사용자 맞춤 이슈 추천 조건 완화 및 로그 개선

Author: ParkJh38

src/main/java/com/chungang/capstone/openstep/domain/Issue/service/IssueQueryService.java

@@ -84,12 +84,13 @@ public List<Issue> getSuggestedIssues(Member member) {
         issueCacheService.evict(memberId);
         issueCacheService.evictInterestHash(memberId);
 
+        //List<Repo> suggestedRepos = repoQueryService.getSuggestedReposBySplitQuery(memberId);
         List<Repo> suggestedRepos = repoQueryService.getSuggestedRepos(memberId);
         log.info("[ISSUE_RECOMMEND] Suggested repos count = {}", suggestedRepos.size());
 
         List<Issue> collectedIssues = new ArrayList<>();
         List<Issue> fallbackIssues = new ArrayList<>();
-        OffsetDateTime threeMonthsAgo = OffsetDateTime.now().minusMonths(3);
+        OffsetDateTime threeMonthsAgo = OffsetDateTime.now().minusMonths(9);
 
         for (Repo repo : suggestedRepos) {
             String owner = repo.getOwnerName();
@@ -104,6 +105,9 @@ public List<Issue> getSuggestedIssues(Member member) {
 
             List<GitHubIssueResponse.IssueNode> nodes = response.getData().getRepository().getIssues().getNodes();
 
+            int repoCollected = 0;
+            int repoFallback = 0;
+
             for (GitHubIssueResponse.IssueNode node : nodes) {
                 OffsetDateTime updatedAt = OffsetDateTime.parse(node.getUpdatedAt());
                 if (updatedAt.isBefore(threeMonthsAgo)) continue;
@@ -144,14 +148,18 @@ public List<Issue> getSuggestedIssues(Member member) {
                         );
                 if (isBeginnerLabel) {
                     collectedIssues.add(issue);
+                    repoCollected++;
                 } else {
                     fallbackIssues.add(issue);
+                    repoFallback++;
                 }
                 if (collectedIssues.size() >= 50) break;
             }
+            log.info("[ISSUE_RECOMMEND] Repo: {} -> Collected: {}, Fallback: {}", name, repoCollected, repoFallback);
             if (collectedIssues.size() >= 50) break;
         }
 
+        // 상위 추천 20개로 구성
         int need = 20;
         List<Issue> top20 = collectedIssues.stream()
                 .sorted(Comparator.comparing(Issue::getUpdatedAt).reversed())
@@ -168,6 +176,7 @@ public List<Issue> getSuggestedIssues(Member member) {
         }
 
         // 요약 + 저장 (중복 방지 포함)
+        log.info("[ISSUE_RECOMMEND] Recommended Issues:");
         List<Issue> summarized = top20.stream()
                 .map(issue -> {
                     String summary;
@@ -179,18 +188,21 @@ public List<Issue> getSuggestedIssues(Member member) {
                         summary = "요약을 생성할 수 없습니다.";
                     }
                     issue.setSummary(summary);
+                    log.info(" - [{}] {} ({})", issue.getIssueId(), issue.getTitle(), issue.getGithubUrl());
+
                     // 중복 저장 방지
                     return issueRepository.findByGithubUrl(issue.getGithubUrl())
                             .orElseGet(() -> issueRepository.save(issue));
                 })
                 .toList();
 
-        issueCacheService.saveRecommendedIssues(memberId, summarized);
-        log.info("[ISSUE_RECOMMEND] Final recommended issues count = {}", summarized.size());
-
-        // 저장
+        // 캐시 저장
         issueCacheService.saveRecommendedIssues(memberId, summarized);
         issueCacheService.saveInterestHash(memberId, currentHash);
+        log.info("[ISSUE_RECOMMEND] Final recommended issues count = {}", summarized.size());
+        if (summarized.size() < 20) {
+            log.warn("[ISSUE_RECOMMEND] WARNING: Recommended issue count below target ({} / 20)", summarized.size());
+        }
         return summarized;
     }
 

src/main/java/com/chungang/capstone/openstep/domain/Repo/service/RepoQueryService.java

@@ -119,7 +119,7 @@ public List<Repo> getSuggestedRepos(Long memberId) {
 
                 String query = GitHubQueryBuilder.buildSearchQuery(List.of(lang), List.of(domain));
                 GitHubRepoResponse response = gitHubGraphQLService.searchRepositories(query);
-                List<Repo> parsed = parseResponseAndSave(response).stream().limit(10).toList();
+                List<Repo> parsed = parseResponseAndSave(response).stream().limit(30).toList();
 
                 repoCacheService.saveReposByLanguageAndDomain(lang, domain, parsed);
                 parsed.forEach(repo -> repoMap.putIfAbsent(repo.getGithubUrl(), repo));
@@ -135,7 +135,7 @@ public List<Repo> getSuggestedRepos(Long memberId) {
 
         List<Repo> sorted = repoMap.values().stream()
                 .sorted(Comparator.comparingInt(r -> -1 * (r.getStars() + r.getBeginnerIssueCount())))
-                .limit(20)
+                .limit(30)
                 .toList();
 
         repoCacheService.saveRecommendedRepos(memberId, sorted);
@@ -163,7 +163,7 @@ private List<Repo> parseResponseAndSave(GitHubRepoResponse response) {
 
         List<Repo> strictFiltered = allNodes.stream()
                 .filter(node -> node.getBeginnerIssueCount() >= 1)
-                .filter(node -> node.getOpenIssuesCount() > 0)
+                //.filter(node -> node.getOpenIssuesCount() > 0)
                 //.filter(node -> node.getStargazerCount() < 100000)
                 .filter(node -> isUpdatedWithin36Months(node.getUpdatedAt()))
                 .map(this::saveIfNotExists)
@@ -173,10 +173,10 @@ private List<Repo> parseResponseAndSave(GitHubRepoResponse response) {
 
         return allNodes.stream()
                 .filter(node -> node.getBeginnerIssueCount() >= 0)
-                .filter(node -> node.getOpenIssuesCount() > 0)
+                //.filter(node -> node.getOpenIssuesCount() > 0)
                 .filter(node -> isUpdatedWithin36Months(node.getUpdatedAt()))
                 .map(this::saveIfNotExists)
-                .limit(10)
+                .limit(30)
                 .collect(Collectors.toList());
     }