update apis

agnesoft · Dec 24, 2024 · d314cca · d314cca
1 parent 69c3140
commit d314cca
Show file tree

Hide file tree

Showing 15 changed files with 128 additions and 47 deletions.
diff --git a/agdb_api/php/docs/Model/ServerDatabase.md b/agdb_api/php/docs/Model/ServerDatabase.md
diff --git a/agdb_api/php/lib/Model/ServerDatabase.php b/agdb_api/php/lib/Model/ServerDatabase.php
diff --git a/agdb_api/rust/src/api_types.rs b/agdb_api/rust/src/api_types.rs
@@ -88,6 +88,7 @@ pub struct DbAudit(pub Vec<QueryAudit>);
 #[derive(Debug, Default, Deserialize, Serialize, ToSchema, PartialEq, Eq, PartialOrd, Ord)]
 pub struct ServerDatabase {
     pub name: String,
+    pub owner: String,
     pub db_type: DbType,
     pub role: DbUserRole,
     pub size: u64,
@@ -242,6 +243,7 @@ mod tests {
             "{:?}",
             ServerDatabase {
                 name: "db".to_string(),
+                owner: "owner".to_string(),
                 db_type: DbType::Memory,
                 role: DbUserRole::Admin,
                 size: 0,
@@ -301,13 +303,15 @@ mod tests {
         assert!(user < other);
         let db = ServerDatabase {
             name: "db".to_string(),
+            owner: "owner".to_string(),
             db_type: DbType::Memory,
             role: DbUserRole::Admin,
             size: 0,
             backup: 0,
         };
         let other = ServerDatabase {
             name: "db2".to_string(),
+            owner: "owner".to_string(),
             db_type: DbType::Memory,
             role: DbUserRole::Admin,
             size: 0,
@@ -347,6 +351,7 @@ mod tests {
 
         let db = ServerDatabase {
             name: "db".to_string(),
+            owner: "owner".to_string(),
             db_type: DbType::Memory,
             role: DbUserRole::Admin,
             size: 0,

diff --git a/agdb_api/typescript/src/openapi.d.ts b/agdb_api/typescript/src/openapi.d.ts
@@ -1171,6 +1171,7 @@ declare namespace Components {
             backup: number; // int64
             db_type: DbType;
             name: string;
+            owner: string;
             role: DbUserRole;
             size: number; // int64
         }

diff --git a/agdb_server/openapi.json b/agdb_server/openapi.json
diff --git a/agdb_server/src/routes/admin/db.rs b/agdb_server/src/routes/admin/db.rs
@@ -173,16 +173,17 @@ pub(crate) async fn clear(
 
     let (commit_index, _result) = cluster
         .exec(DbClear {
-            owner,
-            db,
+            owner: owner.clone(),
+            db: db.clone(),
             resource: request.resource,
         })
         .await?;
 
     let size = db_pool.db_size(&db_name).await.unwrap_or(0);
     let database = server_db.user_db(owner_id, &db_name).await?;
     let db = ServerDatabase {
-        name: db_name,
+        name: db,
+        owner,
         db_type: database.db_type,
         role,
         backup: database.backup,
@@ -442,13 +443,16 @@ pub(crate) async fn list(
     let mut dbs = Vec::with_capacity(databases.len());
 
     for db in databases {
-        dbs.push(ServerDatabase {
-            size: db_pool.db_size(&db.name).await.unwrap_or(0),
-            name: db.name,
-            db_type: db.db_type,
-            role: DbUserRole::Admin,
-            backup: db.backup,
-        });
+        if let Some((owner, name)) = db.name.split_once('/') {
+            dbs.push(ServerDatabase {
+                size: db_pool.db_size(&db.name).await.unwrap_or(0),
+                name: name.to_string(),
+                owner: owner.to_string(),
+                db_type: db.db_type,
+                role: DbUserRole::Admin,
+                backup: db.backup,
+            });
+        }
     }
 
     Ok((StatusCode::OK, Json(dbs)))
@@ -480,14 +484,20 @@ pub(crate) async fn optimize(
     let database = server_db.user_db(owner_id, &db_name).await?;
     let role = server_db.user_db_role(owner_id, &db_name).await?;
 
-    let (commit_index, _result) = cluster.exec(DbOptimize { owner, db }).await?;
+    let (commit_index, _result) = cluster
+        .exec(DbOptimize {
+            owner: owner.clone(),
+            db: db.clone(),
+        })
+        .await?;
     let size = db_pool.db_size(&db_name).await?;
 
     Ok((
         StatusCode::OK,
         [("commit-index", commit_index.to_string())],
         Json(ServerDatabase {
-            name: db_name,
+            name: db,
+            owner,
             db_type: database.db_type,
             role,
             backup: database.backup,

diff --git a/agdb_server/src/routes/db.rs b/agdb_server/src/routes/db.rs
@@ -210,16 +210,17 @@ pub(crate) async fn clear(
 
     let (commit_index, _result) = cluster
         .exec(DbClear {
-            owner,
-            db,
+            owner: owner.clone(),
+            db: db.clone(),
             resource: request.resource,
         })
         .await?;
 
     let size = db_pool.db_size(&db_name).await.unwrap_or(0);
     let database = server_db.user_db(user.0, &db_name).await?;
     let db = ServerDatabase {
-        name: db_name,
+        name: db,
+        owner,
         db_type: database.db_type,
         role,
         backup: database.backup,
@@ -510,16 +511,18 @@ pub(crate) async fn list(
         .zip(sizes)
         .filter_map(|((role, db), size)| {
             if size != 0 {
-                Some(ServerDatabase {
-                    name: db.name,
-                    db_type: db.db_type,
-                    role,
-                    backup: db.backup,
-                    size,
-                })
-            } else {
-                None
+                if let Some((owner, name)) = db.name.split_once('/') {
+                    return Some(ServerDatabase {
+                        name: name.to_string(),
+                        owner: owner.to_string(),
+                        db_type: db.db_type,
+                        role,
+                        backup: db.backup,
+                        size,
+                    });
+                }
             }
+            None
         })
         .collect();
 
@@ -557,14 +560,20 @@ pub(crate) async fn optimize(
         return Err(permission_denied("write rights required"));
     }
 
-    let (commit_index, _result) = cluster.exec(DbOptimize { owner, db }).await?;
+    let (commit_index, _result) = cluster
+        .exec(DbOptimize {
+            owner: owner.clone(),
+            db: db.clone(),
+        })
+        .await?;
     let size = db_pool.db_size(&db_name).await?;
 
     Ok((
         StatusCode::OK,
         [("commit-index", commit_index.to_string())],
         Json(ServerDatabase {
-            name: db_name,
+            name: db.to_string(),
+            owner,
             db_type: database.db_type,
             role,
             backup: database.backup,

diff --git a/agdb_server/tests/routes/admin_db_list_test.rs b/agdb_server/tests/routes/admin_db_list_test.rs
@@ -21,14 +21,16 @@ async fn db_list() -> anyhow::Result<()> {
     let (status, list) = server.api.admin_db_list().await?;
     assert_eq!(status, 200);
     assert!(list.contains(&ServerDatabase {
-        name: format!("{owner1}/{db1}"),
+        name: db1.to_string(),
+        owner: owner1.to_string(),
         db_type: DbType::Memory,
         role: DbUserRole::Admin,
         size: 2656,
         backup: 0,
     }));
     assert!(list.contains(&ServerDatabase {
-        name: format!("{}/{}", owner2, db2),
+        name: db2.to_string(),
+        owner: owner2.to_string(),
         db_type: DbType::Memory,
         role: DbUserRole::Admin,
         size: 2656,
@@ -50,7 +52,7 @@ async fn with_backup() -> anyhow::Result<()> {
     assert_eq!(status, 200);
     let db = list
         .iter()
-        .find(|d| d.name == format!("{}/{}", owner, db))
+        .find(|d| d.name == *db && d.owner == *owner)
         .unwrap();
     assert_ne!(db.backup, 0);
     Ok(())

diff --git a/agdb_server/tests/routes/admin_db_optimize_test.rs b/agdb_server/tests/routes/admin_db_optimize_test.rs
@@ -21,7 +21,7 @@ async fn optimize() -> anyhow::Result<()> {
         .await?
         .1
         .iter()
-        .find(|d| d.name == format!("{owner}/{db}"))
+        .find(|d| d.name == *db && d.owner == *owner)
         .unwrap()
         .size;
     let (status, db) = server.api.admin_db_optimize(owner, db).await?;

diff --git a/agdb_server/tests/routes/admin_db_user_add_test.rs b/agdb_server/tests/routes/admin_db_user_add_test.rs
@@ -26,7 +26,8 @@ async fn db_user_add() -> anyhow::Result<()> {
     assert_eq!(
         list,
         vec![ServerDatabase {
-            name: format!("{}/{}", owner, db),
+            name: db.to_string(),
+            owner: owner.to_string(),
             db_type: DbType::Mapped,
             role: DbUserRole::Write,
             size: 2656,
@@ -61,7 +62,8 @@ async fn change_user_role() -> anyhow::Result<()> {
     assert_eq!(
         list,
         vec![ServerDatabase {
-            name: format!("{}/{}", owner, db),
+            name: db.to_string(),
+            owner: owner.to_string(),
             db_type: DbType::Mapped,
             role: DbUserRole::Read,
             size: 2656,