Fixing errors related to account and account delegation (#331)

* fix format * fixed naother issue * revert * fix optional * fix format * fix delegation event not being used * fmt * fix created at * check for height * fix sqlx
Concordium · Dec 18, 2024 · 0ea2cba · 0ea2cba
1 parent 9fd5af1
commit 0ea2cba
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 15 deletions.
diff --git a/...15245a355a3460e88ec2bce6ba571277e0be.json → ...4ac67825a548794ce2b9c3246d642cc013d5.json b/...15245a355a3460e88ec2bce6ba571277e0be.json → ...4ac67825a548794ce2b9c3246d642cc013d5.json
diff --git a/...nd-rust/.sqlx/query-71525908726653a43c0cf1b0515fb5d8aa6e0405d54781b6220a573e797e6e34.json b/...nd-rust/.sqlx/query-71525908726653a43c0cf1b0515fb5d8aa6e0405d54781b6220a573e797e6e34.json
diff --git a/backend-rust/src/graphql_api.rs b/backend-rust/src/graphql_api.rs
@@ -3140,16 +3140,25 @@ impl Account {
 
     /// Timestamp of the block where this account was created.
     async fn created_at(&self, ctx: &Context<'_>) -> ApiResult<DateTime> {
-        let slot_time = sqlx::query_scalar!(
-            "SELECT slot_time
-            FROM transactions
-            JOIN blocks ON transactions.block_height = blocks.height
-            WHERE transactions.index = $1",
-            self.transaction_index
-        )
-        .fetch_one(get_pool(ctx)?)
-        .await?;
-
+        let slot_time = if let Some(transaction_index) = self.transaction_index {
+            sqlx::query_scalar!(
+                "SELECT slot_time
+                FROM transactions
+                JOIN blocks ON transactions.block_height = blocks.height
+                WHERE transactions.index = $1",
+                transaction_index
+            )
+            .fetch_one(get_pool(ctx)?)
+            .await?
+        } else {
+            sqlx::query_scalar!(
+                "SELECT slot_time
+                FROM blocks
+                WHERE height = 0"
+            )
+            .fetch_one(get_pool(ctx)?)
+            .await?
+        };
         Ok(slot_time)
     }
 

diff --git a/backend-rust/src/graphql_api/account_metrics.rs b/backend-rust/src/graphql_api/account_metrics.rs
@@ -41,7 +41,7 @@ pub(crate) struct AccountMetricsQuery;
 
 #[Object]
 impl AccountMetricsQuery {
-    async fn account_metrics(
+    async fn accounts_metrics(
         &self,
         ctx: &Context<'_>,
         period: MetricsPeriod,

diff --git a/backend-rust/src/indexer.rs b/backend-rust/src/indexer.rs
@@ -1208,8 +1208,13 @@ impl PreparedEvent {
                 } => None,
 
                 AccountTransactionEffects::DelegationConfigured {
-                    data,
-                } => None,
+                    data: events,
+                } => Some(PreparedEvent::AccountDelegationEvents(
+                    events
+                        .iter()
+                        .map(PreparedAccountDelegationEvent::prepare)
+                        .collect::<anyhow::Result<Vec<_>>>()?,
+                )),
             },
             details => {
                 warn!("details = \n {:#?}", details);