MTG 1164 Apply showZeroBalance only for NFTs

integration_tests/src/data/largest_token_account_ids/3yMfqHsajYFw2Yw6C4kwrvHRESMg9U7isNVJuzNETJKG/3yMfqHsajYFw2Yw6C4kwrvHRESMg9U7isNVJuzNETJKG

@@ -0,0 +1 @@
+ßó4'p) Ÿ%¦ GáëÎX·2G¿%Šù£<y‹

integration_tests/src/mpl_core_tests.rs

@@ -67,7 +67,6 @@ async fn test_mpl_core_get_collection() {
 }
 
 #[tokio::test]
-#[ignore = "TODO: must recheck snapshot incompatibility"]
 #[serial]
 #[named]
 async fn test_mpl_core_get_assets_by_authority() {

integration_tests/src/regular_nft_tests.rs

@@ -164,3 +164,52 @@ async fn test_reg_search_assets() {
     let response = setup.das_api.search_assets(request, mutexed_tasks.clone()).await.unwrap();
     insta::assert_json_snapshot!(name, response);
 }
+
+#[tokio::test]
+#[serial]
+#[named]
+async fn test_search_by_owner_with_show_zero_balance() {
+    let name = trim_test_name(function_name!());
+    let setup = TestSetup::new_with_options(
+        name.clone(),
+        TestSetupOptions { network: Some(Network::Mainnet), clear_db: true },
+    )
+    .await;
+
+    let seeds: Vec<SeedEvent> = seed_token_mints([
+        "HxhWkVpk5NS4Ltg5nij2G671CKXFRKPK8vy271Ub4uEK", // mint for fungible acc
+    ]);
+    index_seed_events(&setup, seeds.iter().collect_vec()).await;
+
+    let seeds: Vec<SeedEvent> = seed_accounts([
+        "3rzjtWZcZyvADaT5rrkRwGKWjnuzvK3PDedGMUwpnrrP", // empty token acc from NFT (3yMfqHsajYFw2Yw6C4kwrvHRESMg9U7isNVJuzNETJKG)
+        "94eSnb5qBWTvxj3gqP6Ukq8bPhRTNNVZrE7zR5yTZd9E", // fungible token with zero balance
+    ]);
+
+    index_seed_events(&setup, seeds.iter().collect_vec()).await;
+
+    let seeds: Vec<SeedEvent> = seed_nfts([
+        "BFjgKzLNKZEbZoDrESi79ai8jXgyBth1HXCJPXBGs8sj", // NFT wallet has
+        "3yMfqHsajYFw2Yw6C4kwrvHRESMg9U7isNVJuzNETJKG", // NFT wallet used to have
+    ]);
+
+    index_seed_events(&setup, seeds.iter().collect_vec()).await;
+
+    let request = r#"
+    {
+        "page": 1,
+        "limit": 500,
+        "ownerAddress": "3VvLDXqJbw3heyRwFxv8MmurPznmDVUJS9gPMX2BDqfM",
+        "tokenType": "all",
+        "options": {
+            "showNativeBalance": true, "showZeroBalance": true
+        }
+    }
+    "#;
+
+    let mutexed_tasks = Arc::new(Mutex::new(JoinSet::new()));
+
+    let request: SearchAssets = serde_json::from_str(request).unwrap();
+    let response = setup.das_api.search_assets(request, mutexed_tasks.clone()).await.unwrap();
+    insta::assert_json_snapshot!(name, response);
+}

integration_tests/src/snapshots/integration_tests__regular_nft_tests__search_by_owner_with_show_zero_balance.snap

@@ -0,0 +1,147 @@
+---
+source: integration_tests/src/regular_nft_tests.rs
+assertion_line: 214
+expression: response
+snapshot_kind: text
+---
+{
+  "total": 2,
+  "limit": 500,
+  "page": 1,
+  "items": [
+    {
+      "interface": "Custom",
+      "id": "HxhWkVpk5NS4Ltg5nij2G671CKXFRKPK8vy271Ub4uEK",
+      "content": {
+        "$schema": "https://schema.metaplex.com/nft1.0.json",
+        "json_uri": "",
+        "files": [],
+        "metadata": {
+          "name": "Hxro (Wormhole)",
+          "symbol": "HXRO"
+        },
+        "links": {}
+      },
+      "authorities": [
+        {
+          "address": "BCD75RNBHrJJpW4dXVagL5mPjzRLnVZq4YirJdjEYMV7",
+          "scopes": [
+            "full"
+          ]
+        }
+      ],
+      "compression": {
+        "eligible": false,
+        "compressed": false,
+        "data_hash": "",
+        "creator_hash": "",
+        "asset_hash": "",
+        "tree": "",
+        "seq": 0,
+        "leaf_id": 0
+      },
+      "grouping": [],
+      "royalty": {
+        "royalty_model": "creators",
+        "target": null,
+        "percent": 0.0,
+        "basis_points": 0,
+        "primary_sale_happened": false,
+        "locked": false
+      },
+      "creators": [],
+      "ownership": {
+        "frozen": false,
+        "delegated": false,
+        "delegate": null,
+        "ownership_model": "single",
+        "owner": "3VvLDXqJbw3heyRwFxv8MmurPznmDVUJS9gPMX2BDqfM"
+      },
+      "supply": null,
+      "mutable": true,
+      "burnt": false,
+      "lamports": 5616720,
+      "executable": false,
+      "metadata_owner": "metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s",
+      "rent_epoch": 18446744073709551615,
+      "token_info": {
+        "balance": 0,
+        "supply": 69421234056477841,
+        "decimals": 8,
+        "token_program": "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA",
+        "associated_token_address": "94eSnb5qBWTvxj3gqP6Ukq8bPhRTNNVZrE7zR5yTZd9E",
+        "mint_authority": "BCD75RNBHrJJpW4dXVagL5mPjzRLnVZq4YirJdjEYMV7"
+      }
+    },
+    {
+      "interface": "V1_NFT",
+      "id": "BFjgKzLNKZEbZoDrESi79ai8jXgyBth1HXCJPXBGs8sj",
+      "content": {
+        "$schema": "https://schema.metaplex.com/nft1.0.json",
+        "json_uri": "",
+        "files": [],
+        "metadata": {
+          "name": "Degen Ape",
+          "symbol": "DAPE",
+          "token_standard": "NonFungible"
+        },
+        "links": {}
+      },
+      "authorities": [
+        {
+          "address": "3VvLDXqJbw3heyRwFxv8MmurPznmDVUJS9gPMX2BDqfM",
+          "scopes": [
+            "full"
+          ]
+        }
+      ],
+      "compression": {
+        "eligible": false,
+        "compressed": false,
+        "data_hash": "",
+        "creator_hash": "",
+        "asset_hash": "",
+        "tree": "",
+        "seq": 0,
+        "leaf_id": 0
+      },
+      "grouping": [],
+      "royalty": {
+        "royalty_model": "creators",
+        "target": null,
+        "percent": 0.0,
+        "basis_points": 0,
+        "primary_sale_happened": false,
+        "locked": false
+      },
+      "creators": [],
+      "ownership": {
+        "frozen": false,
+        "delegated": false,
+        "delegate": null,
+        "ownership_model": "single",
+        "owner": "3VvLDXqJbw3heyRwFxv8MmurPznmDVUJS9gPMX2BDqfM"
+      },
+      "supply": {
+        "print_max_supply": 0,
+        "print_current_supply": 0,
+        "edition_nonce": 255
+      },
+      "mutable": true,
+      "burnt": false,
+      "lamports": 5616720,
+      "executable": false,
+      "metadata_owner": "metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s",
+      "rent_epoch": 18446744073709551615,
+      "token_info": {
+        "balance": 1,
+        "supply": 1,
+        "decimals": 0,
+        "token_program": "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA",
+        "associated_token_address": "3oiDhCQMDzxj8NcLfRBCQj3R9mQkE1DnDZfrNbAgruQk",
+        "mint_authority": "565tK79EKhQSYybx52awrrFhD4m2ty198rrUBmiqq7xo",
+        "freeze_authority": "565tK79EKhQSYybx52awrrFhD4m2ty198rrUBmiqq7xo"
+      }
+    }
+  ]
+}

postgre-client/src/asset_filter_client.rs

@@ -123,7 +123,7 @@ impl PgClient {
                     ast_slot_created,
                     ast_slot_updated
                     FROM assets_v3
-                    JOIN fungible_tokens ON ast_pubkey = fungible_tokens.fbt_asset
+                    JOIN fungible_tokens ON ast_pubkey = fungible_tokens.fbt_asset AND ast_owner_type = 'token'
                     WHERE ast_supply > 0 AND fbt_owner = ",
                         );
                         query_builder.push_bind(owner_address);