Merge pull request #185 from Team-Smeme/sohyeon_#184

[DELETE] 첨삭 기능 삭제
Team-Smeme · Jan 16, 2024 · a48a4a5 · a48a4a5
2 parents a3c3251 + 62a2c5b
commit a48a4a5
Show file tree

Hide file tree

Showing 19 changed files with 5 additions and 562 deletions.
diff --git a/src/main/java/com/smeme/server/controller/CorrectionController.java b/src/main/java/com/smeme/server/controller/CorrectionController.java
diff --git a/src/main/java/com/smeme/server/dto/correction/CorrectionRequestDTO.java b/src/main/java/com/smeme/server/dto/correction/CorrectionRequestDTO.java
diff --git a/src/main/java/com/smeme/server/dto/correction/CorrectionResponseDTO.java b/src/main/java/com/smeme/server/dto/correction/CorrectionResponseDTO.java
diff --git a/src/main/java/com/smeme/server/dto/diary/DiaryResponseDTO.java b/src/main/java/com/smeme/server/dto/diary/DiaryResponseDTO.java
@@ -5,7 +5,6 @@
 
 import java.util.List;
 
-import com.smeme.server.model.Correction;
 import com.smeme.server.model.Diary;
 
 import lombok.AccessLevel;
@@ -17,8 +16,7 @@ public record DiaryResponseDTO(
         String topic,
         String content,
         String createdAt,
-        String username,
-        List<CorrectionDTO> corrections
+        String username
 ) {
     public static DiaryResponseDTO of(Diary diary) {
         return DiaryResponseDTO.builder()
@@ -27,19 +25,8 @@ public static DiaryResponseDTO of(Diary diary) {
                 .content(diary.getContent())
                 .createdAt(dateToString(diary.getCreatedAt()))
                 .username(diary.getMember().getUsername())
-                .corrections(diary.getCorrections().stream().map(CorrectionDTO::of).toList())
                 .build();
     }
 
-    public record CorrectionDTO(
-            Long correctionId,
-            String before,
-            String after
-    ) {
-        static CorrectionDTO of(Correction correction) {
-            return new CorrectionDTO(correction.getId(), correction.getBeforeSentence(), correction.getAfterSentence());
-        }
-    }
-
 }
 
diff --git a/src/main/java/com/smeme/server/model/Correction.java b/src/main/java/com/smeme/server/model/Correction.java
diff --git a/src/main/java/com/smeme/server/model/Diary.java b/src/main/java/com/smeme/server/model/Diary.java
@@ -43,9 +43,6 @@ public class Diary extends BaseTimeEntity {
     @JoinColumn(name = "member_id")
     private Member member;
 
-    @OneToMany(mappedBy = "diary")
-    private final List<Correction> corrections = new ArrayList<>();
-
     @Builder
     public Diary(String content, Topic topic, Member member) {
         this.content = content;

diff --git a/src/main/java/com/smeme/server/repository/correction/CorrectionCustomRepository.java b/src/main/java/com/smeme/server/repository/correction/CorrectionCustomRepository.java
diff --git a/src/main/java/com/smeme/server/repository/correction/CorrectionRepository.java b/src/main/java/com/smeme/server/repository/correction/CorrectionRepository.java
diff --git a/src/main/java/com/smeme/server/repository/correction/CorrectionRepositoryImpl.java b/src/main/java/com/smeme/server/repository/correction/CorrectionRepositoryImpl.java
diff --git a/src/main/java/com/smeme/server/repository/diary/DiaryCustomRepository.java b/src/main/java/com/smeme/server/repository/diary/DiaryCustomRepository.java
diff --git a/src/main/java/com/smeme/server/repository/diary/DiaryRepository.java b/src/main/java/com/smeme/server/repository/diary/DiaryRepository.java
@@ -7,7 +7,7 @@
 
 import java.util.List;
 
-public interface DiaryRepository extends JpaRepository<Diary, Long>, DiaryCustomRepository {
+public interface DiaryRepository extends JpaRepository<Diary, Long> {
 
     void deleteAllByMember(Member member);
 

diff --git a/src/main/java/com/smeme/server/repository/diary/DiaryRepositoryImpl.java b/src/main/java/com/smeme/server/repository/diary/DiaryRepositoryImpl.java
diff --git a/src/main/java/com/smeme/server/service/CorrectionService.java b/src/main/java/com/smeme/server/service/CorrectionService.java