Fix Vote History sorting

apps/common/src/main/openapi/common-internal.yaml

@@ -343,6 +343,7 @@ components:
           type: integer
           description: |
             Cursor for pagination. When requesting the next page of results, pass the `next_page_token` from the previous response.
+            Results are ordered by ledger record time, descending.
 
     ListDsoRulesVoteResultsResponse:
       type: object

apps/common/src/main/scala/org/lfdecentralizedtrust/splice/automation/SqlIndexInitializationTrigger.scala

@@ -226,7 +226,7 @@ object SqlIndexInitializationTrigger {
   }
 
   /** Indexes managed by this trigger class */
-  val defaultIndexActions: List[IndexAction] = List(
+  val defaultIndexActions: List[IndexAction] = List[IndexAction](
     IndexAction
       .Create(
         indexName = "updt_hist_crea_hi_mi_ci_import_updates",
@@ -248,13 +248,16 @@ object SqlIndexInitializationTrigger {
       ),
     IndexAction
       .Create(
-        indexName = "scan_txlog_store_sid_en_vot",
+        indexName = "scan_txlog_store_sid_rt_en_vot",
         createAction = sqlu"""
-          create index concurrently if not exists scan_txlog_store_sid_en_vot
-          on scan_txlog_store (store_id, entry_number desc)
+          create index concurrently if not exists scan_txlog_store_sid_rt_en_vot
+          on scan_txlog_store (store_id, record_time desc, entry_number desc)
           where entry_type = 'vot'
         """,
       ),
+    // Superseded by scan_txlog_store_sid_rt_en_vot when vote results switched from
+    // entry_number to record time ordering.
+    IndexAction.Drop(indexName = "scan_txlog_store_sid_en_vot"),
   )
 
   sealed trait Task extends Product with Serializable with PrettyPrinting

apps/common/src/main/scala/org/lfdecentralizedtrust/splice/store/DbVotesStoreQueryBuilder.scala

@@ -42,7 +42,10 @@ trait DbVotesTxLogStoreQueryBuilder[TXE]
     TxLogQueries.SelectFromTxLogTableResult
   ], TxLogQueries.SelectFromTxLogTableResult, Effect.Read] = {
     val afterCondition = after match {
-      case Some(a) => Some(sql"""entry_number < $a""")
+      case Some(a) =>
+        Some(
+          sql"""(record_time, entry_number) < ((select record_time from #$txLogTableName where store_id = $txLogStoreId and entry_number = $a), $a)"""
+        )
       case None => None
     }
     val actionNameCondition = actionName match {
@@ -92,7 +95,7 @@ trait DbVotesTxLogStoreQueryBuilder[TXE]
       txLogTableName,
       txLogStoreId,
       where = whereClause.toActionBuilder,
-      orderLimit = sql"""order by entry_number desc limit ${sqlLimit(limit)}""",
+      orderLimit = sql"""order by record_time desc, entry_number desc limit ${sqlLimit(limit)}""",
     )
   }
 }

apps/common/src/test/scala/org/lfdecentralizedtrust/splice/automation/SqlIndexInitializationTriggerStoreTest.scala

@@ -59,8 +59,9 @@ class SqlIndexInitializationTriggerStoreTest
         indexNames should contain allElementsOf Seq(
           "updt_hist_crea_hi_mi_ci_import_updates",
           "updt_hist_tran_hi_eth",
-          "scan_txlog_store_sid_en_vot",
+          "scan_txlog_store_sid_rt_en_vot",
         )
+        indexNames should not contain "scan_txlog_store_sid_en_vot"
       }
     }
 

apps/scan/src/test/scala/org/lfdecentralizedtrust/splice/store/db/ScanStoreTest.scala

@@ -476,6 +476,66 @@ abstract class ScanStoreTest
           val voteRequestContracts = mkVoteRequests()
           assertListOfAllPastVoteRequestResults(voteRequestContracts, store)
         }
+
+        "return results in record time order, including backfilled entries" in {
+          // Simulates a txlog where backfilling inserted older entries after live ingestion
+          // started: backfilling walks backwards in time, so backfilled entries get entry
+          // numbers in reverse record time order.
+          val baseTime = Instant.now().truncatedTo(ChronoUnit.MICROS)
+          def recordTime(n: Int) = baseTime.plusSeconds(n.toLong)
+          val voteRequests = (1 to 4).map { n =>
+            voteRequest(
+              requester = userParty(n),
+              votes = Seq(
+                new Vote(userParty(n).toProtoPrimitive, true, new Reason("", ""), Optional.empty())
+              ),
+            )
+          }
+          val results = voteRequests.map(mkVoteRequestResult(_))
+          def closeVoteRequest(store: ScanStore, n: Int) =
+            dummyDomain.exercise(
+              contract = dsoRules(dsoParty),
+              interfaceId = Some(DsoRules.TEMPLATE_ID_WITH_PACKAGE_ID),
+              choiceName = DsoRulesCloseVoteRequest.choice.name,
+              choiceArgument = mkCloseVoteRequest(voteRequests(n - 1).contractId),
+              exerciseResult = results(n - 1).toValue,
+              recordTime = recordTime(n),
+            )(store.multiDomainAcsStore)
+          for {
+            store <- mkStore()
+            _ <- MonadUtil.sequentialTraverse(voteRequests)(
+              dummyDomain.create(_)(store.multiDomainAcsStore)
+            )
+            // Live ingestion of results 3 and 4...
+            _ <- closeVoteRequest(store, 3)
+            _ <- closeVoteRequest(store, 4)
+            // ...then backfilling inserts the older results, walking backwards in time.
+            _ <- closeVoteRequest(store, 2)
+            _ <- closeVoteRequest(store, 1)
+            page1 <- store.listVoteRequestResults(
+              None,
+              None,
+              None,
+              None,
+              None,
+              PageLimit.tryCreate(3),
+            )
+            page2 <- store.listVoteRequestResults(
+              None,
+              None,
+              None,
+              None,
+              None,
+              PageLimit.tryCreate(3),
+              page1.nextPageToken,
+            )
+          } yield {
+            page1.resultsInPage.map(_.request.requester) shouldBe
+              Seq(4, 3, 2).map(userParty(_).toProtoPrimitive)
+            page2.resultsInPage.map(_.request.requester) shouldBe
+              Seq(1).map(userParty(_).toProtoPrimitive)
+          }
+        }
       }
 
       "listVoteRequestsByTrackingCid" should {

apps/sv/frontend/src/routes/governance.tsx

@@ -197,6 +197,7 @@ export const Governance: React.FC = () => {
             uniqueId="vote-history"
             showStatus
             showVoteStats
+            sortOrder="effectiveAtDesc"
             fetchNextPage={voteResultsInfiniteQuery.fetchNextPage}
             hasNextPage={voteResultsInfiniteQuery.hasNextPage}
             isFetchingNextPage={voteResultsInfiniteQuery.isFetchingNextPage}