Merge pull request #89 from SWM-Flash/integration

Integration

src/main/java/com/first/flash/account/member/application/ReportService.java

@@ -25,8 +25,9 @@ public MemberReportResponse reportMember(final Long reportedContentId,
         UUID reporterId = AuthUtil.getId();
         Member reporter = memberService.findById(reporterId);
         MemberReport memberReport = MemberReport.reportContent(request.reason(), reporter,
-            reportedContentId);
-        reportRepository.save(memberReport);
-        return MemberReportResponse.toDto(reportedContentId, request.reason());
+            reportedContentId, request.contentType());
+        MemberReport savedReport = reportRepository.save(memberReport);
+        return MemberReportResponse.toDto(savedReport.getReportedContentId(),
+            savedReport.getContentType(), savedReport.getReason());
     }
 }

src/main/java/com/first/flash/account/member/application/dto/MemberReportRequest.java

@@ -1,7 +1,11 @@
 package com.first.flash.account.member.application.dto;
 
+import com.first.flash.account.member.domain.ContentType;
+import com.first.flash.global.annotation.ValidEnum;
 import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
 
-public record MemberReportRequest(@NotEmpty(message = "신고 사유는 필수입니다.") String reason) {
+public record MemberReportRequest(@NotEmpty(message = "신고 사유는 필수입니다.") String reason,
+                                  @NotNull(message = "콘텐츠 타입은 필수입니다.") @ValidEnum(enumClass = ContentType.class) ContentType contentType) {
 
 }

src/main/java/com/first/flash/account/member/application/dto/MemberReportResponse.java

@@ -1,8 +1,11 @@
 package com.first.flash.account.member.application.dto;
 
-public record MemberReportResponse(Long reportedContentId, String reason) {
+import com.first.flash.account.member.domain.ContentType;
 
-    public static MemberReportResponse toDto(final Long reportedContentId, final String reason) {
-        return new MemberReportResponse(reportedContentId, reason);
+public record MemberReportResponse(Long reportedContentId, String contentType, String reason) {
+
+    public static MemberReportResponse toDto(final Long reportedContentId,
+        final ContentType contentType, final String reason) {
+        return new MemberReportResponse(reportedContentId, contentType.name(), reason);
     }
 }

src/main/java/com/first/flash/account/member/domain/ContentType.java

@@ -0,0 +1,8 @@
+package com.first.flash.account.member.domain;
+
+import lombok.ToString;
+
+@ToString
+public enum ContentType {
+    SOLUTION, COMMENT;
+}

src/main/java/com/first/flash/account/member/domain/MemberReport.java

@@ -3,6 +3,8 @@
 import com.first.flash.global.domain.BaseEntity;
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
 import jakarta.persistence.FetchType;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
@@ -27,15 +29,19 @@ public class MemberReport extends BaseEntity {
     @JoinColumn(name = "reporterId")
     private Member reporter;
     private Long reportedContentId;
+    @Enumerated(EnumType.STRING)
+    private ContentType contentType;
 
-    private MemberReport(final String reason, final Member reporter, final Long reportedContentId) {
+    private MemberReport(final String reason, final Member reporter, final Long reportedContentId,
+        final ContentType contentType) {
         this.reason = reason;
         this.reporter = reporter;
         this.reportedContentId = reportedContentId;
+        this.contentType = contentType;
     }
 
     public static MemberReport reportContent(final String reason, final Member reporter,
-        final Long reportedContentId) {
-        return new MemberReport(reason, reporter, reportedContentId);
+        final Long reportedContentId, final ContentType contentType) {
+        return new MemberReport(reason, reporter, reportedContentId, contentType);
     }
 }

src/main/java/com/first/flash/climbing/solution/application/SolutionService.java

@@ -12,12 +12,11 @@
 import com.first.flash.climbing.solution.domain.Solution;
 import com.first.flash.climbing.solution.domain.SolutionDeletedEvent;
 import com.first.flash.climbing.solution.domain.SolutionRepository;
-import com.first.flash.climbing.solution.domain.SolutionSavedEvent;
+import com.first.flash.climbing.solution.domain.dto.SolutionResponseDto;
 import com.first.flash.climbing.solution.exception.exceptions.SolutionAccessDeniedException;
 import com.first.flash.climbing.solution.exception.exceptions.SolutionNotFoundException;
 import com.first.flash.climbing.solution.infrastructure.dto.DetailSolutionDto;
 import com.first.flash.climbing.solution.infrastructure.dto.MySolutionDto;
-import com.first.flash.climbing.solution.infrastructure.dto.SolutionResponseDto;
 import com.first.flash.climbing.solution.infrastructure.paging.SolutionCursor;
 import com.first.flash.global.event.Events;
 import com.first.flash.global.util.AuthUtil;
@@ -49,8 +48,9 @@ public SolutionsResponseDto findAllSolutionsByProblemId(final UUID problemId) {
         Events.raise(ProblemIdConfirmRequestedEvent.of(problemId));
         List<UUID> blockedMembers = blockService.findBlockedMembers();
         List<SolutionResponseDto> solutions = solutionRepository.findAllByProblemId(problemId,
-            AuthUtil.getId(), blockedMembers);
-
+                                                                    blockedMembers).stream()
+                                                                .map(SolutionResponseDto::from)
+                                                                .toList();
         return SolutionsResponseDto.of(solutions);
     }
 

src/main/java/com/first/flash/climbing/solution/application/dto/SolutionsResponseDto.java

@@ -1,6 +1,6 @@
 package com.first.flash.climbing.solution.application.dto;
 
-import com.first.flash.climbing.solution.infrastructure.dto.SolutionResponseDto;
+import com.first.flash.climbing.solution.domain.dto.SolutionResponseDto;
 import java.util.List;
 
 public record SolutionsResponseDto(List<SolutionResponseDto> solutions,

src/main/java/com/first/flash/climbing/solution/domain/SolutionRepository.java

@@ -2,7 +2,7 @@
 
 import com.first.flash.climbing.solution.infrastructure.dto.DetailSolutionDto;
 import com.first.flash.climbing.solution.infrastructure.dto.MySolutionDto;
-import com.first.flash.climbing.solution.infrastructure.dto.SolutionResponseDto;
+import com.first.flash.climbing.solution.infrastructure.dto.SolutionRepositoryResponseDto;
 import com.first.flash.climbing.solution.infrastructure.paging.SolutionCursor;
 import java.util.List;
 import java.util.Optional;
@@ -14,7 +14,7 @@ public interface SolutionRepository {
 
     Optional<Solution> findById(final Long id);
 
-    List<SolutionResponseDto> findAllByProblemId(final UUID problemId, final UUID memberId,
+    List<SolutionRepositoryResponseDto> findAllByProblemId(final UUID problemId,
         final List<UUID> blockedMembers);
 
     void deleteById(final Long id);

src/main/java/com/first/flash/climbing/solution/domain/dto/SolutionResponseDto.java

@@ -0,0 +1,19 @@
+package com.first.flash.climbing.solution.domain.dto;
+
+import com.first.flash.climbing.solution.infrastructure.dto.SolutionRepositoryResponseDto;
+import com.first.flash.global.util.AuthUtil;
+import java.util.UUID;
+
+public record SolutionResponseDto(Long id, String uploader, String review, String instagramId,
+                                  String videoUrl, UUID uploaderId, Boolean isUploader,
+                                  String profileImageUrl, Long commentCount) {
+
+    public static SolutionResponseDto from(
+        final SolutionRepositoryResponseDto repositoryResponseDto) {
+        return new SolutionResponseDto(repositoryResponseDto.id(), repositoryResponseDto.uploader(),
+            repositoryResponseDto.review(), repositoryResponseDto.instagramId(),
+            repositoryResponseDto.videoUrl(), repositoryResponseDto.uploaderId(),
+            AuthUtil.isSameId(repositoryResponseDto.uploaderId()),
+            repositoryResponseDto.profileImageUrl(), repositoryResponseDto.commentCount());
+    }
+}

src/main/java/com/first/flash/climbing/solution/infrastructure/SolutionQueryDslRepository.java

@@ -6,7 +6,7 @@
 
 import com.first.flash.climbing.solution.infrastructure.dto.DetailSolutionDto;
 import com.first.flash.climbing.solution.infrastructure.dto.MySolutionDto;
-import com.first.flash.climbing.solution.infrastructure.dto.SolutionResponseDto;
+import com.first.flash.climbing.solution.infrastructure.dto.SolutionRepositoryResponseDto;
 import com.first.flash.climbing.solution.infrastructure.paging.SolutionCursor;
 import com.querydsl.core.types.Projections;
 import com.querydsl.core.types.dsl.BooleanExpression;
@@ -24,13 +24,13 @@ public class SolutionQueryDslRepository {
 
     private final JPAQueryFactory jpaQueryFactory;
 
-    public List<SolutionResponseDto> findAllExcludedBlockedMembers(final UUID problemId,
-        final UUID memberId, final List<UUID> memberIds) {
-        return jpaQueryFactory.select(Projections.constructor(SolutionResponseDto.class,
+    public List<SolutionRepositoryResponseDto> findAllExcludedBlockedMembers(final UUID problemId,
+        final List<UUID> memberIds) {
+        return jpaQueryFactory.select(Projections.constructor(SolutionRepositoryResponseDto.class,
                                   solution.id, solution.uploaderDetail.uploader, solution.solutionDetail.review,
                                   solution.uploaderDetail.instagramId, solution.solutionDetail.videoUrl,
-                                  solution.uploaderDetail.uploaderId, solution.uploaderDetail.uploaderId.eq(memberId),
-                                  solution.uploaderDetail.profileImageUrl, solutionComment.count()
+                                  solution.uploaderDetail.uploaderId, solution.uploaderDetail.profileImageUrl,
+                                  solutionComment.count()
                               ))
                               .from(solution)
                               .leftJoin(solutionComment)

src/main/java/com/first/flash/climbing/solution/infrastructure/SolutionRepositoryImpl.java

@@ -4,7 +4,7 @@
 import com.first.flash.climbing.solution.domain.SolutionRepository;
 import com.first.flash.climbing.solution.infrastructure.dto.DetailSolutionDto;
 import com.first.flash.climbing.solution.infrastructure.dto.MySolutionDto;
-import com.first.flash.climbing.solution.infrastructure.dto.SolutionResponseDto;
+import com.first.flash.climbing.solution.infrastructure.dto.SolutionRepositoryResponseDto;
 import com.first.flash.climbing.solution.infrastructure.paging.SolutionCursor;
 import java.util.List;
 import java.util.Optional;
@@ -30,10 +30,10 @@ public Optional<Solution> findById(final Long id) {
     }
 
     @Override
-    public List<SolutionResponseDto> findAllByProblemId(final UUID problemId,
-        final UUID memberId, final List<UUID> blockedMembers) {
+    public List<SolutionRepositoryResponseDto> findAllByProblemId(final UUID problemId,
+        final List<UUID> blockedMembers) {
         return solutionQueryDslRepository.findAllExcludedBlockedMembers(
-            problemId, memberId, blockedMembers);
+            problemId, blockedMembers);
     }
 
     @Override

src/main/java/com/first/flash/climbing/solution/infrastructure/dto/SolutionRepositoryResponseDto.java

@@ -0,0 +1,9 @@
+package com.first.flash.climbing.solution.infrastructure.dto;
+
+import java.util.UUID;
+
+public record SolutionRepositoryResponseDto(Long id, String uploader, String review,
+                                            String instagramId, String videoUrl, UUID uploaderId,
+                                            String profileImageUrl, Long commentCount) {
+
+}

src/main/java/com/first/flash/climbing/solution/ui/SolutionCommentController.java

@@ -6,7 +6,7 @@
 import com.first.flash.climbing.solution.application.dto.SolutionCommentResponseDto;
 import com.first.flash.climbing.solution.application.dto.SolutionCommentUpdateRequestDto;
 import com.first.flash.climbing.solution.application.dto.SolutionCommentsResponseDto;
-import com.first.flash.climbing.solution.infrastructure.dto.SolutionResponseDto;
+import com.first.flash.climbing.solution.infrastructure.dto.SolutionRepositoryResponseDto;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.ExampleObject;
@@ -76,7 +76,7 @@ public ResponseEntity<SolutionCommentsResponseDto> getSolutionComments(
     @Operation(summary = "댓글 수정", description = "내 댓글 수정")
     @ApiResponses(value = {
         @ApiResponse(responseCode = "200", description = "성공적으로 댓글을 수정함",
-            content = @Content(mediaType = "application/json", schema = @Schema(implementation = SolutionResponseDto.class))),
+            content = @Content(mediaType = "application/json", schema = @Schema(implementation = SolutionRepositoryResponseDto.class))),
         @ApiResponse(responseCode = "400", description = "유효하지 않은 요청 형식",
             content = @Content(mediaType = "application/json", examples = {
                 @ExampleObject(name = "요청값 누락", value = "{\"error\": \"content는 필수입니다.\"}"),