From 8127c7bb1b564fa2ead9c9c914e79423035f2613 Mon Sep 17 00:00:00 2001 From: filipriec Date: Fri, 25 Jul 2025 18:18:00 +0200 Subject: [PATCH] renamed again and fixed some minor stuff --- Cargo.toml | 4 +- client/src/components/admin/admin_panel.rs | 2 +- client/src/components/common/autocomplete.rs | 2 +- client/src/components/common/status_line.rs | 2 +- client/src/components/handlers/sidebar.rs | 2 +- client/src/components/intro/intro.rs | 2 +- client/src/config/storage/storage.rs | 2 +- client/src/modes/canvas/edit.rs | 2 +- .../src/modes/general/command_navigation.rs | 2 +- client/src/modes/handlers/event.rs | 2 +- client/src/services/auth.rs | 2 +- client/src/services/grpc_client.rs | 14 +++--- client/src/services/ui_service.rs | 2 +- client/src/state/app/search.rs | 2 +- client/src/state/app/state.rs | 4 +- client/src/state/pages/canvas_state.rs | 2 +- client/src/state/pages/form.rs | 2 +- client/src/tui/functions/common/add_table.rs | 2 +- client/src/tui/functions/common/login.rs | 2 +- client/src/tui/functions/common/register.rs | 2 +- client/src/utils/data_converter.rs | 2 +- common/proto/adresar.proto | 2 +- common/proto/auth.proto | 2 +- common/proto/common.proto | 2 +- common/proto/search.proto | 2 +- common/proto/table_definition.proto | 4 +- common/proto/table_script.proto | 2 +- common/proto/table_structure.proto | 2 +- common/proto/tables_data.proto | 4 +- common/proto/uctovnictvo.proto | 2 +- common/src/lib.rs | 2 +- common/src/proto/descriptor.bin | Bin 26700 -> 26768 bytes common/src/proto/komp_ac.adresar.rs | 38 ++++++++-------- common/src/proto/komp_ac.auth.rs | 14 +++--- common/src/proto/komp_ac.search.rs | 8 ++-- common/src/proto/komp_ac.table_definition.rs | 20 ++++----- common/src/proto/komp_ac.table_script.rs | 11 +++-- common/src/proto/komp_ac.table_structure.rs | 8 ++-- common/src/proto/komp_ac.tables_data.rs | 41 ++++++++++-------- common/src/proto/komp_ac.uctovnictvo.rs | 32 +++++++------- common/src/proto/multieko2.adresar.rs | 38 ++++++++-------- common/src/proto/multieko2.auth.rs | 14 +++--- common/src/proto/multieko2.search.rs | 8 ++-- .../src/proto/multieko2.table_definition.rs | 20 ++++----- common/src/proto/multieko2.table_script.rs | 8 ++-- common/src/proto/multieko2.table_structure.rs | 8 ++-- common/src/proto/multieko2.tables_data.rs | 38 ++++++++-------- common/src/proto/multieko2.uctovnictvo.rs | 32 +++++++------- deny.toml | 3 ++ search/src/lib.rs | 6 +-- server/src/auth/docs/first_reg.txt | 2 +- server/src/auth/docs/reg_log.txt | 12 ++--- server/src/auth/docs/role_added.txt | 8 ++-- server/src/auth/handlers/login.rs | 2 +- server/src/auth/handlers/register.rs | 2 +- server/src/server/run.rs | 4 +- server/src/server/services/auth_service.rs | 2 +- .../services/table_definition_service.rs | 2 +- .../server/services/table_script_service.rs | 2 +- .../services/table_structure_service.rs | 4 +- .../server/services/tables_data_service.rs | 6 +-- server/src/steel/docs/pushing_using_steel.txt | 6 +-- .../docs/script_refering_different_table.txt | 4 +- .../table_definition/docs/delete_tables.txt | 12 ++--- server/src/table_definition/docs/eg.txt | 6 +-- .../table_definition/docs/push_new_table.txt | 8 ++-- .../table_definition/handlers/delete_table.rs | 2 +- .../handlers/get_profile_tree.rs | 2 +- .../handlers/post_table_definition.rs | 2 +- .../table_script/docs/push_script_to_db.txt | 2 +- .../handlers/post_table_script.rs | 2 +- server/src/table_structure/docs/response.txt | 2 +- .../handlers/table_structure.rs | 2 +- .../src/tables_data/docs/get_by_position.txt | 2 +- server/src/tables_data/docs/get_data.txt | 4 +- .../src/tables_data/docs/get_data_count.txt | 2 +- server/src/tables_data/docs/post_data.txt | 4 +- server/src/tables_data/docs/put_data.txt | 4 +- .../tables_data/handlers/delete_table_data.rs | 2 +- .../tables_data/handlers/get_table_data.rs | 2 +- .../handlers/get_table_data_by_position.rs | 2 +- .../handlers/get_table_data_count.rs | 4 +- .../tables_data/handlers/post_table_data.rs | 2 +- .../tables_data/handlers/put_table_data.rs | 3 +- .../post_table_definition_test.rs | 2 +- .../comprehensive_error_scenarios_tests.rs | 2 +- .../mathematical_operations_tests.rs | 2 +- .../post_scripts_integration_tests.rs | 2 +- .../table_script/prohibited_types_test.rs | 2 +- .../type_safety_comprehensive_tests.rs | 2 +- .../delete/delete_table_data_test.rs | 4 +- .../get/get_table_data_by_position_test.rs | 4 +- .../get/get_table_data_count_test.rs | 6 +-- .../tables_data/get/get_table_data_test.rs | 6 +-- .../post_table_data_steel_decimal_test.rs | 2 +- .../tables_data/post/post_table_data_test.rs | 6 +-- .../put/put_table_data_steel_decimal_test.rs | 2 +- .../tables_data/put/put_table_data_test.rs | 4 +- 98 files changed, 306 insertions(+), 296 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 7a8ce35..c4723b6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,14 +4,14 @@ resolver = "2" [workspace.package] # TODO: idk how to do the name, fix later -# name = "KompAC" +# name = "komp_ac" version = "0.3.13" edition = "2021" license = "GPL-3.0-or-later" authors = ["Filip Priečinský "] description = "Poriadny uctovnicky software." readme = "README.md" -repository = "https://gitlab.com/filipriec/KompAC" +repository = "https://gitlab.com/filipriec/komp_ac" categories = ["command-line-interface"] # [workspace.metadata] diff --git a/client/src/components/admin/admin_panel.rs b/client/src/components/admin/admin_panel.rs index 877f10f..25a3631 100644 --- a/client/src/components/admin/admin_panel.rs +++ b/client/src/components/admin/admin_panel.rs @@ -4,7 +4,7 @@ use crate::config::colors::themes::Theme; use crate::state::pages::auth::AuthState; use crate::state::app::state::AppState; use crate::state::pages::admin::AdminState; -use common::proto::KompAC::table_definition::ProfileTreeResponse; +use common::proto::komp_ac::table_definition::ProfileTreeResponse; use ratatui::{ layout::{Constraint, Direction, Layout, Rect}, style::Style, diff --git a/client/src/components/common/autocomplete.rs b/client/src/components/common/autocomplete.rs index b4c9958..3589423 100644 --- a/client/src/components/common/autocomplete.rs +++ b/client/src/components/common/autocomplete.rs @@ -2,7 +2,7 @@ use crate::config::colors::themes::Theme; use crate::state::pages::form::FormState; -use common::proto::KompAC::search::search_response::Hit; +use common::proto::komp_ac::search::search_response::Hit; use ratatui::{ layout::Rect, style::{Color, Modifier, Style}, diff --git a/client/src/components/common/status_line.rs b/client/src/components/common/status_line.rs index 2a95e66..cccd879 100644 --- a/client/src/components/common/status_line.rs +++ b/client/src/components/common/status_line.rs @@ -47,7 +47,7 @@ pub fn render_status_line( } // --- The normal status line rendering logic (unchanged) --- - let program_info = format!("KompAC v{}", env!("CARGO_PKG_VERSION")); + let program_info = format!("komp_ac v{}", env!("CARGO_PKG_VERSION")); let mode_text = if is_edit_mode { "[EDIT]" } else { "[READ-ONLY]" }; let home_dir = dirs::home_dir() diff --git a/client/src/components/handlers/sidebar.rs b/client/src/components/handlers/sidebar.rs index 5998ed5..dcf6662 100644 --- a/client/src/components/handlers/sidebar.rs +++ b/client/src/components/handlers/sidebar.rs @@ -6,7 +6,7 @@ use ratatui::{ Frame, }; use crate::config::colors::themes::Theme; -use common::proto::KompAC::table_definition::{ProfileTreeResponse}; +use common::proto::komp_ac::table_definition::{ProfileTreeResponse}; use ratatui::text::{Span, Line}; use crate::components::utils::text::truncate_string; diff --git a/client/src/components/intro/intro.rs b/client/src/components/intro/intro.rs index aff78a7..cd6ae3f 100644 --- a/client/src/components/intro/intro.rs +++ b/client/src/components/intro/intro.rs @@ -32,7 +32,7 @@ pub fn render_intro(f: &mut Frame, intro_state: &IntroState, area: Rect, theme: // Title let title = Line::from(vec![ - Span::styled("KompAC", Style::default().fg(theme.highlight)), + Span::styled("komp_ac", Style::default().fg(theme.highlight)), Span::styled(" v", Style::default().fg(theme.fg)), Span::styled(env!("CARGO_PKG_VERSION"), Style::default().fg(theme.secondary)), ]); diff --git a/client/src/config/storage/storage.rs b/client/src/config/storage/storage.rs index 19a2be9..849d212 100644 --- a/client/src/config/storage/storage.rs +++ b/client/src/config/storage/storage.rs @@ -9,7 +9,7 @@ use tracing::{error, info}; #[cfg(unix)] use std::os::unix::fs::PermissionsExt; -pub const APP_NAME: &str = "KompAC_client"; +pub const APP_NAME: &str = "komp_ac_client"; pub const TOKEN_FILE_NAME: &str = "auth.token"; #[derive(Serialize, Deserialize, Debug, Clone)] diff --git a/client/src/modes/canvas/edit.rs b/client/src/modes/canvas/edit.rs index 0d292c9..fefe7f9 100644 --- a/client/src/modes/canvas/edit.rs +++ b/client/src/modes/canvas/edit.rs @@ -13,7 +13,7 @@ use crate::state::pages::{ form::FormState, }; use anyhow::Result; -use common::proto::KompAC::search::search_response::Hit; +use common::proto::komp_ac::search::search_response::Hit; use crossterm::event::{KeyCode, KeyEvent}; use tokio::sync::mpsc; use tracing::{debug, info}; diff --git a/client/src/modes/general/command_navigation.rs b/client/src/modes/general/command_navigation.rs index 50e4e62..e484af2 100644 --- a/client/src/modes/general/command_navigation.rs +++ b/client/src/modes/general/command_navigation.rs @@ -2,7 +2,7 @@ use crate::config::binds::config::Config; use crate::modes::handlers::event::EventOutcome; use anyhow::Result; -use common::proto::KompAC::table_definition::ProfileTreeResponse; +use common::proto::komp_ac::table_definition::ProfileTreeResponse; use crossterm::event::{KeyCode, KeyEvent}; use std::collections::{HashMap, HashSet}; diff --git a/client/src/modes/handlers/event.rs b/client/src/modes/handlers/event.rs index 1d0c4a1..b2a130d 100644 --- a/client/src/modes/handlers/event.rs +++ b/client/src/modes/handlers/event.rs @@ -42,7 +42,7 @@ use crate::tui::{ use crate::ui::handlers::context::UiContext; use crate::ui::handlers::rat_state::UiStateHandler; use anyhow::Result; -use common::proto::KompAC::search::search_response::Hit; +use common::proto::komp_ac::search::search_response::Hit; use crossterm::cursor::SetCursorStyle; use crossterm::event::{Event, KeyCode, KeyEvent}; use tokio::sync::mpsc; diff --git a/client/src/services/auth.rs b/client/src/services/auth.rs index 4fec1af..df72ddc 100644 --- a/client/src/services/auth.rs +++ b/client/src/services/auth.rs @@ -1,6 +1,6 @@ // src/services/auth.rs use tonic::transport::Channel; -use common::proto::KompAC::auth::{ +use common::proto::komp_ac::auth::{ auth_service_client::AuthServiceClient, LoginRequest, LoginResponse, RegisterRequest, AuthResponse, diff --git a/client/src/services/grpc_client.rs b/client/src/services/grpc_client.rs index 0b7e278..47b807f 100644 --- a/client/src/services/grpc_client.rs +++ b/client/src/services/grpc_client.rs @@ -1,17 +1,17 @@ // src/services/grpc_client.rs -use common::proto::KompAC::common::Empty; -use common::proto::KompAC::table_structure::table_structure_service_client::TableStructureServiceClient; -use common::proto::KompAC::table_structure::{GetTableStructureRequest, TableStructureResponse}; -use common::proto::KompAC::table_definition::{ +use common::proto::komp_ac::common::Empty; +use common::proto::komp_ac::table_structure::table_structure_service_client::TableStructureServiceClient; +use common::proto::komp_ac::table_structure::{GetTableStructureRequest, TableStructureResponse}; +use common::proto::komp_ac::table_definition::{ table_definition_client::TableDefinitionClient, PostTableDefinitionRequest, ProfileTreeResponse, TableDefinitionResponse, }; -use common::proto::KompAC::table_script::{ +use common::proto::komp_ac::table_script::{ table_script_client::TableScriptClient, PostTableScriptRequest, TableScriptResponse, }; -use common::proto::KompAC::tables_data::{ +use common::proto::komp_ac::tables_data::{ tables_data_client::TablesDataClient, GetTableDataByPositionRequest, GetTableDataRequest, // ADD THIS @@ -22,7 +22,7 @@ use common::proto::KompAC::tables_data::{ PostTableDataRequest, PostTableDataResponse, PutTableDataRequest, PutTableDataResponse, }; -use common::proto::KompAC::search::{ +use common::proto::komp_ac::search::{ searcher_client::SearcherClient, SearchRequest, SearchResponse, }; use anyhow::{Context, Result}; diff --git a/client/src/services/ui_service.rs b/client/src/services/ui_service.rs index e075f8c..6c94e42 100644 --- a/client/src/services/ui_service.rs +++ b/client/src/services/ui_service.rs @@ -98,7 +98,7 @@ impl UiService { pub async fn initialize_add_logic_table_data( grpc_client: &mut GrpcClient, add_logic_state: &mut AddLogicState, - profile_tree: &common::proto::KompAC::table_definition::ProfileTreeResponse, + profile_tree: &common::proto::komp_ac::table_definition::ProfileTreeResponse, ) -> Result { let profile_name_clone_opt = Some(add_logic_state.profile_name.clone()); let table_name_opt_clone = add_logic_state.selected_table_name.clone(); diff --git a/client/src/state/app/search.rs b/client/src/state/app/search.rs index 9563e18..0ee31bd 100644 --- a/client/src/state/app/search.rs +++ b/client/src/state/app/search.rs @@ -1,6 +1,6 @@ // src/state/app/search.rs -use common::proto::KompAC::search::search_response::Hit; +use common::proto::komp_ac::search::search_response::Hit; /// Holds the complete state for the search palette. pub struct SearchState { diff --git a/client/src/state/app/state.rs b/client/src/state/app/state.rs index 1cec564..cde8156 100644 --- a/client/src/state/app/state.rs +++ b/client/src/state/app/state.rs @@ -1,9 +1,9 @@ // src/state/app/state.rs use anyhow::Result; -use common::proto::KompAC::table_definition::ProfileTreeResponse; +use common::proto::komp_ac::table_definition::ProfileTreeResponse; // NEW: Import the types we need for the cache -use common::proto::KompAC::table_structure::TableStructureResponse; +use common::proto::komp_ac::table_structure::TableStructureResponse; use crate::modes::handlers::mode_manager::AppMode; use crate::state::app::search::SearchState; use crate::ui::handlers::context::DialogPurpose; diff --git a/client/src/state/pages/canvas_state.rs b/client/src/state/pages/canvas_state.rs index c4494a5..685af97 100644 --- a/client/src/state/pages/canvas_state.rs +++ b/client/src/state/pages/canvas_state.rs @@ -1,6 +1,6 @@ // src/state/pages/canvas_state.rs -use common::proto::KompAC::search::search_response::Hit; +use common::proto::komp_ac::search::search_response::Hit; pub trait CanvasState { // --- Existing methods (unchanged) --- diff --git a/client/src/state/pages/form.rs b/client/src/state/pages/form.rs index 3f5885b..bcb0c5b 100644 --- a/client/src/state/pages/form.rs +++ b/client/src/state/pages/form.rs @@ -3,7 +3,7 @@ use crate::config::colors::themes::Theme; use crate::state::app::highlight::HighlightState; use crate::state::pages::canvas_state::CanvasState; -use common::proto::KompAC::search::search_response::Hit; +use common::proto::komp_ac::search::search_response::Hit; use ratatui::layout::Rect; use ratatui::Frame; use std::collections::HashMap; diff --git a/client/src/tui/functions/common/add_table.rs b/client/src/tui/functions/common/add_table.rs index 1a21f49..999562c 100644 --- a/client/src/tui/functions/common/add_table.rs +++ b/client/src/tui/functions/common/add_table.rs @@ -4,7 +4,7 @@ use crate::state::pages::add_table::{ }; use crate::services::GrpcClient; use anyhow::{anyhow, Result}; -use common::proto::KompAC::table_definition::{ +use common::proto::komp_ac::table_definition::{ PostTableDefinitionRequest, ColumnDefinition as ProtoColumnDefinition, TableLink as ProtoTableLink, diff --git a/client/src/tui/functions/common/login.rs b/client/src/tui/functions/common/login.rs index fa31ed7..c58d915 100644 --- a/client/src/tui/functions/common/login.rs +++ b/client/src/tui/functions/common/login.rs @@ -8,7 +8,7 @@ use crate::state::app::buffer::{AppView, BufferState}; use crate::config::storage::storage::{StoredAuthData, save_auth_data}; use crate::state::pages::canvas_state::CanvasState; use crate::ui::handlers::context::DialogPurpose; -use common::proto::KompAC::auth::LoginResponse; +use common::proto::komp_ac::auth::LoginResponse; use anyhow::{Context, Result}; use tokio::spawn; use tokio::sync::mpsc; diff --git a/client/src/tui/functions/common/register.rs b/client/src/tui/functions/common/register.rs index a580fff..a20f0e8 100644 --- a/client/src/tui/functions/common/register.rs +++ b/client/src/tui/functions/common/register.rs @@ -8,7 +8,7 @@ use crate::state::{ }; use crate::ui::handlers::context::DialogPurpose; use crate::state::app::buffer::{AppView, BufferState}; -use common::proto::KompAC::auth::AuthResponse; +use common::proto::komp_ac::auth::AuthResponse; use anyhow::Context; use tokio::spawn; use tokio::sync::mpsc; diff --git a/client/src/utils/data_converter.rs b/client/src/utils/data_converter.rs index a977544..0f51078 100644 --- a/client/src/utils/data_converter.rs +++ b/client/src/utils/data_converter.rs @@ -1,6 +1,6 @@ // src/utils/data_converter.rs -use common::proto::KompAC::table_structure::TableStructureResponse; +use common::proto::komp_ac::table_structure::TableStructureResponse; use prost_types::{value::Kind, NullValue, Value}; use std::collections::HashMap; diff --git a/common/proto/adresar.proto b/common/proto/adresar.proto index ba94736..41e0ea2 100644 --- a/common/proto/adresar.proto +++ b/common/proto/adresar.proto @@ -1,6 +1,6 @@ // proto/adresar.proto syntax = "proto3"; -package KompAC.adresar; +package komp_ac.adresar; import "common.proto"; // import "table_structure.proto"; diff --git a/common/proto/auth.proto b/common/proto/auth.proto index c982f5b..5a1a442 100644 --- a/common/proto/auth.proto +++ b/common/proto/auth.proto @@ -1,6 +1,6 @@ // proto/auth.proto syntax = "proto3"; -package KompAC.auth; +package komp_ac.auth; import "common.proto"; diff --git a/common/proto/common.proto b/common/proto/common.proto index e89d3ca..7ae4ba0 100644 --- a/common/proto/common.proto +++ b/common/proto/common.proto @@ -1,6 +1,6 @@ // proto/common.proto syntax = "proto3"; -package KompAC.common; +package komp_ac.common; message Empty {} message CountResponse { int64 count = 1; } diff --git a/common/proto/search.proto b/common/proto/search.proto index 0c25a06..8610a6b 100644 --- a/common/proto/search.proto +++ b/common/proto/search.proto @@ -1,6 +1,6 @@ // In common/proto/search.proto syntax = "proto3"; -package KompAC.search; +package komp_ac.search; service Searcher { rpc SearchTable(SearchRequest) returns (SearchResponse); diff --git a/common/proto/table_definition.proto b/common/proto/table_definition.proto index 4283dbd..d5ac6a5 100644 --- a/common/proto/table_definition.proto +++ b/common/proto/table_definition.proto @@ -1,12 +1,12 @@ // common/proto/table_definition.proto syntax = "proto3"; -package KompAC.table_definition; +package komp_ac.table_definition; import "common.proto"; service TableDefinition { rpc PostTableDefinition (PostTableDefinitionRequest) returns (TableDefinitionResponse); - rpc GetProfileTree (KompAC.common.Empty) returns (ProfileTreeResponse); + rpc GetProfileTree (komp_ac.common.Empty) returns (ProfileTreeResponse); rpc DeleteTable (DeleteTableRequest) returns (DeleteTableResponse); } diff --git a/common/proto/table_script.proto b/common/proto/table_script.proto index a10b4f3..4980f85 100644 --- a/common/proto/table_script.proto +++ b/common/proto/table_script.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -package KompAC.table_script; +package komp_ac.table_script; service TableScript { rpc PostTableScript(PostTableScriptRequest) returns (TableScriptResponse); diff --git a/common/proto/table_structure.proto b/common/proto/table_structure.proto index c62d3dd..e9d2932 100644 --- a/common/proto/table_structure.proto +++ b/common/proto/table_structure.proto @@ -1,6 +1,6 @@ // proto/table_structure.proto syntax = "proto3"; -package KompAC.table_structure; +package komp_ac.table_structure; import "common.proto"; diff --git a/common/proto/tables_data.proto b/common/proto/tables_data.proto index a8ffa3b..9e9fd5a 100644 --- a/common/proto/tables_data.proto +++ b/common/proto/tables_data.proto @@ -1,6 +1,6 @@ // common/proto/tables_data.proto syntax = "proto3"; -package KompAC.tables_data; +package komp_ac.tables_data; import "common.proto"; import "google/protobuf/struct.proto"; @@ -10,7 +10,7 @@ service TablesData { rpc PutTableData (PutTableDataRequest) returns (PutTableDataResponse); rpc DeleteTableData (DeleteTableDataRequest) returns (DeleteTableDataResponse); rpc GetTableData(GetTableDataRequest) returns (GetTableDataResponse); - rpc GetTableDataCount(GetTableDataCountRequest) returns (KompAC.common.CountResponse); + rpc GetTableDataCount(GetTableDataCountRequest) returns (komp_ac.common.CountResponse); rpc GetTableDataByPosition(GetTableDataByPositionRequest) returns (GetTableDataResponse); } diff --git a/common/proto/uctovnictvo.proto b/common/proto/uctovnictvo.proto index bbb1a75..1c4a4c3 100644 --- a/common/proto/uctovnictvo.proto +++ b/common/proto/uctovnictvo.proto @@ -1,6 +1,6 @@ // proto/uctovnictvo.proto syntax = "proto3"; -package KompAC.uctovnictvo; +package komp_ac.uctovnictvo; import "common.proto"; diff --git a/common/src/lib.rs b/common/src/lib.rs index d9d8d49..39f5759 100644 --- a/common/src/lib.rs +++ b/common/src/lib.rs @@ -3,7 +3,7 @@ pub mod search; pub mod proto { - pub mod KompAC { + pub mod komp_ac { pub mod adresar { include!("proto/komp_ac.adresar.rs"); } diff --git a/common/src/proto/descriptor.bin b/common/src/proto/descriptor.bin index 7c69b2951e9b540613a36c240bf827d8021735b7..49e1c1eb79bb2e9d215194ea509f913a1058b03e 100644 GIT binary patch delta 2265 zcmbtVOKcle6y@3RXRe)?Od5M^r*YyqZN3h~aXt$^q4}Vu(8O^Zr&SX<&T})3Gh^&= z+K56C3j|`5>PaYK#R9RQ6#@+c31!h$R!9v#LlFyhGxwf% z@44sQd*7D_Xy+>wfI|zov*PBaC`1cIQ4-mP4RN!ulF458zl(g=Kivx)o`m|$S`n8r zMIGYNA@W=3W?kg%I&h3@el`iNS+OM1-;St`Bx!pK(`Nj&IsCo^z%(|HVZ(RB9{eYA zw)_a>pGT47%TPao^H{=^Kqn0wr4`ip6ZoYvE=hqC6h^K%LZ_#}V=_A>mIaAzrhurf z)#PSD+728)YF5z+Tq=k{3A0P&j>E@$#Igg85d=|5l;7s6)d`ZGZ)+C`Gr*>LffToYC?n)Gc;Im*mBVObM z_6SHd(g4BehFxn3;^QV!vwVTOVQc*@1dZjaByI_OR@xGE)=iXkXX`K4z6VxtEtnW~ z9Xyrps5bRdcH~qz!gLvbVz@n+g9haus?j}$|HE)cE&AFFG}WU2&&^@rYJ)wutuW^$ zUKCj4K4~wg9^!JkY8h4dD}DQD{)lM$H-A2QG^WmfZer6d*0S*cva zy1qU-PyXmD)--s@PXpc{`!qPRV!pg7lsMF8?Q#u944v){c*&jU?&uDJ=42)0JdH?O z=`u7brPlh`Cyf9f4fHSr#^2q6HF9C}aXI4!j!8HJsxGRUMrtM|s*~W%N6_ z8heTx16!UKHcFgDrD(2(gIGsk!mPlmy3Lz*5B(Z@&jL-eMKQEYRPV=6kn{0nbcuWsZ}rcBU8PFX$EtAO4t-+*kE+0gQ3(60l2U2bqvj#w;2*>N zjH%N>%txk1ng&y9(^irFx82ci1iByZ^s|@1rL874A=_to_eVMz6T3eWBJAi4YA4I1 zIdq2Hj08P>;0BxhF$=P?R_DlR`QGUJzScL|p;4=NWi2CRj?5?dcy`S3GlFAEiDWL3 z^i4xu1;%OWo9YOucJlJvf#o#|c_Fdxo6=!*>Lm>tBp;@N@^^_J5ZWaNNzRC-b)y-r zkoJ?kv{Mc(oJ8Gk+5psIOA|_FHV5^l-W5Z)5nV`y8M7gTR13K`=kRC2t&Ep;KNY;W zJQOzM$CRBhBRounTk_zkQdrGtZlAHm2xDqKw%FRH?{Fmx9S`-0nMEn4k?u${lU`zo z&6smlIjC(T^CBy_D+})S|9V3%le1|*V=7%p_g2-VWqV#(9JVDdLQACOTsK;jr_Sx$ zL$5o4RXbp%lr8cFNpFE;bToT14|=!3r3yH&B9tan7j(7B6y@w{XI18_tIwe0^4{v# z$bZWL?h?)vv-It1pea6Bd$DI1LBqW2HO6)r>ehLQj;#6g-^N}N!{;MuaB3%%*X<0r bv~QJ^`Ph+9u$O5yTI4oPBA*<|by@xfS48@- delta 2222 zcmbVOO>7%g5a!vAy%{?(*(RH{oj8f@kT{_xiR&ggq>v^7wMEF-iS0H;mSeBuEs59l zu0xB85(#cdRoi!{#Gwrmw<6TC;+6{+4hX5h9pqaT2@VyA9;g)7yZfH)6fWGnGvCa7 z^ZR`3C-lRQ$OFGwz?GM_x21BVQk4{m?YbasR~DCUdp|?m?Qae|^)cwm6{>=qtD1;z z1EGG3zO)68tl(HQ)NBHraY2~Y4Vs8_A<4>|^aAA+7*UXganVqV#iOv0>5c;5eq zb@HhdoNG-8TLgDwYFb4Tq$rs{h#4avp9e?01?bl5*oqAk^|ygw8y20z?jRTYKi$gX z%RwL0)|%riwAuSt7QY1BSPbKEXdd}+h3`|Zh3<9Q4m+U_-(vb0mNU0wF7i<{4cuyO zV@pUX)mmPuRR!9K1#sl0t=e{3=FzZq+&L2@`5s2Tn!SmjuicQ0K@EDeLbdDIDPsHh zwFxFdJ}grOG^B1$-M0iD@W3ezBH4ma6wCUEnmz0{>4u{<^bFsRF7(eq$Cg-rU*;`3 zF}m)5MuVQECT**(rEQu%^=#&z1y01PQc>IzR;xlY**GxT5o(A@wxqL@Qp-?TQQL~y+hN4>~z|va>+x4?%rABsXJr(sJnV*M2)YFq4DQ706klI zS&PaRpsQKvhG3ky-A@G=ItBZw0qjpW_#C*jO)}cjK+`qTNSGC)4yMxq-xYAT6j+Z) zkA;*DF|^`R+COBTa4iN|1>JzgsApb?p{3<#v(4RU7#LTdHm;uW;P*0JZ_wjvJ_GFs zzXn`u(8kF(FFvhv!;vG^)9Ixd)-yTeQ_o)H5X#_-m%=EeethXWyZ^`ztUdr)IbRhk zia7x%%#|$V{+{>%oO%_LIzSsl{iwEzXlZV4j50Lj!N%)oKz+XPGvW^%;F5)0HBa6d z^REDYQg|nP7eRMYSJKlI16xT{$fnX)JS$vXOaWtnwMXbYIE~*rndX~hh9XXl^%x}6 Rk`*`{E}lW0S}KlP{sFP1&Po6P diff --git a/common/src/proto/komp_ac.adresar.rs b/common/src/proto/komp_ac.adresar.rs index 7a4c95f..44fd0ee 100644 --- a/common/src/proto/komp_ac.adresar.rs +++ b/common/src/proto/komp_ac.adresar.rs @@ -225,11 +225,11 @@ pub mod adresar_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/KompAC.adresar.Adresar/PostAdresar", + "/komp_ac.adresar.Adresar/PostAdresar", ); let mut req = request.into_request(); req.extensions_mut() - .insert(GrpcMethod::new("KompAC.adresar.Adresar", "PostAdresar")); + .insert(GrpcMethod::new("komp_ac.adresar.Adresar", "PostAdresar")); self.inner.unary(req, path, codec).await } pub async fn get_adresar( @@ -249,11 +249,11 @@ pub mod adresar_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/KompAC.adresar.Adresar/GetAdresar", + "/komp_ac.adresar.Adresar/GetAdresar", ); let mut req = request.into_request(); req.extensions_mut() - .insert(GrpcMethod::new("KompAC.adresar.Adresar", "GetAdresar")); + .insert(GrpcMethod::new("komp_ac.adresar.Adresar", "GetAdresar")); self.inner.unary(req, path, codec).await } pub async fn put_adresar( @@ -273,11 +273,11 @@ pub mod adresar_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/KompAC.adresar.Adresar/PutAdresar", + "/komp_ac.adresar.Adresar/PutAdresar", ); let mut req = request.into_request(); req.extensions_mut() - .insert(GrpcMethod::new("KompAC.adresar.Adresar", "PutAdresar")); + .insert(GrpcMethod::new("komp_ac.adresar.Adresar", "PutAdresar")); self.inner.unary(req, path, codec).await } pub async fn delete_adresar( @@ -297,11 +297,11 @@ pub mod adresar_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/KompAC.adresar.Adresar/DeleteAdresar", + "/komp_ac.adresar.Adresar/DeleteAdresar", ); let mut req = request.into_request(); req.extensions_mut() - .insert(GrpcMethod::new("KompAC.adresar.Adresar", "DeleteAdresar")); + .insert(GrpcMethod::new("komp_ac.adresar.Adresar", "DeleteAdresar")); self.inner.unary(req, path, codec).await } pub async fn get_adresar_count( @@ -321,11 +321,11 @@ pub mod adresar_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/KompAC.adresar.Adresar/GetAdresarCount", + "/komp_ac.adresar.Adresar/GetAdresarCount", ); let mut req = request.into_request(); req.extensions_mut() - .insert(GrpcMethod::new("KompAC.adresar.Adresar", "GetAdresarCount")); + .insert(GrpcMethod::new("komp_ac.adresar.Adresar", "GetAdresarCount")); self.inner.unary(req, path, codec).await } pub async fn get_adresar_by_position( @@ -345,12 +345,12 @@ pub mod adresar_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/KompAC.adresar.Adresar/GetAdresarByPosition", + "/komp_ac.adresar.Adresar/GetAdresarByPosition", ); let mut req = request.into_request(); req.extensions_mut() .insert( - GrpcMethod::new("KompAC.adresar.Adresar", "GetAdresarByPosition"), + GrpcMethod::new("komp_ac.adresar.Adresar", "GetAdresarByPosition"), ); self.inner.unary(req, path, codec).await } @@ -476,7 +476,7 @@ pub mod adresar_server { } fn call(&mut self, req: http::Request) -> Self::Future { match req.uri().path() { - "/KompAC.adresar.Adresar/PostAdresar" => { + "/komp_ac.adresar.Adresar/PostAdresar" => { #[allow(non_camel_case_types)] struct PostAdresarSvc(pub Arc); impl< @@ -521,7 +521,7 @@ pub mod adresar_server { }; Box::pin(fut) } - "/KompAC.adresar.Adresar/GetAdresar" => { + "/komp_ac.adresar.Adresar/GetAdresar" => { #[allow(non_camel_case_types)] struct GetAdresarSvc(pub Arc); impl< @@ -566,7 +566,7 @@ pub mod adresar_server { }; Box::pin(fut) } - "/KompAC.adresar.Adresar/PutAdresar" => { + "/komp_ac.adresar.Adresar/PutAdresar" => { #[allow(non_camel_case_types)] struct PutAdresarSvc(pub Arc); impl< @@ -611,7 +611,7 @@ pub mod adresar_server { }; Box::pin(fut) } - "/KompAC.adresar.Adresar/DeleteAdresar" => { + "/komp_ac.adresar.Adresar/DeleteAdresar" => { #[allow(non_camel_case_types)] struct DeleteAdresarSvc(pub Arc); impl< @@ -656,7 +656,7 @@ pub mod adresar_server { }; Box::pin(fut) } - "/KompAC.adresar.Adresar/GetAdresarCount" => { + "/komp_ac.adresar.Adresar/GetAdresarCount" => { #[allow(non_camel_case_types)] struct GetAdresarCountSvc(pub Arc); impl< @@ -701,7 +701,7 @@ pub mod adresar_server { }; Box::pin(fut) } - "/KompAC.adresar.Adresar/GetAdresarByPosition" => { + "/komp_ac.adresar.Adresar/GetAdresarByPosition" => { #[allow(non_camel_case_types)] struct GetAdresarByPositionSvc(pub Arc); impl< @@ -784,7 +784,7 @@ pub mod adresar_server { } } /// Generated gRPC service name - pub const SERVICE_NAME: &str = "KompAC.adresar.Adresar"; + pub const SERVICE_NAME: &str = "komp_ac.adresar.Adresar"; impl tonic::server::NamedService for AdresarServer { const NAME: &'static str = SERVICE_NAME; } diff --git a/common/src/proto/komp_ac.auth.rs b/common/src/proto/komp_ac.auth.rs index ba580d1..8219527 100644 --- a/common/src/proto/komp_ac.auth.rs +++ b/common/src/proto/komp_ac.auth.rs @@ -160,11 +160,11 @@ pub mod auth_service_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/KompAC.auth.AuthService/Register", + "/komp_ac.auth.AuthService/Register", ); let mut req = request.into_request(); req.extensions_mut() - .insert(GrpcMethod::new("KompAC.auth.AuthService", "Register")); + .insert(GrpcMethod::new("komp_ac.auth.AuthService", "Register")); self.inner.unary(req, path, codec).await } pub async fn login( @@ -181,11 +181,11 @@ pub mod auth_service_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/KompAC.auth.AuthService/Login", + "/komp_ac.auth.AuthService/Login", ); let mut req = request.into_request(); req.extensions_mut() - .insert(GrpcMethod::new("KompAC.auth.AuthService", "Login")); + .insert(GrpcMethod::new("komp_ac.auth.AuthService", "Login")); self.inner.unary(req, path, codec).await } } @@ -288,7 +288,7 @@ pub mod auth_service_server { } fn call(&mut self, req: http::Request) -> Self::Future { match req.uri().path() { - "/KompAC.auth.AuthService/Register" => { + "/komp_ac.auth.AuthService/Register" => { #[allow(non_camel_case_types)] struct RegisterSvc(pub Arc); impl< @@ -333,7 +333,7 @@ pub mod auth_service_server { }; Box::pin(fut) } - "/KompAC.auth.AuthService/Login" => { + "/komp_ac.auth.AuthService/Login" => { #[allow(non_camel_case_types)] struct LoginSvc(pub Arc); impl tonic::server::UnaryService @@ -411,7 +411,7 @@ pub mod auth_service_server { } } /// Generated gRPC service name - pub const SERVICE_NAME: &str = "KompAC.auth.AuthService"; + pub const SERVICE_NAME: &str = "komp_ac.auth.AuthService"; impl tonic::server::NamedService for AuthServiceServer { const NAME: &'static str = SERVICE_NAME; } diff --git a/common/src/proto/komp_ac.search.rs b/common/src/proto/komp_ac.search.rs index 2f957da..ef1bd31 100644 --- a/common/src/proto/komp_ac.search.rs +++ b/common/src/proto/komp_ac.search.rs @@ -129,11 +129,11 @@ pub mod searcher_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/KompAC.search.Searcher/SearchTable", + "/komp_ac.search.Searcher/SearchTable", ); let mut req = request.into_request(); req.extensions_mut() - .insert(GrpcMethod::new("KompAC.search.Searcher", "SearchTable")); + .insert(GrpcMethod::new("komp_ac.search.Searcher", "SearchTable")); self.inner.unary(req, path, codec).await } } @@ -232,7 +232,7 @@ pub mod searcher_server { } fn call(&mut self, req: http::Request) -> Self::Future { match req.uri().path() { - "/KompAC.search.Searcher/SearchTable" => { + "/komp_ac.search.Searcher/SearchTable" => { #[allow(non_camel_case_types)] struct SearchTableSvc(pub Arc); impl tonic::server::UnaryService @@ -310,7 +310,7 @@ pub mod searcher_server { } } /// Generated gRPC service name - pub const SERVICE_NAME: &str = "KompAC.search.Searcher"; + pub const SERVICE_NAME: &str = "komp_ac.search.Searcher"; impl tonic::server::NamedService for SearcherServer { const NAME: &'static str = SERVICE_NAME; } diff --git a/common/src/proto/komp_ac.table_definition.rs b/common/src/proto/komp_ac.table_definition.rs index 0fa7fe9..8038507 100644 --- a/common/src/proto/komp_ac.table_definition.rs +++ b/common/src/proto/komp_ac.table_definition.rs @@ -179,13 +179,13 @@ pub mod table_definition_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/KompAC.table_definition.TableDefinition/PostTableDefinition", + "/komp_ac.table_definition.TableDefinition/PostTableDefinition", ); let mut req = request.into_request(); req.extensions_mut() .insert( GrpcMethod::new( - "KompAC.table_definition.TableDefinition", + "komp_ac.table_definition.TableDefinition", "PostTableDefinition", ), ); @@ -208,13 +208,13 @@ pub mod table_definition_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/KompAC.table_definition.TableDefinition/GetProfileTree", + "/komp_ac.table_definition.TableDefinition/GetProfileTree", ); let mut req = request.into_request(); req.extensions_mut() .insert( GrpcMethod::new( - "KompAC.table_definition.TableDefinition", + "komp_ac.table_definition.TableDefinition", "GetProfileTree", ), ); @@ -237,13 +237,13 @@ pub mod table_definition_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/KompAC.table_definition.TableDefinition/DeleteTable", + "/komp_ac.table_definition.TableDefinition/DeleteTable", ); let mut req = request.into_request(); req.extensions_mut() .insert( GrpcMethod::new( - "KompAC.table_definition.TableDefinition", + "komp_ac.table_definition.TableDefinition", "DeleteTable", ), ); @@ -362,7 +362,7 @@ pub mod table_definition_server { } fn call(&mut self, req: http::Request) -> Self::Future { match req.uri().path() { - "/KompAC.table_definition.TableDefinition/PostTableDefinition" => { + "/komp_ac.table_definition.TableDefinition/PostTableDefinition" => { #[allow(non_camel_case_types)] struct PostTableDefinitionSvc(pub Arc); impl< @@ -411,7 +411,7 @@ pub mod table_definition_server { }; Box::pin(fut) } - "/KompAC.table_definition.TableDefinition/GetProfileTree" => { + "/komp_ac.table_definition.TableDefinition/GetProfileTree" => { #[allow(non_camel_case_types)] struct GetProfileTreeSvc(pub Arc); impl< @@ -457,7 +457,7 @@ pub mod table_definition_server { }; Box::pin(fut) } - "/KompAC.table_definition.TableDefinition/DeleteTable" => { + "/komp_ac.table_definition.TableDefinition/DeleteTable" => { #[allow(non_camel_case_types)] struct DeleteTableSvc(pub Arc); impl< @@ -537,7 +537,7 @@ pub mod table_definition_server { } } /// Generated gRPC service name - pub const SERVICE_NAME: &str = "KompAC.table_definition.TableDefinition"; + pub const SERVICE_NAME: &str = "komp_ac.table_definition.TableDefinition"; impl tonic::server::NamedService for TableDefinitionServer { const NAME: &'static str = SERVICE_NAME; } diff --git a/common/src/proto/komp_ac.table_script.rs b/common/src/proto/komp_ac.table_script.rs index ecac23d..e832650 100644 --- a/common/src/proto/komp_ac.table_script.rs +++ b/common/src/proto/komp_ac.table_script.rs @@ -125,12 +125,15 @@ pub mod table_script_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/KompAC.table_script.TableScript/PostTableScript", + "/komp_ac.table_script.TableScript/PostTableScript", ); let mut req = request.into_request(); req.extensions_mut() .insert( - GrpcMethod::new("KompAC.table_script.TableScript", "PostTableScript"), + GrpcMethod::new( + "komp_ac.table_script.TableScript", + "PostTableScript", + ), ); self.inner.unary(req, path, codec).await } @@ -233,7 +236,7 @@ pub mod table_script_server { } fn call(&mut self, req: http::Request) -> Self::Future { match req.uri().path() { - "/KompAC.table_script.TableScript/PostTableScript" => { + "/komp_ac.table_script.TableScript/PostTableScript" => { #[allow(non_camel_case_types)] struct PostTableScriptSvc(pub Arc); impl< @@ -313,7 +316,7 @@ pub mod table_script_server { } } /// Generated gRPC service name - pub const SERVICE_NAME: &str = "KompAC.table_script.TableScript"; + pub const SERVICE_NAME: &str = "komp_ac.table_script.TableScript"; impl tonic::server::NamedService for TableScriptServer { const NAME: &'static str = SERVICE_NAME; } diff --git a/common/src/proto/komp_ac.table_structure.rs b/common/src/proto/komp_ac.table_structure.rs index 25f76c7..ea2f418 100644 --- a/common/src/proto/komp_ac.table_structure.rs +++ b/common/src/proto/komp_ac.table_structure.rs @@ -133,13 +133,13 @@ pub mod table_structure_service_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/KompAC.table_structure.TableStructureService/GetTableStructure", + "/komp_ac.table_structure.TableStructureService/GetTableStructure", ); let mut req = request.into_request(); req.extensions_mut() .insert( GrpcMethod::new( - "KompAC.table_structure.TableStructureService", + "komp_ac.table_structure.TableStructureService", "GetTableStructure", ), ); @@ -245,7 +245,7 @@ pub mod table_structure_service_server { } fn call(&mut self, req: http::Request) -> Self::Future { match req.uri().path() { - "/KompAC.table_structure.TableStructureService/GetTableStructure" => { + "/komp_ac.table_structure.TableStructureService/GetTableStructure" => { #[allow(non_camel_case_types)] struct GetTableStructureSvc(pub Arc); impl< @@ -329,7 +329,7 @@ pub mod table_structure_service_server { } } /// Generated gRPC service name - pub const SERVICE_NAME: &str = "KompAC.table_structure.TableStructureService"; + pub const SERVICE_NAME: &str = "komp_ac.table_structure.TableStructureService"; impl tonic::server::NamedService for TableStructureServiceServer { const NAME: &'static str = SERVICE_NAME; } diff --git a/common/src/proto/komp_ac.tables_data.rs b/common/src/proto/komp_ac.tables_data.rs index ea1e65c..f9cd644 100644 --- a/common/src/proto/komp_ac.tables_data.rs +++ b/common/src/proto/komp_ac.tables_data.rs @@ -198,12 +198,12 @@ pub mod tables_data_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/KompAC.tables_data.TablesData/PostTableData", + "/komp_ac.tables_data.TablesData/PostTableData", ); let mut req = request.into_request(); req.extensions_mut() .insert( - GrpcMethod::new("KompAC.tables_data.TablesData", "PostTableData"), + GrpcMethod::new("komp_ac.tables_data.TablesData", "PostTableData"), ); self.inner.unary(req, path, codec).await } @@ -224,12 +224,12 @@ pub mod tables_data_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/KompAC.tables_data.TablesData/PutTableData", + "/komp_ac.tables_data.TablesData/PutTableData", ); let mut req = request.into_request(); req.extensions_mut() .insert( - GrpcMethod::new("KompAC.tables_data.TablesData", "PutTableData"), + GrpcMethod::new("komp_ac.tables_data.TablesData", "PutTableData"), ); self.inner.unary(req, path, codec).await } @@ -250,12 +250,12 @@ pub mod tables_data_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/KompAC.tables_data.TablesData/DeleteTableData", + "/komp_ac.tables_data.TablesData/DeleteTableData", ); let mut req = request.into_request(); req.extensions_mut() .insert( - GrpcMethod::new("KompAC.tables_data.TablesData", "DeleteTableData"), + GrpcMethod::new("komp_ac.tables_data.TablesData", "DeleteTableData"), ); self.inner.unary(req, path, codec).await } @@ -276,12 +276,12 @@ pub mod tables_data_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/KompAC.tables_data.TablesData/GetTableData", + "/komp_ac.tables_data.TablesData/GetTableData", ); let mut req = request.into_request(); req.extensions_mut() .insert( - GrpcMethod::new("KompAC.tables_data.TablesData", "GetTableData"), + GrpcMethod::new("komp_ac.tables_data.TablesData", "GetTableData"), ); self.inner.unary(req, path, codec).await } @@ -302,12 +302,15 @@ pub mod tables_data_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/KompAC.tables_data.TablesData/GetTableDataCount", + "/komp_ac.tables_data.TablesData/GetTableDataCount", ); let mut req = request.into_request(); req.extensions_mut() .insert( - GrpcMethod::new("KompAC.tables_data.TablesData", "GetTableDataCount"), + GrpcMethod::new( + "komp_ac.tables_data.TablesData", + "GetTableDataCount", + ), ); self.inner.unary(req, path, codec).await } @@ -328,13 +331,13 @@ pub mod tables_data_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/KompAC.tables_data.TablesData/GetTableDataByPosition", + "/komp_ac.tables_data.TablesData/GetTableDataByPosition", ); let mut req = request.into_request(); req.extensions_mut() .insert( GrpcMethod::new( - "KompAC.tables_data.TablesData", + "komp_ac.tables_data.TablesData", "GetTableDataByPosition", ), ); @@ -474,7 +477,7 @@ pub mod tables_data_server { } fn call(&mut self, req: http::Request) -> Self::Future { match req.uri().path() { - "/KompAC.tables_data.TablesData/PostTableData" => { + "/komp_ac.tables_data.TablesData/PostTableData" => { #[allow(non_camel_case_types)] struct PostTableDataSvc(pub Arc); impl< @@ -519,7 +522,7 @@ pub mod tables_data_server { }; Box::pin(fut) } - "/KompAC.tables_data.TablesData/PutTableData" => { + "/komp_ac.tables_data.TablesData/PutTableData" => { #[allow(non_camel_case_types)] struct PutTableDataSvc(pub Arc); impl< @@ -564,7 +567,7 @@ pub mod tables_data_server { }; Box::pin(fut) } - "/KompAC.tables_data.TablesData/DeleteTableData" => { + "/komp_ac.tables_data.TablesData/DeleteTableData" => { #[allow(non_camel_case_types)] struct DeleteTableDataSvc(pub Arc); impl< @@ -609,7 +612,7 @@ pub mod tables_data_server { }; Box::pin(fut) } - "/KompAC.tables_data.TablesData/GetTableData" => { + "/komp_ac.tables_data.TablesData/GetTableData" => { #[allow(non_camel_case_types)] struct GetTableDataSvc(pub Arc); impl< @@ -654,7 +657,7 @@ pub mod tables_data_server { }; Box::pin(fut) } - "/KompAC.tables_data.TablesData/GetTableDataCount" => { + "/komp_ac.tables_data.TablesData/GetTableDataCount" => { #[allow(non_camel_case_types)] struct GetTableDataCountSvc(pub Arc); impl< @@ -700,7 +703,7 @@ pub mod tables_data_server { }; Box::pin(fut) } - "/KompAC.tables_data.TablesData/GetTableDataByPosition" => { + "/komp_ac.tables_data.TablesData/GetTableDataByPosition" => { #[allow(non_camel_case_types)] struct GetTableDataByPositionSvc(pub Arc); impl< @@ -784,7 +787,7 @@ pub mod tables_data_server { } } /// Generated gRPC service name - pub const SERVICE_NAME: &str = "KompAC.tables_data.TablesData"; + pub const SERVICE_NAME: &str = "komp_ac.tables_data.TablesData"; impl tonic::server::NamedService for TablesDataServer { const NAME: &'static str = SERVICE_NAME; } diff --git a/common/src/proto/komp_ac.uctovnictvo.rs b/common/src/proto/komp_ac.uctovnictvo.rs index 17d8145..9148405 100644 --- a/common/src/proto/komp_ac.uctovnictvo.rs +++ b/common/src/proto/komp_ac.uctovnictvo.rs @@ -192,12 +192,12 @@ pub mod uctovnictvo_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/KompAC.uctovnictvo.Uctovnictvo/PostUctovnictvo", + "/komp_ac.uctovnictvo.Uctovnictvo/PostUctovnictvo", ); let mut req = request.into_request(); req.extensions_mut() .insert( - GrpcMethod::new("KompAC.uctovnictvo.Uctovnictvo", "PostUctovnictvo"), + GrpcMethod::new("komp_ac.uctovnictvo.Uctovnictvo", "PostUctovnictvo"), ); self.inner.unary(req, path, codec).await } @@ -218,12 +218,12 @@ pub mod uctovnictvo_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/KompAC.uctovnictvo.Uctovnictvo/GetUctovnictvo", + "/komp_ac.uctovnictvo.Uctovnictvo/GetUctovnictvo", ); let mut req = request.into_request(); req.extensions_mut() .insert( - GrpcMethod::new("KompAC.uctovnictvo.Uctovnictvo", "GetUctovnictvo"), + GrpcMethod::new("komp_ac.uctovnictvo.Uctovnictvo", "GetUctovnictvo"), ); self.inner.unary(req, path, codec).await } @@ -244,13 +244,13 @@ pub mod uctovnictvo_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/KompAC.uctovnictvo.Uctovnictvo/GetUctovnictvoCount", + "/komp_ac.uctovnictvo.Uctovnictvo/GetUctovnictvoCount", ); let mut req = request.into_request(); req.extensions_mut() .insert( GrpcMethod::new( - "KompAC.uctovnictvo.Uctovnictvo", + "komp_ac.uctovnictvo.Uctovnictvo", "GetUctovnictvoCount", ), ); @@ -273,13 +273,13 @@ pub mod uctovnictvo_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/KompAC.uctovnictvo.Uctovnictvo/GetUctovnictvoByPosition", + "/komp_ac.uctovnictvo.Uctovnictvo/GetUctovnictvoByPosition", ); let mut req = request.into_request(); req.extensions_mut() .insert( GrpcMethod::new( - "KompAC.uctovnictvo.Uctovnictvo", + "komp_ac.uctovnictvo.Uctovnictvo", "GetUctovnictvoByPosition", ), ); @@ -302,12 +302,12 @@ pub mod uctovnictvo_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/KompAC.uctovnictvo.Uctovnictvo/PutUctovnictvo", + "/komp_ac.uctovnictvo.Uctovnictvo/PutUctovnictvo", ); let mut req = request.into_request(); req.extensions_mut() .insert( - GrpcMethod::new("KompAC.uctovnictvo.Uctovnictvo", "PutUctovnictvo"), + GrpcMethod::new("komp_ac.uctovnictvo.Uctovnictvo", "PutUctovnictvo"), ); self.inner.unary(req, path, codec).await } @@ -438,7 +438,7 @@ pub mod uctovnictvo_server { } fn call(&mut self, req: http::Request) -> Self::Future { match req.uri().path() { - "/KompAC.uctovnictvo.Uctovnictvo/PostUctovnictvo" => { + "/komp_ac.uctovnictvo.Uctovnictvo/PostUctovnictvo" => { #[allow(non_camel_case_types)] struct PostUctovnictvoSvc(pub Arc); impl< @@ -483,7 +483,7 @@ pub mod uctovnictvo_server { }; Box::pin(fut) } - "/KompAC.uctovnictvo.Uctovnictvo/GetUctovnictvo" => { + "/komp_ac.uctovnictvo.Uctovnictvo/GetUctovnictvo" => { #[allow(non_camel_case_types)] struct GetUctovnictvoSvc(pub Arc); impl< @@ -528,7 +528,7 @@ pub mod uctovnictvo_server { }; Box::pin(fut) } - "/KompAC.uctovnictvo.Uctovnictvo/GetUctovnictvoCount" => { + "/komp_ac.uctovnictvo.Uctovnictvo/GetUctovnictvoCount" => { #[allow(non_camel_case_types)] struct GetUctovnictvoCountSvc(pub Arc); impl< @@ -574,7 +574,7 @@ pub mod uctovnictvo_server { }; Box::pin(fut) } - "/KompAC.uctovnictvo.Uctovnictvo/GetUctovnictvoByPosition" => { + "/komp_ac.uctovnictvo.Uctovnictvo/GetUctovnictvoByPosition" => { #[allow(non_camel_case_types)] struct GetUctovnictvoByPositionSvc(pub Arc); impl< @@ -625,7 +625,7 @@ pub mod uctovnictvo_server { }; Box::pin(fut) } - "/KompAC.uctovnictvo.Uctovnictvo/PutUctovnictvo" => { + "/komp_ac.uctovnictvo.Uctovnictvo/PutUctovnictvo" => { #[allow(non_camel_case_types)] struct PutUctovnictvoSvc(pub Arc); impl< @@ -705,7 +705,7 @@ pub mod uctovnictvo_server { } } /// Generated gRPC service name - pub const SERVICE_NAME: &str = "KompAC.uctovnictvo.Uctovnictvo"; + pub const SERVICE_NAME: &str = "komp_ac.uctovnictvo.Uctovnictvo"; impl tonic::server::NamedService for UctovnictvoServer { const NAME: &'static str = SERVICE_NAME; } diff --git a/common/src/proto/multieko2.adresar.rs b/common/src/proto/multieko2.adresar.rs index 7a4c95f..44fd0ee 100644 --- a/common/src/proto/multieko2.adresar.rs +++ b/common/src/proto/multieko2.adresar.rs @@ -225,11 +225,11 @@ pub mod adresar_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/KompAC.adresar.Adresar/PostAdresar", + "/komp_ac.adresar.Adresar/PostAdresar", ); let mut req = request.into_request(); req.extensions_mut() - .insert(GrpcMethod::new("KompAC.adresar.Adresar", "PostAdresar")); + .insert(GrpcMethod::new("komp_ac.adresar.Adresar", "PostAdresar")); self.inner.unary(req, path, codec).await } pub async fn get_adresar( @@ -249,11 +249,11 @@ pub mod adresar_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/KompAC.adresar.Adresar/GetAdresar", + "/komp_ac.adresar.Adresar/GetAdresar", ); let mut req = request.into_request(); req.extensions_mut() - .insert(GrpcMethod::new("KompAC.adresar.Adresar", "GetAdresar")); + .insert(GrpcMethod::new("komp_ac.adresar.Adresar", "GetAdresar")); self.inner.unary(req, path, codec).await } pub async fn put_adresar( @@ -273,11 +273,11 @@ pub mod adresar_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/KompAC.adresar.Adresar/PutAdresar", + "/komp_ac.adresar.Adresar/PutAdresar", ); let mut req = request.into_request(); req.extensions_mut() - .insert(GrpcMethod::new("KompAC.adresar.Adresar", "PutAdresar")); + .insert(GrpcMethod::new("komp_ac.adresar.Adresar", "PutAdresar")); self.inner.unary(req, path, codec).await } pub async fn delete_adresar( @@ -297,11 +297,11 @@ pub mod adresar_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/KompAC.adresar.Adresar/DeleteAdresar", + "/komp_ac.adresar.Adresar/DeleteAdresar", ); let mut req = request.into_request(); req.extensions_mut() - .insert(GrpcMethod::new("KompAC.adresar.Adresar", "DeleteAdresar")); + .insert(GrpcMethod::new("komp_ac.adresar.Adresar", "DeleteAdresar")); self.inner.unary(req, path, codec).await } pub async fn get_adresar_count( @@ -321,11 +321,11 @@ pub mod adresar_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/KompAC.adresar.Adresar/GetAdresarCount", + "/komp_ac.adresar.Adresar/GetAdresarCount", ); let mut req = request.into_request(); req.extensions_mut() - .insert(GrpcMethod::new("KompAC.adresar.Adresar", "GetAdresarCount")); + .insert(GrpcMethod::new("komp_ac.adresar.Adresar", "GetAdresarCount")); self.inner.unary(req, path, codec).await } pub async fn get_adresar_by_position( @@ -345,12 +345,12 @@ pub mod adresar_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/KompAC.adresar.Adresar/GetAdresarByPosition", + "/komp_ac.adresar.Adresar/GetAdresarByPosition", ); let mut req = request.into_request(); req.extensions_mut() .insert( - GrpcMethod::new("KompAC.adresar.Adresar", "GetAdresarByPosition"), + GrpcMethod::new("komp_ac.adresar.Adresar", "GetAdresarByPosition"), ); self.inner.unary(req, path, codec).await } @@ -476,7 +476,7 @@ pub mod adresar_server { } fn call(&mut self, req: http::Request) -> Self::Future { match req.uri().path() { - "/KompAC.adresar.Adresar/PostAdresar" => { + "/komp_ac.adresar.Adresar/PostAdresar" => { #[allow(non_camel_case_types)] struct PostAdresarSvc(pub Arc); impl< @@ -521,7 +521,7 @@ pub mod adresar_server { }; Box::pin(fut) } - "/KompAC.adresar.Adresar/GetAdresar" => { + "/komp_ac.adresar.Adresar/GetAdresar" => { #[allow(non_camel_case_types)] struct GetAdresarSvc(pub Arc); impl< @@ -566,7 +566,7 @@ pub mod adresar_server { }; Box::pin(fut) } - "/KompAC.adresar.Adresar/PutAdresar" => { + "/komp_ac.adresar.Adresar/PutAdresar" => { #[allow(non_camel_case_types)] struct PutAdresarSvc(pub Arc); impl< @@ -611,7 +611,7 @@ pub mod adresar_server { }; Box::pin(fut) } - "/KompAC.adresar.Adresar/DeleteAdresar" => { + "/komp_ac.adresar.Adresar/DeleteAdresar" => { #[allow(non_camel_case_types)] struct DeleteAdresarSvc(pub Arc); impl< @@ -656,7 +656,7 @@ pub mod adresar_server { }; Box::pin(fut) } - "/KompAC.adresar.Adresar/GetAdresarCount" => { + "/komp_ac.adresar.Adresar/GetAdresarCount" => { #[allow(non_camel_case_types)] struct GetAdresarCountSvc(pub Arc); impl< @@ -701,7 +701,7 @@ pub mod adresar_server { }; Box::pin(fut) } - "/KompAC.adresar.Adresar/GetAdresarByPosition" => { + "/komp_ac.adresar.Adresar/GetAdresarByPosition" => { #[allow(non_camel_case_types)] struct GetAdresarByPositionSvc(pub Arc); impl< @@ -784,7 +784,7 @@ pub mod adresar_server { } } /// Generated gRPC service name - pub const SERVICE_NAME: &str = "KompAC.adresar.Adresar"; + pub const SERVICE_NAME: &str = "komp_ac.adresar.Adresar"; impl tonic::server::NamedService for AdresarServer { const NAME: &'static str = SERVICE_NAME; } diff --git a/common/src/proto/multieko2.auth.rs b/common/src/proto/multieko2.auth.rs index ba580d1..8219527 100644 --- a/common/src/proto/multieko2.auth.rs +++ b/common/src/proto/multieko2.auth.rs @@ -160,11 +160,11 @@ pub mod auth_service_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/KompAC.auth.AuthService/Register", + "/komp_ac.auth.AuthService/Register", ); let mut req = request.into_request(); req.extensions_mut() - .insert(GrpcMethod::new("KompAC.auth.AuthService", "Register")); + .insert(GrpcMethod::new("komp_ac.auth.AuthService", "Register")); self.inner.unary(req, path, codec).await } pub async fn login( @@ -181,11 +181,11 @@ pub mod auth_service_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/KompAC.auth.AuthService/Login", + "/komp_ac.auth.AuthService/Login", ); let mut req = request.into_request(); req.extensions_mut() - .insert(GrpcMethod::new("KompAC.auth.AuthService", "Login")); + .insert(GrpcMethod::new("komp_ac.auth.AuthService", "Login")); self.inner.unary(req, path, codec).await } } @@ -288,7 +288,7 @@ pub mod auth_service_server { } fn call(&mut self, req: http::Request) -> Self::Future { match req.uri().path() { - "/KompAC.auth.AuthService/Register" => { + "/komp_ac.auth.AuthService/Register" => { #[allow(non_camel_case_types)] struct RegisterSvc(pub Arc); impl< @@ -333,7 +333,7 @@ pub mod auth_service_server { }; Box::pin(fut) } - "/KompAC.auth.AuthService/Login" => { + "/komp_ac.auth.AuthService/Login" => { #[allow(non_camel_case_types)] struct LoginSvc(pub Arc); impl tonic::server::UnaryService @@ -411,7 +411,7 @@ pub mod auth_service_server { } } /// Generated gRPC service name - pub const SERVICE_NAME: &str = "KompAC.auth.AuthService"; + pub const SERVICE_NAME: &str = "komp_ac.auth.AuthService"; impl tonic::server::NamedService for AuthServiceServer { const NAME: &'static str = SERVICE_NAME; } diff --git a/common/src/proto/multieko2.search.rs b/common/src/proto/multieko2.search.rs index 2f957da..ef1bd31 100644 --- a/common/src/proto/multieko2.search.rs +++ b/common/src/proto/multieko2.search.rs @@ -129,11 +129,11 @@ pub mod searcher_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/KompAC.search.Searcher/SearchTable", + "/komp_ac.search.Searcher/SearchTable", ); let mut req = request.into_request(); req.extensions_mut() - .insert(GrpcMethod::new("KompAC.search.Searcher", "SearchTable")); + .insert(GrpcMethod::new("komp_ac.search.Searcher", "SearchTable")); self.inner.unary(req, path, codec).await } } @@ -232,7 +232,7 @@ pub mod searcher_server { } fn call(&mut self, req: http::Request) -> Self::Future { match req.uri().path() { - "/KompAC.search.Searcher/SearchTable" => { + "/komp_ac.search.Searcher/SearchTable" => { #[allow(non_camel_case_types)] struct SearchTableSvc(pub Arc); impl tonic::server::UnaryService @@ -310,7 +310,7 @@ pub mod searcher_server { } } /// Generated gRPC service name - pub const SERVICE_NAME: &str = "KompAC.search.Searcher"; + pub const SERVICE_NAME: &str = "komp_ac.search.Searcher"; impl tonic::server::NamedService for SearcherServer { const NAME: &'static str = SERVICE_NAME; } diff --git a/common/src/proto/multieko2.table_definition.rs b/common/src/proto/multieko2.table_definition.rs index 0fa7fe9..8038507 100644 --- a/common/src/proto/multieko2.table_definition.rs +++ b/common/src/proto/multieko2.table_definition.rs @@ -179,13 +179,13 @@ pub mod table_definition_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/KompAC.table_definition.TableDefinition/PostTableDefinition", + "/komp_ac.table_definition.TableDefinition/PostTableDefinition", ); let mut req = request.into_request(); req.extensions_mut() .insert( GrpcMethod::new( - "KompAC.table_definition.TableDefinition", + "komp_ac.table_definition.TableDefinition", "PostTableDefinition", ), ); @@ -208,13 +208,13 @@ pub mod table_definition_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/KompAC.table_definition.TableDefinition/GetProfileTree", + "/komp_ac.table_definition.TableDefinition/GetProfileTree", ); let mut req = request.into_request(); req.extensions_mut() .insert( GrpcMethod::new( - "KompAC.table_definition.TableDefinition", + "komp_ac.table_definition.TableDefinition", "GetProfileTree", ), ); @@ -237,13 +237,13 @@ pub mod table_definition_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/KompAC.table_definition.TableDefinition/DeleteTable", + "/komp_ac.table_definition.TableDefinition/DeleteTable", ); let mut req = request.into_request(); req.extensions_mut() .insert( GrpcMethod::new( - "KompAC.table_definition.TableDefinition", + "komp_ac.table_definition.TableDefinition", "DeleteTable", ), ); @@ -362,7 +362,7 @@ pub mod table_definition_server { } fn call(&mut self, req: http::Request) -> Self::Future { match req.uri().path() { - "/KompAC.table_definition.TableDefinition/PostTableDefinition" => { + "/komp_ac.table_definition.TableDefinition/PostTableDefinition" => { #[allow(non_camel_case_types)] struct PostTableDefinitionSvc(pub Arc); impl< @@ -411,7 +411,7 @@ pub mod table_definition_server { }; Box::pin(fut) } - "/KompAC.table_definition.TableDefinition/GetProfileTree" => { + "/komp_ac.table_definition.TableDefinition/GetProfileTree" => { #[allow(non_camel_case_types)] struct GetProfileTreeSvc(pub Arc); impl< @@ -457,7 +457,7 @@ pub mod table_definition_server { }; Box::pin(fut) } - "/KompAC.table_definition.TableDefinition/DeleteTable" => { + "/komp_ac.table_definition.TableDefinition/DeleteTable" => { #[allow(non_camel_case_types)] struct DeleteTableSvc(pub Arc); impl< @@ -537,7 +537,7 @@ pub mod table_definition_server { } } /// Generated gRPC service name - pub const SERVICE_NAME: &str = "KompAC.table_definition.TableDefinition"; + pub const SERVICE_NAME: &str = "komp_ac.table_definition.TableDefinition"; impl tonic::server::NamedService for TableDefinitionServer { const NAME: &'static str = SERVICE_NAME; } diff --git a/common/src/proto/multieko2.table_script.rs b/common/src/proto/multieko2.table_script.rs index b3d5645..e832650 100644 --- a/common/src/proto/multieko2.table_script.rs +++ b/common/src/proto/multieko2.table_script.rs @@ -125,13 +125,13 @@ pub mod table_script_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/KompAC.table_script.TableScript/PostTableScript", + "/komp_ac.table_script.TableScript/PostTableScript", ); let mut req = request.into_request(); req.extensions_mut() .insert( GrpcMethod::new( - "KompAC.table_script.TableScript", + "komp_ac.table_script.TableScript", "PostTableScript", ), ); @@ -236,7 +236,7 @@ pub mod table_script_server { } fn call(&mut self, req: http::Request) -> Self::Future { match req.uri().path() { - "/KompAC.table_script.TableScript/PostTableScript" => { + "/komp_ac.table_script.TableScript/PostTableScript" => { #[allow(non_camel_case_types)] struct PostTableScriptSvc(pub Arc); impl< @@ -316,7 +316,7 @@ pub mod table_script_server { } } /// Generated gRPC service name - pub const SERVICE_NAME: &str = "KompAC.table_script.TableScript"; + pub const SERVICE_NAME: &str = "komp_ac.table_script.TableScript"; impl tonic::server::NamedService for TableScriptServer { const NAME: &'static str = SERVICE_NAME; } diff --git a/common/src/proto/multieko2.table_structure.rs b/common/src/proto/multieko2.table_structure.rs index 25f76c7..ea2f418 100644 --- a/common/src/proto/multieko2.table_structure.rs +++ b/common/src/proto/multieko2.table_structure.rs @@ -133,13 +133,13 @@ pub mod table_structure_service_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/KompAC.table_structure.TableStructureService/GetTableStructure", + "/komp_ac.table_structure.TableStructureService/GetTableStructure", ); let mut req = request.into_request(); req.extensions_mut() .insert( GrpcMethod::new( - "KompAC.table_structure.TableStructureService", + "komp_ac.table_structure.TableStructureService", "GetTableStructure", ), ); @@ -245,7 +245,7 @@ pub mod table_structure_service_server { } fn call(&mut self, req: http::Request) -> Self::Future { match req.uri().path() { - "/KompAC.table_structure.TableStructureService/GetTableStructure" => { + "/komp_ac.table_structure.TableStructureService/GetTableStructure" => { #[allow(non_camel_case_types)] struct GetTableStructureSvc(pub Arc); impl< @@ -329,7 +329,7 @@ pub mod table_structure_service_server { } } /// Generated gRPC service name - pub const SERVICE_NAME: &str = "KompAC.table_structure.TableStructureService"; + pub const SERVICE_NAME: &str = "komp_ac.table_structure.TableStructureService"; impl tonic::server::NamedService for TableStructureServiceServer { const NAME: &'static str = SERVICE_NAME; } diff --git a/common/src/proto/multieko2.tables_data.rs b/common/src/proto/multieko2.tables_data.rs index 1c7e693..f095942 100644 --- a/common/src/proto/multieko2.tables_data.rs +++ b/common/src/proto/multieko2.tables_data.rs @@ -198,12 +198,12 @@ pub mod tables_data_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/KompAC.tables_data.TablesData/PostTableData", + "/komp_ac.tables_data.TablesData/PostTableData", ); let mut req = request.into_request(); req.extensions_mut() .insert( - GrpcMethod::new("KompAC.tables_data.TablesData", "PostTableData"), + GrpcMethod::new("komp_ac.tables_data.TablesData", "PostTableData"), ); self.inner.unary(req, path, codec).await } @@ -224,12 +224,12 @@ pub mod tables_data_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/KompAC.tables_data.TablesData/PutTableData", + "/komp_ac.tables_data.TablesData/PutTableData", ); let mut req = request.into_request(); req.extensions_mut() .insert( - GrpcMethod::new("KompAC.tables_data.TablesData", "PutTableData"), + GrpcMethod::new("komp_ac.tables_data.TablesData", "PutTableData"), ); self.inner.unary(req, path, codec).await } @@ -250,13 +250,13 @@ pub mod tables_data_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/KompAC.tables_data.TablesData/DeleteTableData", + "/komp_ac.tables_data.TablesData/DeleteTableData", ); let mut req = request.into_request(); req.extensions_mut() .insert( GrpcMethod::new( - "KompAC.tables_data.TablesData", + "komp_ac.tables_data.TablesData", "DeleteTableData", ), ); @@ -279,12 +279,12 @@ pub mod tables_data_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/KompAC.tables_data.TablesData/GetTableData", + "/komp_ac.tables_data.TablesData/GetTableData", ); let mut req = request.into_request(); req.extensions_mut() .insert( - GrpcMethod::new("KompAC.tables_data.TablesData", "GetTableData"), + GrpcMethod::new("komp_ac.tables_data.TablesData", "GetTableData"), ); self.inner.unary(req, path, codec).await } @@ -305,13 +305,13 @@ pub mod tables_data_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/KompAC.tables_data.TablesData/GetTableDataCount", + "/komp_ac.tables_data.TablesData/GetTableDataCount", ); let mut req = request.into_request(); req.extensions_mut() .insert( GrpcMethod::new( - "KompAC.tables_data.TablesData", + "komp_ac.tables_data.TablesData", "GetTableDataCount", ), ); @@ -334,13 +334,13 @@ pub mod tables_data_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/KompAC.tables_data.TablesData/GetTableDataByPosition", + "/komp_ac.tables_data.TablesData/GetTableDataByPosition", ); let mut req = request.into_request(); req.extensions_mut() .insert( GrpcMethod::new( - "KompAC.tables_data.TablesData", + "komp_ac.tables_data.TablesData", "GetTableDataByPosition", ), ); @@ -480,7 +480,7 @@ pub mod tables_data_server { } fn call(&mut self, req: http::Request) -> Self::Future { match req.uri().path() { - "/KompAC.tables_data.TablesData/PostTableData" => { + "/komp_ac.tables_data.TablesData/PostTableData" => { #[allow(non_camel_case_types)] struct PostTableDataSvc(pub Arc); impl< @@ -525,7 +525,7 @@ pub mod tables_data_server { }; Box::pin(fut) } - "/KompAC.tables_data.TablesData/PutTableData" => { + "/komp_ac.tables_data.TablesData/PutTableData" => { #[allow(non_camel_case_types)] struct PutTableDataSvc(pub Arc); impl< @@ -570,7 +570,7 @@ pub mod tables_data_server { }; Box::pin(fut) } - "/KompAC.tables_data.TablesData/DeleteTableData" => { + "/komp_ac.tables_data.TablesData/DeleteTableData" => { #[allow(non_camel_case_types)] struct DeleteTableDataSvc(pub Arc); impl< @@ -615,7 +615,7 @@ pub mod tables_data_server { }; Box::pin(fut) } - "/KompAC.tables_data.TablesData/GetTableData" => { + "/komp_ac.tables_data.TablesData/GetTableData" => { #[allow(non_camel_case_types)] struct GetTableDataSvc(pub Arc); impl< @@ -660,7 +660,7 @@ pub mod tables_data_server { }; Box::pin(fut) } - "/KompAC.tables_data.TablesData/GetTableDataCount" => { + "/komp_ac.tables_data.TablesData/GetTableDataCount" => { #[allow(non_camel_case_types)] struct GetTableDataCountSvc(pub Arc); impl< @@ -706,7 +706,7 @@ pub mod tables_data_server { }; Box::pin(fut) } - "/KompAC.tables_data.TablesData/GetTableDataByPosition" => { + "/komp_ac.tables_data.TablesData/GetTableDataByPosition" => { #[allow(non_camel_case_types)] struct GetTableDataByPositionSvc(pub Arc); impl< @@ -790,7 +790,7 @@ pub mod tables_data_server { } } /// Generated gRPC service name - pub const SERVICE_NAME: &str = "KompAC.tables_data.TablesData"; + pub const SERVICE_NAME: &str = "komp_ac.tables_data.TablesData"; impl tonic::server::NamedService for TablesDataServer { const NAME: &'static str = SERVICE_NAME; } diff --git a/common/src/proto/multieko2.uctovnictvo.rs b/common/src/proto/multieko2.uctovnictvo.rs index 476fcf6..0c67168 100644 --- a/common/src/proto/multieko2.uctovnictvo.rs +++ b/common/src/proto/multieko2.uctovnictvo.rs @@ -192,13 +192,13 @@ pub mod uctovnictvo_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/KompAC.uctovnictvo.Uctovnictvo/PostUctovnictvo", + "/komp_ac.uctovnictvo.Uctovnictvo/PostUctovnictvo", ); let mut req = request.into_request(); req.extensions_mut() .insert( GrpcMethod::new( - "KompAC.uctovnictvo.Uctovnictvo", + "komp_ac.uctovnictvo.Uctovnictvo", "PostUctovnictvo", ), ); @@ -221,13 +221,13 @@ pub mod uctovnictvo_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/KompAC.uctovnictvo.Uctovnictvo/GetUctovnictvo", + "/komp_ac.uctovnictvo.Uctovnictvo/GetUctovnictvo", ); let mut req = request.into_request(); req.extensions_mut() .insert( GrpcMethod::new( - "KompAC.uctovnictvo.Uctovnictvo", + "komp_ac.uctovnictvo.Uctovnictvo", "GetUctovnictvo", ), ); @@ -250,13 +250,13 @@ pub mod uctovnictvo_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/KompAC.uctovnictvo.Uctovnictvo/GetUctovnictvoCount", + "/komp_ac.uctovnictvo.Uctovnictvo/GetUctovnictvoCount", ); let mut req = request.into_request(); req.extensions_mut() .insert( GrpcMethod::new( - "KompAC.uctovnictvo.Uctovnictvo", + "komp_ac.uctovnictvo.Uctovnictvo", "GetUctovnictvoCount", ), ); @@ -279,13 +279,13 @@ pub mod uctovnictvo_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/KompAC.uctovnictvo.Uctovnictvo/GetUctovnictvoByPosition", + "/komp_ac.uctovnictvo.Uctovnictvo/GetUctovnictvoByPosition", ); let mut req = request.into_request(); req.extensions_mut() .insert( GrpcMethod::new( - "KompAC.uctovnictvo.Uctovnictvo", + "komp_ac.uctovnictvo.Uctovnictvo", "GetUctovnictvoByPosition", ), ); @@ -308,13 +308,13 @@ pub mod uctovnictvo_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/KompAC.uctovnictvo.Uctovnictvo/PutUctovnictvo", + "/komp_ac.uctovnictvo.Uctovnictvo/PutUctovnictvo", ); let mut req = request.into_request(); req.extensions_mut() .insert( GrpcMethod::new( - "KompAC.uctovnictvo.Uctovnictvo", + "komp_ac.uctovnictvo.Uctovnictvo", "PutUctovnictvo", ), ); @@ -447,7 +447,7 @@ pub mod uctovnictvo_server { } fn call(&mut self, req: http::Request) -> Self::Future { match req.uri().path() { - "/KompAC.uctovnictvo.Uctovnictvo/PostUctovnictvo" => { + "/komp_ac.uctovnictvo.Uctovnictvo/PostUctovnictvo" => { #[allow(non_camel_case_types)] struct PostUctovnictvoSvc(pub Arc); impl< @@ -492,7 +492,7 @@ pub mod uctovnictvo_server { }; Box::pin(fut) } - "/KompAC.uctovnictvo.Uctovnictvo/GetUctovnictvo" => { + "/komp_ac.uctovnictvo.Uctovnictvo/GetUctovnictvo" => { #[allow(non_camel_case_types)] struct GetUctovnictvoSvc(pub Arc); impl< @@ -537,7 +537,7 @@ pub mod uctovnictvo_server { }; Box::pin(fut) } - "/KompAC.uctovnictvo.Uctovnictvo/GetUctovnictvoCount" => { + "/komp_ac.uctovnictvo.Uctovnictvo/GetUctovnictvoCount" => { #[allow(non_camel_case_types)] struct GetUctovnictvoCountSvc(pub Arc); impl< @@ -583,7 +583,7 @@ pub mod uctovnictvo_server { }; Box::pin(fut) } - "/KompAC.uctovnictvo.Uctovnictvo/GetUctovnictvoByPosition" => { + "/komp_ac.uctovnictvo.Uctovnictvo/GetUctovnictvoByPosition" => { #[allow(non_camel_case_types)] struct GetUctovnictvoByPositionSvc(pub Arc); impl< @@ -634,7 +634,7 @@ pub mod uctovnictvo_server { }; Box::pin(fut) } - "/KompAC.uctovnictvo.Uctovnictvo/PutUctovnictvo" => { + "/komp_ac.uctovnictvo.Uctovnictvo/PutUctovnictvo" => { #[allow(non_camel_case_types)] struct PutUctovnictvoSvc(pub Arc); impl< @@ -714,7 +714,7 @@ pub mod uctovnictvo_server { } } /// Generated gRPC service name - pub const SERVICE_NAME: &str = "KompAC.uctovnictvo.Uctovnictvo"; + pub const SERVICE_NAME: &str = "komp_ac.uctovnictvo.Uctovnictvo"; impl tonic::server::NamedService for UctovnictvoServer { const NAME: &'static str = SERVICE_NAME; } diff --git a/deny.toml b/deny.toml index e2eb128..e7d3826 100644 --- a/deny.toml +++ b/deny.toml @@ -71,6 +71,8 @@ feature-depth = 1 # A list of advisory IDs to ignore. Note that ignored advisories will still # output a note when they are encountered. ignore = [ + { id = "RUSTSEC-2024-0014", reason = "generational-arena is archived but no safe upgrade path exists; accepted for now" }, + { id = "RUSTSEC-2024-0436", reason = "paste is archived; no immediate alternative in dependency tree; accepted for now" }, #"RUSTSEC-0000-0000", #{ id = "RUSTSEC-0000-0000", reason = "you can specify a reason the advisory is ignored" }, #"a-crate-that-is-yanked@0.1.1", # you can also ignore yanked crate versions if you wish @@ -100,6 +102,7 @@ allow = [ "HPND", "ISC", "LGPL-3.0", + "AGPL-3.0", "MIT", "MPL-2.0", "NCSA", diff --git a/search/src/lib.rs b/search/src/lib.rs index d8c6bc8..b9ea66b 100644 --- a/search/src/lib.rs +++ b/search/src/lib.rs @@ -11,11 +11,11 @@ use tantivy::schema::{IndexRecordOption, Value}; use tantivy::{Index, TantivyDocument, Term}; use tonic::{Request, Response, Status}; -use common::proto::KompAC::search::{ +use common::proto::komp_ac::search::{ search_response::Hit, SearchRequest, SearchResponse, }; -pub use common::proto::KompAC::search::searcher_server::SearcherServer; -use common::proto::KompAC::search::searcher_server::Searcher; +pub use common::proto::komp_ac::search::searcher_server::SearcherServer; +use common::proto::komp_ac::search::searcher_server::Searcher; use common::search::register_slovak_tokenizers; use sqlx::{PgPool, Row}; use tracing::info; diff --git a/server/src/auth/docs/first_reg.txt b/server/src/auth/docs/first_reg.txt index d1bba24..ed8c3b7 100644 --- a/server/src/auth/docs/first_reg.txt +++ b/server/src/auth/docs/first_reg.txt @@ -1,7 +1,7 @@ ❯ grpcurl -plaintext -d '{ "username": "testuser2", "email": "test2@example.com" -}' localhost:50051 KompAC.auth.AuthService/Register +}' localhost:50051 komp_ac.auth.AuthService/Register { "id": "5fa9bbce-85e0-4b06-8364-b561770c2fdd", "username": "testuser2", diff --git a/server/src/auth/docs/reg_log.txt b/server/src/auth/docs/reg_log.txt index 192fec2..81d7e16 100644 --- a/server/src/auth/docs/reg_log.txt +++ b/server/src/auth/docs/reg_log.txt @@ -3,7 +3,7 @@ "email": "test3@example.com", "password": "your_password", "password_confirmation": "your_password" -}' localhost:50051 KompAC.auth.AuthService/Register +}' localhost:50051 komp_ac.auth.AuthService/Register { "id": "96d2fd35-b39d-4c05-916a-66134453d34c", "username": "testuser3", @@ -12,14 +12,14 @@ } ❯ grpcurl -plaintext -d '{ "identifier": "testuser3" -}' localhost:50051 KompAC.auth.AuthService/Login +}' localhost:50051 komp_ac.auth.AuthService/Login ERROR: Code: Unauthenticated Message: Invalid credentials ❯ grpcurl -plaintext -d '{ "identifier": "testuser3", "password": "your_password" -}' localhost:50051 KompAC.auth.AuthService/Login +}' localhost:50051 komp_ac.auth.AuthService/Login { "accessToken": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiI5NmQyZmQzNS1iMzlkLTRjMDUtOTE2YS02NjEzNDQ1M2QzNGMiLCJleHAiOjE3NDI5ODE2MTAsInJvbGUiOiJhY2NvdW50YW50In0.78VIR3X4QZohzeI5x3xmkmqcICTusOC6PELPohMV-k8", "tokenType": "Bearer", @@ -30,7 +30,7 @@ ERROR: ❯ grpcurl -plaintext -d '{ "username": "testuser4", "email": "test4@example.com" -}' localhost:50051 KompAC.auth.AuthService/Register +}' localhost:50051 komp_ac.auth.AuthService/Register { "id": "413d7ecc-f231-48af-8c5a-566b1dc2bf0b", "username": "testuser4", @@ -39,7 +39,7 @@ ERROR: } ❯ grpcurl -plaintext -d '{ "identifier": "test4@example.com" -}' localhost:50051 KompAC.auth.AuthService/Login +}' localhost:50051 komp_ac.auth.AuthService/Login { "accessToken": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiI0MTNkN2VjYy1mMjMxLTQ4YWYtOGM1YS01NjZiMWRjMmJmMGIiLCJleHAiOjE3NDI5ODE3MDEsInJvbGUiOiJhY2NvdW50YW50In0.4Hzu3tTZRNGHnBSgeCbGy2tFTl8EzpPdXBhcW8kuIc8", "tokenType": "Bearer", @@ -47,5 +47,5 @@ ERROR: "userId": "413d7ecc-f231-48af-8c5a-566b1dc2bf0b", "role": "accountant" } -╭─    ~/Doc/pr/KompAC/server    auth ······ ✔ +╭─    ~/Doc/pr/komp_ac/server    auth ······ ✔ ╰─ diff --git a/server/src/auth/docs/role_added.txt b/server/src/auth/docs/role_added.txt index 3ce522f..13fefd7 100644 --- a/server/src/auth/docs/role_added.txt +++ b/server/src/auth/docs/role_added.txt @@ -3,7 +3,7 @@ "email": "default@example.com", "password": "password", "password_confirmation": "password" -}' localhost:50051 KompAC.auth.AuthService/Register +}' localhost:50051 komp_ac.auth.AuthService/Register { "id": "73017288-af41-49d8-b4cb-2ac2109b38a1", "username": "testuser_default_role", @@ -16,7 +16,7 @@ "password": "password", "password_confirmation": "password", "role": "admin" -}' localhost:50051 KompAC.auth.AuthService/Register +}' localhost:50051 komp_ac.auth.AuthService/Register { "id": "9437e318-818b-4c34-822d-c2d6601b835e", "username": "testuser_admin_role", @@ -29,9 +29,9 @@ "password": "password", "password_confirmation": "password", "role": "invalid_role_name" -}' localhost:50051 KompAC.auth.AuthService/Register +}' localhost:50051 komp_ac.auth.AuthService/Register ERROR: Code: InvalidArgument Message: Invalid role specified: 'invalid_role_name' -╭─    ~/Doc/pr/KompAC/server    main +3 !1  +╭─    ~/Doc/pr/komp_ac/server    main +3 !1  ╰─ diff --git a/server/src/auth/handlers/login.rs b/server/src/auth/handlers/login.rs index d3b2443..7e093ec 100644 --- a/server/src/auth/handlers/login.rs +++ b/server/src/auth/handlers/login.rs @@ -3,7 +3,7 @@ use bcrypt::verify; use tonic::{Response, Status}; use crate::db::PgPool; use crate::auth::logic::jwt; // Fixed import path -use common::proto::KompAC::auth::{LoginRequest, LoginResponse}; +use common::proto::komp_ac::auth::{LoginRequest, LoginResponse}; pub async fn login( pool: &PgPool, diff --git a/server/src/auth/handlers/register.rs b/server/src/auth/handlers/register.rs index 2566e0a..63b6190 100644 --- a/server/src/auth/handlers/register.rs +++ b/server/src/auth/handlers/register.rs @@ -1,7 +1,7 @@ // src/auth/handlers/register.rs use bcrypt::{hash, DEFAULT_COST}; use tonic::{Response, Status}; -use common::proto::KompAC::auth::{RegisterRequest, AuthResponse}; +use common::proto::komp_ac::auth::{RegisterRequest, AuthResponse}; use crate::db::PgPool; use crate::auth::models::AuthError; diff --git a/server/src/server/run.rs b/server/src/server/run.rs index 0b2d9d0..dcd79cb 100644 --- a/server/src/server/run.rs +++ b/server/src/server/run.rs @@ -4,7 +4,7 @@ use tonic_reflection::server::Builder as ReflectionBuilder; use tokio::sync::mpsc; use crate::indexer::{indexer_task, IndexCommand}; -use common::proto::KompAC::FILE_DESCRIPTOR_SET; +use common::proto::komp_ac::FILE_DESCRIPTOR_SET; use crate::server::services::{ TableStructureHandler, TableDefinitionService, @@ -12,7 +12,7 @@ use crate::server::services::{ TableScriptService, AuthServiceImpl }; -use common::proto::KompAC::{ +use common::proto::komp_ac::{ table_structure::table_structure_service_server::TableStructureServiceServer, table_definition::table_definition_server::TableDefinitionServer, tables_data::tables_data_server::TablesDataServer, diff --git a/server/src/server/services/auth_service.rs b/server/src/server/services/auth_service.rs index 66670ba..4a85e41 100644 --- a/server/src/server/services/auth_service.rs +++ b/server/src/server/services/auth_service.rs @@ -1,6 +1,6 @@ // src/server/services/auth_service.rs use tonic::{Request, Response, Status}; -use common::proto::KompAC::auth::{ +use common::proto::komp_ac::auth::{ auth_service_server::AuthService, RegisterRequest, AuthResponse, LoginRequest, LoginResponse diff --git a/server/src/server/services/table_definition_service.rs b/server/src/server/services/table_definition_service.rs index 22e2ff2..5d4aa8c 100644 --- a/server/src/server/services/table_definition_service.rs +++ b/server/src/server/services/table_definition_service.rs @@ -1,6 +1,6 @@ // src/server/services/table_definition_service.rs use tonic::{Request, Response, Status}; -use common::proto::KompAC::{ +use common::proto::komp_ac::{ common::Empty, table_definition::{ table_definition_server::TableDefinition, diff --git a/server/src/server/services/table_script_service.rs b/server/src/server/services/table_script_service.rs index d5e0d69..0a66666 100644 --- a/server/src/server/services/table_script_service.rs +++ b/server/src/server/services/table_script_service.rs @@ -1,6 +1,6 @@ // src/server/services/table_script_service.rs use tonic::{Request, Response, Status}; -use common::proto::KompAC::table_script::{ +use common::proto::komp_ac::table_script::{ table_script_server::TableScript, PostTableScriptRequest, TableScriptResponse }; diff --git a/server/src/server/services/table_structure_service.rs b/server/src/server/services/table_structure_service.rs index db80cd5..e47e672 100644 --- a/server/src/server/services/table_structure_service.rs +++ b/server/src/server/services/table_structure_service.rs @@ -1,8 +1,8 @@ // src/server/services/table_structure_service.rs use tonic::{Request, Response, Status}; // Correct the import path for the TableStructureService trait -use common::proto::KompAC::table_structure::table_structure_service_server::TableStructureService; -use common::proto::KompAC::table_structure::{ +use common::proto::komp_ac::table_structure::table_structure_service_server::TableStructureService; +use common::proto::komp_ac::table_structure::{ GetTableStructureRequest, TableStructureResponse, }; diff --git a/server/src/server/services/tables_data_service.rs b/server/src/server/services/tables_data_service.rs index 37ff2c1..a8b3340 100644 --- a/server/src/server/services/tables_data_service.rs +++ b/server/src/server/services/tables_data_service.rs @@ -5,9 +5,9 @@ use tonic::{Request, Response, Status}; use tokio::sync::mpsc; use crate::indexer::IndexCommand; -use common::proto::KompAC::tables_data::tables_data_server::TablesData; -use common::proto::KompAC::common::CountResponse; -use common::proto::KompAC::tables_data::{ +use common::proto::komp_ac::tables_data::tables_data_server::TablesData; +use common::proto::komp_ac::common::CountResponse; +use common::proto::komp_ac::tables_data::{ PostTableDataRequest, PostTableDataResponse, PutTableDataRequest, PutTableDataResponse, DeleteTableDataRequest, DeleteTableDataResponse, diff --git a/server/src/steel/docs/pushing_using_steel.txt b/server/src/steel/docs/pushing_using_steel.txt index 9a8f7ad..65e5b60 100644 --- a/server/src/steel/docs/pushing_using_steel.txt +++ b/server/src/steel/docs/pushing_using_steel.txt @@ -3,7 +3,7 @@ "target_column": "idea_name", "script": "(begin (define idea_name \"aaa\") idea_name)", "description": "Set idea_name to Awesome Idea" -}' localhost:50051 KompAC.table_script.TableScript/PostTableScript +}' localhost:50051 komp_ac.table_script.TableScript/PostTableScript { "id": "7" } @@ -17,7 +17,7 @@ "is_feasible": "true", "last_updated": "2025-03-11T12:34:56Z" } -}' localhost:50051 KompAC.tables_data.TablesData/PostTableData +}' localhost:50051 komp_ac.tables_data.TablesData/PostTableData ERROR: Code: InvalidArgument Message: Validation failed for 'idea_name'. Expected: 'aaa', Received: 'sdfsfs' @@ -31,7 +31,7 @@ ERROR: "is_feasible": "true", "last_updated": "2025-03-11T12:34:56Z" } -}' localhost:50051 KompAC.tables_data.TablesData/PostTableData +}' localhost:50051 komp_ac.tables_data.TablesData/PostTableData { "success": true, "message": "Data inserted successfully", diff --git a/server/src/steel/docs/script_refering_different_table.txt b/server/src/steel/docs/script_refering_different_table.txt index 2ef5109..5dd161d 100644 --- a/server/src/steel/docs/script_refering_different_table.txt +++ b/server/src/steel/docs/script_refering_different_table.txt @@ -6,7 +6,7 @@ Creation of the tables: {"name": "yearly_goal", "field_type": "text"} ], "profile_name": "finance" -}' localhost:50051 KompAC.table_definition.TableDefinition/PostTableDefinition +}' localhost:50051 komp_ac.table_definition.TableDefinition/PostTableDefinition { "success": true, "sql": "CREATE TABLE \"2025_department\" (\n id BIGSERIAL PRIMARY KEY,\n deleted BOOLEAN NOT NULL DEFAULT FALSE,\n \"yearly_goal\" TEXT,\n created_at TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP\n)\n" @@ -22,7 +22,7 @@ Creation of the tables: "links": [ {"linked_table_name": "2025_department", "required": true} ] -}' localhost:50051 KompAC.table_definition.TableDefinition/PostTableDefinition +}' localhost:50051 komp_ac.table_definition.TableDefinition/PostTableDefinition { "success": true, "sql": "CREATE TABLE \"2025_project\" (\n id BIGSERIAL PRIMARY KEY,\n deleted BOOLEAN NOT NULL DEFAULT FALSE,\n \"department_id\" BIGINT NOT NULL REFERENCES \"2025_department\"(id),\n \"name\" TEXT,\n \"budget_estimate\" TEXT,\n created_at TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP\n)\nCREATE INDEX idx_2025_project_department_fk ON \"2025_project\" (\"department_id\")\nCREATE INDEX idx_2025_project_name ON \"2025_project\" (\"name\")" diff --git a/server/src/table_definition/docs/delete_tables.txt b/server/src/table_definition/docs/delete_tables.txt index e1ce98d..e7c8ce0 100644 --- a/server/src/table_definition/docs/delete_tables.txt +++ b/server/src/table_definition/docs/delete_tables.txt @@ -15,7 +15,7 @@ "indexes": ["company_name", "is_active"], "profile_name": "default", "linked_table_name": "" -}' localhost:50051 KompAC.table_definition.TableDefinition/PostTableDefinition +}' localhost:50051 komp_ac.table_definition.TableDefinition/PostTableDefinition ERROR: Code: NotFound Message: Linked table not found in profile @@ -35,12 +35,12 @@ ERROR: ], "indexes": ["company_name", "is_active"], "profile_name": "default" -}' localhost:50051 KompAC.table_definition.TableDefinition/PostTableDefinition +}' localhost:50051 komp_ac.table_definition.TableDefinition/PostTableDefinition { "success": true, "sql": "CREATE TABLE \"2025_company_data1\" (\n id BIGSERIAL PRIMARY KEY,\n deleted BOOLEAN NOT NULL DEFAULT FALSE,\n firma TEXT NOT NULL,\n \"company_name\" TEXT,\n \"textfield\" TEXT,\n \"textfield2\" TEXT,\n \"textfield3\" TEXT,\n \"headquarters_psc\" TEXT,\n \"contact_phone\" VARCHAR(15),\n \"office_address\" TEXT,\n \"support_email\" VARCHAR(255),\n \"is_active\" BOOLEAN,\n \"last_updated\" TIMESTAMPTZ,\n created_at TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP\n)\nCREATE INDEX idx_2025_company_data1_firma ON \"2025_company_data1\" (firma)\nCREATE INDEX idx_2025_company_data1_company_name ON \"2025_company_data1\" (\"company_name\")\nCREATE INDEX idx_2025_company_data1_is_active ON \"2025_company_data1\" (\"is_active\")" } -❯ grpcurl -plaintext -d '{}' localhost:50051 KompAC.table_definition.TableDefinition/GetProfileTree +❯ grpcurl -plaintext -d '{}' localhost:50051 komp_ac.table_definition.TableDefinition/GetProfileTree { "profiles": [ { @@ -56,12 +56,12 @@ ERROR: ❯ grpcurl -plaintext -d '{ "profile_name": "default", "table_name": "2025_company_data1" -}' localhost:50051 KompAC.table_definition.TableDefinition/DeleteTable +}' localhost:50051 komp_ac.table_definition.TableDefinition/DeleteTable { "success": true, "message": "Table '2025_company_data1' and its definition were successfully removed" } -❯ grpcurl -plaintext -d '{}' localhost:50051 KompAC.table_definition.TableDefinition/GetProfileTree +❯ grpcurl -plaintext -d '{}' localhost:50051 komp_ac.table_definition.TableDefinition/GetProfileTree {} -╭─    ~/Doc/pr/KompAC/server    main ⇡1 ········· ✔ +╭─    ~/Doc/pr/komp_ac/server    main ⇡1 ········· ✔ ╰─ diff --git a/server/src/table_definition/docs/eg.txt b/server/src/table_definition/docs/eg.txt index 443140f..eaad786 100644 --- a/server/src/table_definition/docs/eg.txt +++ b/server/src/table_definition/docs/eg.txt @@ -1,4 +1,4 @@ -❯ grpcurl -plaintext -d '{}' localhost:50051 KompAC.table_definition.TableDefinition/GetProfileTree +❯ grpcurl -plaintext -d '{}' localhost:50051 komp_ac.table_definition.TableDefinition/GetProfileTree { "profiles": [ { @@ -80,12 +80,12 @@ "indexes": ["column1", "columnd"], "profile_name": "new_profile", "linked_table_name": "2025_multi_dependent_table3" -}' localhost:50051 KompAC.table_definition.TableDefinition/PostTableDefinition +}' localhost:50051 komp_ac.table_definition.TableDefinition/PostTableDefinition { "success": true, "sql": "CREATE TABLE \"2025_multi_dependent_table5\" (\n id BIGSERIAL PRIMARY KEY,\n deleted BOOLEAN NOT NULL DEFAULT FALSE,\n firma TEXT NOT NULL,\n \"multi_dependent_table3_id\" BIGINT NOT NULL REFERENCES \"2025_multi_dependent_table3\"(id),\n \"2025_column1\" TEXT,\n \"2025_columnx\" TEXT,\n \"2025_columny\" TEXT,\n \"2025_columnz\" TEXT,\n \"2025_columna\" TEXT,\n \"2025_columnb\" TEXT,\n \"2025_columnc\" TEXT,\n \"2025_columnd\" TEXT,\n \"2025_column2\" INTEGER,\n created_at TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP\n)\nCREATE INDEX idx_2025_multi_dependent_table5_firma ON \"2025_multi_dependent_table5\" (firma)\nCREATE INDEX idx_2025_multi_dependent_table5_multi_dependent_table3_id ON \"2025_multi_dependent_table5\" (\"multi_dependent_table3_id\")\nCREATE INDEX idx_2025_multi_dependent_table5_2025_column1 ON \"2025_multi_dependent_table5\" (\"2025_column1\")\nCREATE INDEX idx_2025_multi_dependent_table5_2025_columnd ON \"2025_multi_dependent_table5\" (\"2025_columnd\")" } -❯ grpcurl -plaintext -d '{}' localhost:50051 KompAC.table_definition.TableDefinition/GetProfileTree +❯ grpcurl -plaintext -d '{}' localhost:50051 komp_ac.table_definition.TableDefinition/GetProfileTree { "profiles": [ { diff --git a/server/src/table_definition/docs/push_new_table.txt b/server/src/table_definition/docs/push_new_table.txt index 21d80e7..97c2127 100644 --- a/server/src/table_definition/docs/push_new_table.txt +++ b/server/src/table_definition/docs/push_new_table.txt @@ -1,4 +1,4 @@ -❯ grpcurl -plaintext -d '{}' localhost:50051 KompAC.table_definition.TableDefinition/GetProfileTree +❯ grpcurl -plaintext -d '{}' localhost:50051 komp_ac.table_definition.TableDefinition/GetProfileTree { "profiles": [ { @@ -44,12 +44,12 @@ ], "indexes": ["firma", "mesto"], "profile_name": "default" -}' localhost:50051 KompAC.table_definition.TableDefinition/PostTableDefinition +}' localhost:50051 komp_ac.table_definition.TableDefinition/PostTableDefinition { "success": true, "sql": "CREATE TABLE \"2025_adresar6\" (\n id BIGSERIAL PRIMARY KEY,\n deleted BOOLEAN NOT NULL DEFAULT FALSE,\n \"firma\" TEXT,\n \"kz\" TEXT,\n \"drc\" TEXT,\n \"ulica\" TEXT,\n \"psc\" TEXT,\n \"mesto\" TEXT,\n \"stat\" TEXT,\n \"banka\" TEXT,\n \"ucet\" TEXT,\n \"skladm\" TEXT,\n \"ico\" TEXT,\n \"kontakt\" TEXT,\n \"telefon\" VARCHAR(15),\n \"skladu\" TEXT,\n \"fax\" TEXT,\n created_at TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP\n)\nCREATE INDEX idx_2025_adresar6_firma ON \"2025_adresar6\" (\"firma\")\nCREATE INDEX idx_2025_adresar6_mesto ON \"2025_adresar6\" (\"mesto\")" } -❯ grpcurl -plaintext -d '{}' localhost:50051 KompAC.table_definition.TableDefinition/GetProfileTree +❯ grpcurl -plaintext -d '{}' localhost:50051 komp_ac.table_definition.TableDefinition/GetProfileTree { "profiles": [ { @@ -154,4 +154,4 @@ grpcurl -plaintext -d '{ {"linked_table_name": "2025_shipping_provider", "required": false}, {"linked_table_name": "2025_ecom_product", "required": false} ] -}' localhost:50051 KompAC.table_definition.TableDefinition/PostTableDefinition +}' localhost:50051 komp_ac.table_definition.TableDefinition/PostTableDefinition diff --git a/server/src/table_definition/handlers/delete_table.rs b/server/src/table_definition/handlers/delete_table.rs index dca708d..ca9caac 100644 --- a/server/src/table_definition/handlers/delete_table.rs +++ b/server/src/table_definition/handlers/delete_table.rs @@ -1,7 +1,7 @@ // src/table_definition/handlers/delete_table.rs use tonic::Status; use sqlx::PgPool; -use common::proto::KompAC::table_definition::{DeleteTableRequest, DeleteTableResponse}; +use common::proto::komp_ac::table_definition::{DeleteTableRequest, DeleteTableResponse}; pub async fn delete_table( db_pool: &PgPool, diff --git a/server/src/table_definition/handlers/get_profile_tree.rs b/server/src/table_definition/handlers/get_profile_tree.rs index 33d8f19..21975e8 100644 --- a/server/src/table_definition/handlers/get_profile_tree.rs +++ b/server/src/table_definition/handlers/get_profile_tree.rs @@ -1,7 +1,7 @@ // src/table_definition/handlers/get_profile_tree.rs use tonic::{Request, Response, Status}; use sqlx::PgPool; -use common::proto::KompAC::{ +use common::proto::komp_ac::{ common::Empty, table_definition::{ ProfileTreeResponse, diff --git a/server/src/table_definition/handlers/post_table_definition.rs b/server/src/table_definition/handlers/post_table_definition.rs index 855246f..dd0b936 100644 --- a/server/src/table_definition/handlers/post_table_definition.rs +++ b/server/src/table_definition/handlers/post_table_definition.rs @@ -3,7 +3,7 @@ use tonic::Status; use sqlx::{PgPool, Transaction, Postgres}; use serde_json::json; -use common::proto::KompAC::table_definition::{PostTableDefinitionRequest, TableDefinitionResponse}; +use common::proto::komp_ac::table_definition::{PostTableDefinitionRequest, TableDefinitionResponse}; const PREDEFINED_FIELD_TYPES: &[(&str, &str)] = &[ ("text", "TEXT"), diff --git a/server/src/table_script/docs/push_script_to_db.txt b/server/src/table_script/docs/push_script_to_db.txt index d28b776..d3bb5ff 100644 --- a/server/src/table_script/docs/push_script_to_db.txt +++ b/server/src/table_script/docs/push_script_to_db.txt @@ -4,7 +4,7 @@ This is how we can push script into the database, now its stored after a push in "target_column": "fax", "script": "(set! fax telefon)", "description": "Copy telefon value to fax column" -}' localhost:50051 KompAC.table_script.TableScript/PostTableScript +}' localhost:50051 komp_ac.table_script.TableScript/PostTableScript { "id": "2" } diff --git a/server/src/table_script/handlers/post_table_script.rs b/server/src/table_script/handlers/post_table_script.rs index 94629d1..c95818b 100644 --- a/server/src/table_script/handlers/post_table_script.rs +++ b/server/src/table_script/handlers/post_table_script.rs @@ -3,7 +3,7 @@ use tonic::Status; use sqlx::{PgPool, Error as SqlxError}; -use common::proto::KompAC::table_script::{PostTableScriptRequest, TableScriptResponse}; +use common::proto::komp_ac::table_script::{PostTableScriptRequest, TableScriptResponse}; use serde_json::Value; use steel_decimal::SteelDecimal; use regex::Regex; diff --git a/server/src/table_structure/docs/response.txt b/server/src/table_structure/docs/response.txt index 67190b9..0aa4304 100644 --- a/server/src/table_structure/docs/response.txt +++ b/server/src/table_structure/docs/response.txt @@ -4,7 +4,7 @@ grpcurl -plaintext \ "table_name": "2025_customer" }' \ localhost:50051 \ - KompAC.table_structure.TableStructureService/GetTableStructure + komp_ac.table_structure.TableStructureService/GetTableStructure { "columns": [ { diff --git a/server/src/table_structure/handlers/table_structure.rs b/server/src/table_structure/handlers/table_structure.rs index 8f6172e..afedfa6 100644 --- a/server/src/table_structure/handlers/table_structure.rs +++ b/server/src/table_structure/handlers/table_structure.rs @@ -1,5 +1,5 @@ // src/table_structure/handlers/table_structure.rs -use common::proto::KompAC::table_structure::{ +use common::proto::komp_ac::table_structure::{ GetTableStructureRequest, TableColumn, TableStructureResponse, }; use sqlx::PgPool; diff --git a/server/src/tables_data/docs/get_by_position.txt b/server/src/tables_data/docs/get_by_position.txt index 560e72c..614d8c0 100644 --- a/server/src/tables_data/docs/get_by_position.txt +++ b/server/src/tables_data/docs/get_by_position.txt @@ -2,7 +2,7 @@ grpcurl -plaintext -d '{ "profile_name": "default", "table_name": "2025_adresar", "position": 1 -}' localhost:50051 KompAC.tables_data.TablesData/GetTableDataByPosition +}' localhost:50051 komp_ac.tables_data.TablesData/GetTableDataByPosition { "data": { "banka": "New Banka", diff --git a/server/src/tables_data/docs/get_data.txt b/server/src/tables_data/docs/get_data.txt index b4f43a2..f051320 100644 --- a/server/src/tables_data/docs/get_data.txt +++ b/server/src/tables_data/docs/get_data.txt @@ -1,6 +1,6 @@ Valid get request: -grpcurl -plaintext -d '{"profile_name": "default", "table_name": "2025_adresar", "id": 2}' localhost:50051 KompAC.tables_data.TablesData/GetTableData +grpcurl -plaintext -d '{"profile_name": "default", "table_name": "2025_adresar", "id": 2}' localhost:50051 komp_ac.tables_data.TablesData/GetTableData { "data": { @@ -26,7 +26,7 @@ grpcurl -plaintext -d '{"profile_name": "default", "table_name": "2025_adresar", Request of a deleted data: -grpcurl -plaintext -d '{"profile_name": "default", "table_name": "2025_adresar", "id": 1}' localhost:50051 KompAC.tables_data.TablesData/GetTableData +grpcurl -plaintext -d '{"profile_name": "default", "table_name": "2025_adresar", "id": 1}' localhost:50051 komp_ac.tables_data.TablesData/GetTableData ERROR: Code: NotFound diff --git a/server/src/tables_data/docs/get_data_count.txt b/server/src/tables_data/docs/get_data_count.txt index 431f522..cf201a4 100644 --- a/server/src/tables_data/docs/get_data_count.txt +++ b/server/src/tables_data/docs/get_data_count.txt @@ -1,4 +1,4 @@ -grpcurl -plaintext -d '{"profile_name": "default", "table_name": "2025_adresar"}' localhost:50051 KompAC.tables_data.TablesData/GetTableDataCount +grpcurl -plaintext -d '{"profile_name": "default", "table_name": "2025_adresar"}' localhost:50051 komp_ac.tables_data.TablesData/GetTableDataCount { "count": "1" diff --git a/server/src/tables_data/docs/post_data.txt b/server/src/tables_data/docs/post_data.txt index c154e6f..ceee743 100644 --- a/server/src/tables_data/docs/post_data.txt +++ b/server/src/tables_data/docs/post_data.txt @@ -1,4 +1,4 @@ -❯ grpcurl -plaintext -d '{}' localhost:50051 KompAC.table_definition.TableDefinition/GetProfileTree +❯ grpcurl -plaintext -d '{}' localhost:50051 komp_ac.table_definition.TableDefinition/GetProfileTree { "profiles": [ { @@ -26,7 +26,7 @@ "support_email": "support@acmecorp.com", "is_active": "true" } -}' localhost:50051 KompAC.tables_data.TablesData/PostTableData +}' localhost:50051 komp_ac.tables_data.TablesData/PostTableData { "success": true, "message": "Data inserted successfully", diff --git a/server/src/tables_data/docs/put_data.txt b/server/src/tables_data/docs/put_data.txt index 46e466f..5b04876 100644 --- a/server/src/tables_data/docs/put_data.txt +++ b/server/src/tables_data/docs/put_data.txt @@ -14,7 +14,7 @@ "support_email": "updated-support@acmecorp.com", "is_active": "false" } -}' localhost:50051 KompAC.tables_data.TablesData/PutTableData +}' localhost:50051 komp_ac.tables_data.TablesData/PutTableData { "success": true, "message": "Data updated successfully", @@ -28,7 +28,7 @@ "firma": "1", "is_active": "true" } -}' localhost:50051 KompAC.tables_data.TablesData/PutTableData +}' localhost:50051 komp_ac.tables_data.TablesData/PutTableData { "success": true, "message": "Data updated successfully", diff --git a/server/src/tables_data/handlers/delete_table_data.rs b/server/src/tables_data/handlers/delete_table_data.rs index 81bdbb8..9d0ccac 100644 --- a/server/src/tables_data/handlers/delete_table_data.rs +++ b/server/src/tables_data/handlers/delete_table_data.rs @@ -1,7 +1,7 @@ // src/tables_data/handlers/delete_table_data.rs use tonic::Status; use sqlx::PgPool; -use common::proto::KompAC::tables_data::{DeleteTableDataRequest, DeleteTableDataResponse}; +use common::proto::komp_ac::tables_data::{DeleteTableDataRequest, DeleteTableDataResponse}; use crate::shared::schema_qualifier::qualify_table_name_for_data; // Import schema qualifier pub async fn delete_table_data( diff --git a/server/src/tables_data/handlers/get_table_data.rs b/server/src/tables_data/handlers/get_table_data.rs index ad33a80..d44eab0 100644 --- a/server/src/tables_data/handlers/get_table_data.rs +++ b/server/src/tables_data/handlers/get_table_data.rs @@ -3,7 +3,7 @@ use tonic::Status; use sqlx::{PgPool, Row}; use std::collections::HashMap; -use common::proto::KompAC::tables_data::{GetTableDataRequest, GetTableDataResponse}; +use common::proto::komp_ac::tables_data::{GetTableDataRequest, GetTableDataResponse}; use crate::shared::schema_qualifier::qualify_table_name_for_data; pub async fn get_table_data( diff --git a/server/src/tables_data/handlers/get_table_data_by_position.rs b/server/src/tables_data/handlers/get_table_data_by_position.rs index 0cc184c..d0caf9f 100644 --- a/server/src/tables_data/handlers/get_table_data_by_position.rs +++ b/server/src/tables_data/handlers/get_table_data_by_position.rs @@ -1,7 +1,7 @@ // src/tables_data/handlers/get_table_data_by_position.rs use tonic::Status; use sqlx::PgPool; -use common::proto::KompAC::tables_data::{ +use common::proto::komp_ac::tables_data::{ GetTableDataByPositionRequest, GetTableDataRequest, GetTableDataResponse }; use super::get_table_data; diff --git a/server/src/tables_data/handlers/get_table_data_count.rs b/server/src/tables_data/handlers/get_table_data_count.rs index 567ae90..a765d34 100644 --- a/server/src/tables_data/handlers/get_table_data_count.rs +++ b/server/src/tables_data/handlers/get_table_data_count.rs @@ -1,8 +1,8 @@ // src/tables_data/handlers/get_table_data_count.rs use tonic::Status; use sqlx::PgPool; -use common::proto::KompAC::common::CountResponse; -use common::proto::KompAC::tables_data::GetTableDataCountRequest; +use common::proto::komp_ac::common::CountResponse; +use common::proto::komp_ac::tables_data::GetTableDataCountRequest; use crate::shared::schema_qualifier::qualify_table_name_for_data; // 1. IMPORT THE FUNCTION pub async fn get_table_data_count( diff --git a/server/src/tables_data/handlers/post_table_data.rs b/server/src/tables_data/handlers/post_table_data.rs index 3f734a4..9a24894 100644 --- a/server/src/tables_data/handlers/post_table_data.rs +++ b/server/src/tables_data/handlers/post_table_data.rs @@ -4,7 +4,7 @@ use tonic::Status; use sqlx::{PgPool, Arguments}; use sqlx::postgres::PgArguments; use chrono::{DateTime, Utc}; -use common::proto::KompAC::tables_data::{PostTableDataRequest, PostTableDataResponse}; +use common::proto::komp_ac::tables_data::{PostTableDataRequest, PostTableDataResponse}; use std::collections::HashMap; use std::sync::Arc; use prost_types::value::Kind; diff --git a/server/src/tables_data/handlers/put_table_data.rs b/server/src/tables_data/handlers/put_table_data.rs index a27f981..e6558a0 100644 --- a/server/src/tables_data/handlers/put_table_data.rs +++ b/server/src/tables_data/handlers/put_table_data.rs @@ -4,12 +4,13 @@ use tonic::Status; use sqlx::{PgPool, Arguments, Row}; use sqlx::postgres::PgArguments; use chrono::{DateTime, Utc}; -use common::proto::KompAC::tables_data::{PutTableDataRequest, PutTableDataResponse}; +use common::proto::komp_ac::tables_data::{PutTableDataRequest, PutTableDataResponse}; use std::sync::Arc; use prost_types::value::Kind; use rust_decimal::Decimal; use std::str::FromStr; +use std::collections::HashMap; use crate::steel::server::execution::{self, Value}; use crate::indexer::{IndexCommand, IndexCommandData}; diff --git a/server/tests/table_definition/post_table_definition_test.rs b/server/tests/table_definition/post_table_definition_test.rs index 9eb6b26..5fa8cb3 100644 --- a/server/tests/table_definition/post_table_definition_test.rs +++ b/server/tests/table_definition/post_table_definition_test.rs @@ -1,7 +1,7 @@ // tests/table_definition/post_table_definition_test.rs // Keep all your normal use statements -use common::proto::KompAC::table_definition::{ +use common::proto::komp_ac::table_definition::{ ColumnDefinition, PostTableDefinitionRequest, TableLink, }; use rstest::{fixture, rstest}; diff --git a/server/tests/table_script/comprehensive_error_scenarios_tests.rs b/server/tests/table_script/comprehensive_error_scenarios_tests.rs index d346603..1fbe764 100644 --- a/server/tests/table_script/comprehensive_error_scenarios_tests.rs +++ b/server/tests/table_script/comprehensive_error_scenarios_tests.rs @@ -2,7 +2,7 @@ use crate::common::setup_isolated_db; use server::table_script::handlers::post_table_script::post_table_script; // Fixed import -use common::proto::KompAC::table_script::PostTableScriptRequest; +use common::proto::komp_ac::table_script::PostTableScriptRequest; use rstest::*; use serde_json::json; use sqlx::PgPool; diff --git a/server/tests/table_script/mathematical_operations_tests.rs b/server/tests/table_script/mathematical_operations_tests.rs index 36e0418..cc0b610 100644 --- a/server/tests/table_script/mathematical_operations_tests.rs +++ b/server/tests/table_script/mathematical_operations_tests.rs @@ -2,7 +2,7 @@ use crate::common::setup_isolated_db; use server::table_script::handlers::post_table_script::post_table_script; // Fixed import -use common::proto::KompAC::table_script::PostTableScriptRequest; +use common::proto::komp_ac::table_script::PostTableScriptRequest; use rstest::*; use serde_json::json; use sqlx::PgPool; diff --git a/server/tests/table_script/post_scripts_integration_tests.rs b/server/tests/table_script/post_scripts_integration_tests.rs index b987ced..5fb6500 100644 --- a/server/tests/table_script/post_scripts_integration_tests.rs +++ b/server/tests/table_script/post_scripts_integration_tests.rs @@ -2,7 +2,7 @@ use crate::common::setup_isolated_db; use server::table_script::handlers::post_table_script::post_table_script; -use common::proto::KompAC::table_script::{PostTableScriptRequest, TableScriptResponse}; +use common::proto::komp_ac::table_script::{PostTableScriptRequest, TableScriptResponse}; use serde_json::json; use sqlx::PgPool; diff --git a/server/tests/table_script/prohibited_types_test.rs b/server/tests/table_script/prohibited_types_test.rs index 52f006b..9808825 100644 --- a/server/tests/table_script/prohibited_types_test.rs +++ b/server/tests/table_script/prohibited_types_test.rs @@ -2,7 +2,7 @@ use crate::common::setup_isolated_db; use server::table_script::handlers::post_table_script::post_table_script; -use common::proto::KompAC::table_script::PostTableScriptRequest; +use common::proto::komp_ac::table_script::PostTableScriptRequest; use serde_json::json; use sqlx::PgPool; diff --git a/server/tests/table_script/type_safety_comprehensive_tests.rs b/server/tests/table_script/type_safety_comprehensive_tests.rs index 2aa2bbf..58b9e12 100644 --- a/server/tests/table_script/type_safety_comprehensive_tests.rs +++ b/server/tests/table_script/type_safety_comprehensive_tests.rs @@ -2,7 +2,7 @@ use crate::common::setup_isolated_db; use server::table_script::handlers::post_table_script::post_table_script; -use common::proto::KompAC::table_script::PostTableScriptRequest; +use common::proto::komp_ac::table_script::PostTableScriptRequest; use rstest::*; use serde_json::json; use sqlx::PgPool; diff --git a/server/tests/tables_data/delete/delete_table_data_test.rs b/server/tests/tables_data/delete/delete_table_data_test.rs index b743cfc..4e0e86b 100644 --- a/server/tests/tables_data/delete/delete_table_data_test.rs +++ b/server/tests/tables_data/delete/delete_table_data_test.rs @@ -13,10 +13,10 @@ use rand::Rng; use rand::distr::Alphanumeric; // Corrected import // Common imports from other modules -use common::proto::KompAC::table_definition::{ +use common::proto::komp_ac::table_definition::{ PostTableDefinitionRequest, ColumnDefinition as TableColumnDefinition, TableLink, }; -use common::proto::KompAC::tables_data::{ +use common::proto::komp_ac::tables_data::{ DeleteTableDataRequest, DeleteTableDataResponse, PostTableDataRequest, PutTableDataRequest, }; use server::indexer::IndexCommand; diff --git a/server/tests/tables_data/get/get_table_data_by_position_test.rs b/server/tests/tables_data/get/get_table_data_by_position_test.rs index d887f10..15494f7 100644 --- a/server/tests/tables_data/get/get_table_data_by_position_test.rs +++ b/server/tests/tables_data/get/get_table_data_by_position_test.rs @@ -2,8 +2,8 @@ use rstest::{fixture, rstest}; use tonic; use sqlx::PgPool; -use common::proto::KompAC::tables_data::GetTableDataByPositionRequest; -use common::proto::KompAC::table_definition::{PostTableDefinitionRequest, ColumnDefinition}; +use common::proto::komp_ac::tables_data::GetTableDataByPositionRequest; +use common::proto::komp_ac::table_definition::{PostTableDefinitionRequest, ColumnDefinition}; use server::table_definition::handlers::post_table_definition; use server::tables_data::handlers::get_table_data_by_position; use crate::common::setup_test_db; diff --git a/server/tests/tables_data/get/get_table_data_count_test.rs b/server/tests/tables_data/get/get_table_data_count_test.rs index 494b997..2fc1587 100644 --- a/server/tests/tables_data/get/get_table_data_count_test.rs +++ b/server/tests/tables_data/get/get_table_data_count_test.rs @@ -2,9 +2,9 @@ use rstest::{fixture, rstest}; use tonic; use sqlx::PgPool; -use common::proto::KompAC::tables_data::GetTableDataCountRequest; -use common::proto::KompAC::table_definition::{PostTableDefinitionRequest, ColumnDefinition}; -use common::proto::KompAC::table_definition::TableLink; +use common::proto::komp_ac::tables_data::GetTableDataCountRequest; +use common::proto::komp_ac::table_definition::{PostTableDefinitionRequest, ColumnDefinition}; +use common::proto::komp_ac::table_definition::TableLink; use server::tables_data::handlers::get_table_data_count; use server::table_definition::handlers::post_table_definition; use crate::common::setup_test_db; diff --git a/server/tests/tables_data/get/get_table_data_test.rs b/server/tests/tables_data/get/get_table_data_test.rs index 83a0476..5efb640 100644 --- a/server/tests/tables_data/get/get_table_data_test.rs +++ b/server/tests/tables_data/get/get_table_data_test.rs @@ -1,7 +1,7 @@ // tests/tables_data/handlers/get_table_data_test.rs use rstest::{fixture, rstest}; use server::tables_data::handlers::get_table_data; -use common::proto::KompAC::tables_data::GetTableDataRequest; +use common::proto::komp_ac::tables_data::GetTableDataRequest; use crate::common::setup_test_db; use sqlx::{PgPool, Row}; use tonic; @@ -15,10 +15,10 @@ use rust_decimal::Decimal; use rust_decimal_macros::dec; use server::table_definition::handlers::post_table_definition; use server::tables_data::handlers::post_table_data; -use common::proto::KompAC::table_definition::{ +use common::proto::komp_ac::table_definition::{ PostTableDefinitionRequest, ColumnDefinition as TableColumnDefinition, TableLink }; -use common::proto::KompAC::tables_data::PostTableDataRequest; +use common::proto::komp_ac::tables_data::PostTableDataRequest; use prost_types::Value; use prost_types::value::Kind; use tokio::sync::mpsc; diff --git a/server/tests/tables_data/post/post_table_data_steel_decimal_test.rs b/server/tests/tables_data/post/post_table_data_steel_decimal_test.rs index d0d85de..39914a8 100644 --- a/server/tests/tables_data/post/post_table_data_steel_decimal_test.rs +++ b/server/tests/tables_data/post/post_table_data_steel_decimal_test.rs @@ -1,7 +1,7 @@ // tests/tables_data/post/post_table_data_steel_decimal_test.rs use sqlx::PgPool; -use common::proto::KompAC::{ +use common::proto::komp_ac::{ table_definition::{PostTableDefinitionRequest, ColumnDefinition}, table_script::PostTableScriptRequest, tables_data::PostTableDataRequest, diff --git a/server/tests/tables_data/post/post_table_data_test.rs b/server/tests/tables_data/post/post_table_data_test.rs index 27b3d18..e8ef37d 100644 --- a/server/tests/tables_data/post/post_table_data_test.rs +++ b/server/tests/tables_data/post/post_table_data_test.rs @@ -4,9 +4,9 @@ use sqlx::PgPool; use std::collections::HashMap; use prost_types::Value; use prost_types::value::Kind; -use common::proto::KompAC::tables_data::{PostTableDataRequest, PostTableDataResponse}; -use common::proto::KompAC::table_definition::TableLink; -use common::proto::KompAC::table_definition::{ +use common::proto::komp_ac::tables_data::{PostTableDataRequest, PostTableDataResponse}; +use common::proto::komp_ac::table_definition::TableLink; +use common::proto::komp_ac::table_definition::{ PostTableDefinitionRequest, ColumnDefinition as TableColumnDefinition }; use server::tables_data::handlers::post_table_data; diff --git a/server/tests/tables_data/put/put_table_data_steel_decimal_test.rs b/server/tests/tables_data/put/put_table_data_steel_decimal_test.rs index 7b26654..87f814e 100644 --- a/server/tests/tables_data/put/put_table_data_steel_decimal_test.rs +++ b/server/tests/tables_data/put/put_table_data_steel_decimal_test.rs @@ -1,7 +1,7 @@ // tests/tables_data/put/put_table_data_steel_decimal_test.rs use sqlx::PgPool; -use common::proto::KompAC::{ +use common::proto::komp_ac::{ table_definition::{PostTableDefinitionRequest, ColumnDefinition}, table_script::PostTableScriptRequest, tables_data::{PostTableDataRequest, PutTableDataRequest}, diff --git a/server/tests/tables_data/put/put_table_data_test.rs b/server/tests/tables_data/put/put_table_data_test.rs index 1043268..0419b22 100644 --- a/server/tests/tables_data/put/put_table_data_test.rs +++ b/server/tests/tables_data/put/put_table_data_test.rs @@ -4,10 +4,10 @@ use rstest::{fixture, rstest}; use sqlx::{PgPool, Row}; use std::collections::HashMap; use prost_types::{value::Kind, Value}; -use common::proto::KompAC::table_definition::{ +use common::proto::komp_ac::table_definition::{ PostTableDefinitionRequest, ColumnDefinition as TableColumnDefinition, TableLink, }; -use common::proto::KompAC::tables_data::{ +use common::proto::komp_ac::tables_data::{ PostTableDataRequest, PutTableDataRequest, }; use server::table_definition::handlers::post_table_definition;