Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Fix DiaryComment #69

Merged
merged 3 commits into from
Aug 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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){
Expand Down Expand Up @@ -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);

}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -43,5 +46,4 @@ public List<ExamFile> findAllByExam(Long examId){
.orElseThrow(() -> new NotFoundException("족보를 찾을 수 없습니다."));
return examFileRepository.findAllByExam(exam);
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading