[ref] gva: fusion sub newBlockMeta with newBlock

rust-libs/modules/gva/gql/src/subscriptions/new_blocks.rs

@@ -16,43 +16,52 @@
 use super::create_subscription;
 use crate::*;
 use duniter_dbs::databases::cm_v1::{CmV1DbReadable, CurrentBlockEvent, CurrentBlockMetaEvent};
+use futures::future::Either;
 
 #[derive(Clone, Copy, Default)]
 pub struct NewBlocksSubscription;
 
 #[async_graphql::Subscription]
 impl NewBlocksSubscription {
-    async fn new_blocks_meta(
+    async fn new_blocks(
         &self,
         ctx: &async_graphql::Context<'_>,
-    ) -> impl Stream<Item = async_graphql::Result<Vec<BlockMeta>>> {
+    ) -> impl Stream<Item = async_graphql::Result<Vec<Block>>> {
+        let meta_only = !(ctx.look_ahead().field("identities").exists()
+            || ctx.look_ahead().field("joiners").exists()
+            || ctx.look_ahead().field("actives").exists()
+            || ctx.look_ahead().field("leavers").exists()
+            || ctx.look_ahead().field("revoked").exists()
+            || ctx.look_ahead().field("excluded").exists()
+            || ctx.look_ahead().field("certifications").exists()
+            || ctx.look_ahead().field("transactions").exists());
+        if meta_only {
+            Either::Left(
                 create_subscription(
                     ctx,
                     |dbs| dbs.cm_db.current_block_meta(),
                     |events| {
-                let mut blocks_meta = Vec::new();
+                        let mut blocks = Vec::new();
                         for event in events.deref() {
                             if let CurrentBlockMetaEvent::Upsert {
                                 value: ref block_meta,
                                 ..
                             } = event
                             {
-                        blocks_meta.push(BlockMeta::from(block_meta));
+                                blocks.push(Block::from(block_meta));
                             }
                         }
-                if blocks_meta.is_empty() {
+                        if blocks.is_empty() {
                             futures::future::ready(None)
                         } else {
-                    futures::future::ready(Some(Ok(blocks_meta)))
+                            futures::future::ready(Some(Ok(blocks)))
                         }
                     },
                 )
-        .await
-    }
-    async fn new_blocks(
-        &self,
-        ctx: &async_graphql::Context<'_>,
-    ) -> impl Stream<Item = async_graphql::Result<Vec<Block>>> {
+                .await,
+            )
+        } else {
+            Either::Right(
                 create_subscription(
                     ctx,
                     |dbs| dbs.cm_db.current_block(),
@@ -73,6 +82,8 @@ impl NewBlocksSubscription {
                         }
                     },
                 )
-        .await
+                .await,
+            )
+        }
     }
 }