apply same logic for get block by height and id

src/database.rs

@@ -1085,10 +1085,12 @@ impl Database {
     #[instrument(skip(self, block_id))]
     pub async fn block_by_id(&self, block_id: &[u8]) -> Result<Option<Row>, Error> {
         // query for the block if it exists
-        let str = format!(
-            "SELECT * FROM {}.{BLOCKS_TABLE_NAME} WHERE block_id=$1",
-            self.network
-        );
+        // let str = format!(
+        //     "SELECT * FROM {}.{BLOCKS_TABLE_NAME} WHERE block_id=$1",
+        //     self.network
+        // );
+        let str = format!("SELECT b.*, txs FROM {0}.blocks b LEFT JOIN (SELECT block_id, JSON_AGG(JSON_BUILD_OBJECT('hash_id', encode(t.hash, 'hex'), 'tx_type', t.tx_type)) AS txs FROM {0}.transactions t GROUP BY t.block_id) t ON b.block_id = t.block_id WHERE b.block_id = $1;", self.network);
+
         query(&str)
             .bind(block_id)
             .fetch_optional(&*self.pool)
@@ -1099,10 +1101,12 @@ impl Database {
     /// Returns the block at `block_height` if present, otherwise returns an Error.
     #[instrument(skip(self))]
     pub async fn block_by_height(&self, block_height: u32) -> Result<Option<Row>, Error> {
-        let str = format!(
-            "SELECT * FROM {}.{BLOCKS_TABLE_NAME} WHERE header_height={block_height}",
-            self.network
-        );
+        // let str = format!(
+        //     "SELECT * FROM {}.{BLOCKS_TABLE_NAME} WHERE header_height={block_height}",
+        //     self.network
+        // );
+        let str = format!("SELECT b.*, txs FROM {0}.blocks b LEFT JOIN (SELECT block_id, JSON_AGG(JSON_BUILD_OBJECT('hash_id', encode(t.hash, 'hex'), 'tx_type', t.tx_type)) AS txs FROM {0}.transactions t GROUP BY t.block_id) t ON b.block_id = t.block_id WHERE b.header_height = {block_height};", self.network);
+
 
         query(&str)
             .fetch_optional(&*self.pool)

src/server/endpoints/block.rs

@@ -57,9 +57,6 @@ pub async fn get_block_by_hash(
     };
     let mut block = BlockInfo::try_from(&row)?;
 
-    let block_id: Vec<u8> = row.try_get("block_id")?;
-    get_tx_hashes(&state, &mut block, &block_id).await?;
-
     Ok(Json(Some(block)))
 }
 
@@ -76,9 +73,6 @@ pub async fn get_block_by_height(
 
     let mut block = BlockInfo::try_from(&row)?;
 
-    let block_id: Vec<u8> = row.try_get("block_id")?;
-    get_tx_hashes(&state, &mut block, &block_id).await?;
-
     Ok(Json(Some(block)))
 }