From 13d937708698961532f893d25e03bc21baf774e4 Mon Sep 17 00:00:00 2001
From: filipriec <filippriec@gmail.com>
Date: Sat, 22 Feb 2025 15:56:20 +0100
Subject: [PATCH] compiled without error, split config is now working for
 server

---
 src/server/handlers.rs                         | 10 +++-------
 src/server/run.rs                              |  8 +++-----
 src/server/services/adresar_service.rs         |  6 +++++-
 src/server/services/mod.rs                     | 10 ++++++++++
 src/server/services/table_structure_service.rs | 10 ++++++----
 src/server/services/uctovnictvo_service.rs     |  6 +++++-
 6 files changed, 32 insertions(+), 18 deletions(-)
 create mode 100644 src/server/services/mod.rs

diff --git a/src/server/handlers.rs b/src/server/handlers.rs
index 39f36a4..5f24b05 100644
--- a/src/server/handlers.rs
+++ b/src/server/handlers.rs
@@ -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;
diff --git a/src/server/run.rs b/src/server/run.rs
index 41679de..81b2dae 100644
--- a/src/server/run.rs
+++ b/src/server/run.rs
@@ -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()?;
diff --git a/src/server/services/adresar_service.rs b/src/server/services/adresar_service.rs
index 8e523d1..91f42f1 100644
--- a/src/server/services/adresar_service.rs
+++ b/src/server/services/adresar_service.rs
@@ -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)]
diff --git a/src/server/services/mod.rs b/src/server/services/mod.rs
new file mode 100644
index 0000000..4b0c195
--- /dev/null
+++ b/src/server/services/mod.rs
@@ -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;
+
diff --git a/src/server/services/table_structure_service.rs b/src/server/services/table_structure_service.rs
index 9ff2f35..ae74963 100644
--- a/src/server/services/table_structure_service.rs
+++ b/src/server/services/table_structure_service.rs
@@ -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))
     }
 }
diff --git a/src/server/services/uctovnictvo_service.rs b/src/server/services/uctovnictvo_service.rs
index 5d3b642..800118c 100644
--- a/src/server/services/uctovnictvo_service.rs
+++ b/src/server/services/uctovnictvo_service.rs
@@ -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)]