Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[mtg-1380] fix(api): getAssetsByCreator doesn't return empty fields #444

Merged
merged 5 commits into from
Mar 6, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion nft_ingester/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ xxhash-rust = { workspace = true }
hex = { workspace = true }
jemallocator = { workspace = true }
arweave-rs = { workspace = true }
serde_cbor = { workspace = true }
bubblegum-batch-sdk = { workspace = true }
jsonpath_lib = { workspace = true }
mime_guess = { workspace = true }
Expand All @@ -81,6 +80,7 @@ axum = { workspace = true }
rocksdb = { workspace = true }
num-bigint = "0.4"
tracing-test = { workspace = true }
assert-json-diff = "2.0"

[dev-dependencies]
setup = { path = "../tests/setup" }
Expand Down
4 changes: 2 additions & 2 deletions nft_ingester/docker-compose_db.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ version: "3.7"
services:
pgdb:
image: "postgres:14.15"
container_name: pgdb
container_name: pg_db
environment:
- POSTGRES_USER=solana
- POSTGRES_PASSWORD=solana
- POSTGRES_DB=aura_db
- POSTGRES_DB=solana
ports:
- "5432:5432"

Expand Down
82 changes: 75 additions & 7 deletions nft_ingester/src/api/dapi/rpc_asset_convertors.rs
Original file line number Diff line number Diff line change
Expand Up @@ -234,16 +234,23 @@ fn extract_collection_metadata(
meta.set_item("name", name.clone());
}

let symbol = safe_select(chain_data_selector, "$.symbol");
if let Some(symbol) = symbol {
meta.set_item("symbol", symbol.clone());
let link_fields = vec!["name", "symbol"];
for name in link_fields {
let value = safe_select(chain_data_selector, format!("$.{}", name).as_str());
if let Some(symbol) = value {
meta.set_item(name, symbol.clone());
} else {
meta.set_item(name, "".into());
}
}

let link_fields = vec!["image", "external_url", "description"];
for f in link_fields {
let l = safe_select(selector, format!("$.{}", f).as_str());
if let Some(l) = l {
meta.set_item(f, l.to_owned());
for name in link_fields {
let value = safe_select(selector, format!("$.{}", name).as_str());
if let Some(symbol) = value {
meta.set_item(name, symbol.clone());
} else {
meta.set_item(name, "".into());
}
}

Expand Down Expand Up @@ -629,3 +636,64 @@ fn get_pagination_values(
Ok(Pagination { after: last_row, before: first_row, ..Default::default() })
}
}

#[cfg(test)]
mod tests {
use assert_json_diff::assert_json_eq;
use entities::models::Updated;
use serde_json::json;

use super::*;

#[test]
fn test_extract_collection_metadata() {
let asset_dynamic = AssetDynamicDetails {
url: Updated::new(12, None, "https://example.com".to_string()),
onchain_data: Some(Updated::new(
12,
None,
r#"{"name": "Test Asset", "symbol": "TST"}"#.to_string(),
)),
..Default::default()
};
let offchain_data = OffChainData {
metadata: Some(r#"{"image": "https://example.com/image.png", "external_url": "https://example.com", "description": "Test Description"}"#.to_string()),
..Default::default()
};

let expected_metadata = json!({
"name": "Test Asset",
"symbol": "TST",
"image": "https://example.com/image.png",
"external_url": "https://example.com",
"description": "Test Description"
});

let result = extract_collection_metadata(&asset_dynamic, &offchain_data);

assert_json_eq!(result, expected_metadata);
}

#[test]
fn test_extract_collection_metadata_empty_fields() {
let asset_dynamic = AssetDynamicDetails {
url: Updated::new(12, None, "https://example.com".to_string()),
onchain_data: Some(Updated::new(12, None, r#"{}"#.to_string())),
..Default::default()
};
let offchain_data =
OffChainData { metadata: Some(r#"{}"#.to_string()), ..Default::default() };

let expected_metadata = json!({
"name": "",
"symbol": "",
"image": "",
"external_url": "",
"description": ""
});

let result = extract_collection_metadata(&asset_dynamic, &offchain_data);

assert_json_eq!(result, expected_metadata);
}
}
17 changes: 17 additions & 0 deletions nft_ingester/tests/api_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4170,6 +4170,23 @@ mod tests {
cursor: None
}
);

// getAssetsByCreator V1
let request_params = r#"["DASPQfEAVcHp55eFmfstRduMT3dSfoTirFFsMHwUaWaz",true,null,null,1,null,null,{"showCollectionMetadata":true},null]"#;
let rpc_params: jsonrpc_core::Params =
serde_json::from_str(request_params).expect("params are valid json");
let params_deserialized: GetAssetsByCreator = rpc_params
.parse()
.expect("params provided deserialize correctly into GetAssetsByOwner");

assert_eq!(
params_deserialized.creator_address,
"DASPQfEAVcHp55eFmfstRduMT3dSfoTirFFsMHwUaWaz".to_owned()
);
assert_eq!(params_deserialized.only_verified, Some(true));
assert_eq!(params_deserialized.options.show_collection_metadata, true);
assert_eq!(params_deserialized.page, Some(1));

// getAssets
let request_params = r#"[["asset1","asset2"]]"#;
let rpc_params: jsonrpc_core::Params =
Expand Down
Loading