merge main

.env.example

@@ -1,11 +1,13 @@
+POSTGRES_TEST_IP=localhost
+POSTGRES_DEV_IP=localhost
 POSTGRES_TEST_PORT=5433
 POSTGRES_DEV_PORT=5432
 
 POSTGRES_DB=ecdar_api
 POSTGRES_PASSWORD=1234
 
-DATABASE_URL=postgresql://postgres:${POSTGRES_PASSWORD}@localhost:${POSTGRES_DEV_PORT}/${POSTGRES_DB}
-TEST_DATABASE_URL=postgresql://postgres:${POSTGRES_PASSWORD}@localhost:${POSTGRES_TEST_PORT}/${POSTGRES_DB}
+DATABASE_URL=postgresql://postgres:${POSTGRES_PASSWORD}@${POSTGRES_DEV_IP}:${POSTGRES_DEV_PORT}/${POSTGRES_DB}
+TEST_DATABASE_URL=postgresql://postgres:${POSTGRES_PASSWORD}@${POSTGRES_TEST_IP}:${POSTGRES_TEST_PORT}/${POSTGRES_DB}
 # TEST_DATABASE_URL=sqlite::memory:
 
 REVEAAL_ADDRESS=http://{IP}:{PORT}

README.md

@@ -8,8 +8,8 @@ Prerequisites:
 
 Set up docker postgresql db:
 - `docker-compose up -d`
-- `DATABASE_URL=postgresql://postgres:{POSTGRES_PASSWORD}@localhost:{POSTGRES_DEV_PORT}/{POSTGRES_DB} sea-orm-cli migrate up`
-- `DATABASE_URL=postgresql://postgres:{POSTGRES_PASSWORD}@localhost:{POSTGRES_TEST_PORT}/{POSTGRES_DB} sea-orm-cli migrate up`
+- `DATABASE_URL=postgresql://postgres:{POSTGRES_PASSWORD}@{POSTGRES_DEV_IP}:{POSTGRES_DEV_PORT}/{POSTGRES_DB} sea-orm-cli migrate up`
+- `DATABASE_URL=postgresql://postgres:{POSTGRES_PASSWORD}@{POSTGRES_TEST_IP}:{POSTGRES_TEST_PORT}/{POSTGRES_DB} sea-orm-cli migrate up`
 
 After modifying DB:
 - `sea-orm-cli migrate fresh`

src/api/ecdar_api.rs

@@ -6,7 +6,7 @@ use super::server::server::{
     CreateAccessRequest, CreateModelRequest, CreateModelResponse, CreateQueryRequest,
     CreateUserRequest, DeleteAccessRequest, DeleteModelRequest, DeleteQueryRequest,
     GetAuthTokenRequest, GetAuthTokenResponse, GetModelRequest, GetModelResponse,
-    ListAccessInfoResponse, Query, QueryRequest, QueryResponse, SimulationStartRequest,
+    ListModelsInfoResponse, QueryRequest, QueryResponse, SimulationStartRequest,
     SimulationStepRequest, SimulationStepResponse, UpdateAccessRequest, UpdateQueryRequest,
     UpdateUserRequest, UserTokenResponse,
 };
@@ -241,18 +241,99 @@ impl EcdarApi for ConcreteEcdarApi {
         todo!()
     }
 
+    /// Deletes a Model from the database.
+    ///
+    /// # Errors
+    /// This function will return an error if the model does not exist in the database
+    /// or if the user is not the model owner.
     async fn delete_model(
         &self,
-        _request: Request<DeleteModelRequest>,
+        request: Request<DeleteModelRequest>,
     ) -> Result<Response<()>, Status> {
-        todo!()
+        let uid = request
+            .uid()
+            .ok_or(Status::internal("Could not get uid from request metadata"))?;
+        let model_id = request.get_ref().id;
+
+        let model = match self.contexts.model_context.get_by_id(model_id).await {
+            Ok(Some(model)) => model,
+            Ok(None) => return Err(Status::new(Code::NotFound, "No model found with given id")),
+            Err(err) => return Err(Status::new(Code::Internal, err.to_string())),
+        };
+
+        // Check if user is owner and thereby has permission to delete model
+        if model.owner_id != uid {
+            return Err(Status::new(
+                Code::PermissionDenied,
+                "You do not have permission to delete this model",
+            ));
+        }
+
+        match self.contexts.model_context.delete(model_id).await {
+            Ok(_) => Ok(Response::new(())),
+            Err(error) => match error {
+                sea_orm::DbErr::RecordNotFound(message) => {
+                    Err(Status::new(Code::NotFound, message))
+                }
+                _ => Err(Status::new(Code::Internal, error.to_string())),
+            },
+        }
     }
 
-    async fn list_access_info(
+    async fn list_models_info(
         &self,
-        _request: Request<()>,
-    ) -> Result<Response<ListAccessInfoResponse>, Status> {
-        todo!()
+        request: Request<()>,
+    ) -> Result<Response<ListModelsInfoResponse>, Status> {
+        let uid = request
+            .uid()
+            .ok_or(Status::internal("Could not get uid from request metadata"))?;
+
+        match self
+            .contexts
+            .model_context
+            .get_models_info_by_uid(uid)
+            .await
+        {
+            Ok(model_info_list) => {
+                if model_info_list.is_empty() {
+                    return Err(Status::new(
+                        Code::NotFound,
+                        "No access found for given user",
+                    ));
+                } else {
+                    Ok(Response::new(ListModelsInfoResponse { model_info_list }))
+                }
+            }
+            Err(error) => Err(Status::new(Code::Internal, error.to_string())),
+        }
+        /*let mut model_info_list_vector: Vec<ModelInfo> = Vec::new(); // Initialize the Vec
+
+        // Get all the models that the user has access to
+        match self.model_context.get_model_info_by_uid(uid).await {
+            Ok(model_info_list) => {
+                for model_info in model_info_list {
+                    let model_info_test = ModelInfo {
+                        model_id: model_info.model_id,
+                        model_name: model_info.model_name,
+                        model_owner_id: model_info.model_owner_id,
+                        user_role_on_model: model_info.user_role_on_model,
+                    };
+                    model_info_list_vector.push(model_info_test);
+                }
+
+                if model_info_list_vector.is_empty() {
+                    return Err(Status::new(
+                        Code::NotFound,
+                        "No access found for given user",
+                    ));
+                } else {
+                    Ok(Response::new(ListModelInfoResponse {
+                        model_info_list: model_info_list_vector,
+                    }))
+                }
+            }
+            Err(error) => Err(Status::new(Code::Internal, error.to_string())),
+        }*/
     }
 
     /// Creates an access in the database.
@@ -673,6 +754,10 @@ mod model_logic_tests;
 #[path = "../tests/api/user_logic.rs"]
 mod user_logic_tests;
 
+#[cfg(test)]
+#[path = "../tests/api/model_logic.rs"]
+mod model_logic_tests;
+
 #[cfg(test)]
 #[path = "../tests/api/session_logic.rs"]
 mod session_logic_tests;

src/build.rs

@@ -8,6 +8,7 @@ fn main() {
             "Component",
             "#[derive(serde::Serialize, serde::Deserialize)]",
         )
+        .type_attribute("ModelInfo", "#[derive(sea_orm::FromQueryResult)]")
         .enum_attribute("rep", "#[derive(serde::Serialize, serde::Deserialize)]")
         .compile(&["Ecdar-ProtoBuf/services.proto"], &["Ecdar-ProtoBuf/"])
         .unwrap();

src/database/model_context.rs

@@ -1,17 +1,60 @@
 use crate::database::database_context::DatabaseContextTrait;
-use crate::entities::{model, query};
+use crate::entities::{access, model, query};
+
+use crate::api::server::server::ModelInfo;
 use crate::EntityContextTrait;
 use async_trait::async_trait;
-use sea_orm::{ActiveModelTrait, DbErr, EntityTrait, IntoActiveModel, ModelTrait, Set, Unchanged};
+use sea_orm::{
+    ActiveModelTrait, ColumnTrait, DbErr, EntityTrait, IntoActiveModel, JoinType, ModelTrait,
+    QueryFilter, QuerySelect, RelationTrait, Set, Unchanged,
+};
 use std::sync::Arc;
 
 pub struct ModelContext {
     db_context: Arc<dyn DatabaseContextTrait>,
 }
 
-pub trait ModelContextTrait: EntityContextTrait<model::Model> {}
+#[async_trait]
+pub trait ModelContextTrait: EntityContextTrait<model::Model> {
+    async fn get_models_info_by_uid(&self, uid: i32) -> Result<Vec<ModelInfo>, DbErr>;
+}
+
+#[async_trait]
+impl ModelContextTrait for ModelContext {
+    async fn get_models_info_by_uid(&self, uid: i32) -> Result<Vec<ModelInfo>, DbErr> {
+        /*let querytest = access::Entity::find()
+        .select_only()
+        .column_as(model::Column::Id, "model_id")
+        .column_as(model::Column::Name, "model_name")
+        .column_as(model::Column::OwnerId, "model_owner_id")
+        .column_as(access::Column::Role, "user_role_on_model")
+        .join(JoinType::InnerJoin, access::Relation::Model.def())
+        .join(JoinType::InnerJoin, access::Relation::Role.def())
+        .group_by(model::Column::Id)
+        .group_by(access::Column::Role)
+        .filter(access::Column::UserId.eq(uid))
+        .build(DbBackend::Postgres)
+        .to_string();
+
+        println!("SQL Query: {}", querytest);*/
 
-impl ModelContextTrait for ModelContext {}
+        //join model, access and role tables
+        access::Entity::find()
+            .select_only()
+            .column_as(model::Column::Id, "model_id")
+            .column_as(model::Column::Name, "model_name")
+            .column_as(model::Column::OwnerId, "model_owner_id")
+            .column_as(access::Column::Role, "user_role_on_model")
+            .join(JoinType::InnerJoin, access::Relation::Model.def())
+            .join(JoinType::InnerJoin, access::Relation::Role.def())
+            .group_by(model::Column::Id)
+            .group_by(access::Column::Role)
+            .filter(access::Column::UserId.eq(uid))
+            .into_model::<ModelInfo>()
+            .all(&self.db_context.get_connection())
+            .await
+    }
+}
 
 impl ModelContext {
     pub fn new(db_context: Arc<dyn DatabaseContextTrait>) -> ModelContext {

src/entities/access.rs

@@ -1,4 +1,4 @@
-//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.4
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.6
 
 use sea_orm::entity::prelude::*;
 

src/entities/in_use.rs

@@ -1,4 +1,4 @@
-//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.4
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.6
 
 use sea_orm::entity::prelude::*;
 

src/entities/mod.rs

@@ -1,4 +1,4 @@
-//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.4
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.6
 
 pub mod prelude;
 

src/entities/model.rs

@@ -1,4 +1,4 @@
-//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.4
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.6
 
 use sea_orm::entity::prelude::*;
 

src/entities/prelude.rs

@@ -1,4 +1,4 @@
-//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.4
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.6
 
 pub use super::access::Entity as Access;
 pub use super::in_use::Entity as InUse;

src/entities/query.rs

@@ -1,4 +1,4 @@
-//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.4
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.6
 
 use sea_orm::entity::prelude::*;
 

src/entities/role.rs

@@ -1,4 +1,4 @@
-//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.4
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.6
 
 use sea_orm::entity::prelude::*;
 

src/entities/session.rs

@@ -1,4 +1,4 @@
-//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.4
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.6
 
 use sea_orm::entity::prelude::*;
 

src/entities/user.rs

@@ -1,4 +1,4 @@
-//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.4
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.6
 
 use sea_orm::entity::prelude::*;
 

src/tests/api/helpers.rs

@@ -5,6 +5,7 @@ use crate::api::context_collection::ContextCollection;
 use crate::api::ecdar_api::ConcreteEcdarApi;
 use crate::api::hashing_context::HashingContextTrait;
 use crate::api::server::server::ecdar_backend_server::EcdarBackend;
+use crate::api::server::server::ModelInfo;
 use crate::api::server::server::{
     QueryRequest, QueryResponse, SimulationStartRequest, SimulationStepRequest,
     SimulationStepResponse, UserTokenResponse,
@@ -115,7 +116,9 @@ mock! {
         async fn delete(&self, entity_id: i32) -> Result<model::Model, DbErr>;
     }
     #[async_trait]
-    impl ModelContextTrait for ModelContext {}
+    impl ModelContextTrait for ModelContext {
+        async fn get_models_info_by_uid(&self, uid: i32) -> Result<Vec<ModelInfo>, DbErr>;
+    }
 }
 
 mock! {