218 댓글 신고 crud - Report 분리

src/main/java/org/prgms/locomocoserver/global/common/BaseEntity.java

@@ -4,6 +4,7 @@
 import jakarta.persistence.EntityListeners;
 import jakarta.persistence.MappedSuperclass;
 import lombok.Getter;
+import lombok.experimental.SuperBuilder;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.annotation.LastModifiedDate;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;

src/main/java/org/prgms/locomocoserver/replies/domain/Reply.java

@@ -19,7 +19,7 @@
 
 @Entity
 @Getter
-@Table(name = "mogakko")
+@Table(name = "replies")
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 public class Reply extends BaseEntity {
 

src/main/java/org/prgms/locomocoserver/replies/domain/ReplyRepository.java

@@ -2,6 +2,8 @@
 
 import org.springframework.data.jpa.repository.JpaRepository;
 
-public interface ReplyRepository extends JpaRepository<Reply, Long> {
+import java.util.Optional;
 
+public interface ReplyRepository extends JpaRepository<Reply, Long> {
+    Optional<Reply> findByIdAndDeletedAtIsNull(Long id);
 }

src/main/java/org/prgms/locomocoserver/report/application/ReplyReportService.java

@@ -0,0 +1,68 @@
+package org.prgms.locomocoserver.report.application;
+
+import lombok.RequiredArgsConstructor;
+import org.prgms.locomocoserver.replies.domain.Reply;
+import org.prgms.locomocoserver.replies.domain.ReplyRepository;
+import org.prgms.locomocoserver.report.domain.ReplyReport;
+import org.prgms.locomocoserver.report.domain.ReplyReportRepository;
+import org.prgms.locomocoserver.report.domain.Report;
+import org.prgms.locomocoserver.report.dto.ReplyReportDto;
+import org.prgms.locomocoserver.report.dto.request.ReplyReportCreateRequest;
+import org.prgms.locomocoserver.report.dto.request.ReplyReportUpdateRequest;
+import org.prgms.locomocoserver.report.exception.ReportErrorType;
+import org.prgms.locomocoserver.report.exception.ReportException;
+import org.prgms.locomocoserver.user.application.UserService;
+import org.prgms.locomocoserver.user.domain.User;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+@Service
+@RequiredArgsConstructor
+public class ReplyReportService {
+
+    private final ReplyReportRepository replyReportRepository;
+    private final UserService userService;
+    private final ReplyRepository replyRepository;
+
+    public ReplyReportDto create(ReplyReportCreateRequest request) {
+        User reporter = userService.getById(request.userId());
+        Reply reply = replyRepository.findByIdAndDeletedAtIsNull(request.replyId())
+                .orElseThrow(() -> new ReportException(ReportErrorType.REPLY_NOT_FOUND));
+        ReplyReport replyReport = replyReportRepository.save(request.toEntity(reporter, reply, request.content()));
+
+        return ReplyReportDto.of(replyReport);
+    }
+
+    @Transactional
+    public ReplyReportDto update(Long id, ReplyReportUpdateRequest request) {
+        ReplyReport replyReport = getById(id);
+
+        if(!replyReport.getReporter().getId().equals(request.reporterId())) {
+            throw new ReportException(ReportErrorType.AUTH_NOT_ALLOWED);
+        }
+        replyReport.updateContent(request.content());
+
+        return ReplyReportDto.of(replyReport);
+    }
+
+    @Transactional(readOnly = true)
+    public List<ReplyReportDto> getAllReplyReports(Long cursor, int pageSize) {
+        return replyReportRepository.findAllByDeletedAtIsNull(cursor, pageSize).stream()
+                .map(replyReport -> ReplyReportDto.of(replyReport))
+                .toList();
+    }
+
+    @Transactional
+    public void delete(Long id) {
+        ReplyReport replyReport = getById(id);
+        replyReport.delete();
+    }
+
+    @Transactional(readOnly = true)
+    public ReplyReport getById(Long id) {
+        return replyReportRepository.findByIdAndDeletedAtIsNull(id)
+                .orElseThrow(() -> new ReportException(ReportErrorType.REPORT_NOT_FOUND));
+    }
+}

src/main/java/org/prgms/locomocoserver/report/application/ReportService.java

@@ -2,7 +2,8 @@
 
 import lombok.RequiredArgsConstructor;
 import org.prgms.locomocoserver.report.domain.Report;
-import org.prgms.locomocoserver.report.domain.ReportRepository;
+import org.prgms.locomocoserver.report.domain.UserReport;
+import org.prgms.locomocoserver.report.domain.UserReportRepository;
 import org.prgms.locomocoserver.report.dto.ReportDto;
 import org.prgms.locomocoserver.report.dto.request.ReportCreateRequest;
 import org.prgms.locomocoserver.report.dto.request.ReportUpdateRequest;
@@ -20,46 +21,46 @@
 @RequiredArgsConstructor
 public class ReportService {
 
-    private final ReportRepository reportRepository;
+    private final UserReportRepository userReportRepository;
     private final UserService userService;
     private final UserRepository userRepository;
 
     public ReportDto create(ReportCreateRequest request) {
         User reporter = userService.getById(request.reporterId());
         User reported = userService.getById(request.reportedId());
-        Report report = reportRepository.save(request.toEntity(reporter));
+        Report report = userReportRepository.save(request.toEntity(reporter, reported));
 
         return ReportDto.of(report, reported);
     }
 
     @Transactional
     public ReportDto update(Long id, ReportUpdateRequest request) {
-        Report report = getById(id);
+        UserReport report = getById(id);
         report.updateContent(request.content());
-        User reported = userService.getById(report.getReportedId());
+        User reported = userService.getById(report.getReportedUser().getId());
 
         return ReportDto.of(report, reported);
     }
 
     @Transactional(readOnly = true)
     public List<ReportDto> getAllReports(Long cursor, int pageSize) {
         if (cursor == null) cursor = 0L;
-        return reportRepository.findAllByDeletedAtIsNull(cursor, pageSize).stream()
+        return userReportRepository.findAllByDeletedAtIsNull(cursor, pageSize).stream()
               .map(report -> {
-                  User reported = userRepository.findById(report.getReportedId())
+                  User reported = userRepository.findById(report.getReportedUser().getId())
                           .orElseThrow(() -> new UserException(UserErrorType.USER_NOT_FOUND));
                   return ReportDto.of(report, reported);
               })
               .toList();
     }
 
     public void delete(Long id) {
-        Report report = getById(id);
-        reportRepository.delete(report);
+        UserReport report = getById(id);
+        userReportRepository.delete(report);
     }
 
-    private Report getById(Long id) {
-        return reportRepository.findByIdAndDeletedAtIsNull(id)
+    private UserReport getById(Long id) {
+        return userReportRepository.findByIdAndDeletedAtIsNull(id)
                 .orElseThrow(() -> new IllegalArgumentException("Report Not Found [id]: " + id));
     }
 }

src/main/java/org/prgms/locomocoserver/report/domain/ReplyReport.java

@@ -0,0 +1,28 @@
+package org.prgms.locomocoserver.report.domain;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import org.prgms.locomocoserver.replies.domain.Reply;
+import org.prgms.locomocoserver.user.domain.User;
+
+@Entity
+@Getter
+@SuperBuilder
+@Table(name = "reply_reports")
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+public class ReplyReport extends Report {
+
+    @ManyToOne
+    @JoinColumn(name = "reply_id")
+    private Reply reply;
+
+    public ReplyReport(User reporter, Reply reply, String content) {
+        this.reply = reply;
+    }
+}

src/main/java/org/prgms/locomocoserver/report/domain/ReplyReportRepository.java

@@ -0,0 +1,14 @@
+package org.prgms.locomocoserver.report.domain;
+
+import jakarta.persistence.Id;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+
+import java.util.List;
+import java.util.Optional;
+
+public interface ReplyReportRepository extends JpaRepository<ReplyReport, Id> {
+    Optional<ReplyReport> findByIdAndDeletedAtIsNull(Long id);
+    @Query(value = "SELECT * FROM  reply_reports r WHERE r.deleted_at IS NULL AND r.id > :cursor ORDER BY r.id limit :pageSize", nativeQuery = true)
+    List<ReplyReport> findAllByDeletedAtIsNull(Long cursor, int pageSize);
+}

src/main/java/org/prgms/locomocoserver/report/domain/Report.java

@@ -5,36 +5,61 @@
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
 import org.prgms.locomocoserver.global.common.BaseEntity;
 import org.prgms.locomocoserver.user.domain.User;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 
-@Entity
 @Getter
-@Table(name = "reports")
+@SuperBuilder
+@MappedSuperclass
+@EntityListeners(AuditingEntityListener.class)
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
-public class Report extends BaseEntity {
+public abstract class Report {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "reporter_id")
-    User reporter;
-
-    @Column(name = "reported_id")
-    Long reportedId;
+    private User reporter;
 
     @Column(name = "content")
-    String content;
+    private String content;
+
+    @CreatedDate
+    @Column(name = "created_at")
+    private LocalDateTime createdAt;
 
-    @Builder
-    public Report(User reporter, Long reportedId, String content) {
+    @Column(name = "updated_at")
+    private LocalDateTime updatedAt;
+
+    @Column(name = "deleted_at")
+    private LocalDateTime deletedAt;
+
+    public Report(User reporter, String content) {
         this.reporter = reporter;
-        this.reportedId = reportedId;
         this.content = content;
     }
 
+    public boolean isDeleted() {
+        return this.deletedAt != null;
+    }
+
+    public void delete() {
+        if (isDeleted()) throw new IllegalArgumentException("이미 삭제된 엔티티 입니다.");
+        this.deletedAt = LocalDateTime.now();
+    }
+
+    public void updateUpdatedAt() {
+        this.updatedAt = LocalDateTime.now();
+    }
+
     public void updateContent(String content) {
         this.content = content;
         this.updateUpdatedAt();

src/main/java/org/prgms/locomocoserver/report/domain/UserReport.java

@@ -0,0 +1,27 @@
+package org.prgms.locomocoserver.report.domain;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import org.prgms.locomocoserver.user.domain.User;
+
+@Entity
+@Getter
+@SuperBuilder
+@Table(name = "user_reports")
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+public class UserReport extends Report {
+
+    @ManyToOne
+    @JoinColumn(name = "reported_id")
+    private User reportedUser;
+
+    public UserReport(User reportedUser) {
+        this.reportedUser = reportedUser;
+    }
+}

src/main/java/org/prgms/locomocoserver/report/domain/ReportRepository.java → src/main/java/org/prgms/locomocoserver/report/domain/UserReportRepository.java

@@ -6,8 +6,8 @@
 import java.util.List;
 import java.util.Optional;
 
-public interface ReportRepository extends JpaRepository<Report, Long> {
-    Optional<Report> findByIdAndDeletedAtIsNull(Long id);
+public interface UserReportRepository extends JpaRepository<UserReport, Long> {
+    Optional<UserReport> findByIdAndDeletedAtIsNull(Long id);
     @Query(value = "SELECT * FROM  reports r WHERE r.deleted_at IS NULL AND r.id > :cursor ORDER BY r.id limit :pageSize", nativeQuery = true)
-    List<Report> findAllByDeletedAtIsNull(Long cursor, int pageSize);
+    List<UserReport> findAllByDeletedAtIsNull(Long cursor, int pageSize);
 }

src/main/java/org/prgms/locomocoserver/report/dto/ReplyReportDto.java

@@ -0,0 +1,14 @@
+package org.prgms.locomocoserver.report.dto;
+
+import org.prgms.locomocoserver.report.domain.ReplyReport;
+
+public record ReplyReportDto(
+        Long id,
+        Long reporter,
+        Long replyId,
+        String content
+) {
+    public static ReplyReportDto of(ReplyReport replyReport) {
+        return new ReplyReportDto(replyReport.getId(), replyReport.getReporter().getId(), replyReport.getId(), replyReport.getContent());
+    }
+}

src/main/java/org/prgms/locomocoserver/report/dto/ReportDto.java

@@ -7,15 +7,13 @@
 public record ReportDto(
         @Schema(description = "신고 id") Long reportId,
         @Schema(description = "신고자 id") Long reporterId,
-        @Schema(description = "신고 당한 사람 id") Long reportedId,
         @Schema(description = "신고 당한 사람 닉네임") String reportedNickname,
         @Schema(description = "신고 내용") String content
 ) {
     public static ReportDto of(Report report, User reported) {
         return new ReportDto(
                 report.getId(),
                 report.getReporter().getId(),
-                report.getReportedId(),
                 reported.getNickname(),
                 report.getContent()
         );

src/main/java/org/prgms/locomocoserver/report/dto/request/ReplyReportCreateRequest.java

@@ -0,0 +1,19 @@
+package org.prgms.locomocoserver.report.dto.request;
+
+import org.prgms.locomocoserver.replies.domain.Reply;
+import org.prgms.locomocoserver.report.domain.ReplyReport;
+import org.prgms.locomocoserver.user.domain.User;
+
+public record ReplyReportCreateRequest(
+        Long replyId,
+        Long userId,
+        String content
+) {
+    public static ReplyReport toEntity(User reporter, Reply reply, String content) {
+        return ReplyReport.builder()
+                .reporter(reporter)
+                .reply(reply)
+                .content(content)
+                .build();
+    }
+}

src/main/java/org/prgms/locomocoserver/report/dto/request/ReplyReportUpdateRequest.java

@@ -0,0 +1,12 @@
+package org.prgms.locomocoserver.report.dto.request;
+
+import jakarta.annotation.Nonnull;
+import jakarta.validation.constraints.NotBlank;
+
+public record ReplyReportUpdateRequest(
+        @Nonnull
+        Long reporterId,
+        @NotBlank
+        String content
+) {
+}