From d66c0131da108288972b25b5f429497d45cbbc38 Mon Sep 17 00:00:00 2001 From: filipriec Date: Mon, 17 Feb 2025 22:40:28 +0100 Subject: [PATCH] working put post and get --- proto/api.proto | 4 ++-- src/adresar/handlers.rs | 8 ++++---- .../{create_adresar.rs => post_adresar.rs} | 8 ++++---- .../{update_adresar.rs => put_adresar.rs} | 0 src/client/terminal.rs | 6 +++--- src/client/ui.rs | 8 ++++---- src/proto/descriptor.bin | Bin 4815 -> 4821 bytes src/server/mod.rs | 10 +++++----- 8 files changed, 22 insertions(+), 22 deletions(-) rename src/adresar/handlers/{create_adresar.rs => post_adresar.rs} (91%) rename src/adresar/handlers/{update_adresar.rs => put_adresar.rs} (100%) diff --git a/proto/api.proto b/proto/api.proto index 4e685fb..8d564af 100644 --- a/proto/api.proto +++ b/proto/api.proto @@ -8,7 +8,7 @@ service DataProcessor { } service Adresar { - rpc CreateAdresar (AdresarRequest) returns (AdresarResponse); + rpc PostAdresar (PostAdresarRequest) returns (AdresarResponse); rpc GetAdresar (GetAdresarRequest) returns (AdresarResponse); rpc UpdateAdresar (UpdateAdresarRequest) returns (AdresarResponse); } @@ -17,7 +17,7 @@ message GetAdresarRequest { int64 id = 1; // The ID of the Adresar entry to retrieve } -message AdresarRequest { +message PostAdresarRequest { string firma = 1; string kz = 2; string drc = 3; diff --git a/src/adresar/handlers.rs b/src/adresar/handlers.rs index aa44aa2..cc4ee04 100644 --- a/src/adresar/handlers.rs +++ b/src/adresar/handlers.rs @@ -1,9 +1,9 @@ // src/adresar/handlers.rs -pub mod create_adresar; +pub mod post_adresar; pub mod get_adresar; -pub mod update_adresar; +pub mod put_adresar; -pub use create_adresar::create_adresar; +pub use post_adresar::post_adresar; pub use get_adresar::get_adresar; -pub use update_adresar::update_adresar; +pub use put_adresar::update_adresar; diff --git a/src/adresar/handlers/create_adresar.rs b/src/adresar/handlers/post_adresar.rs similarity index 91% rename from src/adresar/handlers/create_adresar.rs rename to src/adresar/handlers/post_adresar.rs index c58c874..d965b99 100644 --- a/src/adresar/handlers/create_adresar.rs +++ b/src/adresar/handlers/post_adresar.rs @@ -1,12 +1,12 @@ -// src/adresar/handlers/create_adresar.rs +// src/adresar/handlers/post_adresar.rs use tonic::{Request, Response, Status}; use sqlx::PgPool; use crate::adresar::models::Adresar; -use crate::proto::multieko2::{AdresarRequest, AdresarResponse}; +use crate::proto::multieko2::{PostAdresarRequest, AdresarResponse}; -pub async fn create_adresar( +pub async fn post_adresar( db_pool: &PgPool, - request: AdresarRequest, + request: PostAdresarRequest, ) -> Result { let adresar = sqlx::query_as!( Adresar, diff --git a/src/adresar/handlers/update_adresar.rs b/src/adresar/handlers/put_adresar.rs similarity index 100% rename from src/adresar/handlers/update_adresar.rs rename to src/adresar/handlers/put_adresar.rs diff --git a/src/client/terminal.rs b/src/client/terminal.rs index e4c2b6f..c12f9cb 100644 --- a/src/client/terminal.rs +++ b/src/client/terminal.rs @@ -9,7 +9,7 @@ use std::io::{self, stdout}; use tonic::transport::Channel; use crate::proto::multieko2::adresar_client::AdresarClient; use crate::client::config::Config; -use crate::proto::multieko2::AdresarRequest; +use crate::proto::multieko2::PostAdresarRequest; pub struct AppTerminal { terminal: Terminal>, @@ -52,13 +52,13 @@ impl AppTerminal { &mut self, action: &str, // This should be the resolved action (e.g., "save") is_saved: &mut bool, - form_data: &AdresarRequest, + form_data: &PostAdresarRequest, ) -> Result<(bool, String), Box> { match action { "save" => { // Send data to the server let request = tonic::Request::new(form_data.clone()); - let response = self.grpc_client.create_adresar(request).await?; + let response = self.grpc_client.post_adresar(request).await?; *is_saved = true; Ok((false, format!("State saved. Response: {:?}", response))) diff --git a/src/client/ui.rs b/src/client/ui.rs index fe21142..54a3404 100644 --- a/src/client/ui.rs +++ b/src/client/ui.rs @@ -6,7 +6,7 @@ use crate::client::colors::Theme; use crate::client::config::Config; use ratatui::layout::{Constraint, Direction, Layout, Rect}; use std::env; -use crate::proto::multieko2::AdresarRequest; +use crate::proto::multieko2::PostAdresarRequest; pub async fn run_ui() -> Result<(), Box> { let config = Config::load()?; @@ -101,8 +101,8 @@ pub async fn run_ui() -> Result<(), Box> { if command_mode { match key.code { KeyCode::Enter => { - // Create AdresarRequest from form data - let form_data = AdresarRequest { + // Create PostAdresarRequest from form data + let form_data = PostAdresarRequest { firma: firma.clone(), kz: kz.clone(), drc: drc.clone(), @@ -158,7 +158,7 @@ pub async fn run_ui() -> Result<(), Box> { } else { // Check for keybindings if let Some(action) = config.get_action_for_key(key.code, key.modifiers) { - let form_data = AdresarRequest { + let form_data = PostAdresarRequest { firma: firma.clone(), kz: kz.clone(), drc: drc.clone(), diff --git a/src/proto/descriptor.bin b/src/proto/descriptor.bin index caba16bceff7d66355a9263260ac70818707fd25..617539ce509abea2c22861f26fe9b8f2896d82f1 100644 GIT binary patch delta 130 zcmX@FdR3K)>(WFfTaF7%TtWf)#U&e^ce7}{WaMIZOesn&PAn4g;Nk{}!??0~xurQJ znW@?NMtVT;$$6|gn}b-b7`2_bc(_>E7?~Itg_yZGgkd};AWu{s#$yKZj2tI#XZz16 KwRt&!$ZTb46STznhdce7|dXXIjcOesn&PAn2~@z3dX) E0I~ubHUIzs diff --git a/src/server/mod.rs b/src/server/mod.rs index f20eb54..2172234 100644 --- a/src/server/mod.rs +++ b/src/server/mod.rs @@ -2,9 +2,9 @@ use tonic::{Request, Response, Status}; use tonic_reflection::server::Builder as ReflectionBuilder; use crate::db; -use crate::adresar::handlers::{create_adresar, get_adresar, update_adresar}; // Import the new handler +use crate::adresar::handlers::{post_adresar, get_adresar, update_adresar}; // Import the new handler use crate::proto::multieko2::{ - AdresarRequest, AdresarResponse, GetAdresarRequest, UpdateAdresarRequest, + PostAdresarRequest, AdresarResponse, GetAdresarRequest, UpdateAdresarRequest, adresar_server::{Adresar, AdresarServer}, FILE_DESCRIPTOR_SET, }; @@ -15,11 +15,11 @@ pub struct AdresarService { #[tonic::async_trait] impl Adresar for AdresarService { - async fn create_adresar( + async fn post_adresar( &self, - request: Request, + request: Request, ) -> Result, Status> { - let response = create_adresar(&self.db_pool, request.into_inner()).await?; + let response = post_adresar(&self.db_pool, request.into_inner()).await?; Ok(Response::new(response)) }