From 6a948abeb9aef2bcb93792fbc7d9476c2ce0afba Mon Sep 17 00:00:00 2001 From: PARK BYUNG JUN Date: Sun, 28 Aug 2022 13:37:36 +0000 Subject: [PATCH] return type is changed --- proto/c2se/member_bank_deposit.proto | 10 +++++----- proto/c2se/member_bank_withdraw.proto | 10 +++++----- proto/models/member_bank_deposit.proto | 18 +++++++++++++++++- proto/models/member_bank_withdraw.proto | 21 ++++++++++++++++++++- proto/ss/member_bank_deposit.proto | 20 +++++++++++++++----- proto/ss/member_bank_withdraw.proto | 20 +++++++++++++++----- 6 files changed, 77 insertions(+), 22 deletions(-) diff --git a/proto/c2se/member_bank_deposit.proto b/proto/c2se/member_bank_deposit.proto index 8241bbc..fb4f946 100644 --- a/proto/c2se/member_bank_deposit.proto +++ b/proto/c2se/member_bank_deposit.proto @@ -15,7 +15,7 @@ message CreateMemberBankDepositRequest { message CreateMemberBankDepositResponse { message Result { - bet.beteran.member_bank_deposit.MemberBankDeposit member_bank_deposit = 1; + bet.beteran.member_bank_deposit.MemberBankDepositModel member_bank_deposit = 1; } optional bet.protobuf.rpc.Error error = 1; optional Result result = 2; @@ -36,7 +36,7 @@ message ListMemberBankDepositsRequest { message ListMemberBankDepositsResponse { message Result { - repeated bet.beteran.member_bank_deposit.MemberBankDeposit member_bank_deposits = 1; + repeated bet.beteran.member_bank_deposit.MemberBankDepositModel member_bank_deposits = 1; } optional bet.protobuf.rpc.Error error = 1; optional Result result = 2; @@ -48,7 +48,7 @@ message GetMemberBankDepositRequest { message GetMemberBankDepositResponse { message Result { - bet.beteran.member_bank_deposit.MemberBankDeposit member_bank_deposit = 1; + bet.beteran.member_bank_deposit.MemberBankDepositModel member_bank_deposit = 1; } optional bet.protobuf.rpc.Error error = 1; optional Result result = 2; @@ -63,7 +63,7 @@ message UpdateMemberBankDepositRequest { message UpdateMemberBankDepositResponse { message Result { - bet.beteran.member_bank_deposit.MemberBankDeposit member_bank_deposit = 1; + bet.beteran.member_bank_deposit.MemberBankDepositModel member_bank_deposit = 1; } optional bet.protobuf.rpc.Error error = 1; optional Result result = 2; @@ -77,7 +77,7 @@ message UpdateMemberBankDepositForStateRequest { message UpdateMemberBankDepositForStateResponse { message Result { - bet.beteran.member_bank_deposit.MemberBankDeposit member_bank_deposit = 1; + bet.beteran.member_bank_deposit.MemberBankDepositModel member_bank_deposit = 1; } optional bet.protobuf.rpc.Error error = 1; optional Result result = 2; diff --git a/proto/c2se/member_bank_withdraw.proto b/proto/c2se/member_bank_withdraw.proto index c7ca20c..fde814c 100644 --- a/proto/c2se/member_bank_withdraw.proto +++ b/proto/c2se/member_bank_withdraw.proto @@ -18,7 +18,7 @@ message CreateMemberBankWithdrawRequest { message CreateMemberBankWithdrawResponse { message Result { - bet.beteran.member_bank_withdraw.MemberBankWithdraw member_bank_withdraw = 1; + bet.beteran.member_bank_withdraw.MemberBankWithdrawModel member_bank_withdraw = 1; } optional bet.protobuf.rpc.Error error = 1; optional Result result = 2; @@ -41,7 +41,7 @@ message ListMemberBankWithdrawsRequest { message ListMemberBankWithdrawsResponse { message Result { - repeated bet.beteran.member_bank_withdraw.MemberBankWithdraw member_bank_withdraws = 1; + repeated bet.beteran.member_bank_withdraw.MemberBankWithdrawModel member_bank_withdraws = 1; } optional bet.protobuf.rpc.Error error = 1; optional Result result = 2; @@ -53,7 +53,7 @@ message GetMemberBankWithdrawRequest { message GetMemberBankWithdrawResponse { message Result { - bet.beteran.member_bank_withdraw.MemberBankWithdraw member_bank_withdraw = 1; + bet.beteran.member_bank_withdraw.MemberBankWithdrawModel member_bank_withdraw = 1; } optional bet.protobuf.rpc.Error error = 1; optional Result result = 2; @@ -71,7 +71,7 @@ message UpdateMemberBankWithdrawRequest { message UpdateMemberBankWithdrawResponse { message Result { - bet.beteran.member_bank_withdraw.MemberBankWithdraw member_bank_withdraw = 1; + bet.beteran.member_bank_withdraw.MemberBankWithdrawModel member_bank_withdraw = 1; } optional bet.protobuf.rpc.Error error = 1; optional Result result = 2; @@ -84,7 +84,7 @@ message UpdateMemberBankWithdrawForStateRequest { message UpdateMemberBankWithdrawForStateResponse { message Result { - bet.beteran.member_bank_withdraw.MemberBankWithdraw member_bank_withdraw = 1; + bet.beteran.member_bank_withdraw.MemberBankWithdrawModel member_bank_withdraw = 1; } optional bet.protobuf.rpc.Error error = 1; optional Result result = 2; diff --git a/proto/models/member_bank_deposit.proto b/proto/models/member_bank_deposit.proto index 73a9c35..000e0d3 100644 --- a/proto/models/member_bank_deposit.proto +++ b/proto/models/member_bank_deposit.proto @@ -2,10 +2,13 @@ syntax = "proto3"; package bet.beteran.member_bank_deposit; +import "models/member.proto"; + enum MemberBankDepositState { NONE = 0; APPLICATION = 1; - COMPLETE = 2; + PENDING = 2; + COMPLETE = 3; } message MemberBankDeposit { @@ -19,3 +22,16 @@ message MemberBankDeposit { uint64 created_at = 8; uint64 updated_at = 9; } + + +message MemberBankDepositModel { + string id = 1; + bet.beteran.member.Member member = 2; + string name = 3; + uint32 amount = 4; + optional string memo = 5; + MemberBankDepositState state = 6; + uint64 state_changed_at = 7; + uint64 created_at = 8; + uint64 updated_at = 9; +} diff --git a/proto/models/member_bank_withdraw.proto b/proto/models/member_bank_withdraw.proto index 3cf5da5..b3ad385 100644 --- a/proto/models/member_bank_withdraw.proto +++ b/proto/models/member_bank_withdraw.proto @@ -2,10 +2,13 @@ syntax = "proto3"; package bet.beteran.member_bank_withdraw; +import "models/member.proto"; + enum MemberBankWithdrawState { NONE = 0; APPLICATION = 1; - COMPLETE = 2; + PENDING = 2; + COMPLETE = 3; } message MemberBankWithdraw { @@ -22,3 +25,19 @@ message MemberBankWithdraw { uint64 created_at = 11; uint64 updated_at = 12; } + + +message MemberBankWithdrawModel { + string id = 1; + bet.beteran.member.Member member = 2; + string bank_name = 3; + string name = 4; + string account_number = 5; + uint32 amount = 6; + string password = 7; + optional string memo = 8; + MemberBankWithdrawState state = 9; + uint64 state_changed_at = 10; + uint64 created_at = 11; + uint64 updated_at = 12; +} diff --git a/proto/ss/member_bank_deposit.proto b/proto/ss/member_bank_deposit.proto index a9f5fa1..0a32ee5 100644 --- a/proto/ss/member_bank_deposit.proto +++ b/proto/ss/member_bank_deposit.proto @@ -21,7 +21,7 @@ message CreateMemberBankDepositRequest { message CreateMemberBankDepositResponse { message Result { - bet.beteran.member_bank_deposit.MemberBankDeposit member_bank_deposit = 1; + bet.beteran.member_bank_deposit.MemberBankDepositModel member_bank_deposit = 1; } optional bet.protobuf.rpc.Error error = 1; optional Result result = 2; @@ -47,7 +47,7 @@ message ListMemberBankDepositsRequest { message ListMemberBankDepositsResponse { message Result { - repeated bet.beteran.member_bank_deposit.MemberBankDeposit member_bank_deposits = 1; + repeated bet.beteran.member_bank_deposit.MemberBankDepositModel member_bank_deposits = 1; } optional bet.protobuf.rpc.Error error = 1; optional Result result = 2; @@ -64,7 +64,7 @@ message GetMemberBankDepositRequest { message GetMemberBankDepositResponse { message Result { - bet.beteran.member_bank_deposit.MemberBankDeposit member_bank_deposit = 1; + bet.beteran.member_bank_deposit.MemberBankDepositModel member_bank_deposit = 1; } optional bet.protobuf.rpc.Error error = 1; optional Result result = 2; @@ -84,7 +84,7 @@ message UpdateMemberBankDepositRequest { message UpdateMemberBankDepositResponse { message Result { - bet.beteran.member_bank_deposit.MemberBankDeposit member_bank_deposit = 1; + bet.beteran.member_bank_deposit.MemberBankDepositModel member_bank_deposit = 1; } optional bet.protobuf.rpc.Error error = 1; optional Result result = 2; @@ -102,7 +102,7 @@ message UpdateMemberBankDepositForStateRequest { message UpdateMemberBankDepositForStateResponse { message Result { - bet.beteran.member_bank_deposit.MemberBankDeposit member_bank_deposit = 1; + bet.beteran.member_bank_deposit.MemberBankDepositModel member_bank_deposit = 1; } optional bet.protobuf.rpc.Error error = 1; optional Result result = 2; @@ -123,3 +123,13 @@ message DeleteMemberBankDepositResponse { optional bet.protobuf.rpc.Error error = 1; optional Result result = 2; } + + +// subject = bet.beteran.ss_event.member_bank_deposit.AfterUpdateMemberBankDepositForState +message AfterUpdateMemberBankDepositForState { + message Event { + bet.beteran.member_bank_deposit.MemberBankDepositModel member_bank_deposit = 1; + } + bet.beteran.core.network.Client client = 1; + Event event = 2; +} diff --git a/proto/ss/member_bank_withdraw.proto b/proto/ss/member_bank_withdraw.proto index 1ae38a5..dac6ad8 100644 --- a/proto/ss/member_bank_withdraw.proto +++ b/proto/ss/member_bank_withdraw.proto @@ -24,7 +24,7 @@ message CreateMemberBankWithdrawRequest { message CreateMemberBankWithdrawResponse { message Result { - bet.beteran.member_bank_withdraw.MemberBankWithdraw member_bank_withdraw = 1; + bet.beteran.member_bank_withdraw.MemberBankWithdrawModel member_bank_withdraw = 1; } optional bet.protobuf.rpc.Error error = 1; optional Result result = 2; @@ -52,7 +52,7 @@ message ListMemberBankWithdrawsRequest { message ListMemberBankWithdrawsResponse { message Result { - repeated bet.beteran.member_bank_withdraw.MemberBankWithdraw member_bank_withdraws = 1; + repeated bet.beteran.member_bank_withdraw.MemberBankWithdrawModel member_bank_withdraws = 1; } optional bet.protobuf.rpc.Error error = 1; optional Result result = 2; @@ -69,7 +69,7 @@ message GetMemberBankWithdrawRequest { message GetMemberBankWithdrawResponse { message Result { - bet.beteran.member_bank_withdraw.MemberBankWithdraw member_bank_withdraw = 1; + bet.beteran.member_bank_withdraw.MemberBankWithdrawModel member_bank_withdraw = 1; } optional bet.protobuf.rpc.Error error = 1; optional Result result = 2; @@ -92,7 +92,7 @@ message UpdateMemberBankWithdrawRequest { message UpdateMemberBankWithdrawResponse { message Result { - bet.beteran.member_bank_withdraw.MemberBankWithdraw member_bank_withdraw = 1; + bet.beteran.member_bank_withdraw.MemberBankWithdrawModel member_bank_withdraw = 1; } optional bet.protobuf.rpc.Error error = 1; optional Result result = 2; @@ -110,7 +110,7 @@ message UpdateMemberBankWithdrawForStateRequest { message UpdateMemberBankWithdrawForStateResponse { message Result { - bet.beteran.member_bank_withdraw.MemberBankWithdraw member_bank_withdraw = 1; + bet.beteran.member_bank_withdraw.MemberBankWithdrawModel member_bank_withdraw = 1; } optional bet.protobuf.rpc.Error error = 1; optional Result result = 2; @@ -131,3 +131,13 @@ message DeleteMemberBankWithdrawResponse { optional bet.protobuf.rpc.Error error = 1; optional Result result = 2; } + + +// subject = bet.beteran.ss_event.member_bank_withdraw.AfterUpdateMemberBankWithdrawForState +message AfterUpdateMemberBankWithdrawForState { + message Event { + bet.beteran.member_bank_withdraw.MemberBankWithdrawModel member_bank_withdraw = 1; + } + bet.beteran.core.network.Client client = 1; + Event event = 2; +}