filipriec/komp_ac
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

it compiled properly well

Browse Source
This commit is contained in:
filipriec
2025-03-01 20:16:32 +01:00
parent e53ed7bdc0
commit 93ce33c840
3 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
server/src/server/services/table_definition_service.rs
View File

@@ -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 tonic::{Request, Response, Status};
use common::proto::multieko2::table_definition::{ use common::proto::multieko2::{
common::Empty,
table_definition::{
table_definition_server::TableDefinition, table_definition_server::TableDefinition,
PostTableDefinitionRequest, TableDefinitionResponse PostTableDefinitionRequest, TableDefinitionResponse, ProfileTreeResponse
}
}; };
use common::proto::multieko2::table_definition::ProfileTreeResponse;
use sqlx::PgPool; use sqlx::PgPool;
use crate::table_definition::handlers::post_table_definition; use crate::table_definition::handlers::{post_table_definition, get_profile_tree};
use crate::table_definition::handlers::get_profile_tree;
#[derive(Debug)] #[derive(Debug)]
pub struct TableDefinitionService { pub struct TableDefinitionService {
@@ -23,9 +24,10 @@ impl TableDefinition for TableDefinitionService {
let response = post_table_definition(&self.db_pool, request.into_inner()).await?; let response = post_table_definition(&self.db_pool, request.into_inner()).await?;
Ok(Response::new(response)) Ok(Response::new(response))
} }
async fn get_profile_tree( async fn get_profile_tree(
&self, &self,
request: Request<()>, request: Request<Empty>, // Changed from Request<()>
) -> Result<Response<ProfileTreeResponse>, Status> { ) -> Result<Response<ProfileTreeResponse>, Status> {
get_profile_tree::get_profile_tree(&self.db_pool, request).await get_profile_tree::get_profile_tree(&self.db_pool, request).await
} }

2
server/src/table_definition/handlers.rs
View File

@@ -1,4 +1,4 @@
// src/table_definition/handlers.rs // server/src/table_definition/handlers.rs
pub mod post_table_definition; pub mod post_table_definition;
pub mod get_profile_tree; pub mod get_profile_tree;

14
server/src/table_definition/handlers/get_profile_tree.rs
View File

@@ -1,11 +1,17 @@
// server/src/table_definition/handlers/get_profile_tree.rs // server/src/table_definition/handlers/get_profile_tree.rs
use tonic::{Request, Response, Status}; use tonic::{Request, Response, Status};
use sqlx::PgPool; 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( pub async fn get_profile_tree(
db_pool: &PgPool, db_pool: &PgPool,
_request: Request<()>, _request: Request<Empty>,
) -> Result<Response<ProfileTreeResponse>, Status> { ) -> Result<Response<ProfileTreeResponse>, Status> {
let mut profiles = Vec::new(); let mut profiles = Vec::new();
@@ -45,13 +51,13 @@ pub async fn get_profile_tree(
// Convert to protobuf format // Convert to protobuf format
let proto_tables = table_map.into_iter() let proto_tables = table_map.into_iter()
.map(|(name, depends_on)| ProfileTreeResponse::Table { .map(|(name, depends_on)| Table {
name, name,
depends_on depends_on
}) })
.collect(); .collect();
profiles.push(ProfileTreeResponse::Profile { profiles.push(Profile {
name: profile.name, name: profile.name,
tables: proto_tables tables: proto_tables
}); });