From 1f4c91a344aefbf2e44ef638db06cd3a860f46e3 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Tue, 4 Sep 2018 10:37:45 -0400 Subject: [PATCH] SPARK-1679 --- src/lib/api/services/AdminService.proto | 6 ++++-- src/server/sparkd/user/AdminServiceServer.cpp | 9 ++++++--- src/server/sparkd/user/AdminServiceServer.h | 10 +++++++--- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/src/lib/api/services/AdminService.proto b/src/lib/api/services/AdminService.proto index 06604d312..ebed88546 100644 --- a/src/lib/api/services/AdminService.proto +++ b/src/lib/api/services/AdminService.proto @@ -349,9 +349,9 @@ message OrderSummaryRequest{ string account = 10; string user = 20; } -message OrderCancelRequest{ +message OrderUsersCancelRequest{ string account = 10; - string user = 20; + repeated string user = 20; } /************************************************************************/ /************************************************************************/ @@ -407,5 +407,7 @@ service AdminService { // subscription rpc admin_data(bts.api.VoidMessage) returns (stream AdminData); rpc get_admin_data(bts.api.VoidMessage) returns (AdminData); + // orders rpc get_order_summary(OrderSummaryRequest) returns (OrdersSummary); + rpc cancel_orders(OrderUsersCancelRequest) returns (bts.api.VoidMessage); } \ No newline at end of file diff --git a/src/server/sparkd/user/AdminServiceServer.cpp b/src/server/sparkd/user/AdminServiceServer.cpp index 1cbd8dcbf..e6774ce3a 100644 --- a/src/server/sparkd/user/AdminServiceServer.cpp +++ b/src/server/sparkd/user/AdminServiceServer.cpp @@ -84,9 +84,6 @@ void AdminServiceServer::get_admin_data(const bts::api::VoidMessage&, const api::Response<::bts::api::admin::AdminData>& reply){ reply(_state); } -void AdminServiceServer::get_order_summary(const api::admin::OrderSummaryRequest&, - const api::Response<::bts::api::admin::OrdersSummary>&){ -} void AdminServiceServer::delete_user(const bts::api::admin::IDAPIArgument& id, const api::Response& reply){ bts::api::admin::AdminServiceOperationResult result; result.set_is_success(true); @@ -116,4 +113,10 @@ void AdminServiceServer::_update_and_publish(bool is_insert){ else LOG(Gen, Error, "Could not serialize admin data, saving failed"); } +void AdminServiceServer::get_order_summary(const api::admin::OrderSummaryRequest&, + const api::Response<::bts::api::admin::OrdersSummary>&){ +} +void AdminServiceServer::cancel_orders(const api::admin::OrderUsersCancelRequest&, + const api::Response&){ +} }} diff --git a/src/server/sparkd/user/AdminServiceServer.h b/src/server/sparkd/user/AdminServiceServer.h index 85f15ce48..f8a7503e8 100644 --- a/src/server/sparkd/user/AdminServiceServer.h +++ b/src/server/sparkd/user/AdminServiceServer.h @@ -37,15 +37,19 @@ public: void get_admin_data(const bts::api::VoidMessage& request, const api::Response<::bts::api::admin::AdminData>& reply) override; - - void get_order_summary(const api::admin::OrderSummaryRequest& request, - const api::Response<::bts::api::admin::OrdersSummary>& reply) override; void delete_user(const bts::api::admin::IDAPIArgument& request, const api::Response<::bts::api::admin::AdminServiceOperationResult>& reply) override; void delete_account(const bts::api::admin::IDAPIArgument& request, const api::Response<::bts::api::admin::AdminServiceOperationResult>& reply) override; + + void get_order_summary(const api::admin::OrderSummaryRequest& request, + const api::Response<::bts::api::admin::OrdersSummary>& reply) override; + + void cancel_orders(const api::admin::OrderUsersCancelRequest& request, + const api::Response& reply) override; + private: void _update_and_publish (bool is_insert); };