fix: 멤버 status 확인 로직 추가

TABA-4th · Dec 16, 2023 · 0a71f94 · 0a71f94
1 parent fb269c7
commit 0a71f94
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/src/main/java/com/taba/nimonaemo/diagnosis/repository/DiagnosisResultRepository.java b/src/main/java/com/taba/nimonaemo/diagnosis/repository/DiagnosisResultRepository.java
@@ -13,23 +13,27 @@
 public interface DiagnosisResultRepository extends JpaRepository<DiagnosisResult, Long> {
     @Query("select d from DiagnosisResult d " +
             "where d.member.id = :memberId and " +
+            "d.member.status = 'ACTIVE' and " +
             "(d.diagnosisDate between TO_DATE(:curDate, 'YYYY/MM') and TO_DATE(:nextDate, 'YYYY/MM'))")
     List<DiagnosisResult> findByDate(Long memberId, String curDate, String nextDate);
 
     @Query("select d from DiagnosisResult d " +
             "where d.member.id = :memberId and " +
+            "d.member.status = 'ACTIVE' and " +
             "d.diagnosisDate = :date ")
     Optional<DiagnosisResult> findByDateForDetail(Long memberId, LocalDateTime date);
 
     @Transactional
     @Modifying
     @Query("delete from DiagnosisResult d " +
             "where d.member.id = :memberId and " +
+                    "d.member.status = 'ACTIVE' and " +
                     "d.diagnosisDate LIKE CONCAT(:targetDate, '%')")
     void deleteByDate(Long memberId, LocalDateTime targetDate);
 
     @Query("select COUNT(*) from DiagnosisResult d " +
             "where d.member.id = (select m.id from Member m " +
-                                "where m.nickname = :nickname) ")
+                                "where m.nickname = :nickname) and " +
+                                "d.member.status = 'ACTIVE'")
     Long findAllWithNickname(String nickname);
 }
diff --git a/src/main/java/com/taba/nimonaemo/diagnosis/repository/SurveyRepository.java b/src/main/java/com/taba/nimonaemo/diagnosis/repository/SurveyRepository.java
@@ -10,6 +10,7 @@
 public interface SurveyRepository extends JpaRepository<Survey, Long> {
     @Query("select s from Survey s " +
             "where s.member.id = :memberId and " +
+            "s.member.status = 'ACTIVE' and " +
             "s.surveyDate = :targetDate ")
     Optional<Survey> findByDate(Long memberId, LocalDateTime targetDate);
 }
diff --git a/src/main/java/com/taba/nimonaemo/record/repository/DiaryRepository.java b/src/main/java/com/taba/nimonaemo/record/repository/DiaryRepository.java
@@ -13,13 +13,15 @@ public interface DiaryRepository extends JpaRepository<Diary, Long> {
 
     @Query("select d from Diary d " +
             "where d.member.id = :memberId and " +
+            "d.member.status = 'ACTIVE' and " +
             "(d.diaryDate between TO_DATE(:curDate, 'YYYY/MM') and TO_DATE(:nextDate, 'YYYY/MM'))")
     List<Diary> findByDate(Long memberId, String curDate, String nextDate);
 
     @Transactional
     @Modifying
     @Query("delete from Diary d " +
             "where d.member.id = :memberId and " +
+            "d.member.status = 'ACTIVE' and " +
             "d.id = :diaryId ")
     void deleteByDate(Long memberId, Long diaryId);
 }
diff --git a/src/main/java/com/taba/nimonaemo/record/repository/HairStatusRepository.java b/src/main/java/com/taba/nimonaemo/record/repository/HairStatusRepository.java
@@ -8,6 +8,7 @@
 
 public interface HairStatusRepository extends JpaRepository<HairStatus, Long> {
     @Query("select h from HairStatus h " +
-            "where h.member.id = :memberId ")
+            "where h.member.id = :memberId and " +
+            "h.member.status = 'ACTIVE'")
     Optional<HairStatus> findByMemberId(Long memberId);
 }