dev 반영

Author: minjee2758

build.gradle

@@ -73,8 +73,9 @@ dependencies {
     // Mac에서 빌드시 필요한 의존성
     implementation 'io.netty:netty-resolver-dns-native-macos:4.1.121.Final:osx-aarch_64'
 
-    // actuator
+    // actuator + 프로메테우스
     implementation 'org.springframework.boot:spring-boot-starter-actuator'
+    runtimeOnly 'io.micrometer:micrometer-registry-prometheus'
 
     // elasticsearch + elasticsearch 쿼리빌더 dsl
     implementation 'org.springframework.boot:spring-boot-starter-data-elasticsearch'
@@ -99,7 +100,7 @@ dependencies {
     annotationProcessor 'com.querydsl:querydsl-apt:5.0.0:jakarta'
     annotationProcessor 'jakarta.persistence:jakarta.persistence-api:3.1.0'
     annotationProcessor 'jakarta.annotation:jakarta.annotation-api:2.1.1'
-    
+
     // mongodb
     implementation 'org.springframework.boot:spring-boot-starter-data-mongodb'
 
@@ -110,8 +111,12 @@ dependencies {
     //email-smtp
     implementation 'org.springframework.boot:spring-boot-starter-mail'
 
+    // S3 SDK
+    implementation 'org.springframework.cloud:spring-cloud-starter-aws:2.2.6.RELEASE'
+
     //AES 암호화
-    implementation 'javax.xml.bind:jaxb-api:2.3.1'}
+    implementation 'javax.xml.bind:jaxb-api:2.3.1'
+}
 
 tasks.named('test') {
     useJUnitPlatform()

src/main/java/org/ezcode/codetest/application/community/dto/response/DiscussionResponse.java

@@ -2,13 +2,18 @@
 
 import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.*;
 
+import java.time.LocalDateTime;
+
 import org.ezcode.codetest.application.usermanagement.user.dto.response.SimpleUserInfoResponse;
+import org.ezcode.codetest.domain.community.dto.DiscussionQueryResult;
 import org.ezcode.codetest.domain.community.model.entity.Discussion;
+import org.ezcode.codetest.domain.community.model.enums.VoteType;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 
-@Schema(name = "DiscussionResponse", description = "Discussion 조회 응답 DTO")
+@Schema(name = "DiscussionResponse", description = "Discussion 응답 DTO, 목록 조회 시에만 추천 수, 비추천 수 등의 데이터가 포함됨")
 public record DiscussionResponse(
+
 	@Schema(description = "Discussion 고유 ID", example = "123", requiredMode = REQUIRED)
 	Long discussionId,
 
@@ -18,20 +23,51 @@ public record DiscussionResponse(
 	@Schema(description = "관련 문제 ID", example = "45", requiredMode = REQUIRED)
 	Long problemId,
 
-	@Schema(description = "사용 언어명", example = "Java 17", requiredMode = REQUIRED)
-	String languages,
-
 	@Schema(description = "토론 내용", example = "이 문제는 이렇게 풀 수 있습니다...", requiredMode = REQUIRED)
-	String content
+	String content,
+
+	@Schema(description = "생성 일시", example = "2025-06-25T14:30:00", requiredMode = REQUIRED)
+	LocalDateTime createdAt,
+
+	@Schema(description = "총 추천 수 (upvote)", example = "10")
+	Long upvoteCount,
+
+	@Schema(description = "총 비추천 수 (downvote)", example = "2")
+	Long downvoteCount,
+
+	@Schema(description = "총 댓글 수", example = "5")
+	Long replyCount,
+
+	@Schema(description = "현재 사용자의 추천 상태 (UP, DOWN, NONE)", example = "UP")
+	VoteType voteStatus
+
 ) {
 
 	public static DiscussionResponse fromEntity(Discussion discussion) {
 		return new DiscussionResponse(
 			discussion.getId(),
 			SimpleUserInfoResponse.fromEntity(discussion.getUser()),
-			discussion.getProblem().getId(),	// 문제 id가 굳이 필요한가?
-			discussion.getLanguage().getName(),	// TODO: 가공해줘야 할듯?
-			discussion.getContent()
+			discussion.getProblem().getId(),
+			discussion.getContent(),
+			discussion.getCreatedAt(),
+			null,
+			null,
+			null,
+			null
+		);
+	}
+
+	public static DiscussionResponse from(DiscussionQueryResult result) {
+		return new DiscussionResponse(
+			result.getDiscussionId(),
+			result.getUserInfo(),
+			result.getProblemId(),
+			result.getContent(),
+			result.getCreatedAt(),
+			result.getUpvoteCount(),
+			result.getDownvoteCount(),
+			result.getReplyCount(),
+			result.getVoteStatus()
 		);
 	}
 }

src/main/java/org/ezcode/codetest/application/community/dto/response/ReplyResponse.java

@@ -2,18 +2,23 @@
 
 import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.*;
 
+import java.time.LocalDateTime;
+
 import org.ezcode.codetest.application.usermanagement.user.dto.response.SimpleUserInfoResponse;
+import org.ezcode.codetest.domain.community.dto.ReplyQueryResult;
 import org.ezcode.codetest.domain.community.model.entity.Reply;
+import org.ezcode.codetest.domain.community.model.enums.VoteType;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 
 @Schema(name = "ReplyResponse", description = "Reply 조회 응답 DTO")
 public record ReplyResponse(
+
 	@Schema(description = "Reply 고유 ID", example = "456", requiredMode = REQUIRED)
 	Long replyId,
 
 	@Schema(description = "부모 Reply ID (없으면 null)", example = "123", nullable = true, requiredMode = NOT_REQUIRED)
-	Long parentId,
+	Long parentReplyId,
 
 	@Schema(description = "소속 Discussion ID", example = "123", requiredMode = REQUIRED)
 	Long discussionId,
@@ -22,19 +27,58 @@ public record ReplyResponse(
 	SimpleUserInfoResponse userInfo,
 
 	@Schema(description = "댓글 내용", example = "동의합니다!", requiredMode = REQUIRED)
-	String content
+	String content,
+
+	@Schema(description = "생성 일시", example = "2025-06-25T14:30:00", requiredMode = REQUIRED)
+	LocalDateTime createdAt,
+
+	@Schema(description = "총 추천 수 (upvote)", example = "10")
+	Long upvoteCount,
+
+	@Schema(description = "총 비추천 수 (downvote)", example = "2")
+	Long downvoteCount,
+
+	@Schema(description = "총 댓글 수", example = "5")
+	Long childReplyCount,
+
+	@Schema(description = "현재 사용자의 추천 상태 (UP, DOWN, NONE)", example = "UP")
+	VoteType voteStatus
+
 ) {
 
 	public static ReplyResponse fromEntity(Reply reply) {
+
 		Long parentId = (reply.getParent() != null)
 			? reply.getParent().getId()
 			: null;
+
 		return new ReplyResponse(
 			reply.getId(),
 			parentId,
 			reply.getDiscussion().getId(),
 			SimpleUserInfoResponse.fromEntity(reply.getUser()),
-			reply.getContent()
+			reply.getContent(),
+			reply.getCreatedAt(),
+			null,
+			null,
+			null,
+			null
+		);
+	}
+
+	public static ReplyResponse from(ReplyQueryResult result) {
+
+		return new ReplyResponse(
+			result.getReplyId(),
+			result.getParentReplyId(),
+			result.getDiscussionId(),
+			result.getUserInfo(),
+			result.getContent(),
+			result.getCreatedAt(),
+			result.getUpvoteCount(),
+			result.getDownvoteCount(),
+			result.getChildReplyCount(),
+			result.getVoteStatus()
 		);
 	}
 }

src/main/java/org/ezcode/codetest/application/community/dto/response/VoteResponse.java

@@ -2,7 +2,7 @@
 
 import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.*;
 
-import org.ezcode.codetest.domain.community.model.VoteResult;
+import org.ezcode.codetest.domain.community.dto.VoteResult;
 import org.ezcode.codetest.domain.community.model.enums.VoteType;
 
 import io.swagger.v3.oas.annotations.media.Schema;

src/main/java/org/ezcode/codetest/application/community/service/BaseVoteService.java

@@ -1,7 +1,7 @@
 package org.ezcode.codetest.application.community.service;
 
 import org.ezcode.codetest.application.community.dto.response.VoteResponse;
-import org.ezcode.codetest.domain.community.model.VoteResult;
+import org.ezcode.codetest.domain.community.dto.VoteResult;
 import org.ezcode.codetest.domain.community.model.entity.BaseVote;
 import org.ezcode.codetest.domain.community.model.enums.VoteType;
 import org.ezcode.codetest.domain.community.service.BaseVoteDomainService;

src/main/java/org/ezcode/codetest/application/community/service/DiscussionService.java

@@ -3,6 +3,7 @@
 import org.ezcode.codetest.application.community.dto.request.DiscussionCreateRequest;
 import org.ezcode.codetest.application.community.dto.request.DiscussionModifyRequest;
 import org.ezcode.codetest.application.community.dto.response.DiscussionResponse;
+import org.ezcode.codetest.domain.community.dto.DiscussionQueryResult;
 import org.ezcode.codetest.domain.community.model.entity.Discussion;
 import org.ezcode.codetest.domain.community.service.DiscussionDomainService;
 import org.ezcode.codetest.domain.language.model.entity.Language;
@@ -40,10 +41,11 @@ public DiscussionResponse createDiscussion(Long problemId, DiscussionCreateReque
 	}
 
 	@Transactional(readOnly = true)
-	public Page<DiscussionResponse> getDiscussions(Long problemId, Pageable pageable) {
+	public Page<DiscussionResponse> getDiscussions(Long problemId, String sortBy, Long userId, Pageable pageable) {
 
-		Page<Discussion> discussionResponsePage = discussionDomainService.getAllDiscussionsByProblemId(problemId, pageable);
-		return discussionResponsePage.map(DiscussionResponse::fromEntity);
+		Page<DiscussionQueryResult> result =
+			discussionDomainService.getAllDiscussionsByProblemId(problemId, sortBy, userId, pageable);
+		return result.map(DiscussionResponse::from);
 	}
 
 	@Transactional

src/main/java/org/ezcode/codetest/application/community/service/ReplyService.java

@@ -7,6 +7,7 @@
 import org.ezcode.codetest.application.community.dto.response.ReplyResponse;
 import org.ezcode.codetest.application.notification.event.NotificationCreateEvent;
 import org.ezcode.codetest.application.notification.port.NotificationEventService;
+import org.ezcode.codetest.domain.community.dto.ReplyQueryResult;
 import org.ezcode.codetest.domain.community.model.entity.Discussion;
 import org.ezcode.codetest.domain.community.model.entity.Reply;
 import org.ezcode.codetest.domain.community.service.DiscussionDomainService;
@@ -58,28 +59,30 @@ public ReplyResponse createReply(
 	}
 
 	@Transactional(readOnly = true)
-	public Page<ReplyResponse> getReplies(Long problemId, Long discussionId, Pageable pageable) {
+	public Page<ReplyResponse> getReplies(Long problemId, Long discussionId, Long currentUserId, Pageable pageable) {
 
 		Discussion discussion = discussionDomainService.getDiscussionForProblem(discussionId, problemId);
 
-		Page<Reply> replies = replyDomainService.getRepliesByDiscussionId(discussion, pageable);
+		Page<ReplyQueryResult> replies = replyDomainService.getRepliesByDiscussionId(discussion, currentUserId, pageable);
 
-		return replies.map(ReplyResponse::fromEntity);
+		return replies.map(ReplyResponse::from);
 	}
 
 	@Transactional(readOnly = true)
 	public Page<ReplyResponse> getChildReplies(
 		Long problemId,
 		Long discussionId,
 		Long parentReplyId,
+		Long currentUserId,
 		Pageable pageable
 	) {
 
 		Discussion discussion = discussionDomainService.getDiscussionForProblem(discussionId, problemId);
 
-		Page<Reply> replies = replyDomainService.getRepliesByParentReplyId(parentReplyId, discussion, pageable);
+		Page<ReplyQueryResult> childReplies =
+			replyDomainService.getRepliesByParentReplyId(parentReplyId, discussion, currentUserId, pageable);
 
-		return replies.map(ReplyResponse::fromEntity);
+		return childReplies.map(ReplyResponse::from);
 	}
 
 	@Transactional

src/main/java/org/ezcode/codetest/application/problem/service/ProblemService.java

@@ -1,38 +1,51 @@
 package org.ezcode.codetest.application.problem.service;
 
 import org.ezcode.codetest.application.problem.dto.request.ProblemCreateRequest;
-import org.ezcode.codetest.domain.problem.model.ProblemSearchCondition;
 import org.ezcode.codetest.application.problem.dto.request.ProblemUpdateRequest;
 import org.ezcode.codetest.application.problem.dto.response.ProblemDetailResponse;
 import org.ezcode.codetest.application.problem.dto.response.ProblemResponse;
+import org.ezcode.codetest.domain.problem.model.ProblemSearchCondition;
 import org.ezcode.codetest.domain.problem.model.entity.Problem;
 import org.ezcode.codetest.domain.problem.service.ProblemDomainService;
 import org.ezcode.codetest.domain.user.model.entity.AuthUser;
 import org.ezcode.codetest.domain.user.model.entity.User;
 import org.ezcode.codetest.domain.user.service.UserDomainService;
+import org.ezcode.codetest.infrastructure.s3.S3Directory;
+import org.ezcode.codetest.infrastructure.s3.S3Uploader;
+import org.ezcode.codetest.infrastructure.s3.exception.S3Exception;
+import org.ezcode.codetest.infrastructure.s3.exception.code.S3ExceptionCode;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
 
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 
 @Service
 @RequiredArgsConstructor
+@Slf4j
 public class ProblemService {
 
 	private final ProblemDomainService problemDomainService;
 	private final UserDomainService userDomainService;
+	private final S3Uploader s3Uploader;
 
 	// 문제 생성 ( 관리자 )
 	@Transactional
-	public ProblemDetailResponse createProblem(ProblemCreateRequest requestDto, AuthUser authUser) {
+	public ProblemDetailResponse createProblem(ProblemCreateRequest requestDto, MultipartFile image, AuthUser authUser) {
 
 		User user = userDomainService.getUserById(authUser.getId());
 
-		Problem savedProblem = problemDomainService.createProblem(
-			ProblemCreateRequest.toEntity(requestDto, user)
-		);
+		Problem problem = ProblemCreateRequest.toEntity(requestDto, user);
+		Problem savedProblem = problemDomainService.createProblem(problem);
+
+		// 문제 이미지 있다면?
+		if (image != null && !image.isEmpty()) {
+			String imageUrl = uploadImageAfterTransaction(image, savedProblem.getId());
+			updateProblemWithImage(savedProblem.getId(), imageUrl);
+		}
 
 		return ProblemDetailResponse.from(savedProblem);
 	}
@@ -82,5 +95,20 @@ public void removeProblem(Long problemId) {
 
 		problemDomainService.removeProblem(findProblem);
 	}
+
+	@Transactional
+	public void updateProblemWithImage(Long problemId, String imageUrl) {
+		Problem problem = problemDomainService.getProblem(problemId);
+		problem.addImage(imageUrl);
+	}
+
+	private String uploadImageAfterTransaction(MultipartFile image, Long problemId) {
+		try {
+			return s3Uploader.upload(image, S3Directory.PROBLEM.getDir());
+		} catch (Exception e) {
+			log.error("Problem {} 이미지 업로드 실패", problemId, e);
+			throw new S3Exception(S3ExceptionCode.S3_UPLOAD_FAILED);
+		}
+	}
 }
 

src/main/java/org/ezcode/codetest/application/report/dto/ReportMyResponse.java

@@ -0,0 +1,29 @@
+package org.ezcode.codetest.application.report.dto;
+
+import org.ezcode.codetest.domain.report.model.Report;
+
+public record ReportMyResponse(
+        Long id,
+        Long targetId,
+        String targetType,
+        String reportType,
+        String reportStatus,
+        String message,
+        String imageUrl,
+        String resultMessage,
+        String createdAt
+) {
+    public static ReportMyResponse from(Report r) {
+        return new ReportMyResponse(
+                r.getId(),
+                r.getTargetId(),
+                r.getTargetType().name(),
+                r.getReportType().name(),
+                r.getReportStatus().name(),
+                r.getMessage(),
+                r.getImageUrl(),
+                r.getResultMessage(),
+                r.getCreatedAt().toString()
+        );
+    }
+}