src/main/java/com/kamco/cd/training/postgres/repository/dataset/DatasetRepositoryImpl.java

@@ -67,7 +67,11 @@ public class DatasetRepositoryImpl implements DatasetRepositoryCustom {
     // Count 쿼리 별도 실행 (null safe handling)
     long total =
         Optional.ofNullable(
-                queryFactory.select(dataset.count()).from(dataset).where(builder).fetchOne())
+                queryFactory
+                    .select(dataset.count())
+                    .from(dataset)
+                    .where(builder.and(dataset.deleted.isFalse()))
+                    .fetchOne())
             .orElse(0L);
 
     return new PageImpl<>(content, pageable, total);
@@ -239,7 +243,7 @@ public class DatasetRepositoryImpl implements DatasetRepositoryCustom {
     return queryFactory
         .select(dataset.id)
         .from(dataset)
-        .where(dataset.uid.eq(mngRegDto.getUid()))
+        .where(dataset.uid.eq(mngRegDto.getUid()), dataset.deleted.isFalse())
         .fetchOne();
   }
 
@@ -253,7 +257,7 @@ public class DatasetRepositoryImpl implements DatasetRepositoryCustom {
     return queryFactory
         .select(dataset.id.count())
         .from(dataset)
-        .where(dataset.uid.eq(uid))
+        .where(dataset.uid.eq(uid), dataset.deleted.isFalse())
         .fetchOne();
   }
 }