compiled without error, split config is now working for server
This commit is contained in:
@@ -1,8 +1,4 @@
|
||||
// src/server/handlers.rs
|
||||
pub mod adresar_service;
|
||||
pub mod uctovnictvo_service;
|
||||
pub mod table_structure_service;
|
||||
|
||||
pub use adresar_service::AdresarService;
|
||||
pub use uctovnictvo_service::UctovnictvoService;
|
||||
pub use table_structure_service::TableStructureHandler;
|
||||
pub use crate::server::services::adresar_service::AdresarService;
|
||||
pub use crate::server::services::uctovnictvo_service::UctovnictvoService;
|
||||
pub use crate::server::services::table_structure_service::TableStructureHandler;
|
||||
|
||||
@@ -8,11 +8,9 @@ use crate::server::services::{
|
||||
UctovnictvoService,
|
||||
TableStructureHandler
|
||||
};
|
||||
use crate::server::{
|
||||
AdresarServer,
|
||||
UctovnictvoServer,
|
||||
TableStructureServiceServer
|
||||
};
|
||||
use crate::proto::multieko2::adresar::adresar_server::AdresarServer;
|
||||
use crate::proto::multieko2::uctovnictvo::uctovnictvo_server::UctovnictvoServer;
|
||||
use crate::proto::multieko2::table_structure::table_structure_service_server::TableStructureServiceServer;
|
||||
|
||||
pub async fn run_server(db_pool: sqlx::PgPool) -> Result<(), Box<dyn std::error::Error>> {
|
||||
let addr = "[::1]:50051".parse()?;
|
||||
|
||||
@@ -5,7 +5,11 @@ use crate::proto::multieko2::adresar::{
|
||||
PostAdresarRequest, AdresarResponse, GetAdresarRequest, PutAdresarRequest,
|
||||
DeleteAdresarRequest, DeleteAdresarResponse,
|
||||
};
|
||||
use crate::adresar::handlers;
|
||||
use crate::proto::multieko2::common::{Empty, CountResponse, PositionRequest};
|
||||
use crate::adresar::handlers::{
|
||||
post_adresar, get_adresar, put_adresar, delete_adresar,
|
||||
get_adresar_count, get_adresar_by_position,
|
||||
};
|
||||
use sqlx::PgPool;
|
||||
|
||||
#[derive(Debug)]
|
||||
|
||||
10
src/server/services/mod.rs
Normal file
10
src/server/services/mod.rs
Normal file
@@ -0,0 +1,10 @@
|
||||
// src/server/services/mod.rs
|
||||
|
||||
pub mod adresar_service;
|
||||
pub mod table_structure_service;
|
||||
pub mod uctovnictvo_service;
|
||||
|
||||
pub use adresar_service::AdresarService;
|
||||
pub use table_structure_service::TableStructureHandler;
|
||||
pub use uctovnictvo_service::UctovnictvoService;
|
||||
|
||||
@@ -3,7 +3,10 @@ use tonic::{Request, Response, Status};
|
||||
use crate::proto::multieko2::table_structure::table_structure_service_server::{
|
||||
TableStructureService, TableStructureServiceServer,
|
||||
};
|
||||
use crate::table_structure::handlers;
|
||||
use crate::proto::multieko2::table_structure::TableStructureResponse;
|
||||
use crate::table_structure::handlers::{
|
||||
get_adresar_table_structure, get_uctovnictvo_table_structure,
|
||||
};
|
||||
use sqlx::PgPool;
|
||||
|
||||
#[derive(Debug)]
|
||||
@@ -17,7 +20,7 @@ impl TableStructureService for TableStructureHandler {
|
||||
&self,
|
||||
request: Request<crate::proto::multieko2::common::Empty>,
|
||||
) -> Result<Response<TableStructureResponse>, Status> {
|
||||
let response = handlers::get_adresar_table_structure(&self.db_pool, request.into_inner())
|
||||
let response = get_adresar_table_structure(&self.db_pool, request.into_inner())
|
||||
.await?;
|
||||
Ok(Response::new(response))
|
||||
}
|
||||
@@ -26,8 +29,7 @@ impl TableStructureService for TableStructureHandler {
|
||||
&self,
|
||||
request: Request<crate::proto::multieko2::common::Empty>,
|
||||
) -> Result<Response<TableStructureResponse>, Status> {
|
||||
let response =
|
||||
handlers::get_uctovnictvo_table_structure(&self.db_pool, request.into_inner()).await?;
|
||||
let response = get_uctovnictvo_table_structure(&self.db_pool, request.into_inner()).await?;
|
||||
Ok(Response::new(response))
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,7 +4,11 @@ use crate::proto::multieko2::uctovnictvo::{
|
||||
uctovnictvo_server::{Uctovnictvo, UctovnictvoServer},
|
||||
PostUctovnictvoRequest, UctovnictvoResponse, GetUctovnictvoRequest, PutUctovnictvoRequest,
|
||||
};
|
||||
use crate::uctovnictvo::handlers;
|
||||
use crate::uctovnictvo::handlers::{
|
||||
post_uctovnictvo, get_uctovnictvo, get_uctovnictvo_count,
|
||||
get_uctovnictvo_by_position, put_uctovnictvo,
|
||||
};
|
||||
use crate::proto::multieko2::common::{Empty, CountResponse, PositionRequest};
|
||||
use sqlx::PgPool;
|
||||
|
||||
#[derive(Debug)]
|
||||
|
||||
Reference in New Issue
Block a user