diff --git a/src/lib/api/services/AdminService.proto b/src/lib/api/services/AdminService.proto index f68f22aea..bc5e7873f 100644 --- a/src/lib/api/services/AdminService.proto +++ b/src/lib/api/services/AdminService.proto @@ -345,9 +345,9 @@ message OrdersSummary{ } message OrderSummaryRequest{ } -message OrderUsersCancelRequest{ - string account = 10; - repeated string user = 20; +message OrderCancelRequest{ + repeated string accounts = 10; + repeated string users = 20; } /************************************************************************/ /************************************************************************/ @@ -405,5 +405,5 @@ service AdminService { rpc get_admin_data(bts.api.VoidMessage) returns (AdminData); // orders rpc get_order_summary(bts.api.VoidMessage) returns (OrdersSummary); - rpc cancel_orders(OrderUsersCancelRequest) returns (bts.api.VoidMessage); + rpc cancel_orders(OrderCancelRequest) 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 18e2c2e67..62afb668a 100644 --- a/src/server/sparkd/user/AdminServiceServer.cpp +++ b/src/server/sparkd/user/AdminServiceServer.cpp @@ -149,8 +149,14 @@ void AdminServiceServer::get_order_summary(const bts::api::VoidMessage&, } reply(rv); } -void AdminServiceServer::cancel_orders(const api::admin::OrderUsersCancelRequest&, - const api::Response&){ +void AdminServiceServer::cancel_orders(const api::admin::OrderCancelRequest& req, + const api::Response&){ + vector accts, users; + for(auto it=req.accounts().begin();it!=req.accounts().end();it++) + accts.push_back(*it); + for(auto it=req.users().begin();it!=req.users().end();it++) + users.push_back(*it); + _cancel_orders(accts,users); } void AdminServiceServer::_add_live_order(std::map>& agg, @@ -176,4 +182,26 @@ void AdminServiceServer::_add_live_order(std::map& accounts, + const vector& users){ + map acct_map, user_map; + vector keys; + for(const std::string& a : accounts) + acct_map[a]=true; + for(const std::string& u : users) + user_map[u]=true; + for(auto it=_order_map.begin();it!=_order_map.end();it++){ + const OrderRecord& ord=*(it->second); + if(bts::orderman::order_in_working_state(ord.state().status()) && + bts::orderman::is_parent_order(ord) && + acct_map.find(ord.def().account()) != acct_map.end() && + user_map.find(ord.def().user()) != user_map.end()) + keys.push_back(ord.key()); + } + for(uint32_t k : keys){ + Cancel c; + c.set_order_key(k); + _order_service.cancel_order(c); + } +} }} diff --git a/src/server/sparkd/user/AdminServiceServer.h b/src/server/sparkd/user/AdminServiceServer.h index 5a74b9c65..e984bc8b5 100644 --- a/src/server/sparkd/user/AdminServiceServer.h +++ b/src/server/sparkd/user/AdminServiceServer.h @@ -13,6 +13,7 @@ namespace admin{ using namespace bts::api::orderman; using namespace bts::api::admin; +using namespace std; class AdminServiceServer : public api::admin::AdminServiceBase { @@ -54,12 +55,14 @@ public: void get_order_summary(const bts::api::VoidMessage& request, const api::Response<::bts::api::admin::OrdersSummary>& reply) override; - void cancel_orders(const api::admin::OrderUsersCancelRequest& request, + void cancel_orders(const api::admin::OrderCancelRequest& request, const api::Response& reply) override; private: void _update_and_publish (bool is_insert); void _add_live_order(std::map>& agg, const OrderRecord& order); + void _cancel_orders(const std::vector& accounts, + const std::vector& users); }; }}