From cbb2dbffb9bcd96884c56ee5495bd6c134b1d79b Mon Sep 17 00:00:00 2001 From: CalDescent Date: Sun, 31 Oct 2021 21:22:51 +0000 Subject: [PATCH] The /arbitrary/search API endpoint now uses a string instead of an int for the "service", and shows a dropdown of possible values in the API documentation page. --- .../java/org/qortal/api/resource/ArbitraryResource.java | 6 +++--- src/test/java/org/qortal/test/api/ArbitraryApiTests.java | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/qortal/api/resource/ArbitraryResource.java b/src/main/java/org/qortal/api/resource/ArbitraryResource.java index 3867a81f..ada8ff84 100644 --- a/src/main/java/org/qortal/api/resource/ArbitraryResource.java +++ b/src/main/java/org/qortal/api/resource/ArbitraryResource.java @@ -89,7 +89,7 @@ public class ArbitraryResource { }) public List searchTransactions(@QueryParam("startBlock") Integer startBlock, @QueryParam("blockLimit") Integer blockLimit, @QueryParam("txGroupId") Integer txGroupId, - @QueryParam("service") Integer service, + @QueryParam("service") Service service, @QueryParam("name") String name, @QueryParam("address") String address, @Parameter( description = "whether to include confirmed, unconfirmed or both", @@ -113,8 +113,8 @@ public class ArbitraryResource { txTypes.add(TransactionType.ARBITRARY); try (final Repository repository = RepositoryManager.getRepository()) { - List signatures = repository.getTransactionRepository().getSignaturesMatchingCriteria(startBlock, blockLimit, txGroupId, txTypes, - service, name, address, confirmationStatus, limit, offset, reverse); + List signatures = repository.getTransactionRepository().getSignaturesMatchingCriteria(startBlock, blockLimit, txGroupId, txTypes, + service.value, name, address, confirmationStatus, limit, offset, reverse); // Expand signatures to transactions List transactions = new ArrayList(signatures.size()); diff --git a/src/test/java/org/qortal/test/api/ArbitraryApiTests.java b/src/test/java/org/qortal/test/api/ArbitraryApiTests.java index 5cf141b4..415e619c 100644 --- a/src/test/java/org/qortal/test/api/ArbitraryApiTests.java +++ b/src/test/java/org/qortal/test/api/ArbitraryApiTests.java @@ -6,6 +6,8 @@ import org.junit.Before; import org.junit.Test; import org.qortal.api.resource.ArbitraryResource; import org.qortal.api.resource.TransactionsResource.ConfirmationStatus; +import org.qortal.data.transaction.ArbitraryTransactionData; +import org.qortal.data.transaction.ArbitraryTransactionData.Service; import org.qortal.test.common.ApiCommon; public class ArbitraryApiTests extends ApiCommon { @@ -22,7 +24,7 @@ public class ArbitraryApiTests extends ApiCommon { Integer[] startingBlocks = new Integer[] { null, 0, 1, 999999999 }; Integer[] blockLimits = new Integer[] { null, 0, 1, 999999999 }; Integer[] txGroupIds = new Integer[] { null, 0, 1, 999999999 }; - Integer[] services = new Integer[] { null, 0, 1, 999999999 }; + ArbitraryTransactionData.Service[] services = new Service[] { Service.WEBSITE, Service.GIT_REPOSITORY, Service.BLOG_COMMENT }; String[] names = new String[] { null, "Test" }; String[] addresses = new String[] { null, this.aliceAddress }; ConfirmationStatus[] confirmationStatuses = new ConfirmationStatus[] { ConfirmationStatus.UNCONFIRMED, ConfirmationStatus.CONFIRMED, ConfirmationStatus.BOTH }; @@ -30,7 +32,7 @@ public class ArbitraryApiTests extends ApiCommon { for (Integer startBlock : startingBlocks) for (Integer blockLimit : blockLimits) for (Integer txGroupId : txGroupIds) - for (Integer service : services) + for (Service service : services) for (String name : names) for (String address : addresses) for (ConfirmationStatus confirmationStatus : confirmationStatuses) {