Merge pull request #17 from nathanhourt/master

Resolve #9: Add early APIs for filtered contest generators
FollowMyVote · Dec 14, 2015 · 6d2ac18 · 6d2ac18
2 parents 5d24368 + a40f73d
commit 6d2ac18
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 0 deletions.
diff --git a/StubBackend/BackendServer.cpp b/StubBackend/BackendServer.cpp
@@ -34,6 +34,12 @@ ::kj::Promise<void> BackendServer::getContestGenerator(Backend::Server::GetConte
     return kj::READY_NOW;
 }
 
+::kj::Promise<void> BackendServer::searchContests(Backend::Server::SearchContestsContext context)
+{
+    context.getResults().setGenerator(kj::heap<ContestGeneratorImpl>());
+    return kj::READY_NOW;
+}
+
 ::kj::Promise<void> BackendServer::getContestResults(Backend::Server::GetContestResultsContext context)
 {
     auto contestId = context.getParams().getContestId()[0];

diff --git a/StubBackend/BackendServer.hpp b/StubBackend/BackendServer.hpp
@@ -37,6 +37,7 @@ class BackendServer : public Backend::Server
     // Backend::Server interface
 protected:
     virtual ::kj::Promise<void> getContestGenerator(GetContestGeneratorContext context);
+    virtual ::kj::Promise<void> searchContests(SearchContestsContext context);
     virtual ::kj::Promise<void> getContestResults(GetContestResultsContext context);
     virtual ::kj::Promise<void> purchaseResultReport(PurchaseResultReportContext context);
     virtual ::kj::Promise<void> downloadResultReport(DownloadResultReportContext context);

diff --git a/VotingApp/BackendWrapper.cpp b/VotingApp/BackendWrapper.cpp
@@ -42,4 +42,26 @@ ContestGeneratorWrapper* BackendWrapper::getFeedGenerator()
     return new ContestGeneratorWrapper(backend.getContestGeneratorRequest().send().getGenerator(), promiseConverter);
 }
 
+ContestGeneratorWrapper* BackendWrapper::getContestsByCreator(QString creator)
+{
+    auto request = backend.searchContestsRequest();
+    auto filters = request.initFilters(1);
+    filters[0].setType(Backend::Filter::Type::CONTEST_CREATOR);
+    auto arguments = filters[0].initArguments(1);
+    arguments.set(0, creator.toStdString());
+
+    return new ContestGeneratorWrapper(request.send().getGenerator(), promiseConverter);
+}
+
+ContestGeneratorWrapper* BackendWrapper::getContestsByCoin(quint64 coinId)
+{
+    auto request = backend.searchContestsRequest();
+    auto filters = request.initFilters(1);
+    filters[0].setType(Backend::Filter::Type::CONTEST_COIN);
+    auto arguments = filters[0].initArguments(1);
+    arguments.set(0, std::to_string(coinId));
+
+    return new ContestGeneratorWrapper(request.send().getGenerator(), promiseConverter);
+}
+
 } // namespace swv
diff --git a/VotingApp/BackendWrapper.hpp b/VotingApp/BackendWrapper.hpp
@@ -49,6 +49,8 @@ class BackendWrapper : public QObject
     virtual ~BackendWrapper() noexcept {}
 
     Q_INVOKABLE swv::ContestGeneratorWrapper* getFeedGenerator();
+    Q_INVOKABLE swv::ContestGeneratorWrapper* getContestsByCreator(QString creator);
+    Q_INVOKABLE swv::ContestGeneratorWrapper* getContestsByCoin(quint64 coinId);
 
 private:
     PromiseConverter& promiseConverter;

diff --git a/shared/capnp/backend.capnp b/shared/capnp/backend.capnp
@@ -26,6 +26,8 @@ interface Backend {
 
     getContestGenerator @0 () -> (generator :ContestGenerator);
     # Get a generator for a feed of contests
+    searchContests @8 (filters :List(Filter)) -> (generator :ContestGenerator);
+    # Search contests and get a generator for the results
     getContestResults @1 (contestId :Data) -> (results :ContestResults);
     # Get the instantaneous live results for the specified contest
 
@@ -54,4 +56,18 @@ interface Backend {
             tally @1 :Int64;
         }
     }
+
+    struct Filter {
+        type @0 :Type;
+        arguments @1 :List(Text);
+
+        enum Type {
+            searchTerms @0;
+            # Search for contests containing the specified search terms. Each search term is an argument
+            contestCreator @1;
+            # Search for contests created by the specified account. Argument is a blockchain-specific account ID
+            contestCoin @2;
+            # Search for contests weighted by the specified coin. Argument is base-10 string of coin ID
+        }
+    }
 }