it compiled properly well
This commit is contained in:
@@ -1,13 +1,14 @@
|
||||
// src/server/services/table_definition_service.rs
|
||||
// server/src/server/services/table_definition_service.rs
|
||||
use tonic::{Request, Response, Status};
|
||||
use common::proto::multieko2::table_definition::{
|
||||
table_definition_server::TableDefinition,
|
||||
PostTableDefinitionRequest, TableDefinitionResponse
|
||||
use common::proto::multieko2::{
|
||||
common::Empty,
|
||||
table_definition::{
|
||||
table_definition_server::TableDefinition,
|
||||
PostTableDefinitionRequest, TableDefinitionResponse, ProfileTreeResponse
|
||||
}
|
||||
};
|
||||
use common::proto::multieko2::table_definition::ProfileTreeResponse;
|
||||
use sqlx::PgPool;
|
||||
use crate::table_definition::handlers::post_table_definition;
|
||||
use crate::table_definition::handlers::get_profile_tree;
|
||||
use crate::table_definition::handlers::{post_table_definition, get_profile_tree};
|
||||
|
||||
#[derive(Debug)]
|
||||
pub struct TableDefinitionService {
|
||||
@@ -23,9 +24,10 @@ impl TableDefinition for TableDefinitionService {
|
||||
let response = post_table_definition(&self.db_pool, request.into_inner()).await?;
|
||||
Ok(Response::new(response))
|
||||
}
|
||||
|
||||
async fn get_profile_tree(
|
||||
&self,
|
||||
request: Request<()>,
|
||||
request: Request<Empty>, // Changed from Request<()>
|
||||
) -> Result<Response<ProfileTreeResponse>, Status> {
|
||||
get_profile_tree::get_profile_tree(&self.db_pool, request).await
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// src/table_definition/handlers.rs
|
||||
// server/src/table_definition/handlers.rs
|
||||
pub mod post_table_definition;
|
||||
pub mod get_profile_tree;
|
||||
|
||||
|
||||
@@ -1,11 +1,17 @@
|
||||
// server/src/table_definition/handlers/get_profile_tree.rs
|
||||
use tonic::{Request, Response, Status};
|
||||
use sqlx::PgPool;
|
||||
use common::proto::multieko2::table_definition::ProfileTreeResponse;
|
||||
use common::proto::multieko2::{
|
||||
common::Empty,
|
||||
table_definition::{
|
||||
ProfileTreeResponse,
|
||||
profile_tree_response::{Table, Profile}
|
||||
}
|
||||
};
|
||||
|
||||
pub async fn get_profile_tree(
|
||||
db_pool: &PgPool,
|
||||
_request: Request<()>,
|
||||
_request: Request<Empty>,
|
||||
) -> Result<Response<ProfileTreeResponse>, Status> {
|
||||
let mut profiles = Vec::new();
|
||||
|
||||
@@ -45,13 +51,13 @@ pub async fn get_profile_tree(
|
||||
|
||||
// Convert to protobuf format
|
||||
let proto_tables = table_map.into_iter()
|
||||
.map(|(name, depends_on)| ProfileTreeResponse::Table {
|
||||
.map(|(name, depends_on)| Table {
|
||||
name,
|
||||
depends_on
|
||||
})
|
||||
.collect();
|
||||
|
||||
profiles.push(ProfileTreeResponse::Profile {
|
||||
profiles.push(Profile {
|
||||
name: profile.name,
|
||||
tables: proto_tables
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user