feat: add filter by status to explorer transactions endpoint

Author: kuco23

packages/fasset-indexer-api/src/analytics/explorer.ts

@@ -48,18 +48,14 @@ export class ExplorerAnalytics extends SharedAnalytics {
     user?: string, agent?: string,
     start?: number, end?: number,
     asc: boolean = false,
+    status?: number,
     types: ExplorerType.TransactionType[] = ALL_TRANSACTION_TYPES
   ): Promise<ExplorerType.TransactionsInfo> {
     const em = this.orm.em.fork()
-    const isuser = user != null
-    const isagent = agent != null
     ;[start, end] = this.standardizeInterval(start, end)
-    const window = start != null || end != null
     const transactions = await em.getConnection('read').execute(
-      SQL.EXPLORER_TRANSACTIONS(isuser, isagent, asc, window, types),
-      (isuser || isagent)
-        ? (window ? [user ?? agent, start, end, limit, offset] : [user ?? agent, limit, offset])
-        : (window ? [start, end, limit, offset] : [limit, offset])
+      SQL.EXPLORER_TRANSACTIONS(user != null, agent != null, asc, start != null || end != null, status != null, types),
+      [user ?? agent, start, end, status, limit, offset].filter(x => x != null)
     ) as SQL.ExplorerTransactionsOrmResult[]
     const info: ExplorerType.TransactionInfo[] = []
     for (const { name, timestamp, source, hash, agent_vault, agent_name, value_uba, user, resolution, underlying_payment } of transactions) {

packages/fasset-indexer-api/src/analytics/utils/raw-sql.ts

@@ -137,12 +137,17 @@ const explorerQueryTransactions = new Map([
 ])
 
 // psql specific query
-export const EXPLORER_TRANSACTIONS = (user: boolean, agent: boolean, asc: boolean, window: boolean, methods: TransactionType[]) => `
+export const EXPLORER_TRANSACTIONS = (
+  user: boolean, agent: boolean,
+  asc: boolean, window: boolean,
+  status: boolean,
+  methods: TransactionType[]
+) => `
 SELECT
   et.hash, el.name, eb.timestamp, eaa.hex as agent_vault,
   am.name as agent_name, eau.hex as user, eao.hex as source,
   t.value_uba, t.resolution, ur.id as underlying_payment, COUNT(*) OVER() as count
-FROM (${Array.from(explorerQueryTransactions.entries()).filter(([k, _]) => methods.includes(k)).map(([_,v]) => v).join(' UNION ALL ')}) t
+FROM (${Array.from(explorerQueryTransactions.entries()).filter(([k, _]) => methods.includes(k)).map(([_, v]) => v).join(' UNION ALL ')}) t
 FULL JOIN evm_address eau ON eau.id = t.user_id
 FULL JOIN underlying_reference ur ON ur.reference = t.payment_reference
 JOIN evm_log el ON el.id = t.evm_log_id
@@ -153,9 +158,11 @@ JOIN evm_address eao ON eao.id = et.source_id
 JOIN agent_vault av ON av.address_id = t.agent_vault_address_id
 JOIN agent_owner ao ON av.vaults = ao.id
 JOIN agent_manager am ON am.address_id = ao.agents
-${user ? 'WHERE eau.hex = ?' : ''}
-${agent ? 'WHERE eaa.hex = ?' : ''}
-${window ? ((agent || user ? 'AND' : 'WHERE') + ' eb.timestamp BETWEEN ? AND ?') : ''}
+WHERE 1=1
+${user ? 'AND eau.hex = ?' : ''}
+${agent ? 'AND eaa.hex = ?' : ''}
+${window ? 'AND eb.timestamp BETWEEN ? AND ?' : ''}
+${status ? 'AND t.resolution = ?' : ''}
 ORDER BY el.block_index ${asc ? 'ASC' : 'DESC'}
 LIMIT ? OFFSET ?
 `

packages/fasset-indexer-api/src/controllers/explorer.controller.ts

@@ -37,6 +37,7 @@ export class ExplorerController {
   @ApiQuery({ name: 'start', type: Number, required: false })
   @ApiQuery({ name: 'end', type: Number, required: false })
   @ApiQuery({ name: 'asc', type: Boolean, required: false })
+  @ApiQuery({ name: 'status', type: Number, required: false })
   @ApiQuery({ name: 'types', type: String, isArray: true, required: false })
   getTransactions(
     @Query('limit', ParseIntPipe) limit: number,
@@ -46,11 +47,12 @@ export class ExplorerController {
     @Query('asc', new ParseBoolPipe({ optional: true })) asc?: boolean,
     @Query('start', new ParseIntPipe({ optional: true })) start?: number,
     @Query('end', new ParseIntPipe({ optional: true })) end?: number,
+    @Query('status', new ParseIntPipe({ optional: true })) status?: number,
     @Query('types') types?: string | string[]
   ): Promise<ApiResponse<Types.TransactionsInfo>> {
     if (types != null && typeof types == 'string') types = [types]
     const transactionTypes = types != null ? this.parseTransactionTypes(types as string[]) : undefined
-    return apiResponse(this.service.transactions(limit, offset, user, agent, start, end, asc, transactionTypes), 200)
+    return apiResponse(this.service.transactions(limit, offset, user, agent, start, end, asc, status, transactionTypes), 200)
   }
 
   @Get('transaction-classification')