more changes to the structure of the project

src/server/mod.rs

@@ -23,15 +23,6 @@ use crate::proto::multieko2::uctovnictvo::{
     uctovnictvo_server::{Uctovnictvo, UctovnictvoServer},
     PostUctovnictvoRequest, UctovnictvoResponse, GetUctovnictvoRequest, PutUctovnictvoRequest,
 };
-use crate::proto::multieko2::table_structure::{
-    table_structure_service_server::{TableStructureService, TableStructureServiceServer},
-    TableStructureResponse
-};
-use crate::proto::multieko2::{
-    common::{Empty, CountResponse, PositionRequest},
-    table_structure::{TableStructureResponse, TableColumn}
-};
-
 pub struct AdresarService {
     db_pool: sqlx::PgPool,
 }
@@ -123,7 +114,7 @@ impl Uctovnictvo for UctovnictvoService {
 
     async fn get_uctovnictvo_by_position(
         &self,
-        request: Request<crate::proto::multieko2::adresar::PositionRequest>,
+        request: Request<PositionRequest>,
     ) -> Result<Response<UctovnictvoResponse>, Status> {
         let response = get_uctovnictvo_by_position(&self.db_pool, request.into_inner()).await?;
         Ok(Response::new(response))
@@ -144,14 +135,18 @@ impl TableStructureService for TableStructureHandler {
         &self,
         request: Request<crate::proto::multieko2::common::Empty>,
     ) -> Result<Response<TableStructureResponse>, Status> {
-        handlers::get_adresar_table_structure(&self.db_pool, request.into_inner()).await
+        let response = handlers::get_adresar_table_structure(&self.db_pool, request.into_inner())
+            .await?;
+        Ok(Response::new(response))
     }
 
     async fn get_uctovnictvo_table_structure(
         &self,
         request: Request<crate::proto::multieko2::common::Empty>,
     ) -> Result<Response<TableStructureResponse>, Status> {
-        handlers::get_uctovnictvo_table_structure(&self.db_pool, request.into_inner()).await
+        let response =
+            handlers::get_uctovnictvo_table_structure(&self.db_pool, request.into_inner()).await?;
+        Ok(Response::new(response))
     }
 }