complete redesign

server/src/adresar/docs/example.txt

@@ -0,0 +1,156 @@
+❯ grpcurl -plaintext -d '{"id": 1}' localhost:50051 multieko2.Adresar/GetAdresar
+{
+  "id": "1",
+  "firma": "Updated Firma",
+  "kz": "Updated KZ",
+  "drc": "Updated DRC",
+  "ulica": "Updated Ulica",
+  "psc": "Updated PSC",
+  "mesto": "Updated Mesto",
+  "stat": "Updated Stat",
+  "banka": "Updated Banka",
+  "ucet": "Updated Ucet",
+  "skladm": "Updated Skladm",
+  "ico": "Updated ICO",
+  "kontakt": "Updated Kontakt",
+  "telefon": "Updated Telefon",
+  "skladu": "Updated Skladu",
+  "fax": "Updated Fax"
+}
+❯ grpcurl -plaintext -d '{"id": 2}' localhost:50051 multieko2.Adresar/GetAdresar
+{
+  "id": "2",
+  "firma": "asdfasf",
+  "kz": " ",
+  "drc": " ",
+  "ulica": " ",
+  "psc": "sdfasdf",
+  "mesto": "asf",
+  "stat": "as",
+  "banka": "df",
+  "ucet": "asf",
+  "skladm": "f",
+  "ico": "f",
+  "kontakt": "f",
+  "telefon": "f",
+  "skladu": "f",
+  "fax": " "
+}
+❯ grpcurl -plaintext -d '{"id": 1}' localhost:50051 multieko2.Adresar/DeleteAdresar
+{
+  "success": true
+}
+❯ grpcurl -plaintext -d '{"id": 1}' localhost:50051 multieko2.Adresar/GetAdresar
+ERROR:
+  Code: NotFound
+  Message: no rows returned by a query that expected to return at least one row
+❯ grpcurl -plaintext -d '{"id": 2}' localhost:50051 multieko2.Adresar/GetAdresar
+{
+  "id": "2",
+  "firma": "asdfasf",
+  "kz": " ",
+  "drc": " ",
+  "ulica": " ",
+  "psc": "sdfasdf",
+  "mesto": "asf",
+  "stat": "as",
+  "banka": "df",
+  "ucet": "asf",
+  "skladm": "f",
+  "ico": "f",
+  "kontakt": "f",
+  "telefon": "f",
+  "skladu": "f",
+  "fax": " "
+}
+
+❯ grpcurl -plaintext -d '{
+  "firma": "New Firma",
+  "kz": "New KZ",
+  "drc": "New DRC",
+  "ulica": "New Ulica",
+  "psc": "New PSC",
+  "mesto": "New Mesto",
+  "stat": "New Stat",
+  "banka": "New Banka",
+  "ucet": "New Ucet",
+  "skladm": "New Skladm",
+  "ico": "New ICO",
+  "kontakt": "New Kontakt",
+  "telefon": "New Telefon",
+  "skladu": "New Skladu",
+  "fax": "New Fax"
+}' localhost:50051 multieko2.Adresar/PostAdresar
+{
+  "id": "43",
+  "firma": "New Firma",
+  "kz": "New KZ",
+  "drc": "New DRC",
+  "ulica": "New Ulica",
+  "psc": "New PSC",
+  "mesto": "New Mesto",
+  "stat": "New Stat",
+  "banka": "New Banka",
+  "ucet": "New Ucet",
+  "skladm": "New Skladm",
+  "ico": "New ICO",
+  "kontakt": "New Kontakt",
+  "telefon": "New Telefon",
+  "skladu": "New Skladu",
+  "fax": "New Fax"
+}
+❯ grpcurl -plaintext -d '{
+  "id": 43,
+  "firma": "Updated Firma",
+  "kz": "Updated KZ",
+  "drc": "Updated DRC",
+  "ulica": "Updated Ulica",
+  "psc": "Updated PSC",
+  "mesto": "Updated Mesto",
+  "stat": "Updated Stat",
+  "banka": "Updated Banka",
+  "ucet": "Updated Ucet",
+  "skladm": "Updated Skladm",
+  "ico": "Updated ICO",
+  "kontakt": "Updated Kontakt",
+  "telefon": "Updated Telefon",
+  "skladu": "Updated Skladu",
+  "fax": "Updated Fax"
+}' localhost:50051 multieko2.Adresar/PutAdresar
+{
+  "id": "43",
+  "firma": "Updated Firma",
+  "kz": "Updated KZ",
+  "drc": "Updated DRC",
+  "ulica": "Updated Ulica",
+  "psc": "Updated PSC",
+  "mesto": "Updated Mesto",
+  "stat": "Updated Stat",
+  "banka": "Updated Banka",
+  "ucet": "Updated Ucet",
+  "skladm": "Updated Skladm",
+  "ico": "Updated ICO",
+  "kontakt": "Updated Kontakt",
+  "telefon": "Updated Telefon",
+  "skladu": "Updated Skladu",
+  "fax": "Updated Fax"
+}
+❯ grpcurl -plaintext -d '{"id": 43}' localhost:50051 multieko2.Adresar/GetAdresar
+{
+  "id": "43",
+  "firma": "Updated Firma",
+  "kz": "Updated KZ",
+  "drc": "Updated DRC",
+  "ulica": "Updated Ulica",
+  "psc": "Updated PSC",
+  "mesto": "Updated Mesto",
+  "stat": "Updated Stat",
+  "banka": "Updated Banka",
+  "ucet": "Updated Ucet",
+  "skladm": "Updated Skladm",
+  "ico": "Updated ICO",
+  "kontakt": "Updated Kontakt",
+  "telefon": "Updated Telefon",
+  "skladu": "Updated Skladu",
+  "fax": "Updated Fax"
+}

server/src/adresar/docs/get_example.txt

@@ -0,0 +1,33 @@
+# TOTAL items in the adresar
+❯ grpcurl -plaintext localhost:50051 multieko2.Adresar/GetAdresarCount
+{
+  "count": "43"
+}
+
+# Item at this count. If there are 43 items, number 1 is the first item 
+❯ grpcurl -plaintext -d '{"position": 1}' localhost:50051 multieko2.Adresar/GetAdresarByPosition
+{
+  "id": "2",
+  "firma": "asdfasf",
+  "kz": " ",
+  "drc": " ",
+  "ulica": " ",
+  "psc": "sdfasdf",
+  "mesto": "asf",
+  "stat": "as",
+  "banka": "df",
+  "ucet": "asf",
+  "skladm": "f",
+  "ico": "f",
+  "kontakt": "f",
+  "telefon": "f",
+  "skladu": "f",
+  "fax": " "
+}
+# Item fetched by id. The first item was created and removed, therefore number 1 in ids doenst exists, since first to exist now has number 2
+❯ grpcurl -plaintext -d '{"id": 1}' localhost:50051 multieko2.Adresar/GetAdresar
+ERROR:
+  Code: NotFound
+  Message: no rows returned by a query that expected to return at least one row
+╭─     ~ ············································· 69 ✘
+╰─

server/src/adresar/handlers.rs

@@ -0,0 +1,15 @@
+// src/adresar/handlers.rs
+
+pub mod post_adresar;
+pub mod get_adresar;
+pub mod put_adresar;
+pub mod delete_adresar;
+pub mod get_adresar_count;
+pub mod get_adresar_by_position;
+
+pub use post_adresar::post_adresar;
+pub use get_adresar::get_adresar;
+pub use put_adresar::put_adresar;
+pub use delete_adresar::delete_adresar;
+pub use get_adresar_count::get_adresar_count;
+pub use get_adresar_by_position::get_adresar_by_position;

server/src/adresar/handlers/delete_adresar.rs

@@ -0,0 +1,27 @@
+// src/adresar/handlers/delete_adresar.rs
+use tonic::Status;
+use sqlx::PgPool;
+use common::proto::multieko2::adresar::{DeleteAdresarRequest, DeleteAdresarResponse};
+
+pub async fn delete_adresar(
+    db_pool: &PgPool,
+    request: DeleteAdresarRequest,
+) -> Result<DeleteAdresarResponse, Status> {
+    let rows_affected = sqlx::query!(
+        r#"
+        UPDATE adresar
+        SET deleted = true
+        WHERE id = $1
+        "#,
+        request.id
+    )
+    .execute(db_pool)
+    .await
+    .map_err(|e| Status::internal(e.to_string()))?
+    .rows_affected();
+
+    Ok(DeleteAdresarResponse {
+        success: rows_affected > 0,
+    })
+}
+

server/src/adresar/handlers/get_adresar.rs

@@ -0,0 +1,60 @@
+// src/adresar/handlers/get_adresar.rs
+use tonic::Status;
+use sqlx::PgPool;
+use crate::adresar::models::Adresar;
+use common::proto::multieko2::adresar::{GetAdresarRequest, AdresarResponse};
+
+pub async fn get_adresar(
+    db_pool: &PgPool,
+    request: GetAdresarRequest,
+) -> Result<AdresarResponse, Status> {
+    let adresar = sqlx::query_as!(
+        Adresar,
+        r#"
+        SELECT
+            id,
+            deleted,
+            firma,
+            kz,
+            drc,
+            ulica,
+            psc,
+            mesto,
+            stat,
+            banka,
+            ucet,
+            skladm,
+            ico,
+            kontakt,
+            telefon,
+            skladu,
+            fax
+        FROM adresar
+        WHERE id = $1
+        "#,
+        request.id
+    )
+    .fetch_one(db_pool)
+    .await
+    .map_err(|e| Status::not_found(e.to_string()))?;
+
+    Ok(AdresarResponse {
+        id: adresar.id,
+        firma: adresar.firma,
+        kz: adresar.kz.unwrap_or_default(),
+        drc: adresar.drc.unwrap_or_default(),
+        ulica: adresar.ulica.unwrap_or_default(),
+        psc: adresar.psc.unwrap_or_default(),
+        mesto: adresar.mesto.unwrap_or_default(),
+        stat: adresar.stat.unwrap_or_default(),
+        banka: adresar.banka.unwrap_or_default(),
+        ucet: adresar.ucet.unwrap_or_default(),
+        skladm: adresar.skladm.unwrap_or_default(),
+        ico: adresar.ico.unwrap_or_default(),
+        kontakt: adresar.kontakt.unwrap_or_default(),
+        telefon: adresar.telefon.unwrap_or_default(),
+        skladu: adresar.skladu.unwrap_or_default(),
+        fax: adresar.fax.unwrap_or_default(),
+    })
+}
+

server/src/adresar/handlers/get_adresar_by_position.rs

@@ -0,0 +1,35 @@
+// src/adresar/handlers/get_adresar_by_position.rs
+use tonic::{Status};
+use sqlx::PgPool;
+use common::proto::multieko2::adresar::{AdresarResponse, GetAdresarRequest};
+use common::proto::multieko2::common::PositionRequest;
+use super::get_adresar;
+
+pub async fn get_adresar_by_position(
+    db_pool: &PgPool,
+    request: PositionRequest,
+) -> Result<AdresarResponse, Status> {
+    if request.position < 1 {
+        return Err(Status::invalid_argument("Position must be at least 1"));
+    }
+    
+    // Find the ID of the Nth non-deleted record
+    let id: i64 = sqlx::query_scalar!(
+        r#"
+        SELECT id 
+        FROM adresar 
+        WHERE deleted = FALSE 
+        ORDER BY id ASC 
+        OFFSET $1 
+        LIMIT 1
+        "#,
+        request.position - 1
+    )
+    .fetch_optional(db_pool)
+    .await
+    .map_err(|e| Status::internal(e.to_string()))?
+    .ok_or_else(|| Status::not_found("Position out of bounds"))?;
+    
+    // Now fetch the complete record using the existing get_adresar function
+    get_adresar(db_pool, GetAdresarRequest { id }).await
+}

server/src/adresar/handlers/get_adresar_count.rs

@@ -0,0 +1,23 @@
+// src/adresar/handlers/get_adresar_count.rs
+use tonic::Status;
+use sqlx::PgPool;
+use common::proto::multieko2::common::{CountResponse, Empty};
+
+pub async fn get_adresar_count(
+    db_pool: &PgPool,
+    _request: Empty,
+) -> Result<CountResponse, Status> {
+    let count: i64 = sqlx::query_scalar!(
+        r#"
+        SELECT COUNT(*) AS count
+        FROM adresar
+        WHERE deleted = FALSE
+        "#
+    )
+    .fetch_one(db_pool)
+    .await
+    .map_err(|e| Status::internal(e.to_string()))?
+    .unwrap_or(0);
+
+    Ok(CountResponse { count })
+}

server/src/adresar/handlers/post_adresar.rs

@@ -0,0 +1,68 @@
+// src/adresar/handlers/post_adresar.rs
+use tonic::Status;
+use sqlx::PgPool;
+use crate::adresar::models::Adresar;
+use common::proto::multieko2::adresar::{PostAdresarRequest, AdresarResponse};
+
+pub async fn post_adresar(
+    db_pool: &PgPool,
+    request: PostAdresarRequest,
+) -> Result<AdresarResponse, Status> {
+    let adresar = sqlx::query_as!(
+        Adresar,
+        r#"
+        INSERT INTO adresar (
+            firma, kz, drc, ulica, psc, mesto, stat, banka, ucet,
+            skladm, ico, kontakt, telefon, skladu, fax, deleted
+        )
+        VALUES (
+            $1, $2, $3, $4, $5, $6, $7, $8, $9,
+            $10, $11, $12, $13, $14, $15, $16
+        )
+        RETURNING
+            id, deleted, firma, kz, drc, ulica, psc, mesto, stat,
+            banka, ucet, skladm, ico, kontakt, telefon, skladu, fax
+        "#,
+        request.firma,
+        request.kz,
+        request.drc,
+        request.ulica,
+        request.psc,
+        request.mesto,
+        request.stat,
+        request.banka,
+        request.ucet,
+        request.skladm,
+        request.ico,
+        request.kontakt,
+        request.telefon,
+        request.skladu,
+        request.fax,
+        false  // Set deleted to false by default
+    )
+    .fetch_one(db_pool)
+    .await
+    .map_err(|e| Status::internal(e.to_string()))?;
+
+    Ok(AdresarResponse {
+        id: adresar.id,
+        // Do not include `deleted` in the response since it's not
+        // defined in the proto message.
+        firma: adresar.firma,
+        kz: adresar.kz.unwrap_or_default(),
+        drc: adresar.drc.unwrap_or_default(),
+        ulica: adresar.ulica.unwrap_or_default(),
+        psc: adresar.psc.unwrap_or_default(),
+        mesto: adresar.mesto.unwrap_or_default(),
+        stat: adresar.stat.unwrap_or_default(),
+        banka: adresar.banka.unwrap_or_default(),
+        ucet: adresar.ucet.unwrap_or_default(),
+        skladm: adresar.skladm.unwrap_or_default(),
+        ico: adresar.ico.unwrap_or_default(),
+        kontakt: adresar.kontakt.unwrap_or_default(),
+        telefon: adresar.telefon.unwrap_or_default(),
+        skladu: adresar.skladu.unwrap_or_default(),
+        fax: adresar.fax.unwrap_or_default(),
+    })
+}
+

server/src/adresar/handlers/put_adresar.rs

@@ -0,0 +1,91 @@
+// src/adresar/handlers/put_adresar.rs
+use tonic::Status;
+use sqlx::PgPool;
+use crate::adresar::models::Adresar;
+use common::proto::multieko2::adresar::{PutAdresarRequest, AdresarResponse};
+
+pub async fn put_adresar(
+    db_pool: &PgPool,
+    request: PutAdresarRequest,
+) -> Result<AdresarResponse, Status> {
+    let adresar = sqlx::query_as!(
+        Adresar,
+        r#"
+        UPDATE adresar
+        SET
+            firma = $2,
+            kz = $3,
+            drc = $4,
+            ulica = $5,
+            psc = $6,
+            mesto = $7,
+            stat = $8,
+            banka = $9,
+            ucet = $10,
+            skladm = $11,
+            ico = $12,
+            kontakt = $13,
+            telefon = $14,
+            skladu = $15,
+            fax = $16
+        WHERE id = $1 AND deleted = FALSE
+        RETURNING
+            id,
+            deleted,
+            firma,
+            kz,
+            drc,
+            ulica,
+            psc,
+            mesto,
+            stat,
+            banka,
+            ucet,
+            skladm,
+            ico,
+            kontakt,
+            telefon,
+            skladu,
+            fax
+        "#,
+        request.id,
+        request.firma,
+        request.kz,
+        request.drc,
+        request.ulica,
+        request.psc,
+        request.mesto,
+        request.stat,
+        request.banka,
+        request.ucet,
+        request.skladm,
+        request.ico,
+        request.kontakt,
+        request.telefon,
+        request.skladu,
+        request.fax
+    )
+    .fetch_one(db_pool)
+    .await
+    .map_err(|e| Status::internal(e.to_string()))?;
+
+    Ok(AdresarResponse {
+        id: adresar.id,
+        firma: adresar.firma,
+        kz: adresar.kz.unwrap_or_default(),
+        drc: adresar.drc.unwrap_or_default(),
+        ulica: adresar.ulica.unwrap_or_default(),
+        psc: adresar.psc.unwrap_or_default(),
+        mesto: adresar.mesto.unwrap_or_default(),
+        stat: adresar.stat.unwrap_or_default(),
+        banka: adresar.banka.unwrap_or_default(),
+        ucet: adresar.ucet.unwrap_or_default(),
+        skladm: adresar.skladm.unwrap_or_default(),
+        ico: adresar.ico.unwrap_or_default(),
+        kontakt: adresar.kontakt.unwrap_or_default(),
+        telefon: adresar.telefon.unwrap_or_default(),
+        skladu: adresar.skladu.unwrap_or_default(),
+        fax: adresar.fax.unwrap_or_default(),
+    })
+}
+

server/src/adresar/mod.rs

@@ -0,0 +1,4 @@
+// src/adresar/mod.rs
+
+pub mod models;
+pub mod handlers;

server/src/adresar/models.rs

@@ -0,0 +1,23 @@
+// src/adresar/models.rs
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct Adresar {
+    pub id: i64,
+    pub deleted: bool,
+    pub firma: String,
+    pub kz: Option<String>,
+    pub drc: Option<String>,
+    pub ulica: Option<String>,
+    pub psc: Option<String>,
+    pub mesto: Option<String>,
+    pub stat: Option<String>,
+    pub banka: Option<String>,
+    pub ucet: Option<String>,
+    pub skladm: Option<String>,
+    pub ico: Option<String>,
+    pub kontakt: Option<String>,
+    pub telefon: Option<String>,
+    pub skladu: Option<String>,
+    pub fax: Option<String>,
+}