Merge branch 'main' into feat/evaluation

Author: Hyeseung-OH

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

@@ -3,6 +3,8 @@
 import com.backend.domain.analysis.entity.AnalysisResult;
 import com.backend.domain.analysis.entity.Score;
 
+import java.time.LocalDateTime;
+
 /**
  * 특정 분석 결과의 상세 정보 응답 DTO
  * 분석 점수, 피드백 등을 포함
@@ -15,7 +17,8 @@ public record AnalysisResultResponseDto(
     int cicdScore,
     String summary,
     String strengths,
-    String improvements
+    String improvements,
+    LocalDateTime createDate
 ) {
     public AnalysisResultResponseDto(AnalysisResult analysisResult, Score score){
         this(
@@ -26,7 +29,8 @@ public AnalysisResultResponseDto(AnalysisResult analysisResult, Score score){
                 score.getCicdScore(),
                 analysisResult.getSummary(),
                 analysisResult.getStrengths(),
-                analysisResult.getImprovements()
+                analysisResult.getImprovements(),
+                analysisResult.getCreateDate()
         );
     }
 }

backend/src/main/java/com/backend/domain/community/dto/response/CommunityResponseDto.java

@@ -9,8 +9,9 @@
 
 public record CommunityResponseDto(
         String userName,
-        String userIamge,
+        String userImage,
         String repositoryName,
+        Long repositoryId,
         String summary,
         List<String> language,
         int totalScore,
@@ -21,6 +22,7 @@ public CommunityResponseDto(Repositories repositories, AnalysisResult analysis,
                 repositories.getUser().getName(),
                 repositories.getUser().getImageUrl(),
                 repositories.getName(),
+                repositories.getId(),
                 analysis.getSummary(),
                 repositories.getLanguages().stream()
                         .map(language -> language.getLanguage().name())

backend/src/main/java/com/backend/domain/community/repository/CommentRepository.java

@@ -10,4 +10,5 @@
 @Repository
 public interface CommentRepository extends JpaRepository<Comment, Long> {
     List<Comment> findByAnalysisResult_Id(Long analysisResultId);
+    List<Comment> findByAnalysisResultIdOrderByIdDesc(Long analysisResultId);
 }

backend/src/main/java/com/backend/domain/community/service/CommunityService.java

@@ -50,9 +50,14 @@ public Comment addComment(Long analysisResultId, Long memberId, String content)
         return commentRepository.save(comment);
     }
 
-    // 특정 분석 결과의 댓글 조회
+//    // 특정 분석 결과의 댓글 조회
+//    public List<Comment> getCommentsByAnalysisResult(Long analysisResultId) {
+//        return commentRepository.findByAnalysisResult_Id(analysisResultId);
+//    }
+
     public List<Comment> getCommentsByAnalysisResult(Long analysisResultId) {
-        return commentRepository.findByAnalysisResult_Id(analysisResultId);
+        // id 내림차순으로 정렬된 댓글 리스트 반환
+        return commentRepository.findByAnalysisResultIdOrderByIdDesc(analysisResultId);
     }
 
     // 댓글 삭제

backend/src/main/java/com/backend/domain/repository/dto/response/RepositoryResponse.java

@@ -2,6 +2,7 @@
 
 import com.backend.domain.repository.entity.Repositories;
 
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -16,7 +17,8 @@ public record RepositoryResponse(
         String htmlUrl,
         boolean publicRepository,
         String mainBranch,
-        List<String> languages
+        List<String> languages,
+        LocalDateTime createDate
 ) {
     public RepositoryResponse(Repositories repositories) {
         this(
@@ -28,7 +30,8 @@ public RepositoryResponse(Repositories repositories) {
                 repositories.getMainBranch(),
                 repositories.getLanguages().stream()
                         .map(lang -> lang.getLanguage().name())
-                        .collect(Collectors.toList())
+                        .collect(Collectors.toList()),
+                repositories.getCreateDate()
         );
     }
 }

backend/src/main/resources/application.yml

@@ -43,8 +43,8 @@ github:
 
 jwt:
   secret: ${SECRET_KEY}
-  access-token-expiration-in-milliseconds: 600000 # 600 * 1000
+  access-token-expiration-in-milliseconds: 7200000 # 두 시간
 
 openai:
   api:
-    key: ${OPENAI_API_KEY}
+    key: ${OPENAI_API_KEY}