From 5ecebd816a470b5d6f3ea3cab41453708cd1e725 Mon Sep 17 00:00:00 2001 From: Thibault Duplessis Date: Tue, 18 Feb 2025 12:20:54 +0100 Subject: [PATCH] simplify query when counting own studies --- modules/study/src/main/StudyRepo.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/study/src/main/StudyRepo.scala b/modules/study/src/main/StudyRepo.scala index 0b1fe2b58ac03..deceaeffbc3e7 100644 --- a/modules/study/src/main/StudyRepo.scala +++ b/modules/study/src/main/StudyRepo.scala @@ -97,8 +97,8 @@ final class StudyRepo(private[study] val coll: AsyncColl)(using private def hasMemberOrIsPublic(using as: Option[MyId]) = as.fold(selectPublic): me => $or($doc(s"members.$me".$exists(true)), selectPublic) - def countByOwner(ownerId: UserId)(using Option[MyId]) = coll: - _.countSel(selectOwnerId(ownerId) ++ hasMemberOrIsPublic) + def countByOwner(ownerId: UserId)(using as: Option[MyId]) = coll: + _.countSel(selectOwnerId(ownerId) ++ as.forall(_.isnt(ownerId)).so(hasMemberOrIsPublic)) def sourceByOwner(ownerId: UserId, isMe: Boolean): Source[Study, ?] = Source.futureSource: