From 4f28e92685bd2c90944e2e1c0583f98f62fea61d02c1778ba3267769d8faf3b1 Mon Sep 17 00:00:00 2001 From: raven <7156279+RavenX8@users.noreply.github.com> Date: Thu, 27 Feb 2025 22:42:54 -0500 Subject: [PATCH] - update: proto files and code referencing them to make it more clear what service they are --- character-service/src/character_db_client.rs | 6 +++--- character-service/src/character_service.rs | 3 +-- database-service/src/grpc/character_service.rs | 4 ++-- database-service/src/main.rs | 4 ++-- packet-service/src/character_client.rs | 2 +- proto/character.proto | 2 -- proto/character_db_api.proto | 2 +- 7 files changed, 10 insertions(+), 13 deletions(-) diff --git a/character-service/src/character_db_client.rs b/character-service/src/character_db_client.rs index d7b4062..7a1b66f 100644 --- a/character-service/src/character_db_client.rs +++ b/character-service/src/character_db_client.rs @@ -1,11 +1,11 @@ use tonic::transport::Channel; use serde::{Deserialize, Serialize}; -use crate::database::character_service_client::CharacterServiceClient; +use crate::database::character_db_service_client::CharacterDbServiceClient; use crate::database::{CharacterRequest, Character, CharacterListRequest, CharacterListResponse, CreateCharacterRequest, CreateCharacterResponse, DeleteCharacterRequest, DeleteCharacterResponse}; #[derive(Clone)] pub struct CharacterDbClient { - client: CharacterServiceClient, + client: CharacterDbServiceClient, } #[derive(Debug, Deserialize, Serialize)] @@ -67,7 +67,7 @@ struct Stats { impl CharacterDbClient { pub async fn connect(endpoint: &str) -> Result> { - let client = CharacterServiceClient::connect(endpoint.to_string()).await?; + let client = CharacterDbServiceClient::connect(endpoint.to_string()).await?; Ok(Self { client }) } diff --git a/character-service/src/character_service.rs b/character-service/src/character_service.rs index 3742886..800c28d 100644 --- a/character-service/src/character_service.rs +++ b/character-service/src/character_service.rs @@ -4,14 +4,13 @@ use tonic::{Request, Response, Status}; use utils::null_string::NullTerminatedString; use crate::character_db_client::CharacterDbClient; use crate::character_service::character::character_service_server::CharacterService; -use crate::character_service::character::{CreateCharacterRequest, CreateCharacterResponse, DeleteCharacterRequest, DeleteCharacterResponse, Empty, GetCharacterListRequest, GetCharacterListResponse, GetCharacterRequest, GetCharacterResponse}; +use crate::character_service::character::{CreateCharacterRequest, CreateCharacterResponse, DeleteCharacterRequest, DeleteCharacterResponse, GetCharacterListRequest, GetCharacterListResponse, GetCharacterRequest, GetCharacterResponse}; use crate::character_service::character_common::{Character, CharacterFull, Looks, Stats}; pub mod character_common { tonic::include_proto!("character_common"); } pub mod character { - tonic::include_proto!("character"); } diff --git a/database-service/src/grpc/character_service.rs b/database-service/src/grpc/character_service.rs index b0117c0..ebd6a56 100644 --- a/database-service/src/grpc/character_service.rs +++ b/database-service/src/grpc/character_service.rs @@ -1,11 +1,11 @@ use serde_json::Value::Null; use crate::grpc::{Character, CharacterRequest, CharacterListRequest, CharacterListResponse, CreateCharacterRequest, CreateCharacterResponse, DeleteCharacterRequest, DeleteCharacterResponse}; -use crate::grpc::character_service_server::CharacterService; +use crate::grpc::character_db_service_server::CharacterDbService; use crate::grpc::database_service::MyDatabaseService; use tonic::{Request, Response, Status}; #[tonic::async_trait] -impl CharacterService for MyDatabaseService { +impl CharacterDbService for MyDatabaseService { async fn get_character( &self, request: Request, diff --git a/database-service/src/main.rs b/database-service/src/main.rs index 7b3f828..b28629a 100644 --- a/database-service/src/main.rs +++ b/database-service/src/main.rs @@ -2,7 +2,7 @@ use std::collections::HashMap; use database_service::db::Database; use database_service::grpc::database_service::MyDatabaseService; use database_service::grpc::user_service_server::UserServiceServer; -use database_service::grpc::character_service_server::CharacterServiceServer; +use database_service::grpc::character_db_service_server::CharacterDbServiceServer; use utils::redis_cache::RedisCache; use dotenv::dotenv; use sqlx::postgres::PgPoolOptions; @@ -71,7 +71,7 @@ async fn main() -> Result<(), Box> { info!("Database Service running on {}", address); tokio::spawn(Server::builder() .add_service(UserServiceServer::new(my_service.clone())) - .add_service(CharacterServiceServer::new(my_service)) + .add_service(CharacterDbServiceServer::new(my_service)) .serve(address)); utils::signal_handler::wait_for_signal().await; diff --git a/packet-service/src/character_client.rs b/packet-service/src/character_client.rs index 9c57cf6..4311110 100644 --- a/packet-service/src/character_client.rs +++ b/packet-service/src/character_client.rs @@ -1,5 +1,5 @@ use crate::character::character_service_client::CharacterServiceClient; -use crate::character::{CreateCharacterRequest, CreateCharacterResponse, DeleteCharacterRequest, DeleteCharacterResponse, Empty, GetCharacterListRequest, GetCharacterListResponse, GetCharacterRequest, GetCharacterResponse}; +use crate::character::{CreateCharacterRequest, CreateCharacterResponse, DeleteCharacterRequest, DeleteCharacterResponse, GetCharacterListRequest, GetCharacterListResponse, GetCharacterRequest, GetCharacterResponse}; use tonic::transport::Channel; use utils::null_string::NullTerminatedString; diff --git a/proto/character.proto b/proto/character.proto index 27e7bfd..01ffdaf 100644 --- a/proto/character.proto +++ b/proto/character.proto @@ -51,5 +51,3 @@ message GetCharacterRequest { message GetCharacterResponse { character_common.CharacterFull character = 1; } - -message Empty {} diff --git a/proto/character_db_api.proto b/proto/character_db_api.proto index 790c1cf..3e28a30 100644 --- a/proto/character_db_api.proto +++ b/proto/character_db_api.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package character_db_api; -service CharacterService { +service CharacterDbService { rpc GetCharacter (CharacterRequest) returns (Character); rpc GetCharacterList (CharacterListRequest) returns (CharacterListResponse); rpc CreateCharacter (CreateCharacterRequest) returns (CreateCharacterResponse);