feat: totalFiltered return from stats

gege83var · Feb 18, 2022 · 9e8cb2f · 9e8cb2f
1 parent 864837d
commit 9e8cb2f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/src/api/helpers/nftHelpers.ts b/src/api/helpers/nftHelpers.ts
@@ -44,6 +44,7 @@ export async function populateStat(
 ): Promise<{
   totalNft: number,
   totalListedNft: number,
+  totalFiltered: number | null,
   totalListedInMarketplace: number,
   totalOwnedByRequestingUser: number,
   totalOwnedListedByRequestingUser: number,
@@ -52,7 +53,7 @@ export async function populateStat(
   try {
     const marketplaceId = query.filter?.marketplaceId;
     const owner = query.filter?.owner;
-    const stat = await NFTService.getStatNFT(NFT.serieId, marketplaceId, owner)
+    const stat = await NFTService.getStatNFT(NFT.serieId, marketplaceId, owner, query)
     return stat
   } catch (err) {
     L.error({ err }, "NFTs stats could not have been fetched");

diff --git a/src/api/services/gqlQueriesBuilder.ts b/src/api/services/gqlQueriesBuilder.ts
@@ -427,7 +427,7 @@ countAllListedInMarketplace = (marketplaceId: number) => gql`
   }
 `;
 
-countTotalFilteredNFTs = (query: getTotalFilteredNFTsQuery) => { 
+countTotalFilteredNFTs = (query: getTotalFilteredNFTsQuery, seriesId?: string) => { 
   const {
     idsCategories,
     idsToExcludeCategories,
@@ -445,6 +445,7 @@ countTotalFilteredNFTs = (query: getTotalFilteredNFTsQuery) => {
         filter: { 
           and: [
             { timestampBurn: { isNull: true } }
+            ${seriesId!==undefined ? `{ serieId: { equalTo: "${seriesId}" } }` : ""}
             ${listed!==undefined ? `{ listed: { equalTo: ${!listed ? 0 : 1} } }` : ""}
             ${marketplaceId!==undefined ? `{ marketplaceId: { equalTo: "${marketplaceId}" } }` : ""}
             ${idsCategories ? `{id: { in: ${JSON.stringify(idsCategories.map(x => String(x)))} }}` : ""}

diff --git a/src/api/services/nft.ts b/src/api/services/nft.ts
@@ -147,21 +147,24 @@ export class NFTService {
    * @param seriesId - Series Id of nft to get stat for
    * @param marketplaceId - marketplace id (optional)
    * @param owner - owner (optional)
+   * @param filterOptionsQuery - filter options (optional)
    * @throws Will throw an error if can't request indexer
    */
-     async getStatNFT(seriesId:string, marketplaceId:number=null, owner:string=null): Promise<{
+     async getStatNFT(seriesId:string, marketplaceId:number=null, owner:string=null, filterOptionsQuery:getTotalFilteredNFTsQuery=null): Promise<{
       totalNft: number,
       totalListedNft: number,
+      totalFiltered: number | null,
       totalListedInMarketplace: number,
       totalOwnedByRequestingUser: number,
       totalOwnedListedByRequestingUser: number,
       totalOwnedListedInMarketplaceByRequestingUser: number,
       smallestPrice: string
     }> {
       try {
-        const [totalRequest, totalListedRequest, totalListedInMarketplaceRequest, totalOwnedByRequestingUserRequest, totalOwnedListedByRequestingUserRequest, totalOwnedListedInMarketplaceByRequestingUserRequest, smallestPriceRequest] = await Promise.all([
+        const [totalRequest, totalListedRequest, totalFilteredRequest, totalListedInMarketplaceRequest, totalOwnedByRequestingUserRequest, totalOwnedListedByRequestingUserRequest, totalOwnedListedInMarketplaceByRequestingUserRequest, smallestPriceRequest] = await Promise.all([
           request(indexerUrl, QueriesBuilder.countTotal(seriesId)),
           request(indexerUrl, QueriesBuilder.countTotalListed(seriesId)),
+          filterOptionsQuery ? request(indexerUrl, QueriesBuilder.countTotalFilteredNFTs(filterOptionsQuery, seriesId)) : null,
           marketplaceId!==null ? request(indexerUrl, QueriesBuilder.countTotalListedInMarketplace(seriesId, marketplaceId)) : 0,
           owner ? request(indexerUrl, QueriesBuilder.countTotalOwned(seriesId, owner)) : null,
           owner ? request(indexerUrl, QueriesBuilder.countTotalOwnedListed(seriesId, owner)) : null,
@@ -171,6 +174,7 @@ export class NFTService {
         const totalNft: number = totalRequest.nftEntities.totalCount;
         const totalListedNft: number = totalListedRequest.nftEntities.totalCount;
         const totalListedInMarketplace: number = totalListedInMarketplaceRequest ? totalListedInMarketplaceRequest.nftEntities.totalCount : 0;
+        const totalFiltered: number = totalFilteredRequest ? totalFilteredRequest.nftEntities.totalCount : null;
         const totalOwnedByRequestingUser: number = totalOwnedByRequestingUserRequest ? totalOwnedByRequestingUserRequest.nftEntities.totalCount : 0;
         const totalOwnedListedByRequestingUser: number = totalOwnedListedByRequestingUserRequest ? totalOwnedListedByRequestingUserRequest.nftEntities.totalCount : 0;
         const totalOwnedListedInMarketplaceByRequestingUser: number = totalOwnedListedInMarketplaceByRequestingUserRequest ? totalOwnedListedInMarketplaceByRequestingUserRequest.nftEntities.totalCount : 0;
@@ -179,7 +183,7 @@ export class NFTService {
         : 
           "0"
         ;
-        return { totalNft, totalListedNft, totalListedInMarketplace, totalOwnedByRequestingUser, totalOwnedListedByRequestingUser, totalOwnedListedInMarketplaceByRequestingUser, smallestPrice }
+        return { totalNft, totalListedNft, totalListedInMarketplace, totalFiltered, totalOwnedByRequestingUser, totalOwnedListedByRequestingUser, totalOwnedListedInMarketplaceByRequestingUser, smallestPrice }
       } catch (err) {
         throw new Error("Couldn't get NFT stat");
       }