Merge pull request '업로드 시 uid로 중복체크 -> 삭제인 row는 제외하기' (#112) from feat/training_260202 into develop
Reviewed-on: #112
This commit was merged in pull request #112.
This commit is contained in:
@@ -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();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user