Fix party filter in expired reward query (#2129)

[ci]

Signed-off-by: Moritz Kiefer <[email protected]>
Co-authored-by: Moritz Kiefer <[email protected]>

Author: 2 people

apps/sv/src/main/scala/org/lfdecentralizedtrust/splice/sv/store/db/DbSvDsoStore.scala

@@ -518,11 +518,15 @@ class DbSvDsoStore(
   ): Future[Seq[SvDsoStore.RoundBatch[TCId]]] = {
     val templateId = companionClass.typeId(companion)
     val opName = s"list${templateId.getEntityName}GroupedByRound"
+    val partyFilter =
+      if (ignoredParties.nonEmpty)
+        (sql"and reward_party not in " ++ inClause(ignoredParties)).toActionBuilder
+      else sql""
     waitUntilAcsIngested {
       for {
         result <- storage
           .query(
-            sql"""
+            (sql"""
                 select reward_round, array_agg(contract_id)
                 from dso_acs_store
                 where store_id = $acsStoreId
@@ -531,13 +535,11 @@ class DbSvDsoStore(
                   and assigned_domain = $domain
                   and reward_party is not null -- otherwise index is not used
                   and reward_round is not null -- otherwise index is not used
-                  and reward_party NOT IN (${ignoredParties
-                .map(_.filterString)
-                .mkString(",")})
+                  """ ++ partyFilter ++ sql"""
                 group by reward_round
                 order by reward_round asc
                 limit ${sqlLimit(totalCouponsLimit)}
-               """.as[(Long, Array[ContractId[ValidatorRewardCoupon]])],
+               """).toActionBuilder.as[(Long, Array[ContractId[ValidatorRewardCoupon]])],
             opName,
           )
       } yield applyLimit(opName, totalCouponsLimit, result)

apps/sv/src/test/scala/org/lfdecentralizedtrust/splice/store/db/SvDsoStoreTest.scala

@@ -654,6 +654,7 @@ abstract class SvDsoStoreTest extends StoreTest with HasExecutionContext {
         (1 to 3).map(_ => validatorFaucetCoupon(userParty(2), round = 3))
       val validatorFaucet1Closed = (1 to 3).map(_ => validatorFaucetCoupon(userParty(1), round = 2))
       val validatorFaucet2Closed = (1 to 3).map(_ => validatorFaucetCoupon(userParty(2), round = 2))
+      val validatorFaucet3Closed = (1 to 3).map(_ => validatorFaucetCoupon(userParty(3), round = 2))
 
       val validator1NotClosed = (1 to 3).map(_ => validatorRewardCoupon(round = 3, userParty(1)))
       val validator2NotClosed = (1 to 3).map(_ => validatorRewardCoupon(round = 3, userParty(2)))
@@ -675,7 +676,7 @@ abstract class SvDsoStoreTest extends StoreTest with HasExecutionContext {
         store <- mkStore()
         _ <- dummyDomain.create(closedRound)(store.multiDomainAcsStore)
         _ <- MonadUtil.sequentialTraverse(
-          validatorFaucet1NotClosed ++ validatorFaucet2NotClosed ++ validatorFaucet1Closed ++ validatorFaucet2Closed
+          validatorFaucet1NotClosed ++ validatorFaucet2NotClosed ++ validatorFaucet1Closed ++ validatorFaucet2Closed ++ validatorFaucet3Closed
         )(
           dummyDomain.create(_)(store.multiDomainAcsStore)
         )
@@ -702,7 +703,7 @@ abstract class SvDsoStoreTest extends StoreTest with HasExecutionContext {
           domain = dummyDomain,
           enableExpireValidatorFaucet = true,
           totalCouponsLimit = PageLimit.tryCreate(1000),
-          ignoredExpiredRewardsPartyIds = Set(userParty(1)),
+          ignoredExpiredRewardsPartyIds = Set(userParty(1), userParty(3)),
         )
         resultWithoutFaucet <- store.getExpiredCouponsInBatchesPerRoundAndCouponType(
           domain = dummyDomain,
@@ -735,7 +736,7 @@ abstract class SvDsoStoreTest extends StoreTest with HasExecutionContext {
           batch.validatorCoupons should have size 0
           batch.appCoupons should have size 0
           batch.svRewardCoupons should have size 0
-          batch.validatorFaucets should have size 6
+          batch.validatorFaucets should have size 9
         }
         resultWithIgnoredUserParty should have size 4
         forAll(resultWithIgnoredUserParty)(_.closedRoundNumber shouldBe 2)