working get count properly for adresar

proto/api.proto

@@ -12,6 +12,8 @@ service Adresar {
     rpc GetAdresar (GetAdresarRequest) returns (AdresarResponse);
     rpc PutAdresar (PutAdresarRequest) returns (AdresarResponse);
     rpc DeleteAdresar (DeleteAdresarRequest) returns (DeleteAdresarResponse);
+    rpc GetAdresarCount (Empty) returns (CountResponse); // New endpoint
+    rpc GetAdresarByPosition (PositionRequest) returns (AdresarResponse); // New endpoint
 }
 
 message GetAdresarRequest {
@@ -89,3 +91,14 @@ message DataResponse {
 message DeleteAdresarResponse {
     bool success = 1; // Indicates whether the deletion was successful
 }
+
+// New messages for the additional endpoints
+message Empty {} // Empty request for count
+
+message CountResponse {
+    int64 count = 1; // Response with the count of items
+}
+
+message PositionRequest {
+    int64 position = 1; // Request with the position of the item to retrieve
+}

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 ✘
+╰─

src/adresar/handlers.rs

@@ -4,8 +4,12 @@ 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;

src/adresar/handlers/get_adresar_by_position.rs

@@ -0,0 +1,26 @@
+// src/adresar/handlers/get_by_position.rs
+use tonic::{Status};
+use sqlx::PgPool;
+use crate::proto::multieko2::{PositionRequest, AdresarResponse, GetAdresarRequest};
+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"));
+    }
+    let offset = request.position - 1;
+
+    let id: i64 = sqlx::query_scalar!(
+        "SELECT id FROM adresar ORDER BY id ASC OFFSET $1 LIMIT 1",
+        offset
+    )
+    .fetch_optional(db_pool)
+    .await
+    .map_err(|e| Status::internal(e.to_string()))?
+    .ok_or_else(|| Status::not_found("Position out of bounds"))?;
+
+    get_adresar(db_pool, GetAdresarRequest { id }).await
+}

src/adresar/handlers/get_adresar_count.rs

@@ -0,0 +1,19 @@
+// src/adresar/handlers/get_adresar_count.rs
+use tonic::{Status};
+use sqlx::PgPool;
+use crate::proto::multieko2::{CountResponse, Empty};
+
+pub async fn get_adresar_count(
+    db_pool: &PgPool,
+    _request: Empty,
+) -> Result<CountResponse, Status> {
+    let count: i64 = sqlx::query_scalar!(
+        "SELECT COUNT(*) as count FROM adresar"
+    )
+    .fetch_one(db_pool)
+    .await
+    .map_err(|e| Status::internal(e.to_string()))?
+    .unwrap_or(0); // Handle the case where the count is None
+
+    Ok(CountResponse { count })
+}

src/server/mod.rs

@@ -2,10 +2,10 @@
 use tonic::{Request, Response, Status};
 use tonic_reflection::server::Builder as ReflectionBuilder;
 use crate::db;
-use crate::adresar::handlers::{post_adresar, get_adresar, put_adresar, delete_adresar}; // Import the new handler
+use crate::adresar::handlers::{post_adresar, get_adresar, put_adresar, delete_adresar, get_adresar_count, get_adresar_by_position};
 use crate::proto::multieko2::{
     PostAdresarRequest, AdresarResponse, GetAdresarRequest, PutAdresarRequest,
-    DeleteAdresarRequest, DeleteAdresarResponse, // Add these imports
+    DeleteAdresarRequest, DeleteAdresarResponse, PositionRequest, CountResponse, Empty,
     adresar_server::{Adresar, AdresarServer},
     FILE_DESCRIPTOR_SET,
 };
@@ -47,6 +47,22 @@ impl Adresar for AdresarService {
         let response = delete_adresar(&self.db_pool, request.into_inner()).await?;
         Ok(Response::new(response))
     }
+
+    async fn get_adresar_count(
+        &self,
+        request: Request<Empty>,
+    ) -> Result<Response<CountResponse>, Status> {
+        let response = get_adresar_count(&self.db_pool, request.into_inner()).await?;
+        Ok(Response::new(response))
+    }
+
+    async fn get_adresar_by_position(
+        &self,
+        request: Request<PositionRequest>,
+    ) -> Result<Response<AdresarResponse>, Status> {
+        let response = get_adresar_by_position(&self.db_pool, request.into_inner()).await?;
+        Ok(Response::new(response))
+    }
 }
 
 pub async fn run_server(db_pool: sqlx::PgPool) -> Result<(), Box<dyn std::error::Error>> {