Merge pull request #595 from input-output-hk/feature/reward-received-in

feature: `Reward.receivedIn`
cardano-foundation · Sep 17, 2021 · 67a8777 · 67a8777
2 parents 8fa2893 + e9e5715
commit 67a8777
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 0 deletions.
diff --git a/packages/api-cardano-db-hasura/hasura/project/metadata/tables.yaml b/packages/api-cardano-db-hasura/hasura/project/metadata/tables.yaml
@@ -435,6 +435,14 @@
           name: Epoch
         column_mapping:
           earnedInEpochNo: number
+  - name: receivedIn
+    using:
+      manual_configuration:
+        remote_table:
+          schema: public
+          name: Epoch
+        column_mapping:
+          receivedInEpochNo: number
   - name: stakePool
     using:
       manual_configuration:

diff --git a/packages/api-cardano-db-hasura/hasura/project/migrations/1589369664961_init/up.sql b/packages/api-cardano-db-hasura/hasura/project/migrations/1589369664961_init/up.sql
@@ -150,6 +150,7 @@ SELECT
   stake_address.view AS "address",
   reward.earned_epoch AS "earnedInEpochNo",
   reward.pool_id AS pool_hash_id,
+  reward.spendable_epoch AS "receivedInEpochNo",
   reward.type AS "type"
 FROM reward
 JOIN stake_address on reward.addr_id = stake_address.id;

diff --git a/packages/api-cardano-db-hasura/schema.graphql b/packages/api-cardano-db-hasura/schema.graphql
@@ -609,6 +609,7 @@ type Reward {
   address: StakeAddress!
   amount: String!
   earnedIn: Epoch!
+  receivedIn: Epoch!
   stakePool: StakePool
   type: String!
 }
@@ -648,6 +649,7 @@ input Reward_bool_exp {
   address: StakeAddress_comparison_exp
   amount: text_comparison_exp
   earnedIn: Epoch_bool_exp
+  receivedIn: Epoch_bool_exp
   stakePool: StakePool_bool_exp
   type: text_comparison_exp
 }
@@ -656,6 +658,7 @@ input Reward_order_by {
   address: order_by
   amount: order_by
   earnedIn: Epoch_order_by
+  receivedIn: Epoch_order_by
   stakePool: StakePool_order_by
   type: order_by
 }

diff --git a/packages/api-cardano-db-hasura/src/example_queries/rewards/rewardsForAddress.graphql b/packages/api-cardano-db-hasura/src/example_queries/rewards/rewardsForAddress.graphql
@@ -11,6 +11,9 @@ query rewardsForAddress (
         earnedIn {
             number
         }
+        receivedIn {
+            number
+        }
         type
     }
 }
diff --git a/packages/api-cardano-db-hasura/src/example_queries/stake_pools/allStakePoolFields.graphql b/packages/api-cardano-db-hasura/src/example_queries/stake_pools/allStakePoolFields.graphql
@@ -69,6 +69,9 @@ query allStakePoolFields (
             earnedIn {
                 number
             }
+            receivedIn {
+                number
+            }
         }
         rewards_aggregate {
             aggregate {

diff --git a/packages/api-cardano-db-hasura/test/rewards.query.test.ts b/packages/api-cardano-db-hasura/test/rewards.query.test.ts
@@ -25,6 +25,7 @@ describe('rewards', () => {
     expect(rewards.length).toBe(5)
     expect(rewards[0].stakePool.hash).toBeDefined()
     expect(rewards[0].earnedIn.number).toBeDefined()
+    expect(rewards[0].receivedIn.number).toBeDefined()
     expect(rewards[0].type).toBeDefined()
   })