Merge branch 'main' into feat/evaluation

Author: samuel426

backend/src/main/java/com/backend/domain/analysis/controller/AnalysisController.java

@@ -1,16 +1,13 @@
 package com.backend.domain.analysis.controller;
 
-import com.backend.domain.analysis.dto.HistoryResponseDto;
+import com.backend.domain.analysis.dto.response.AnalysisResultResponseDto;
+import com.backend.domain.analysis.dto.response.HistoryResponseDto;
 import com.backend.domain.analysis.dto.request.AnalysisRequest;
 import com.backend.domain.analysis.entity.AnalysisResult;
 import com.backend.domain.analysis.entity.Score;
 import com.backend.domain.analysis.service.AnalysisService;
-import com.backend.domain.repository.entity.Language;
 import com.backend.domain.repository.entity.Repositories;
-import com.backend.domain.repository.entity.RepositoryLanguage;
 import com.backend.domain.repository.service.RepositoryService;
-import com.backend.global.exception.BusinessException;
-import com.backend.global.exception.ErrorCode;
 import com.backend.global.response.ApiResponse;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
@@ -34,14 +31,14 @@ public ResponseEntity<ApiResponse<Void>> analyzeRepository(@RequestBody Analysis
         return ResponseEntity.ok(ApiResponse.success());
     }
 
-    @GetMapping("/user/{memberId}")
+    @GetMapping("/user/repository/{memberId}")
     @Transactional(readOnly = true)
     public ResponseEntity<List<HistoryResponseDto>> getMemberHistory(@PathVariable Long memberId){
         List<Repositories> repositories = repositoryService.findRepositoryByMember(memberId);
         List<HistoryResponseDto> historyList = new ArrayList<>();
 
         for (Repositories repo : repositories) {
-            Optional<AnalysisResult> optionalAnalysis = analysisService.findAnalysisResultByRepositoryId(repo.getId());
+            Optional<AnalysisResult> optionalAnalysis = analysisService.findByRepositoryId(repo.getId());
 
             if (optionalAnalysis.isPresent()) { // 존재하는지 확인
                 AnalysisResult analysisResult = optionalAnalysis.get();
@@ -62,4 +59,20 @@ public ResponseEntity<List<HistoryResponseDto>> getMemberHistory(@PathVariable L
 
         return ResponseEntity.ok(historyList);
     }
+
+    @GetMapping("repository/{repositoriesId}")
+    @Transactional(readOnly = true)
+    public ResponseEntity<List<AnalysisResultResponseDto>> getAnalysisByRepositoriesId(@PathVariable("repositoriesId") Long repoId){
+        List<AnalysisResult> optionalResult = analysisService.getAnalysisResultList(repoId);
+        List<AnalysisResultResponseDto> resultList = new ArrayList<>();
+
+
+        for(AnalysisResult result : optionalResult){
+            Score score = result.getScore();
+            AnalysisResultResponseDto dto = new AnalysisResultResponseDto(result, score);
+            resultList.add(dto);
+        }
+
+        return ResponseEntity.ok(resultList);
+    }
 }

backend/src/main/java/com/backend/domain/analysis/dto/response/AnalysisResultResponseDto.java

@@ -0,0 +1,28 @@
+package com.backend.domain.analysis.dto.response;
+
+import com.backend.domain.analysis.entity.AnalysisResult;
+import com.backend.domain.analysis.entity.Score;
+
+public record AnalysisResultResponseDto(
+    int totalScore,
+    int readmeScore,
+    int testScore,
+    int commitScore,
+    int cicdScore,
+    String summery,
+    String strengths,
+    String improvements
+) {
+    public AnalysisResultResponseDto(AnalysisResult analysisResult, Score score){
+        this(
+                score.getTotalScore(),
+                score.getReadmeScore(),
+                score.getTestScore(),
+                score.getCommitScore(),
+                score.getCicdScore(),
+                analysisResult.getSummary(),
+                analysisResult.getStrengths(),
+                analysisResult.getImprovements()
+        );
+    }
+}

backend/src/main/java/com/backend/domain/analysis/dto/HistoryResponseDto.java renamed to backend/src/main/java/com/backend/domain/analysis/dto/response/HistoryResponseDto.java

@@ -1,9 +1,8 @@
-package com.backend.domain.analysis.dto;
+package com.backend.domain.analysis.dto.response;
 
 import com.backend.domain.analysis.entity.AnalysisResult;
 import com.backend.domain.analysis.entity.Score;
 import com.backend.domain.repository.entity.Repositories;
-import com.backend.domain.repository.entity.RepositoryLanguage;
 
 import java.time.LocalDateTime;
 import java.util.List;

backend/src/main/java/com/backend/domain/analysis/repository/AnalysisResultRepository.java

@@ -10,4 +10,5 @@
 @Repository
 public interface AnalysisResultRepository extends JpaRepository <AnalysisResult, Long>{
     Optional<AnalysisResult> findByRepositoriesId(Long repositoryId);
+    List<AnalysisResult> findAnalysisResultByRepositoriesId(Long repositoryId);
 }

backend/src/main/java/com/backend/domain/analysis/service/AnalysisService.java

@@ -10,6 +10,8 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
 import java.util.Optional;
 
 @Slf4j
@@ -57,7 +59,12 @@ private String[] parseGitHubUrl(String githubUrl) {
     }
 
     // AnalysisRresult에서 repository id로 분석 결과 찾기
-    public Optional<AnalysisResult> findAnalysisResultByRepositoryId (Long RepositoryId){
+    public Optional<AnalysisResult> findByRepositoryId(Long RepositoryId) {
         return analysisResultRepository.findByRepositoriesId(RepositoryId);
     }
+
+    // AnalysisResult를 list로 반환
+    public List<AnalysisResult> getAnalysisResultList(Long RepositoryId){
+        return analysisResultRepository.findAnalysisResultByRepositoriesId(RepositoryId);
+    }
 }

front/components.json

@@ -0,0 +1,22 @@
+{
+  "$schema": "https://ui.shadcn.com/schema.json",
+  "style": "new-york",
+  "rsc": true,
+  "tsx": true,
+  "tailwind": {
+    "config": "tailwind.config.js",
+    "css": "src/styles/globals.css",
+    "baseColor": "neutral",
+    "cssVariables": true,
+    "prefix": ""
+  },
+  "iconLibrary": "lucide",
+  "aliases": {
+    "components": "@/components",
+    "utils": "@/lib/utils",
+    "ui": "@/components/ui",
+    "lib": "@/lib",
+    "hooks": "@/hooks"
+  },
+  "registries": {}
+}