minor fix to handle nullable values and test

Signed-off-by: Manish Dait <[email protected]>

Author: manishdait

hiero-enterprise-base/src/main/java/com/openelements/hiero/base/data/TransactionInfo.java

@@ -37,7 +37,6 @@ public record TransactionInfo(
         Objects.requireNonNull(maxFee, "maxFee must not be null");
         Objects.requireNonNull(name, "name must not be null");
         Objects.requireNonNull(nftTransfers, "nftTransfers must not be null");
-        Objects.requireNonNull(parentConsensusTimestamp, "parentConsensusTimestamp must not be null");
         Objects.requireNonNull(stakingRewardTransfers, "stakingRewardTransfers must not be null");
         Objects.requireNonNull(tokenTransfers, "tokenTransfers must not be null");
         Objects.requireNonNull(transfers, "transfers must not be null");

hiero-enterprise-microprofile/src/main/java/com/openelements/hiero/microprofile/implementation/MirrorNodeJsonConverterImpl.java

@@ -169,6 +169,11 @@ public class MirrorNodeJsonConverterImpl implements MirrorNodeJsonConverter<Json
         if (jsonObject.isEmpty()) {
             return Optional.empty();
         }
+
+        if (jsonObject.containsKey("transactions")) {
+            jsonObject = jsonArrayToStream(jsonObject.getJsonArray("transactions")).findFirst().get().asJsonObject();
+        }
+
         try {
             final String transactionId = jsonObject.getString("transaction_id");
             final byte[] bytes = jsonObject.getString("bytes").getBytes();
@@ -180,7 +185,8 @@ public class MirrorNodeJsonConverterImpl implements MirrorNodeJsonConverter<Json
             final TransactionType name = TransactionType.from(jsonObject.getString("name"));
             final String _node = jsonObject.getString("node");
             final int nonce = jsonObject.getInt("nonce");
-            final Instant parentConsensusTimestamp = Instant.ofEpochSecond((long) Double.parseDouble(jsonObject.getString("parent_consensus_timestamp")));
+            final Instant parentConsensusTimestamp = jsonObject.get("parent_consensus_timestamp").asJsonObject() == null ? null :
+                    Instant.ofEpochSecond((long) Double.parseDouble(jsonObject.getString("parent_consensus_timestamp")));
             final String result = jsonObject.getString("result");
             final boolean scheduled = jsonObject.getBoolean("scheduled");
             final byte[] transactionHash = jsonObject.getString("transaction_hash").getBytes();

hiero-enterprise-spring/src/main/java/com/openelements/hiero/spring/implementation/MirrorNodeJsonConverterImpl.java

@@ -201,7 +201,8 @@ public List<NetworkFee> toNetworkFees(final JsonNode node) {
             final TransactionType name = TransactionType.from(node.get("name").asText());
             final String _node = node.get("node").asText();
             final int nonce = node.get("nonce").asInt();
-            final Instant parentConsensusTimestamp = Instant.ofEpochSecond(node.get("parent_consensus_timestamp").asLong());
+            final Instant parentConsensusTimestamp = node.get("parent_consensus_timestamp").isNull()? null :
+                    Instant.ofEpochSecond(node.get("parent_consensus_timestamp").asLong());
             final String result = node.get("result").asText();
             final boolean scheduled = node.get("scheduled").asBoolean();
             final byte[] transactionHash = node.get("transaction_hash").asText().getBytes();

hiero-enterprise-spring/src/test/java/com/openelements/hiero/spring/test/TransactionRepositoryTest.java

@@ -32,7 +32,7 @@ public class TransactionRepositoryTest {
     @Test
     void testFindTransactionByAccountId() throws HieroException {
         final Account account = accountClient.createAccount(1);
-
+        hieroTestUtils.waitForMirrorNodeRecords();
         final Page<TransactionInfo> page = transactionRepository.findByAccount(account.accountId());
         Assertions.assertNotNull(page);
 
@@ -43,6 +43,7 @@ void testFindTransactionByAccountId() throws HieroException {
     @Test
     void testFindTransactionByAccountIdGiveEmptyListForAccountIdWithZeroTransaction() throws HieroException {
         final AccountId accountId = AccountId.fromString("0.0.0");
+        hieroTestUtils.waitForMirrorNodeRecords();
         final Page<TransactionInfo> page = transactionRepository.findByAccount(accountId);
         Assertions.assertNotNull(page);
 
@@ -53,7 +54,7 @@ void testFindTransactionByAccountIdGiveEmptyListForAccountIdWithZeroTransaction(
     @Test
     void testFindTransactionByAccountIdAndType() throws HieroException {
         final Account account = accountClient.createAccount(1);
-
+        hieroTestUtils.waitForMirrorNodeRecords();
         final Page<TransactionInfo> page = transactionRepository.findByAccountAndType(account.accountId(),
                 TransactionType.ACCOUNT_CREATE);
         Assertions.assertNotNull(page);
@@ -62,7 +63,7 @@ void testFindTransactionByAccountIdAndType() throws HieroException {
     @Test
     void testFindTransactionByAccountIdAndResult() throws HieroException {
         final Account account = accountClient.createAccount(1);
-
+        hieroTestUtils.waitForMirrorNodeRecords();
         final Page<TransactionInfo> page = transactionRepository.findByAccountAndResult(account.accountId(),
                 Result.SUCCESS);
         Assertions.assertNotNull(page);
@@ -71,7 +72,7 @@ void testFindTransactionByAccountIdAndResult() throws HieroException {
     @Test
     void testFindTransactionByAccountIdAndBalanceModification() throws HieroException {
         final Account account = accountClient.createAccount(1);
-
+        hieroTestUtils.waitForMirrorNodeRecords();
         final Page<TransactionInfo> page = transactionRepository.findByAccountAndModification(account.accountId(),
                 BalanceModification.DEBIT);
         Assertions.assertNotNull(page);