From de2fa1af8e4dc9e15db3b97da95780db0d63abe1 Mon Sep 17 00:00:00 2001 From: yang Date: Fri, 15 Dec 2023 00:09:26 +0900 Subject: [PATCH] =?UTF-8?q?RAC-231=20fix=20:=20=EC=83=81=EC=84=B8=EC=A1=B0?= =?UTF-8?q?=ED=9A=8C=20=EC=9D=B4=EC=99=B8=EC=97=90=20=EB=8B=A8=EC=88=9C=20?= =?UTF-8?q?=EB=AA=A9=EB=A1=9D=20=EC=A1=B0=ED=9A=8C=20=EA=B0=80=EB=8A=A5?= =?UTF-8?q?=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mentoring/domain/repository/MentoringRepository.java | 4 ++-- .../domain/mentoring/domain/service/MentoringGetService.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/postgraduate/domain/mentoring/domain/repository/MentoringRepository.java b/src/main/java/com/postgraduate/domain/mentoring/domain/repository/MentoringRepository.java index 07c209db..5d68c50f 100644 --- a/src/main/java/com/postgraduate/domain/mentoring/domain/repository/MentoringRepository.java +++ b/src/main/java/com/postgraduate/domain/mentoring/domain/repository/MentoringRepository.java @@ -12,8 +12,8 @@ public interface MentoringRepository extends JpaRepository { Optional findByMentoringIdAndUser_IsDeleteAndSenior_User_IsDelete(Long mentoringId, Boolean isUserDelete, Boolean isSeniorDelete); - List findAllByUserAndStatusAndSenior_User_IsDelete(User user, Status status, Boolean isDelete); - List findAllBySeniorAndStatusAndUser_IsDelete(Senior senior, Status status, Boolean isDelete); + List findAllByUserAndStatus(User user, Status status); + List findAllBySeniorAndStatus(Senior senior, Status status); List findAllByStatusAndCreatedAtIsBefore(Status status, LocalDate now); List findAllByUser_UserId(Long userId); List findAllBySenior_SeniorId(Long seniorId); diff --git a/src/main/java/com/postgraduate/domain/mentoring/domain/service/MentoringGetService.java b/src/main/java/com/postgraduate/domain/mentoring/domain/service/MentoringGetService.java index d68f3f85..6afc0434 100644 --- a/src/main/java/com/postgraduate/domain/mentoring/domain/service/MentoringGetService.java +++ b/src/main/java/com/postgraduate/domain/mentoring/domain/service/MentoringGetService.java @@ -20,11 +20,11 @@ public class MentoringGetService { private final MentoringRepository mentoringRepository; public List mentoringByUser(User user, Status status) { - return mentoringRepository.findAllByUserAndStatusAndSenior_User_IsDelete(user, status, FALSE); + return mentoringRepository.findAllByUserAndStatus(user, status); } public List mentoringBySenior(Senior senior, Status status) { - return mentoringRepository.findAllBySeniorAndStatusAndUser_IsDelete(senior, status, FALSE); + return mentoringRepository.findAllBySeniorAndStatus(senior, status); } public Mentoring byMentoringId(Long mentoringId) {