diff --git a/rust-libs/modules/gva/src/entities.rs b/rust-libs/modules/gva/src/entities.rs index b13c292280c4d8913b59350651d5c95bb4075216..6aac30cd2524c60472109e77d0009ebec6230512 100644 --- a/rust-libs/modules/gva/src/entities.rs +++ b/rust-libs/modules/gva/src/entities.rs @@ -18,6 +18,11 @@ pub mod ud_gva; use crate::*; +#[derive(Default, async_graphql::SimpleObject)] +pub(crate) struct AggregateSum { + pub(crate) aggregate: Sum, +} + #[derive(Default, async_graphql::SimpleObject)] pub(crate) struct AmountWithBase { pub(crate) amount: i32, diff --git a/rust-libs/modules/gva/src/lib.rs b/rust-libs/modules/gva/src/lib.rs index 5bcd84c4c8756485c41433e0d20ad2e3205ed72d..9825d0db65582a900640bed3869fd9968768f236 100644 --- a/rust-libs/modules/gva/src/lib.rs +++ b/rust-libs/modules/gva/src/lib.rs @@ -38,7 +38,7 @@ mod warp_; use crate::entities::{ tx_gva::TxGva, ud_gva::{CurrentUdGva, RevalUdGva, UdGva}, - AmountWithBase, RawTxOrChanges, Sum, TxsHistoryGva, UtxoGva, + AggregateSum, AmountWithBase, RawTxOrChanges, Sum, TxsHistoryGva, UtxoGva, }; use crate::inputs::{TxIssuer, TxRecipient, UdsFilter}; use crate::inputs_validators::TxCommentValidator; diff --git a/rust-libs/modules/gva/src/queries.rs b/rust-libs/modules/gva/src/queries.rs index 6925c6c3e0d61eceff4805c3076e02f8553ff4f9..17146d9795581c4d357c7c988088171d738a04a6 100644 --- a/rust-libs/modules/gva/src/queries.rs +++ b/rust-libs/modules/gva/src/queries.rs @@ -17,7 +17,7 @@ pub mod account_balance; pub mod gen_tx; pub mod txs_history; pub mod uds; -pub mod utxos; +pub mod utxos_of_script; use crate::*; use duniter_dbs::cm_v1::CmV1DbReadable as _; @@ -29,7 +29,7 @@ pub struct QueryRoot( queries::gen_tx::GenTxsQuery, queries::txs_history::TxsHistoryQuery, queries::uds::UdsQuery, - queries::utxos::UtxosQuery, + queries::utxos_of_script::UtxosQuery, ); #[derive(Default, async_graphql::SimpleObject)] diff --git a/rust-libs/modules/gva/src/queries/uds.rs b/rust-libs/modules/gva/src/queries/uds.rs index 0a1924c11b87cb856f406fb9d445628e70b7ada6..21c3902ef2bf2bf2e523bcf67b388d9f65d32f20 100644 --- a/rust-libs/modules/gva/src/queries/uds.rs +++ b/rust-libs/modules/gva/src/queries/uds.rs @@ -48,7 +48,7 @@ impl UdsQuery { #[graphql(default)] filter: UdsFilter, #[graphql(desc = "pagination", default)] pagination: Pagination, #[graphql(desc = "Amount needed")] amount: Option<i64>, - ) -> async_graphql::Result<Connection<usize, UdGva, Sum, EmptyFields>> { + ) -> async_graphql::Result<Connection<usize, UdGva, AggregateSum, EmptyFields>> { let pagination = Pagination::convert_to_page_info(pagination)?; let pubkey = PublicKey::from_base58(&pubkey)?; @@ -107,10 +107,12 @@ impl UdsQuery { let mut conn = Connection::with_additional_fields( has_previous_page, has_next_page, - Sum { - sum: AmountWithBase { - amount: sum.amount() as i32, - base: sum.base() as i32, + AggregateSum { + aggregate: Sum { + sum: AmountWithBase { + amount: sum.amount() as i32, + base: sum.base() as i32, + }, }, }, ); diff --git a/rust-libs/modules/gva/src/queries/utxos.rs b/rust-libs/modules/gva/src/queries/utxos_of_script.rs similarity index 92% rename from rust-libs/modules/gva/src/queries/utxos.rs rename to rust-libs/modules/gva/src/queries/utxos_of_script.rs index 20c0a732f86b609d4921689d27cbc93b5754208c..8892ac8ee7380439bc905eb99f40b0cb243af3e4 100644 --- a/rust-libs/modules/gva/src/queries/utxos.rs +++ b/rust-libs/modules/gva/src/queries/utxos_of_script.rs @@ -32,7 +32,7 @@ impl UtxosQuery { #[graphql(desc = "DUBP wallet script")] script: String, #[graphql(desc = "pagination", default)] pagination: Pagination, #[graphql(desc = "Amount needed")] amount: Option<i64>, - ) -> async_graphql::Result<Connection<String, UtxoGva, Sum, EmptyFields>> { + ) -> async_graphql::Result<Connection<String, UtxoGva, AggregateSum, EmptyFields>> { let pagination = Pagination::convert_to_page_info(pagination)?; let script = dubp::documents_parser::wallet_script_from_str(&script)?; @@ -81,10 +81,12 @@ impl UtxosQuery { let mut conn = Connection::with_additional_fields( has_previous_page, has_next_page, - Sum { - sum: AmountWithBase { - amount: sum.amount() as i32, - base: sum.base() as i32, + AggregateSum { + aggregate: Sum { + sum: AmountWithBase { + amount: sum.amount() as i32, + base: sum.base() as i32, + }, }, }, );