[#3] refactor: 약속,친구 조회에서 상대방이 탈퇴하였을 경우 관련 정보는 조회에서 제외되도록 변경

src/main/java/com/example/calpick/domain/repository/AppointmentRepository.java

@@ -15,24 +15,10 @@
 @Repository
 public interface AppointmentRepository extends JpaRepository<Appointment,Long> {
 
-    /*@Query("SELECT a FROM Appointment a WHERE a.receiver.userId = :receiverId AND a.appointmentStatus = :status")
-    List<Appointment> findByReceiverIdAndStatus(@Param("receiverId") Long receiverId,
-                                                @Param("status") AppointmentStatus status);*/
-
-
-    @Query("""
-    SELECT a FROM Appointment a
-    WHERE a.receiver.userId = :userId AND a.appointmentStatus = :status
-""")
-    Page<Appointment> findByReceiverIdAndStatus(
-            @Param("userId") Long userId,
-            @Param("status") AppointmentStatus status,
-            Pageable pageable
-    );
-
     @Query("""
     SELECT a FROM Appointment a
     WHERE a.receiver.userId = :userId AND a.appointmentStatus IN :statuses
+    AND (a.requester IS NULL OR a.requester.userStatus <> 'DELETED')
 """)
     Page<Appointment> findByReceiverIdAndStatuses(
             @Param("userId") Long userId,
@@ -43,6 +29,7 @@ Page<Appointment> findByReceiverIdAndStatuses(
     @Query("""
     SELECT a FROM Appointment a
     WHERE a.requester.userId = :userId AND a.appointmentStatus IN :statuses
+    AND (a.receiver.userStatus <> 'DELETED')
 """)
     Page<Appointment> findByRequesterIdAndStatuses(
             @Param("userId") Long userId,

src/main/java/com/example/calpick/domain/repository/FriendRequestRepository.java

@@ -26,6 +26,7 @@ public interface FriendRequestRepository extends JpaRepository<FriendRequest,Lon
              JOIN users u ON fr.receiver_id = u.user_id
              WHERE fr.request_status = 'ACCEPTED'
                AND fr.requester_id = :userId
+               AND u.user_status <> 'DELETED'
 
              UNION ALL
 
@@ -38,19 +39,27 @@ public interface FriendRequestRepository extends JpaRepository<FriendRequest,Lon
              JOIN users u ON fr.requester_id = u.user_id
              WHERE fr.request_status = 'ACCEPTED'
                AND fr.receiver_id = :userId
+               AND u.user_status <> 'DELETED'
+
          ) AS friends
          ORDER BY name,email ASC
          """,  countQuery = """
             SELECT 
             (
                  SELECT COUNT(*) FROM friend_request fr
+                 JOIN users u ON fr.receiver_id = u.user_id
                  WHERE fr.request_status = 'ACCEPTED'
                    AND fr.requester_id = :userId
+                   AND u.user_status <> 'DELETED'
+
             ) + 
             (
                SELECT COUNT(*) FROM friend_request fr
+               JOIN users u ON fr.requester_id = u.user_id
                WHERE fr.request_status = 'ACCEPTED'
-               AND fr.receiver_id = :userId  
+               AND fr.receiver_id = :userId 
+               AND u.user_status <> 'DELETED'
+
             ) 
          """,
              nativeQuery = true)
@@ -103,12 +112,16 @@ SELECT EXISTS (
      FROM friend_request fr
      JOIN users u ON u.user_id = fr.requester_id
      WHERE fr.receiver_id = :userId AND fr.request_status = 'REQUESTED'
+     AND u.user_status <> 'DELETED'
      ORDER BY fr.created_at DESC
 
      """, countQuery = """
         SELECT COUNT(*)
         FROM friend_request fr
-        WHERE fr.receiver_id = :userId AND fr.request_status = 'REQUESTED'
+        JOIN users u ON u.user_id = fr.requester_id
+        WHERE fr.receiver_id = :userId 
+        AND fr.request_status = 'REQUESTED'
+        AND u.user_status <> 'DELETED'
         """,
              nativeQuery = true)
      Page<FriendRequestDto> getFriendRequestsList(@Param("userId") Long userId, Pageable pageable);
@@ -142,15 +155,17 @@ SELECT COUNT(*)
            OR
            (req.receiver_id = u.user_id AND req.requester_id = :userId)
         )
-        WHERE ( (:searchType = 'NAME' AND u.name LIKE CONCAT('%', :query, '%'))
+        WHERE u.user_status <> 'DELETED'
+        AND ( (:searchType = 'NAME' AND u.name LIKE CONCAT('%', :query, '%'))
              OR (:searchType = 'EMAIL' AND u.email LIKE CONCAT('%', :query, '%'))
              )
         ORDER BY u.name ASC, u.email ASC
          """,
              countQuery = """
                SELECT COUNT(*)
                FROM users u
-               WHERE (
+               WHERE u.user_status <> 'DELETED'
+               AND (
                 (:searchType = 'NAME' AND u.name LIKE CONCAT('%', :query, '%'))
                 OR (:searchType = 'EMAIL' AND u.email LIKE CONCAT('%', :query, '%'))
                )