fix: Fix DiaryComment

KHU-RETURN · Aug 16, 2023 · 6128a18 · 6128a18
2 parents afbf7e0 + 7fcc030
commit 6128a18
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/src/main/java/com/khureturn/community/controller/ExamController.java b/src/main/java/com/khureturn/community/controller/ExamController.java
@@ -17,6 +17,7 @@
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.security.Principal;
 import java.util.List;

diff --git a/src/main/java/com/khureturn/community/repository/DiaryCommentRepository.java b/src/main/java/com/khureturn/community/repository/DiaryCommentRepository.java
@@ -12,16 +12,14 @@ public interface DiaryCommentRepository extends JpaRepository<DiaryComment, Long
 
     List<DiaryComment> findAllByDiary(Diary diary);
 
-    void deleteByDiaryAndId(Diary diary, Long diaryCommentId);
+    void delete(DiaryComment diaryComment);
 
     DiaryComment findByIdAndDiary(Long diaryCommentId, Diary diary);
 
     DiaryComment findByIdAndDiaryAndParent(Long recommentId, Diary diary, DiaryComment parent);
 
     int countAllByParent(DiaryComment parent);
 
-    void deleteByDiaryAndParentAndId(Diary diary, DiaryComment parent, Long recommendId);
-
     List<DiaryComment> findAllByDiaryAndParent(Diary diary, DiaryComment parent);
 
 

diff --git a/src/main/java/com/khureturn/community/service/DiaryCommentService.java b/src/main/java/com/khureturn/community/service/DiaryCommentService.java
@@ -60,7 +60,8 @@ public List<DiaryComment> findAllByDiary(Long diaryId){
     public void delete(Long diaryId, Long diaryCommentId){
         Diary diary = diaryRepository.findById(diaryId)
                 .orElseThrow(() -> new NotFoundException("Diary를 찾을 수 없습니다"));
-        diaryCommentRepository.deleteByDiaryAndId(diary, diaryCommentId);
+        DiaryComment diaryComment = diaryCommentRepository.findByIdAndDiary(diaryCommentId, diary);
+        diaryCommentRepository.delete(diaryComment);
     }
 
     public DiaryComment createReComment(Principal principal, Long diaryId, Long commentId, DiaryCommentRequestDto.CreateRecommentDto request){
@@ -120,7 +121,8 @@ public void deleteRecomment(Long diaryId, Long commentId, Long recommentId){
         Diary diary = diaryRepository.findById(diaryId)
                 .orElseThrow(() -> new NotFoundException("Diary를 찾을 수 없습니다."));
         DiaryComment parent = diaryCommentRepository.findByIdAndDiary(commentId, diary);
-        diaryCommentRepository.deleteByDiaryAndParentAndId(diary, parent, recommentId);
+        DiaryComment recomment = diaryCommentRepository.findByIdAndDiaryAndParent(recommentId, diary, parent);
+        diaryCommentRepository.delete(recomment);
 
     }
 

diff --git a/src/main/java/com/khureturn/community/service/ExamFileService.java b/src/main/java/com/khureturn/community/service/ExamFileService.java
@@ -12,7 +12,10 @@
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.net.URLEncoder;
 import java.util.List;
 import java.util.UUID;
 
@@ -43,5 +46,4 @@ public List<ExamFile> findAllByExam(Long examId){
                 .orElseThrow(() -> new NotFoundException("족보를 찾을 수 없습니다."));
         return examFileRepository.findAllByExam(exam);
     }
-
 }
diff --git a/src/main/java/com/khureturn/community/service/ExamService.java b/src/main/java/com/khureturn/community/service/ExamService.java
@@ -9,6 +9,8 @@
 import com.khureturn.community.dto.converter.JacksonUtil;
 import com.khureturn.community.exception.NotFoundException;
 import com.khureturn.community.repository.*;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;