From ca1b23e1d007af7c272acef0804a49fb0de77cd6 Mon Sep 17 00:00:00 2001 From: Stoyan Tzenkov Date: Sat, 27 Oct 2018 08:24:59 +0300 Subject: [PATCH 1/5] search-accout: search-account.proto added Signed-off-by: Stoyan Tzenkov --- search-service/1.0/search.proto | 70 +++++++++++++++++++ .../search-account/1.0/search-account.proto | 70 +++++++++++++++++++ 2 files changed, 140 insertions(+) create mode 100644 search-service/1.0/search.proto create mode 100644 search-service/search-account/1.0/search-account.proto diff --git a/search-service/1.0/search.proto b/search-service/1.0/search.proto new file mode 100644 index 0000000..9fa4151 --- /dev/null +++ b/search-service/1.0/search.proto @@ -0,0 +1,70 @@ +// +// proto3 +// Syntax documentation - see https://developers.google.com/protocol-buffers/docs/proto3 +// +syntax = "proto3"; + +// GRPC package, also used by the Go code generator +package search; + +option java_generic_services = true; +option java_multiple_files = true; +option java_package = "biz.nynja.search.grpc"; +option java_outer_classname = "Search"; + +service SearchService { + rpc searchByUsername(SearchByUsernameRequest) returns (SearchResponse); + rpc searchByPhoneNumber(SearchByPhoneNumberRequest) returns (SearchResponse); + rpc searchByEmail(SearchByEmailRequest) returns (SearchResponse); + rpc searchByQrCode(SearchByQrCodeRequest) returns (SearchResponse); +} + +message SearchByUsernameRequest { + string username = 1; +} + +message SearchByPhoneNumberRequest { + string phoneNumber = 1; +} + +message SearchByEmailRequest { + string email = 1; +} + +message SearchByQrCodeRequest { + string qrCode = 1; +} + +message SearchResponse { + uint64 requestId = 1; + oneof result { + ErrorResponse error = 2; + SearchResultDetails searchResultDetails = 3; + } +} + +message SearchResultDetails { + bytes avatar = 1; + string firstName = 2; + string lastName = 3; +} + +message ErrorResponse { + enum Cause { + INTERNAL_SERVER_ERROR = 0; + MISSING_USERNAME = 1; + MISSING_EMAIL = 2; + MISSING_PHONENUMBER = 3; + MISSING_QR_CODE = 4; + INVALID_USERNAME = 5; + INVALID_EMAIL = 6; + INVALID_PHONENUMBER = 7; + INVALID_QR_CODE = 8; + USERNAME_NOT_FOUND = 9; + EMAIL_NOT_FOUND = 10; + PHONENUMBER_NOT_FOUND = 11; + QR_CODE_NOT_FOUND = 12; + } + Cause cause = 1; + string message = 2; +} \ No newline at end of file diff --git a/search-service/search-account/1.0/search-account.proto b/search-service/search-account/1.0/search-account.proto new file mode 100644 index 0000000..9e72aa6 --- /dev/null +++ b/search-service/search-account/1.0/search-account.proto @@ -0,0 +1,70 @@ +// +// proto3 +// Syntax documentation - see https://developers.google.com/protocol-buffers/docs/proto3 +// +syntax = "proto3"; + +// GRPC package, also used by the Go code generator +package search-account; + +option java_generic_services = true; +option java_multiple_files = true; +option java_package = "biz.nynja.search-account.grpc"; +option java_outer_classname = "SearchAccount"; + +service SearchAccountService { + rpc searchAccountByUsername(SearchByUsernameRequest) returns (SearchResponse); + rpc searchAccountByPhoneNumber(SearchByPhoneNumberRequest) returns (SearchResponse); + rpc searchAccountByEmail(SearchByEmailRequest) returns (SearchResponse); + rpc searchAccountByQrCode(SearchByQrCodeRequest) returns (SearchResponse); +} + +message SearchByUsernameRequest { + string username = 1; +} + +message SearchByPhoneNumberRequest { + string phoneNumber = 1; +} + +message SearchByEmailRequest { + string email = 1; +} + +message SearchByQrCodeRequest { + string qrCode = 1; +} + +message SearchResponse { + uint64 requestId = 1; + oneof result { + ErrorResponse error = 2; + SearchResultDetails searchResultDetails = 3; + } +} + +message SearchResultDetails { + bytes avatar = 1; + string firstName = 2; + string lastName = 3; +} + +message ErrorResponse { + enum Cause { + INTERNAL_SERVER_ERROR = 0; + MISSING_USERNAME = 1; + MISSING_EMAIL = 2; + MISSING_PHONENUMBER = 3; + MISSING_QR_CODE = 4; + INVALID_USERNAME = 5; + INVALID_EMAIL = 6; + INVALID_PHONENUMBER = 7; + INVALID_QR_CODE = 8; + USERNAME_NOT_FOUND = 9; + EMAIL_NOT_FOUND = 10; + PHONENUMBER_NOT_FOUND = 11; + QR_CODE_NOT_FOUND = 12; + } + Cause cause = 1; + string message = 2; +} \ No newline at end of file -- GitLab From 029b58d8c05e8126825dbf2c8ef5f8843483c6c9 Mon Sep 17 00:00:00 2001 From: Stoyan Tzenkov Date: Sat, 27 Oct 2018 08:34:42 +0300 Subject: [PATCH 2/5] search-account: proto moved Signed-off-by: Stoyan Tzenkov --- .../search-account => search-account}/1.0/search-account.proto | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {search-service/search-account => search-account}/1.0/search-account.proto (100%) diff --git a/search-service/search-account/1.0/search-account.proto b/search-account/1.0/search-account.proto similarity index 100% rename from search-service/search-account/1.0/search-account.proto rename to search-account/1.0/search-account.proto -- GitLab From 6e41f059f8c065e4026239d48506a87fd4af76fc Mon Sep 17 00:00:00 2001 From: Stoyan Tzenkov Date: Sat, 27 Oct 2018 12:35:52 +0300 Subject: [PATCH 3/5] search-account: Fixed the proto Signed-off-by: Stoyan Tzenkov --- search-account/1.0/search-account.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/search-account/1.0/search-account.proto b/search-account/1.0/search-account.proto index 9e72aa6..0963d4c 100644 --- a/search-account/1.0/search-account.proto +++ b/search-account/1.0/search-account.proto @@ -5,7 +5,7 @@ syntax = "proto3"; // GRPC package, also used by the Go code generator -package search-account; +package search_account; option java_generic_services = true; option java_multiple_files = true; -- GitLab From 32cdff0962fce66b7cb526bea855da06724f45fd Mon Sep 17 00:00:00 2001 From: Stoyan Tzenkov Date: Sat, 27 Oct 2018 12:45:45 +0300 Subject: [PATCH 4/5] search-account: Another fix Signed-off-by: Stoyan Tzenkov --- .../1.0/{search-account.proto => searchaccount.proto} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename search-account/1.0/{search-account.proto => searchaccount.proto} (98%) diff --git a/search-account/1.0/search-account.proto b/search-account/1.0/searchaccount.proto similarity index 98% rename from search-account/1.0/search-account.proto rename to search-account/1.0/searchaccount.proto index 0963d4c..a46543e 100644 --- a/search-account/1.0/search-account.proto +++ b/search-account/1.0/searchaccount.proto @@ -5,7 +5,7 @@ syntax = "proto3"; // GRPC package, also used by the Go code generator -package search_account; +package searchaccount; option java_generic_services = true; option java_multiple_files = true; -- GitLab From efe8faf9f94bf88c65abe46e96a77eee0e9cb447 Mon Sep 17 00:00:00 2001 From: Stoyan Tzenkov Date: Sat, 27 Oct 2018 12:54:57 +0300 Subject: [PATCH 5/5] searxh-account: fix Signed-off-by: Stoyan Tzenkov --- search-account/1.0/searchaccount.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/search-account/1.0/searchaccount.proto b/search-account/1.0/searchaccount.proto index a46543e..20bff85 100644 --- a/search-account/1.0/searchaccount.proto +++ b/search-account/1.0/searchaccount.proto @@ -9,7 +9,7 @@ package searchaccount; option java_generic_services = true; option java_multiple_files = true; -option java_package = "biz.nynja.search-account.grpc"; +option java_package = "biz.nynja.searchaccount.grpc"; option java_outer_classname = "SearchAccount"; service SearchAccountService { -- GitLab