diff --git a/CHANGELOG.md b/CHANGELOG.md index dbe10e58..7f265193 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ## [Unreleased] +## [1.0.0.1003] - 2022-04-11 +### Changed +- `GetWallets` query in project schema no longer implements `PaginationArguments`. + +### Fixed +- Fixed typo for `result` in `GetWallets.gql` template file for project schema. + ## [1.0.0.1002] - 2022-03-01 ### Changed - Updated path to template generation command in root CMakeLists file. @@ -30,7 +37,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ### Added - Initial alpha release. -[Unreleased]: https://github.com/enjin/enjin-cpp-sdk/compare/1.0.0.1002...HEAD +[Unreleased]: https://github.com/enjin/enjin-cpp-sdk/compare/1.0.0.1003...HEAD +[1.0.0.1003]: https://github.com/enjin/enjin-cpp-sdk/compare/1.0.0.1002...1.0.0.1003 [1.0.0.1002]: https://github.com/enjin/enjin-cpp-sdk/compare/1.0.0.1001...1.0.0.1002 [1.0.0.1001]: https://github.com/enjin/enjin-cpp-sdk/compare/1.0.0.1000...1.0.0.1001 [1.0.0.1000]: https://github.com/enjin/enjin-cpp-sdk/releases/tag/1.0.0.1000 \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index c44c32fb..fcc940a7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ include(GenerateExportHeader) ### Define project and set properties project(enjinsdk LANGUAGES CXX - VERSION 1.0.0.1002) + VERSION 1.0.0.1003) set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED True) diff --git a/DOXYFILE b/DOXYFILE index 77531c41..ab460f07 100644 --- a/DOXYFILE +++ b/DOXYFILE @@ -5,7 +5,7 @@ #--------------------------------------------------------------------------- DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = "Enjin C++ SDK" -PROJECT_NUMBER = 1.0.0.1001 +PROJECT_NUMBER = 1.0.0.1003 PROJECT_BRIEF = "A C++ SDK for creating games using the Enjin blockchain platform." PROJECT_LOGO = doxygenIcon.png OUTPUT_DIRECTORY = diff --git a/include/enjinsdk/project/GetWallets.hpp b/include/enjinsdk/project/GetWallets.hpp index d238df76..05feb4cb 100644 --- a/include/enjinsdk/project/GetWallets.hpp +++ b/include/enjinsdk/project/GetWallets.hpp @@ -18,7 +18,6 @@ #include "enjinsdk_export.h" #include "enjinsdk/internal/AbstractGraphqlRequest.hpp" -#include "enjinsdk/shared/PaginationArguments.hpp" #include "enjinsdk/shared/WalletFragmentArguments.hpp" #include #include @@ -28,8 +27,7 @@ namespace enjin::sdk::project { /// \brief Request for getting wallets from the platform. class ENJINSDK_EXPORT GetWallets : public graphql::AbstractGraphqlRequest, - public shared::WalletFragmentArguments, - public shared::PaginationArguments { + public shared::WalletFragmentArguments { public: /// \brief Default constructor. GetWallets(); @@ -89,12 +87,6 @@ template ENJINSDK_EXPORT project::GetWallets& AssetFragmentArguments::set_with_assets_created(); -template ENJINSDK_EXPORT project::GetWallets& -PaginationArguments::set_pagination(models::PaginationOptions pagination); - -template ENJINSDK_EXPORT project::GetWallets& -PaginationArguments::set_pagination(int page, int limit); - } #endif //ENJINCPPSDK_PROJECTGETWALLETS_HPP diff --git a/src/graphql/templates/enjin/schemas/project/query/GetWallets.gql b/src/graphql/templates/enjin/schemas/project/query/GetWallets.gql index d266a7fc..f0757af0 100644 --- a/src/graphql/templates/enjin/schemas/project/query/GetWallets.gql +++ b/src/graphql/templates/enjin/schemas/project/query/GetWallets.gql @@ -1,20 +1,14 @@ #namespace enjin.sdk.project.GetWallets #import enjin.sdk.shared.Wallet -#import enjin.sdk.shared.PaginationCursor #arg userIds [String] #arg ethAddresses [EthAddress] query { - results: GetWallets( + result: GetWallets( userIds: $userIds ethAddresses: $ethAddresses ) { - items { - ...Wallet - } - cursor { - ...PaginationCursor - } + ...Wallet } } diff --git a/src/schemas/project/queries/GetWallets.cpp b/src/schemas/project/queries/GetWallets.cpp index 52d9aaf5..8e5a65c2 100644 --- a/src/schemas/project/queries/GetWallets.cpp +++ b/src/schemas/project/queries/GetWallets.cpp @@ -25,8 +25,7 @@ GetWallets::GetWallets() : graphql::AbstractGraphqlRequest("enjin.sdk.project.Ge std::string GetWallets::serialize() const { rapidjson::Document document(rapidjson::kObjectType); utils::join_serialized_objects_to_document(document, { - WalletFragmentArguments::serialize(), - PaginationArguments::serialize() + WalletFragmentArguments::serialize() }); if (user_ids.has_value()) { @@ -54,8 +53,6 @@ bool GetWallets::operator==(const GetWallets& rhs) const { static_cast(rhs) && static_cast&>(*this) == static_cast&>(rhs) && - static_cast&>(*this) == - static_cast&>(rhs) && user_ids == rhs.user_ids && eth_addresses == rhs.eth_addresses; } diff --git a/test/unit/schemas/project/queries/ProjectGetWalletsTest.cpp b/test/unit/schemas/project/queries/ProjectGetWalletsTest.cpp index 13610589..7312a153 100644 --- a/test/unit/schemas/project/queries/ProjectGetWalletsTest.cpp +++ b/test/unit/schemas/project/queries/ProjectGetWalletsTest.cpp @@ -14,7 +14,6 @@ */ #include "JsonTestSuite.hpp" -#include "PaginationArgumentsTestSuite.hpp" #include "WalletFragmentArgumentsTestSuite.hpp" #include "enjinsdk/project/GetWallets.hpp" #include "gtest/gtest.h" @@ -25,7 +24,6 @@ using namespace enjin::sdk::project; using namespace enjin::test::suites; class ProjectGetWalletsTest : public WalletFragmentArgumentsTestSuite, - public PaginationArgumentsTestSuite, public JsonTestSuite, public testing::Test { public: @@ -39,7 +37,6 @@ class ProjectGetWalletsTest : public WalletFragmentArgumentsTestSuite()) .set_eth_addresses(std::vector()); set_wallet_fragment_arguments(request); - set_pagination_arguments(request); return request; } };