Merge pull request #312 from dkackman/nft-paging

Nft paging improvements
xch-dev · Feb 2, 2025 · 1c41312 · 1c41312
2 parents e597216 + 7643192
commit 1c41312
Show file tree

Hide file tree

Showing 20 changed files with 833 additions and 391 deletions.
diff --git a/.sqlx/query-05d7a87d04e669dc8ed1a1152be390d5abfdd0cf202744c65597aec1f2f03ff1.json b/.sqlx/query-05d7a87d04e669dc8ed1a1152be390d5abfdd0cf202744c65597aec1f2f03ff1.json
diff --git a/...2a627dc5d84bec1519e0779dc61c13ab0a26.json → ...7e80b9e84294af7b626712e4f13a7f23468b.json b/...2a627dc5d84bec1519e0779dc61c13ab0a26.json → ...7e80b9e84294af7b626712e4f13a7f23468b.json
diff --git a/...deeb3765c89c9fc78576f447c646c46f445c.json → ...eb35e1c2bcfb1a276f633cf2493f2038231f.json b/...deeb3765c89c9fc78576f447c646c46f445c.json → ...eb35e1c2bcfb1a276f633cf2493f2038231f.json
diff --git a/.sqlx/query-c28c5534fa54f929c81d02b31276dfb5d621da40c7adc621a055e9b72d4dae30.json b/.sqlx/query-c28c5534fa54f929c81d02b31276dfb5d621da40c7adc621a055e9b72d4dae30.json
diff --git a/.sqlx/query-cc24879f9012f1e056cc0fcfc664437aee6a72b858918c0ca70776ef36b50f33.json b/.sqlx/query-cc24879f9012f1e056cc0fcfc664437aee6a72b858918c0ca70776ef36b50f33.json
diff --git a/...10085a115f7d5900802ade79722b0c4ed560.json → ...a4af753cbee36b430767e372debb5df15ce4.json b/...10085a115f7d5900802ade79722b0c4ed560.json → ...a4af753cbee36b430767e372debb5df15ce4.json
diff --git a/crates/sage-api/src/requests/data.rs b/crates/sage-api/src/requests/data.rs
@@ -91,12 +91,16 @@ pub struct GetDidsResponse {
 
 #[derive(Debug, Clone, Copy, Serialize, Deserialize)]
 #[cfg_attr(feature = "tauri", derive(specta::Type))]
-pub struct GetMinterDidIds {}
+pub struct GetMinterDidIds {
+    pub offset: u32,
+    pub limit: u32,
+}
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[cfg_attr(feature = "tauri", derive(specta::Type))]
 pub struct GetMinterDidIdsResponse {
     pub did_ids: Vec<String>,
+    pub total: u32,
 }
 
 #[derive(Debug, Clone, Copy, Serialize, Deserialize)]
@@ -147,6 +151,7 @@ pub struct GetNftCollections {
 #[cfg_attr(feature = "tauri", derive(specta::Type))]
 pub struct GetNftCollectionsResponse {
     pub collections: Vec<NftCollectionRecord>,
+    pub total: u32,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -182,6 +187,7 @@ pub struct GetNfts {
 #[cfg_attr(feature = "tauri", derive(specta::Type))]
 pub struct GetNftsResponse {
     pub nfts: Vec<NftRecord>,
+    pub total: u32,
 }
 
 #[derive(Debug, Clone, Copy, Serialize, Deserialize)]

diff --git a/crates/sage-database/src/lib.rs b/crates/sage-database/src/lib.rs
@@ -73,6 +73,21 @@ impl Database {
 
         Ok(())
     }
+
+    /// Count collections, optionally including hidden ones
+    pub async fn count_collections(&self, include_hidden: bool) -> Result<i64> {
+        let count: i64 = if include_hidden {
+            sqlx::query_scalar!("SELECT COUNT(*) FROM collections")
+                .fetch_one(&self.pool)
+                .await?
+        } else {
+            sqlx::query_scalar!("SELECT COUNT(*) FROM collections WHERE visible = 1")
+                .fetch_one(&self.pool)
+                .await?
+        };
+
+        Ok(count)
+    }
 }
 
 #[derive(Debug)]