queryNftsByAccountAndTokenId fixed

Author: hendrikebbers

hedera-spring/src/main/java/com/openelements/hedera/spring/implementation/MirrorNodeClientImpl.java

@@ -59,18 +59,22 @@ public List<Nft> queryNftsByAccount(@NonNull final AccountId accountId) throws H
     public List<Nft> queryNftsByAccountAndTokenId(@NonNull final AccountId accountId, @NonNull final TokenId tokenId) throws HederaException {
         Objects.requireNonNull(accountId, "accountId must not be null");
         Objects.requireNonNull(tokenId, "tokenId must not be null");
+        final String host = mirrorNodeEndpoint.substring(8).split("\\:")[0];
+        final String port = mirrorNodeEndpoint.substring(8).split("\\:")[1];
         final String body = restClient.get()
-                .uri(uriBuilder -> uriBuilder.path(mirrorNodeEndpoint + "/api/v1/tokens/" + tokenId + "/nfts")
+                .uri(uriBuilder -> uriBuilder
+                        .scheme("https")
+                                .host(host)
+                                .port(port)
+                        .path("/api/v1/tokens/" + tokenId + "/nfts")
                         .queryParam("account.id", accountId)
                         .build())
                 .header("accept", "application/json")
                 .retrieve()
                 .onStatus(HttpStatusCode::is4xxClientError, (request, response) -> {
                     throw new RuntimeException("Client error: " + response.getStatusText());
                 }).body(String.class);
-        System.out.println(body);
-        //TODO: JSON PARSING
-        return List.of();
+        return fromJson(body);
     }
 
     @Override
@@ -83,26 +87,27 @@ public List<Nft> queryNftsByTokenId(@NonNull TokenId tokenId) throws HederaExcep
                 .onStatus(HttpStatusCode::is4xxClientError, (request, response) -> {
                     throw new RuntimeException("Client error: " + response.getStatusText());
                 }).body(String.class);
+        return fromJson(body);
+    }
+
+    private List<Nft> fromJson(final String json) {
         try {
-            final JsonNode rootNode = objectMapper.readTree(body);
+            final JsonNode rootNode = objectMapper.readTree(json);
             return StreamSupport.stream(
                     Spliterators.spliteratorUnknownSize(rootNode.get("nfts").iterator(), Spliterator.ORDERED),
                     false).map(nftNode -> {
-                        try {
-                            final TokenId parsedTokenId = TokenId.fromString(nftNode.get("token_id").asText());
-                            if (!tokenId.equals(parsedTokenId)) {
-                                throw new RuntimeException("Token ID mismatch: " + tokenId + " != " + parsedTokenId);
-                            }
-                            final AccountId account = AccountId.fromString(nftNode.get("account_id").asText());
-                            final long serial = nftNode.get("serial_number").asLong();
-                            final byte[] metadata = nftNode.get("metadata").binaryValue();
-                            return new Nft(tokenId, serial, account, metadata);
-                        } catch (final Exception e) {
-                            throw new RuntimeException("Error parsing NFT", e);
-                        }
+                try {
+                    final TokenId parsedTokenId = TokenId.fromString(nftNode.get("token_id").asText());
+                    final AccountId account = AccountId.fromString(nftNode.get("account_id").asText());
+                    final long serial = nftNode.get("serial_number").asLong();
+                    final byte[] metadata = nftNode.get("metadata").binaryValue();
+                    return new Nft(parsedTokenId, serial, account, metadata);
+                } catch (final Exception e) {
+                    throw new RuntimeException("Error parsing NFT", e);
+                }
             }).toList();
         } catch (final Exception e) {
-            throw new HederaException("Error parsing body as JSON: " + body, e);
+            throw new IllegalArgumentException("Error parsing body as JSON: " + json, e);
         }
     }
 

hedera-spring/src/test/java/com/openelements/hedera/spring/test/NftRepositoryTests.java

@@ -1,5 +1,6 @@
 package com.openelements.hedera.spring.test;
 
+import com.hedera.hashgraph.sdk.AccountId;
 import com.hedera.hashgraph.sdk.TokenId;
 import com.openelements.hedera.base.Account;
 import com.openelements.hedera.base.AccountClient;
@@ -27,6 +28,9 @@ public class NftRepositoryTests {
     @Autowired
     private HederaTestUtils hederaTestUtils;
 
+    @Value("${spring.hedera.accountId}")
+    private String accountId;
+
     @Test
     void findByTokenId() throws Exception {
         //given
@@ -47,4 +51,26 @@ void findByTokenId() throws Exception {
         Assertions.assertTrue(result.stream().anyMatch(nft -> nft.serial() == serial.get(0)));
         Assertions.assertTrue(result.stream().anyMatch(nft -> nft.serial() == serial.get(1)));
     }
+
+    @Test
+    void findByTokenIdAndAccountId() throws Exception {
+        //given
+        final String name = "Tokemon cards";
+        final String symbol = "TOK";
+        final String metadata1 = "https://example.com/metadata1";
+        final String metadata2 = "https://example.com/metadata2";
+        final TokenId tokenId = nftClient.createNftType(name, symbol);
+        final List<Long> serial = nftClient.mintNfts(tokenId, List.of(metadata1, metadata2));
+        final AccountId owner = AccountId.fromString(accountId);
+        hederaTestUtils.waitForMirrorNodeRecords();
+
+        //when
+        final List<Nft> result = nftRepository.findByOwnerAndType(owner, tokenId);
+
+        //then
+        Assertions.assertNotNull(result);
+        Assertions.assertEquals(2, result.size());
+        Assertions.assertTrue(result.stream().anyMatch(nft -> nft.serial() == serial.get(0)));
+        Assertions.assertTrue(result.stream().anyMatch(nft -> nft.serial() == serial.get(1)));
+    }
 }