fix: casting slowing down queries

decentraland · Dec 11, 2024 · ebaa7ed · ebaa7ed
1 parent d9f0b0d
commit ebaa7ed
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/src/ports/catalog/queries.ts b/src/ports/catalog/queries.ts
@@ -529,7 +529,7 @@ const getTradesCTE = () => {
               )
             ) AS assets,
             CASE
-              WHEN COUNT(CASE WHEN trade_status.action = 'cancelled' THEN 1 END) > 0 THEN '${ListingStatus.CANCELLED}'
+              WHEN COUNT(CASE WHEN trade_status.action = 'cancelled' THEN 1 END) > 0 THEN 'cancelled'
               WHEN t.expires_at < now()::timestamptz(3) THEN '${ListingStatus.CANCELLED}'
               WHEN (
                 (signer_signature_index.index IS NOT NULL AND signer_signature_index.index != (t.checks ->> 'signerSignatureIndex')::int)
@@ -604,7 +604,7 @@ const getTradesJoin = () => {
           FROM unified_trades
             WHERE status = 'open'
             GROUP BY contract_address_sent, assets -> 'sent' ->> 'item_id'
-          ) AS offchain_orders ON offchain_orders.contract_address_sent = items.collection_id AND offchain_orders.item_id = items.blockchain_id::text
+          ) AS offchain_orders ON offchain_orders.contract_address_sent = items.collection_id AND offchain_orders.item_id::numeric = items.blockchain_id
   `
 }
 

diff --git a/src/ports/nfts/component.ts b/src/ports/nfts/component.ts
@@ -50,7 +50,8 @@ export function createNFTsComponent(components: Pick<AppComponents, 'dappsDataba
       if ((error as Error).message === 'Query read timeout') {
         console.error('Query timeout exceeded (2 minutes)', {
           filters,
-          query
+          query: query?.text,
+          values: query?.values
         })
       }
       throw new HttpError("Couldn't fetch nfts with the filters provided", 400)

diff --git a/src/ports/nfts/queries.ts b/src/ports/nfts/queries.ts
@@ -230,7 +230,7 @@ function getTradesCTE(filters: GetNFTsFilters): SQLStatement {
         LEFT JOIN marketplace.trade_assets_erc721 as erc721_asset ON ta.id = erc721_asset.asset_id
         LEFT JOIN marketplace.trade_assets_erc20 as erc20_asset ON ta.id = erc20_asset.asset_id
         LEFT JOIN marketplace.trade_assets_item as item_asset ON ta.id = item_asset.asset_id
-        LEFT JOIN squid_marketplace.item as item ON (ta.contract_address = item.collection_id AND item_asset.item_id = item.blockchain_id::text)
+        LEFT JOIN squid_marketplace.item as item ON (ta.contract_address = item.collection_id AND item_asset.item_id::numeric = item.blockchain_id)
         LEFT JOIN squid_marketplace.nft as nft ON (ta.contract_address = nft.contract_address AND erc721_asset.token_id::numeric = nft.token_id)
         LEFT JOIN squid_marketplace.account as account ON (account.id = nft.owner_id)
       ) as assets_with_values ON t.id = assets_with_values.trade_id
@@ -555,7 +555,7 @@ function getRecentlyListedNFTsCTE(nftFilters: GetNFTsFilters): SQLStatement {
         LEFT JOIN marketplace.trade_assets_erc721 erc721_asset ON ta.id = erc721_asset.asset_id
         LEFT JOIN squid_marketplace.nft nft ON (
           ta.contract_address = nft.contract_address
-          AND erc721_asset.token_id = nft.token_id::TEXT
+          AND erc721_asset.token_id::numeric = nft.token_id
         )
         `
     .append(whereClauseForTradeNFTsIds)

diff --git a/src/ports/trades/queries.ts b/src/ports/trades/queries.ts
@@ -156,8 +156,8 @@ export function getTradesForTypeQuery(type: TradeType) {
       LEFT JOIN marketplace.trade_assets_erc721 as erc721_asset ON ta.id = erc721_asset.asset_id
       LEFT JOIN marketplace.trade_assets_erc20 as erc20_asset ON ta.id = erc20_asset.asset_id
       LEFT JOIN marketplace.trade_assets_item as item_asset ON ta.id = item_asset.asset_id
-      LEFT JOIN squid_marketplace.item as item ON (ta.contract_address = item.collection_id AND item_asset.item_id = item.blockchain_id::text)
-      LEFT JOIN squid_marketplace.nft as nft ON (ta.contract_address = nft.contract_address AND erc721_asset.token_id = nft.token_id::text)
+      LEFT JOIN squid_marketplace.item as item ON (ta.contract_address = item.collection_id AND item_asset.item_id::numeric = item.blockchain_id)
+      LEFT JOIN squid_marketplace.nft as nft ON (ta.contract_address = nft.contract_address AND erc721_asset.token_id::numeric = nft.token_id)
       LEFT JOIN squid_marketplace.account as account ON (account.id = nft.owner_id)
     ) as assets_with_values ON t.id = assets_with_values.trade_id
     LEFT JOIN squid_trades.trade as trade_status ON trade_status.signature = t.hashed_signature
@@ -231,8 +231,8 @@ export function getTradesForTypeQueryWithFilters(type: TradeType, filters: NFTFi
       LEFT JOIN marketplace.trade_assets_erc721 as erc721_asset ON ta.id = erc721_asset.asset_id
       LEFT JOIN marketplace.trade_assets_erc20 as erc20_asset ON ta.id = erc20_asset.asset_id
       LEFT JOIN marketplace.trade_assets_item as item_asset ON ta.id = item_asset.asset_id
-      LEFT JOIN squid_marketplace.item as item ON (ta.contract_address = item.collection_id AND item_asset.item_id = item.blockchain_id::text)
-      LEFT JOIN squid_marketplace.nft as nft ON (ta.contract_address = nft.contract_address AND erc721_asset.token_id = nft.token_id::text)
+      LEFT JOIN squid_marketplace.item as item ON (ta.contract_address = item.collection_id AND item_asset.item_id::numeric = item.blockchain_id)
+      LEFT JOIN squid_marketplace.nft as nft ON (ta.contract_address = nft.contract_address AND erc721_asset.token_id::numeric = nft.token_id)
       LEFT JOIN squid_marketplace.account as account ON (account.id = nft.owner_id)
     ) as assets_with_values ON t.id = assets_with_values.trade_id
     LEFT JOIN squid_trades.trade as trade_status ON trade_status.signature = t.hashed_signature