Merge pull request #66 from ArunaStorage/test/object-group-tests

Add tests for ObjectGroupService

Author: das-Abroxas

src/config.rs

@@ -103,7 +103,6 @@ impl ArunaServerConfig {
     /// If the parameter is mandatory the
     ///
     fn load_config_env() -> Result<EnvConfig, VarError> {
-        //ToDo: Implement loading of mandatory/optional environmental variables
         //let env_var = env::var("ENV_VAR")?; //Note: Mandatory
 
         /* Note: Optional

src/database/crud/collection.rs

@@ -395,9 +395,11 @@ impl Database {
                         .version
                         .clone()
                         .map(|v| from_grpc_version(v, uuid::Uuid::new_v4()))
-                        .ok_or(ArunaError::InvalidRequest(
-                            "Unable to create collection version".to_string(),
-                        ))?;
+                        .ok_or_else(|| {
+                            ArunaError::InvalidRequest(
+                                "Unable to create collection version".to_string(),
+                            )
+                        })?;
 
                     // Create new Uuid for collection
                     let new_coll_uuid = uuid::Uuid::new_v4();
@@ -1222,9 +1224,11 @@ fn pin_paths_to_version(
             path: path_parts.join("/").to_string(),
             shared_revision_id: *revision_id_mapping
                 .get(&old_path.shared_revision_id)
-                .ok_or(ArunaError::InvalidRequest(
-                    "Could not map old object to newly created.".to_string(),
-                ))?,
+                .ok_or_else(|| {
+                    ArunaError::InvalidRequest(
+                        "Could not map old object to newly created.".to_string(),
+                    )
+                })?,
             collection_id: pin_collection.coll.id,
             created_at: Local::now().naive_local(),
             active: true,

src/database/crud/object.rs

@@ -971,14 +971,14 @@ impl Database {
                 .get()?
                 .transaction::<(Option<ObjectDto>, Vec<ProtoPath>), ArunaError, _>(|conn| {
                     // Check if object exists in collection
-                    if !object_exists_in_collection(conn, &object_uuid, &collection_uuid, true)? {
+                    if !object_exists_in_collection(conn, object_uuid, collection_uuid, true)? {
                         return Err(ArunaError::InvalidRequest(format!(
                             "Object {object_uuid} does not exist in collection {collection_uuid}."
                         )));
                     }
 
                     // Try to get object without reference needed and its associated paths
-                    let object_dto_option = get_object_ignore_coll(&object_uuid, conn)?;
+                    let object_dto_option = get_object_ignore_coll(object_uuid, conn)?;
 
                     let proto_paths = if let Some(object_dto) = object_dto_option.clone() {
                         get_paths_proto(&object_dto.object.shared_revision_id, conn)?
@@ -2172,7 +2172,7 @@ pub fn object_exists_in_collection(
         }
     };
 
-    Ok(references.len() > 0)
+    Ok(!references.is_empty())
 }
 
 /// This is a general helper function that can be use inside already open transactions
@@ -2523,14 +2523,12 @@ pub fn delete_staging_object(
         .execute(conn)?;
 
     // Get lowest object revision number
-    println!("{:#?}", staging_object);
     let lowest_object_revision: Option<i64> = objects
         .select(min(database::schema::objects::revision_number))
         .filter(
             database::schema::objects::shared_revision_id.eq(&staging_object.shared_revision_id),
         )
         .first::<Option<i64>>(conn)?;
-    println!("{:#?}", lowest_object_revision);
 
     // Update object status to TRASH
     match lowest_object_revision {
@@ -3190,12 +3188,14 @@ pub fn delete_multiple_objects(
     for rel_col in relevant_collections {
         for reference in references.clone() {
             if reference.collection_id == rel_col {
-                let sh_rev_id = object_id_shared_rev_id.get(&reference.object_id).ok_or(
-                    ArunaError::InvalidRequest(format!(
-                        "Shared revision can not be found for object_id {} ",
-                        reference.object_id
-                    )),
-                )?; // Should never occur
+                let sh_rev_id = object_id_shared_rev_id
+                    .get(&reference.object_id)
+                    .ok_or_else(|| {
+                        ArunaError::InvalidRequest(format!(
+                            "Shared revision can not be found for object_id {} ",
+                            reference.object_id
+                        ))
+                    })?; // Should never occur
                 if let Some(sr_id) = shared_revisions_per_collection.get_mut(&rel_col) {
                     if let Some(sr_count) = sr_id.get_mut(sh_rev_id) {
                         *sr_count += 1;
@@ -3211,9 +3211,11 @@ pub fn delete_multiple_objects(
 
         for reference in references_to_delete.clone() {
             if reference.collection_id == rel_col {
-                let sh_rev_id = object_id_shared_rev_id.get(&reference.object_id).ok_or(
-                    ArunaError::InvalidRequest("Shared revision does not exist".to_string()),
-                )?; // Should never occur
+                let sh_rev_id = object_id_shared_rev_id
+                    .get(&reference.object_id)
+                    .ok_or_else(|| {
+                        ArunaError::InvalidRequest("Shared revision does not exist".to_string())
+                    })?; // Should never occur
                 if let Some(sr_id) = shared_revision_per_collection_to_delete.get_mut(&rel_col) {
                     if let Some(sr_count) = sr_id.get_mut(sh_rev_id) {
                         *sr_count += 1;
@@ -3233,9 +3235,9 @@ pub fn delete_multiple_objects(
         let shared_counts_before =
             shared_revisions_per_collection
                 .get(&col_id)
-                .ok_or(ArunaError::InvalidRequest(
-                    "Shared revision does not exist".to_string(),
-                ))?;
+                .ok_or_else(|| {
+                    ArunaError::InvalidRequest("Shared revision does not exist".to_string())
+                })?;
 
         for (sh_rev_id, counts_deleted) in shared_counts_deleted {
             if let Some(counts_before) = shared_counts_before.get(&sh_rev_id) {

src/database/crud/objectgroups.rs

@@ -640,7 +640,7 @@ impl Database {
         // Deletion transaction
         self.pg_connection.get()?.transaction::<_, Error, _>(|conn| {
             // Query the relevant object groups from the database
-            let queried_groups = if true { // request.with_revisions {
+            let queried_groups = if request.with_revisions {
                 // If with_revisions == true:
                 //  - Query all revisions of provided object group and delete them descending
                 let og_shared_revision_id = object_groups
@@ -673,7 +673,7 @@ impl Database {
                             delete(object_group_key_value)
                                 .filter(
                                     crate::database::schema::object_group_key_value::object_group_id.eq(
-                                        object_group_uuid
+                                        &queried_group.id
                                     )
                                 )
                                 .execute(conn)?;
@@ -682,7 +682,7 @@ impl Database {
                             delete(collection_object_groups)
                                 .filter(
                                     crate::database::schema::collection_object_groups::object_group_id.eq(
-                                        object_group_uuid
+                                        &queried_group.id
                                     )
                                 )
                                 .execute(conn)?;
@@ -691,15 +691,15 @@ impl Database {
                             delete(object_group_objects)
                                 .filter(
                                     crate::database::schema::object_group_objects::object_group_id.eq(
-                                        object_group_uuid
+                                        &queried_group.id
                                     )
                                 )
                                 .execute(conn)?;
 
                             // Rename ObjectGroup revision name and description to "DELETED"
                             update(object_groups)
                                 .filter(
-                                    crate::database::schema::object_groups::id.eq(object_group_uuid)
+                                    crate::database::schema::object_groups::id.eq(&queried_group.id)
                                 )
                                 .set((
                                     crate::database::schema::object_groups::name.eq(

tests/common/functions.rs

@@ -1,8 +1,10 @@
 use aruna_rust_api::api::internal::v1::{Location, LocationType};
-use aruna_rust_api::api::storage::models::v1::{Permission, ProjectPermission};
+use aruna_rust_api::api::storage::models::v1::{
+    ObjectGroupOverview, Permission, ProjectPermission,
+};
 use aruna_rust_api::api::storage::services::v1::{
-    EditUserPermissionsForProjectRequest, GetObjectByIdRequest, GetReferencesRequest,
-    ObjectReference, UpdateObjectRequest,
+    EditUserPermissionsForProjectRequest, GetObjectByIdRequest, GetObjectGroupByIdRequest,
+    GetReferencesRequest, ObjectReference, UpdateObjectRequest,
 };
 use aruna_rust_api::api::storage::{
     models::v1::{
@@ -513,7 +515,7 @@ pub fn get_object(collection_id: String, object_id: String) -> Object {
 
 /// GetObjectById wrapper for simplified use in tests.
 #[allow(dead_code)]
-pub fn get_raw_db_object_by_id(object_id: &String) -> DbObject {
+pub fn get_raw_db_object_by_id(object_id: &str) -> DbObject {
     use diesel::prelude::*;
 
     let db = database::connection::Database::new("postgres://root:test123@localhost:26257/test");
@@ -693,3 +695,20 @@ pub fn update_object(update: &TCreateUpdate) -> Object {
 
     updated_object
 }
+
+// Helper function to fetch an object group directly from database
+#[allow(dead_code)]
+pub fn get_raw_db_object_group(
+    object_group_uuid: &String,
+    collection_uuid: &String,
+) -> ObjectGroupOverview {
+    let db = database::connection::Database::new("postgres://root:test123@localhost:26257/test");
+
+    db.get_object_group_by_id(&GetObjectGroupByIdRequest {
+        group_id: object_group_uuid.to_string(),
+        collection_id: collection_uuid.to_string(),
+    })
+    .unwrap()
+    .object_group
+    .unwrap()
+}

tests/e1_object_tests.rs

@@ -636,7 +636,7 @@ fn delete_object_test() {
         is_specification: false,
         preferred_endpoint_id: "".to_string(),
         multi_part: false,
-        hash: None, //ToDo: Implement?
+        hash: None, // Note: Maybe has to be refactored for future hash validation
     };
 
     let new_id = uuid::Uuid::new_v4();
@@ -848,13 +848,13 @@ fn get_object_test() {
     let get_obj_internal = db
         .get_object_by_id(
             &uuid::Uuid::parse_str(&new_obj).unwrap(),
-            &uuid::Uuid::parse_str(&random_collection.id.to_string()).unwrap(),
+            &uuid::Uuid::parse_str(&random_collection.id).unwrap(),
         )
         .unwrap()
         .object
         .unwrap();
 
-    assert_eq!(get_obj_internal.id.to_string(), new_obj);
+    assert_eq!(get_obj_internal.id, new_obj);
 }
 
 #[test]
@@ -1147,7 +1147,7 @@ fn delete_multiple_objects_test() {
 
     // Check random_collection objects
     let get_obj = GetObjectsRequest {
-        collection_id: source_collection.id.to_string(),
+        collection_id: source_collection.id,
         page_request: None,
         label_id_filter: None,
         with_url: false,
@@ -1160,14 +1160,10 @@ fn delete_multiple_objects_test() {
     // - obj_3_rev_0: moved writeable to random_collection2
     assert_eq!(resp.len(), 0);
 
-    let obj_1_rev_0_check =
-        common::functions::get_raw_db_object_by_id(&rnd_obj_1_rev_0.id.to_string());
-    let obj_1_rev_1_check =
-        common::functions::get_raw_db_object_by_id(&rnd_obj_1_rev_1.id.to_string());
-    let obj_2_rev_0_check =
-        common::functions::get_raw_db_object_by_id(&rnd_obj_2_rev_0.id.to_string());
-    let obj_3_rev_0_check =
-        common::functions::get_raw_db_object_by_id(&rnd_obj_3_rev_0.id.to_string());
+    let obj_1_rev_0_check = common::functions::get_raw_db_object_by_id(&rnd_obj_1_rev_0.id);
+    let obj_1_rev_1_check = common::functions::get_raw_db_object_by_id(&rnd_obj_1_rev_1.id);
+    let obj_2_rev_0_check = common::functions::get_raw_db_object_by_id(&rnd_obj_2_rev_0.id);
+    let obj_3_rev_0_check = common::functions::get_raw_db_object_by_id(&rnd_obj_3_rev_0.id);
 
     assert_eq!(obj_1_rev_0_check.object_status, ObjectStatus::AVAILABLE); // Read-only available in collection2
     assert_eq!(obj_1_rev_1_check.object_status, ObjectStatus::AVAILABLE); // Revision 1 is still read-only in collection2