total_count is added
This commit is contained in:
parent
41a53aeafb
commit
f16bbdbc61
|
@ -36,7 +36,7 @@ tokio = { version = "1", features = ["macros", "rt-multi-thread"] }
|
||||||
tokio-cron-scheduler = { version = "0" }
|
tokio-cron-scheduler = { version = "0" }
|
||||||
uuid = { version = "0", features = ["serde", "v4", "v5"] }
|
uuid = { version = "0", features = ["serde", "v4", "v5"] }
|
||||||
|
|
||||||
beteran-protobuf-rust = { git = "https://gitlab.loafle.net/bet/beteran-protobuf-rust.git", tag = "v0.1.92-snapshot" }
|
beteran-protobuf-rust = { git = "https://gitlab.loafle.net/bet/beteran-protobuf-rust.git", tag = "v0.1.93-snapshot" }
|
||||||
beteran-common-rust = { git = "https://gitlab.loafle.net/bet/beteran-common-rust.git", tag = "v0.1.78-snapshot" }
|
beteran-common-rust = { git = "https://gitlab.loafle.net/bet/beteran-common-rust.git", tag = "v0.1.79-snapshot" }
|
||||||
|
|
||||||
[build-dependencies]
|
[build-dependencies]
|
||||||
|
|
|
@ -293,7 +293,7 @@ impl Service {
|
||||||
),
|
),
|
||||||
};
|
};
|
||||||
|
|
||||||
let count = self
|
let total_count = self
|
||||||
.bank_repository
|
.bank_repository
|
||||||
.select_all_count(&conn, &find_all)
|
.select_all_count(&conn, &find_all)
|
||||||
.map_err(|e| {
|
.map_err(|e| {
|
||||||
|
@ -320,6 +320,7 @@ impl Service {
|
||||||
bpr::ss::bank::ListBanksResponse {
|
bpr::ss::bank::ListBanksResponse {
|
||||||
error: None,
|
error: None,
|
||||||
result: Some(bpr::ss::bank::list_banks_response::Result {
|
result: Some(bpr::ss::bank::list_banks_response::Result {
|
||||||
|
total_count: total_count as u64,
|
||||||
banks: list
|
banks: list
|
||||||
.iter()
|
.iter()
|
||||||
.map(|d| bpr::models::bank::Bank::from(d))
|
.map(|d| bpr::models::bank::Bank::from(d))
|
||||||
|
|
|
@ -752,8 +752,8 @@ impl Service<'_> {
|
||||||
search,
|
search,
|
||||||
};
|
};
|
||||||
|
|
||||||
let m = self
|
let total_count = self
|
||||||
.member_repository
|
.member_composition
|
||||||
.select_all_count(&conn, &find_all)
|
.select_all_count(&conn, &find_all)
|
||||||
.map_err(|e| {
|
.map_err(|e| {
|
||||||
bcr::error::rpc::Error::Server(bcr::error::rpc::Server {
|
bcr::error::rpc::Error::Server(bcr::error::rpc::Server {
|
||||||
|
@ -779,6 +779,7 @@ impl Service<'_> {
|
||||||
bpr::ss::member::ListMembersResponse {
|
bpr::ss::member::ListMembersResponse {
|
||||||
error: None,
|
error: None,
|
||||||
result: Some(bpr::ss::member::list_members_response::Result {
|
result: Some(bpr::ss::member::list_members_response::Result {
|
||||||
|
total_count: total_count as u64,
|
||||||
members: member_list
|
members: member_list
|
||||||
.iter()
|
.iter()
|
||||||
.map(bpr::models::member::MemberModel::from)
|
.map(bpr::models::member::MemberModel::from)
|
||||||
|
|
|
@ -379,7 +379,7 @@ impl Service<'_> {
|
||||||
),
|
),
|
||||||
};
|
};
|
||||||
|
|
||||||
let count = self
|
let total_count = self
|
||||||
.member_bank_account_repository
|
.member_bank_account_repository
|
||||||
.select_all_count(&conn, &find_all)
|
.select_all_count(&conn, &find_all)
|
||||||
.map_err(|e| {
|
.map_err(|e| {
|
||||||
|
@ -407,6 +407,7 @@ impl Service<'_> {
|
||||||
error: None,
|
error: None,
|
||||||
result: Some(
|
result: Some(
|
||||||
bpr::ss::member_bank_account::list_member_bank_accounts_response::Result {
|
bpr::ss::member_bank_account::list_member_bank_accounts_response::Result {
|
||||||
|
total_count: total_count as u64,
|
||||||
member_bank_accounts: list
|
member_bank_accounts: list
|
||||||
.iter()
|
.iter()
|
||||||
.map(|d| bpr::models::member_bank_account::MemberBankAccount::from(d))
|
.map(|d| bpr::models::member_bank_account::MemberBankAccount::from(d))
|
||||||
|
|
|
@ -356,7 +356,7 @@ impl Service {
|
||||||
),
|
),
|
||||||
};
|
};
|
||||||
|
|
||||||
let count = self
|
let total_count = self
|
||||||
.member_bank_deposit_repository
|
.member_bank_deposit_repository
|
||||||
.select_all_count(&conn, &find_all)
|
.select_all_count(&conn, &find_all)
|
||||||
.map_err(|e| {
|
.map_err(|e| {
|
||||||
|
@ -384,6 +384,7 @@ impl Service {
|
||||||
error: None,
|
error: None,
|
||||||
result: Some(
|
result: Some(
|
||||||
bpr::ss::member_bank_deposit::list_member_bank_deposits_response::Result {
|
bpr::ss::member_bank_deposit::list_member_bank_deposits_response::Result {
|
||||||
|
total_count: total_count as u64,
|
||||||
member_bank_deposits: list
|
member_bank_deposits: list
|
||||||
.iter()
|
.iter()
|
||||||
.map(bpr::models::member_bank_deposit::MemberBankDepositModel::from)
|
.map(bpr::models::member_bank_deposit::MemberBankDepositModel::from)
|
||||||
|
|
|
@ -359,7 +359,7 @@ impl Service {
|
||||||
),
|
),
|
||||||
};
|
};
|
||||||
|
|
||||||
let count = self
|
let total_count = self
|
||||||
.member_bank_withdraw_repository
|
.member_bank_withdraw_repository
|
||||||
.select_all_count(&conn, &find_all)
|
.select_all_count(&conn, &find_all)
|
||||||
.map_err(|e| {
|
.map_err(|e| {
|
||||||
|
@ -387,6 +387,7 @@ impl Service {
|
||||||
error: None,
|
error: None,
|
||||||
result: Some(
|
result: Some(
|
||||||
bpr::ss::member_bank_withdraw::list_member_bank_withdraws_response::Result {
|
bpr::ss::member_bank_withdraw::list_member_bank_withdraws_response::Result {
|
||||||
|
total_count: total_count as u64,
|
||||||
member_bank_withdraws: list
|
member_bank_withdraws: list
|
||||||
.iter()
|
.iter()
|
||||||
.map(bpr::models::member_bank_withdraw::MemberBankWithdrawModel::from)
|
.map(bpr::models::member_bank_withdraw::MemberBankWithdrawModel::from)
|
||||||
|
|
|
@ -309,7 +309,7 @@ impl Service {
|
||||||
),
|
),
|
||||||
};
|
};
|
||||||
|
|
||||||
let count = self
|
let total_count = self
|
||||||
.member_class_repository
|
.member_class_repository
|
||||||
.select_all_count(&conn, &find_all)
|
.select_all_count(&conn, &find_all)
|
||||||
.map_err(|e| {
|
.map_err(|e| {
|
||||||
|
@ -337,6 +337,7 @@ impl Service {
|
||||||
error: None,
|
error: None,
|
||||||
result: Some(
|
result: Some(
|
||||||
bpr::ss::member_class::list_member_classes_response::Result {
|
bpr::ss::member_class::list_member_classes_response::Result {
|
||||||
|
total_count: total_count as u64,
|
||||||
member_classes: list
|
member_classes: list
|
||||||
.iter()
|
.iter()
|
||||||
.map(|d| bpr::models::member_class::MemberClass::from(d))
|
.map(|d| bpr::models::member_class::MemberClass::from(d))
|
||||||
|
|
|
@ -336,7 +336,7 @@ impl Service {
|
||||||
),
|
),
|
||||||
};
|
};
|
||||||
|
|
||||||
let count = self
|
let total_count = self
|
||||||
.member_game_setting_repository
|
.member_game_setting_repository
|
||||||
.select_all_count(&conn, &find_all)
|
.select_all_count(&conn, &find_all)
|
||||||
.map_err(|e| {
|
.map_err(|e| {
|
||||||
|
@ -364,6 +364,7 @@ impl Service {
|
||||||
error: None,
|
error: None,
|
||||||
result: Some(
|
result: Some(
|
||||||
bpr::ss::member_game_setting::list_member_game_settings_response::Result {
|
bpr::ss::member_game_setting::list_member_game_settings_response::Result {
|
||||||
|
total_count: total_count as u64,
|
||||||
member_game_settings: list
|
member_game_settings: list
|
||||||
.iter()
|
.iter()
|
||||||
.map(|d| bpr::models::member_game_setting::MemberGameSetting::from(d))
|
.map(|d| bpr::models::member_game_setting::MemberGameSetting::from(d))
|
||||||
|
|
|
@ -288,7 +288,7 @@ impl Service {
|
||||||
),
|
),
|
||||||
};
|
};
|
||||||
|
|
||||||
let count = self
|
let total_count = self
|
||||||
.member_level_repository
|
.member_level_repository
|
||||||
.select_all_count(&conn, &find_all)
|
.select_all_count(&conn, &find_all)
|
||||||
.map_err(|e| {
|
.map_err(|e| {
|
||||||
|
@ -315,6 +315,7 @@ impl Service {
|
||||||
bpr::ss::member_level::ListMemberLevelsResponse {
|
bpr::ss::member_level::ListMemberLevelsResponse {
|
||||||
error: None,
|
error: None,
|
||||||
result: Some(bpr::ss::member_level::list_member_levels_response::Result {
|
result: Some(bpr::ss::member_level::list_member_levels_response::Result {
|
||||||
|
total_count: total_count as u64,
|
||||||
member_levels: list
|
member_levels: list
|
||||||
.iter()
|
.iter()
|
||||||
.map(|d| bpr::models::member_level::MemberLevel::from(d))
|
.map(|d| bpr::models::member_level::MemberLevel::from(d))
|
||||||
|
|
|
@ -500,7 +500,7 @@ impl Service {
|
||||||
),
|
),
|
||||||
};
|
};
|
||||||
|
|
||||||
let count = self
|
let total_count = self
|
||||||
.member_referrer_repository
|
.member_referrer_repository
|
||||||
.select_all_count(&conn, &find_all)
|
.select_all_count(&conn, &find_all)
|
||||||
.map_err(|e| {
|
.map_err(|e| {
|
||||||
|
@ -528,6 +528,7 @@ impl Service {
|
||||||
error: None,
|
error: None,
|
||||||
result: Some(
|
result: Some(
|
||||||
bpr::ss::member_referrer::list_member_referrers_response::Result {
|
bpr::ss::member_referrer::list_member_referrers_response::Result {
|
||||||
|
total_count: total_count as u64,
|
||||||
member_referrers: list
|
member_referrers: list
|
||||||
.iter()
|
.iter()
|
||||||
.map(|d| bpr::models::member_referrer::MemberReferrerModel::from(d))
|
.map(|d| bpr::models::member_referrer::MemberReferrerModel::from(d))
|
||||||
|
|
|
@ -353,7 +353,7 @@ impl Service {
|
||||||
),
|
),
|
||||||
};
|
};
|
||||||
|
|
||||||
let count = self
|
let total_count = self
|
||||||
.member_settlement_setting_repository
|
.member_settlement_setting_repository
|
||||||
.select_all_count(&conn, &find_all)
|
.select_all_count(&conn, &find_all)
|
||||||
.map_err(|e| {
|
.map_err(|e| {
|
||||||
|
@ -381,6 +381,7 @@ impl Service {
|
||||||
error: None,
|
error: None,
|
||||||
result: Some(
|
result: Some(
|
||||||
bpr::ss::member_settlement_setting::list_member_settlement_settings_response::Result {
|
bpr::ss::member_settlement_setting::list_member_settlement_settings_response::Result {
|
||||||
|
total_count: total_count as u64,
|
||||||
member_settlement_settings: list
|
member_settlement_settings: list
|
||||||
.iter()
|
.iter()
|
||||||
.map(|d| bpr::models::member_settlement_setting::MemberSettlementSetting::from(d))
|
.map(|d| bpr::models::member_settlement_setting::MemberSettlementSetting::from(d))
|
||||||
|
|
|
@ -175,7 +175,7 @@ impl Service {
|
||||||
),
|
),
|
||||||
};
|
};
|
||||||
|
|
||||||
let count = self
|
let total_count = self
|
||||||
.site_repository
|
.site_repository
|
||||||
.select_all_count(&conn, &find_all)
|
.select_all_count(&conn, &find_all)
|
||||||
.map_err(|e| {
|
.map_err(|e| {
|
||||||
|
@ -202,6 +202,7 @@ impl Service {
|
||||||
bpr::ss::site::ListSitesResponse {
|
bpr::ss::site::ListSitesResponse {
|
||||||
error: None,
|
error: None,
|
||||||
result: Some(bpr::ss::site::list_sites_response::Result {
|
result: Some(bpr::ss::site::list_sites_response::Result {
|
||||||
|
total_count: total_count as u64,
|
||||||
sites: list
|
sites: list
|
||||||
.iter()
|
.iter()
|
||||||
.map(|d| bpr::models::site::Site::from(d))
|
.map(|d| bpr::models::site::Site::from(d))
|
||||||
|
|
Loading…
Reference in New Issue
Block a user