feat: ✨ add default orderBy for pagination

dydxprotocol · May 16, 2024 · 2fd8d09 · 2fd8d09
1 parent 6ea2dbf
commit 2fd8d09
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/indexer/services/comlink/src/controllers/api/v4/fills-controller.ts b/indexer/services/comlink/src/controllers/api/v4/fills-controller.ts
@@ -7,6 +7,8 @@ import {
   FillTable,
   FillFromDatabase,
   QueryableField,
+  FillColumns,
+  Ordering,
 } from '@dydxprotocol-indexer/postgres';
 import express from 'express';
 import {
@@ -91,6 +93,7 @@ class FillsController extends Controller {
         page,
       },
       [QueryableField.LIMIT],
+      { orderBy: [[FillColumns.eventId, Ordering.ASC]] },
     );
 
     const clobPairIdToPerpetualMarket: Record<
@@ -165,6 +168,7 @@ class FillsController extends Controller {
         page,
       },
       [QueryableField.LIMIT],
+      { orderBy: [[FillColumns.eventId, Ordering.ASC]] },
     );
 
     const clobPairIdToPerpetualMarket: Record<

diff --git a/indexer/services/comlink/src/controllers/api/v4/trades-controller.ts b/indexer/services/comlink/src/controllers/api/v4/trades-controller.ts
@@ -6,6 +6,8 @@ import {
   Liquidity,
   QueryableField,
   perpetualMarketRefresher,
+  FillColumns,
+  Ordering,
 } from '@dydxprotocol-indexer/postgres';
 import express from 'express';
 import {
@@ -71,6 +73,7 @@ class TradesController extends Controller {
         page,
       },
       [QueryableField.LIQUIDITY, QueryableField.CLOB_PAIR_ID, QueryableField.LIMIT],
+      { orderBy: [[FillColumns.eventId, Ordering.ASC]] },
     );
 
     return {

diff --git a/indexer/services/comlink/src/controllers/api/v4/transfers-controller.ts b/indexer/services/comlink/src/controllers/api/v4/transfers-controller.ts
@@ -86,7 +86,12 @@ class TransfersController extends Controller {
         [QueryableField.LIMIT],
         {
           ...DEFAULT_POSTGRES_OPTIONS,
-          orderBy: [[TransferColumns.createdAtHeight, Ordering.DESC]],
+          orderBy: page !== undefined ? [
+            [TransferColumns.eventId, Ordering.DESC],
+          ]
+            : [
+              [TransferColumns.createdAtHeight, Ordering.DESC],
+            ],
         },
       ),
       AssetTable.findAll(
@@ -184,7 +189,12 @@ class TransfersController extends Controller {
         [QueryableField.LIMIT],
         {
           ...DEFAULT_POSTGRES_OPTIONS,
-          orderBy: [[TransferColumns.createdAtHeight, Ordering.DESC]],
+          orderBy: page !== undefined ? [
+            [TransferColumns.eventId, Ordering.DESC],
+          ]
+            : [
+              [TransferColumns.createdAtHeight, Ordering.DESC],
+            ],
         },
       ),
       AssetTable.findAll(