returns if in_use as well

Ecdar · Nov 28, 2023 · 08b154e · 08b154e
1 parent a0aa8b4
commit 08b154e
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/Ecdar-ProtoBuf b/Ecdar-ProtoBuf
diff --git a/src/api/ecdar_api.rs b/src/api/ecdar_api.rs
@@ -18,10 +18,10 @@ use super::server::server::{
     get_auth_token_request::{user_credentials, UserCredentials},
     CreateAccessRequest, CreateModelRequest, CreateModelResponse, CreateQueryRequest,
     CreateUserRequest, DeleteAccessRequest, DeleteModelRequest, DeleteQueryRequest,
-    GetAuthTokenRequest, GetAuthTokenResponse, GetModelRequest, GetModelResponse, Query,
-    QueryRequest, QueryResponse, SimulationStartRequest, SimulationStepRequest,
-    SimulationStepResponse, UpdateAccessRequest, UpdateQueryRequest, UpdateUserRequest,
-    UserTokenResponse,
+    GetAuthTokenRequest, GetAuthTokenResponse, GetModelRequest, GetModelResponse,
+    ListAccessInfoResponse, Query, QueryRequest, QueryResponse, SimulationStartRequest,
+    SimulationStepRequest, SimulationStepResponse, UpdateAccessRequest, UpdateQueryRequest,
+    UpdateUserRequest, UserTokenResponse,
 };
 
 use crate::database::{
@@ -165,6 +165,13 @@ impl EcdarApi for ConcreteEcdarApi {
             owner_id: model.owner_id,
         };
 
+        let in_use = match self.in_use_context.get_by_id(model_id).await {
+            Ok(in_use) => {
+                matches!(in_use, Some(_in_use))
+            }
+            Err(err) => return Err(Status::new(Code::Internal, err.to_string())),
+        };
+
         let queries = self
             .query_context
             .get_all_by_model_id(model_id)
@@ -188,6 +195,7 @@ impl EcdarApi for ConcreteEcdarApi {
         Ok(Response::new(GetModelResponse {
             model: Some(model),
             queries,
+            in_use,
         }))
     }
 
@@ -229,7 +237,10 @@ impl EcdarApi for ConcreteEcdarApi {
         todo!()
     }
 
-    async fn list_models_info(&self, _request: Request<()>) -> Result<Response<()>, Status> {
+    async fn list_access_info(
+        &self,
+        _request: Request<()>,
+    ) -> Result<Response<ListAccessInfoResponse>, Status> {
         todo!()
     }