From 63748f4d8002a2fb49d5db3385406d5acd65a650 Mon Sep 17 00:00:00 2001 From: PARK BYUNG JUN Date: Wed, 3 Aug 2022 07:26:34 +0000 Subject: [PATCH] responses are modified --- src/c2se/backend/identity.rs | 14 ++++++-- src/c2se/backend/member.rs | 44 ++++++++++++++++++++---- src/c2se/common/identity.rs | 59 ++++++++++++++++++++++++-------- src/c2se/frontend/identity.rs | 15 +++++++-- src/ss/member/identity.rs | 63 +++++++++++++++++++++++++++-------- 5 files changed, 158 insertions(+), 37 deletions(-) diff --git a/src/c2se/backend/identity.rs b/src/c2se/backend/identity.rs index c8b3a15..270b4f3 100644 --- a/src/c2se/backend/identity.rs +++ b/src/c2se/backend/identity.rs @@ -28,6 +28,16 @@ pub struct SigninRequest { } #[derive(Clone, PartialEq, ::prost::Message)] pub struct SigninResponse { - #[prost(string, tag = "1")] - pub session_id: ::prost::alloc::string::String, + #[prost(message, optional, tag = "1")] + pub error: ::core::option::Option, + #[prost(message, optional, tag = "2")] + pub result: ::core::option::Option, +} +/// Nested message and enum types in `SigninResponse`. +pub mod signin_response { + #[derive(Clone, PartialEq, ::prost::Message)] + pub struct Result { + #[prost(string, tag = "1")] + pub session_id: ::prost::alloc::string::String, + } } diff --git a/src/c2se/backend/member.rs b/src/c2se/backend/member.rs index 466bf76..45f78d4 100644 --- a/src/c2se/backend/member.rs +++ b/src/c2se/backend/member.rs @@ -1,5 +1,5 @@ -use crate::models::member; use crate::protobuf::pagination; +use crate::protobuf::rpc; const SUBJECT: &str = "bet.beteran.c2se.backend.member"; @@ -16,10 +16,21 @@ pub struct ListMembersRequest { } #[derive(Clone, PartialEq, ::prost::Message)] pub struct ListMembersResponse { - #[prost(message, repeated, tag = "1")] - pub members: ::prost::alloc::vec::Vec, + #[prost(message, optional, tag = "1")] + pub error: ::core::option::Option, + #[prost(message, optional, tag = "2")] + pub result: ::core::option::Option, } +/// Nested message and enum types in `ListMembersResponse`. +pub mod list_members_response { + use crate::models::member; + #[derive(Clone, PartialEq, ::prost::Message)] + pub struct Result { + #[prost(message, repeated, tag = "1")] + pub members: ::prost::alloc::vec::Vec, + } +} pub const SUBJECT_GET_MEMBER: &str = const_format::concatcp!(SUBJECT, ".GetMember"); /// subject = bet.beteran.c2se.backend.member.GetMember #[derive(Clone, PartialEq, ::prost::Message)] @@ -30,9 +41,19 @@ pub struct GetMemberRequest { #[derive(Clone, PartialEq, ::prost::Message)] pub struct GetMemberResponse { #[prost(message, optional, tag = "1")] - pub member: ::core::option::Option, + pub error: ::core::option::Option, + #[prost(message, optional, tag = "2")] + pub result: ::core::option::Option, +} +/// Nested message and enum types in `GetMemberResponse`. +pub mod get_member_response { + use crate::models::member; + #[derive(Clone, PartialEq, ::prost::Message)] + pub struct Result { + #[prost(message, optional, tag = "1")] + pub member: ::core::option::Option, + } } - pub const SUBJECT_GET_MEMBER_BY_USERNAME: &str = const_format::concatcp!(SUBJECT, ".GetMemberByUsername"); /// subject = bet.beteran.c2se.backend.member.GetMemberByUsername @@ -44,5 +65,16 @@ pub struct GetMemberByUsernameRequest { #[derive(Clone, PartialEq, ::prost::Message)] pub struct GetMemberByUsernameResponse { #[prost(message, optional, tag = "1")] - pub member: ::core::option::Option, + pub error: ::core::option::Option, + #[prost(message, optional, tag = "2")] + pub result: ::core::option::Option, +} +/// Nested message and enum types in `GetMemberByUsernameResponse`. +pub mod get_member_by_username_response { + use crate::models::member; + #[derive(Clone, PartialEq, ::prost::Message)] + pub struct Result { + #[prost(message, optional, tag = "1")] + pub member: ::core::option::Option, + } } diff --git a/src/c2se/common/identity.rs b/src/c2se/common/identity.rs index 0b74cfe..02f776b 100644 --- a/src/c2se/common/identity.rs +++ b/src/c2se/common/identity.rs @@ -2,37 +2,70 @@ use crate::protobuf::rpc; const SUBJECT: &str = "bet.beteran.c2se.common.identity"; +pub const SUBJECT_CHECK_USERNAME_FOR_DUPLICATION: &str = + const_format::concatcp!(SUBJECT, ".CheckUsernameForDuplication"); +/// subject = bet.beteran.c2se.common.identity.CheckUsernameForDuplication; #[derive(Clone, PartialEq, ::prost::Message)] pub struct CheckUsernameForDuplicationRequest { #[prost(string, tag = "1")] pub username: ::prost::alloc::string::String, } - #[derive(Clone, PartialEq, ::prost::Message)] pub struct CheckUsernameForDuplicationResponse { - #[prost(bool, tag = "1")] - pub duplicated: bool, + #[prost(message, optional, tag = "1")] + pub error: ::core::option::Option, + #[prost(message, optional, tag = "2")] + pub result: ::core::option::Option, } - +/// Nested message and enum types in `CheckUsernameForDuplicationResponse`. +pub mod check_username_for_duplication_response { + #[derive(Clone, PartialEq, ::prost::Message)] + pub struct Result { + #[prost(bool, tag = "1")] + pub duplicated: bool, + } +} +pub const SUBJECT_CHECK_NICKNAME_FOR_DUPLICATION: &str = + const_format::concatcp!(SUBJECT, ".CheckNicknameForDuplication"); +/// subject = bet.beteran.c2se.common.identity.CheckNicknameForDuplication; #[derive(Clone, PartialEq, ::prost::Message)] pub struct CheckNicknameForDuplicationRequest { #[prost(string, tag = "1")] pub nickname: ::prost::alloc::string::String, } - #[derive(Clone, PartialEq, ::prost::Message)] pub struct CheckNicknameForDuplicationResponse { - #[prost(bool, tag = "1")] - pub duplicated: bool, + #[prost(message, optional, tag = "1")] + pub error: ::core::option::Option, + #[prost(message, optional, tag = "2")] + pub result: ::core::option::Option, } - +/// Nested message and enum types in `CheckNicknameForDuplicationResponse`. +pub mod check_nickname_for_duplication_response { + #[derive(Clone, PartialEq, ::prost::Message)] + pub struct Result { + #[prost(bool, tag = "1")] + pub duplicated: bool, + } +} +pub const SUBJECT_CAPTCHA: &str = const_format::concatcp!(SUBJECT, ".Captcha"); +/// subject = bet.beteran.c2se.common.identity.Captcha #[derive(Clone, PartialEq, ::prost::Message)] pub struct CaptchaRequest {} - #[derive(Clone, PartialEq, ::prost::Message)] pub struct CaptchaResponse { - #[prost(string, tag = "1")] - pub token: ::prost::alloc::string::String, - #[prost(string, tag = "2")] - pub image: ::prost::alloc::string::String, + #[prost(message, optional, tag = "1")] + pub error: ::core::option::Option, + #[prost(message, optional, tag = "2")] + pub result: ::core::option::Option, +} +/// Nested message and enum types in `CaptchaResponse`. +pub mod captcha_response { + #[derive(Clone, PartialEq, ::prost::Message)] + pub struct Result { + #[prost(string, tag = "1")] + pub token: ::prost::alloc::string::String, + #[prost(string, tag = "2")] + pub image: ::prost::alloc::string::String, + } } diff --git a/src/c2se/frontend/identity.rs b/src/c2se/frontend/identity.rs index 9a8e2fd..1698f4e 100644 --- a/src/c2se/frontend/identity.rs +++ b/src/c2se/frontend/identity.rs @@ -26,9 +26,18 @@ pub struct SigninRequest { #[prost(string, tag = "4")] pub password: ::prost::alloc::string::String, } - #[derive(Clone, PartialEq, ::prost::Message)] pub struct SigninResponse { - #[prost(string, tag = "1")] - pub session_id: ::prost::alloc::string::String, + #[prost(message, optional, tag = "1")] + pub error: ::core::option::Option, + #[prost(message, optional, tag = "2")] + pub result: ::core::option::Option, +} +/// Nested message and enum types in `SigninResponse`. +pub mod signin_response { + #[derive(Clone, PartialEq, ::prost::Message)] + pub struct Result { + #[prost(string, tag = "1")] + pub session_id: ::prost::alloc::string::String, + } } diff --git a/src/ss/member/identity.rs b/src/ss/member/identity.rs index 1dfb9b2..af80c35 100644 --- a/src/ss/member/identity.rs +++ b/src/ss/member/identity.rs @@ -15,10 +15,19 @@ pub struct CheckUsernameForDuplicationRequest { } #[derive(Clone, PartialEq, ::prost::Message)] pub struct CheckUsernameForDuplicationResponse { - #[prost(bool, tag = "1")] - pub duplicated: bool, + #[prost(message, optional, tag = "1")] + pub error: ::core::option::Option, + #[prost(message, optional, tag = "2")] + pub result: ::core::option::Option, +} +/// Nested message and enum types in `CheckUsernameForDuplicationResponse`. +pub mod check_username_for_duplication_response { + #[derive(Clone, PartialEq, ::prost::Message)] + pub struct Result { + #[prost(bool, tag = "1")] + pub duplicated: bool, + } } - pub const SUBJECT_CHECK_NICKNAME_FOR_DUPLICATION: &str = const_format::concatcp!(SUBJECT, ".CheckNicknameForDuplication"); /// subject = bet.beteran.ss.member.identity.CheckNicknameForDuplication; @@ -31,10 +40,19 @@ pub struct CheckNicknameForDuplicationRequest { } #[derive(Clone, PartialEq, ::prost::Message)] pub struct CheckNicknameForDuplicationResponse { - #[prost(bool, tag = "1")] - pub duplicated: bool, + #[prost(message, optional, tag = "1")] + pub error: ::core::option::Option, + #[prost(message, optional, tag = "2")] + pub result: ::core::option::Option, +} +/// Nested message and enum types in `CheckNicknameForDuplicationResponse`. +pub mod check_nickname_for_duplication_response { + #[derive(Clone, PartialEq, ::prost::Message)] + pub struct Result { + #[prost(bool, tag = "1")] + pub duplicated: bool, + } } - pub const SUBJECT_CAPTCHA: &str = const_format::concatcp!(SUBJECT, ".Captcha"); /// subject = bet.beteran.ss.member.identity.Captcha #[derive(Clone, PartialEq, ::prost::Message)] @@ -44,12 +62,21 @@ pub struct CaptchaRequest { } #[derive(Clone, PartialEq, ::prost::Message)] pub struct CaptchaResponse { - #[prost(string, tag = "1")] - pub token: ::prost::alloc::string::String, - #[prost(string, tag = "2")] - pub image: ::prost::alloc::string::String, + #[prost(message, optional, tag = "1")] + pub error: ::core::option::Option, + #[prost(message, optional, tag = "2")] + pub result: ::core::option::Option, +} +/// Nested message and enum types in `CaptchaResponse`. +pub mod captcha_response { + #[derive(Clone, PartialEq, ::prost::Message)] + pub struct Result { + #[prost(string, tag = "1")] + pub token: ::prost::alloc::string::String, + #[prost(string, tag = "2")] + pub image: ::prost::alloc::string::String, + } } - pub const SUBJECT_SIGNIN: &str = const_format::concatcp!(SUBJECT, ".Signin"); /// subject = bet.beteran.ss.member.identity.Signin #[derive(Clone, PartialEq, ::prost::Message)] @@ -67,6 +94,16 @@ pub struct SigninRequest { } #[derive(Clone, PartialEq, ::prost::Message)] pub struct SigninResponse { - #[prost(string, tag = "1")] - pub session_id: ::prost::alloc::string::String, + #[prost(message, optional, tag = "1")] + pub error: ::core::option::Option, + #[prost(message, optional, tag = "2")] + pub result: ::core::option::Option, +} +/// Nested message and enum types in `SigninResponse`. +pub mod signin_response { + #[derive(Clone, PartialEq, ::prost::Message)] + pub struct Result { + #[prost(string, tag = "1")] + pub session_id: ::prost::alloc::string::String, + } }