feat(api): return total requests when getFeedRequestsPage

packages/api/src/repository/ResultRequest.ts

@@ -4,7 +4,8 @@ import {
   Db,
   Collection,
   FeedInfo,
-  WithoutId
+  WithoutId,
+  PaginatedRequests
 } from '../types'
 import { containFalsyValues } from './containFalsyValues'
 
@@ -49,17 +50,26 @@ export class ResultRequestRepository {
     feedFullName: string,
     page: number,
     size: number
-  ): Promise<Array<ResultRequestDbObjectNormalized>> {
-    return (
-      await this.collection
-        .find({
-          feedFullName
-        })
-        .sort({ timestamp: -1 })
-        .skip(size * (page - 1))
-        .limit(size)
-        .toArray()
-    ).map(this.normalizeId)
+  ): Promise<PaginatedRequests> {
+    return {
+      requests: (
+        await this.collection
+          .find({
+            feedFullName
+          })
+          .sort({ timestamp: -1 })
+          .skip(size * (page - 1))
+          .limit(size)
+          .toArray()
+      ).map(this.normalizeId),
+      total: (
+        await this.collection
+          .find({
+            feedFullName
+          })
+          .toArray()
+      ).length
+    }
   }
 
   async getLastResult (

packages/api/src/resolvers.ts

@@ -11,11 +11,13 @@ const resolvers = {
     },
 
     requests: async (_parent, args, { resultRequestRepository }: Context) => {
-      return await resultRequestRepository.getFeedRequestsPage(
+      const result = await resultRequestRepository.getFeedRequestsPage(
         args.feedFullName,
         args.page,
         args.size
       )
+      console.log('result', result)
+      return result
     },
 
     feed: async (_parent, args, { feedRepository }: Context) => {

packages/api/src/typeDefs.ts

@@ -50,6 +50,11 @@ const typeDefs = gql`
     timestamp: String! @column
   }
 
+  type PaginatedResultRequest {
+    requests: [ResultRequest]
+    total: Int!
+  }
+
   # type DataRequest @entity(embedded: true) {
   #   retrieval: String! @column
   #   aggregation: String! @column
@@ -59,7 +64,11 @@ const typeDefs = gql`
   type Query {
     feed(feedFullName: String!): Feed
     feeds(network: String): FeedsPage!
-    requests(feedFullName: String!, page: Int!, size: Int!): [ResultRequest]!
+    requests(
+      feedFullName: String!
+      page: Int!
+      size: Int!
+    ): PaginatedResultRequest!
     networks: [NetworksConfig]!
   }
 `

packages/api/src/types.ts

@@ -111,6 +111,11 @@ export type ResultRequestDbObjectNormalized = ResultRequestDbObject & {
   id: string
 }
 
+export type PaginatedRequests = {
+  requests: Array<ResultRequestDbObjectNormalized>
+  total: number
+}
+
 export type Repositories = {
   feedRepository: FeedRepository
   resultRequestRepository: ResultRequestRepository

packages/ui/apollo/queries/requests.gql

@@ -1,9 +1,12 @@
 query requests($feedFullName: String!, $page: Int!, $size: Int!) {
   requests(feedFullName: $feedFullName, page: $page, size: $size) {
-    feedFullName
-    result
-    drTxHash,
-    requestId
-    timestamp
+    requests {
+      feedFullName
+      result
+      drTxHash,
+      requestId
+      timestamp
+    }
+    total
   }
 }

packages/ui/components/DataFeedDetails.vue

@@ -184,8 +184,8 @@ export default {
       }
     },
     numberOfPages() {
-      return this.feed
-        ? Math.ceil(this.feed.requests.length / this.itemsPerPage)
+      return this.requests
+        ? Math.ceil(this.requests.total / this.itemsPerPage)
         : 0
     },
     chartData() {
@@ -204,8 +204,8 @@ export default {
       }
     },
     transactions() {
-      if (this.feed && this.requests && this.requests.length > 0) {
-        return this.requests.map((request) => ({
+      if (this.requests && this.requests.total > 0) {
+        return this.requests.requests.map((request) => ({
           witnetLink: getWitnetBlockExplorerLink(request.drTxHash),
           drTxHash: request.drTxHash,
           data: {