[server] Add admin db rename #872 (#912)

* fix rename with backup * add admin db rename * refactor add db * refactoring * rename * exec * add user * fixes * user * fix coverage
agnesoft · Dec 23, 2023 · 0a8812f · 0a8812f
1 parent cafac48
commit 0a8812f
Show file tree

Hide file tree

Showing 25 changed files with 1,004 additions and 914 deletions.
diff --git a/agdb_server/openapi/schema.json b/agdb_server/openapi/schema.json
@@ -23,7 +23,7 @@
                 "schema": {
                   "type": "array",
                   "items": {
-                    "$ref": "#/components/schemas/ServerDatabaseSize"
+                    "$ref": "#/components/schemas/ServerDatabase"
                   }
                 }
               }
@@ -295,6 +295,61 @@
         ]
       }
     },
+    "/api/v1/admin/db/{owner}/{db}/rename": {
+      "post": {
+        "tags": [
+          "crate::routes::admin::db"
+        ],
+        "operationId": "rename",
+        "parameters": [
+          {
+            "name": "owner",
+            "in": "path",
+            "description": "db owner user name",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "db",
+            "in": "path",
+            "description": "db name",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "new_name",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "201": {
+            "description": "db renamed"
+          },
+          "401": {
+            "description": "unauthorized"
+          },
+          "404": {
+            "description": "user / db not found"
+          },
+          "467": {
+            "description": "invalid db"
+          }
+        },
+        "security": [
+          {
+            "Token": []
+          }
+        ]
+      }
+    },
     "/api/v1/admin/db/{owner}/{db}/user/list": {
       "get": {
         "tags": [
@@ -624,7 +679,7 @@
                 "schema": {
                   "type": "array",
                   "items": {
-                    "$ref": "#/components/schemas/ServerDatabaseWithRole"
+                    "$ref": "#/components/schemas/ServerDatabase"
                   }
                 }
               }
@@ -889,7 +944,7 @@
             "content": {
               "application/json": {
                 "schema": {
-                  "$ref": "#/components/schemas/ServerDatabaseSize"
+                  "$ref": "#/components/schemas/ServerDatabase"
                 }
               }
             }
@@ -990,7 +1045,7 @@
           }
         ],
         "responses": {
-          "204": {
+          "201": {
             "description": "db renamed"
           },
           "401": {
@@ -1415,22 +1470,12 @@
           "$ref": "#/components/schemas/QueryResult"
         }
       },
-      "ServerDatabaseRename": {
-        "type": "object",
-        "required": [
-          "new_name"
-        ],
-        "properties": {
-          "new_name": {
-            "type": "string"
-          }
-        }
-      },
-      "ServerDatabaseSize": {
+      "ServerDatabase": {
         "type": "object",
         "required": [
           "name",
           "db_type",
+          "role",
           "size",
           "backup"
         ],
@@ -1446,41 +1491,24 @@
           "name": {
             "type": "string"
           },
+          "role": {
+            "$ref": "#/components/schemas/DbUserRole"
+          },
           "size": {
             "type": "integer",
             "format": "int64",
             "minimum": 0
           }
         }
       },
-      "ServerDatabaseWithRole": {
+      "ServerDatabaseRename": {
         "type": "object",
         "required": [
-          "name",
-          "db_type",
-          "role",
-          "size",
-          "backup"
+          "new_name"
         ],
         "properties": {
-          "backup": {
-            "type": "integer",
-            "format": "int64",
-            "minimum": 0
-          },
-          "db_type": {
-            "$ref": "#/components/schemas/DbType"
-          },
-          "name": {
+          "new_name": {
             "type": "string"
-          },
-          "role": {
-            "$ref": "#/components/schemas/DbUserRole"
-          },
-          "size": {
-            "type": "integer",
-            "format": "int64",
-            "minimum": 0
           }
         }
       },

diff --git a/agdb_server/src/api.rs b/agdb_server/src/api.rs
@@ -13,6 +13,7 @@ use utoipa::OpenApi;
         crate::routes::admin::db::exec,
         crate::routes::admin::db::list,
         crate::routes::admin::db::optimize,
+        crate::routes::admin::db::rename,
         crate::routes::admin::db::remove,
         crate::routes::admin::db::user::add,
         crate::routes::admin::db::user::list,
@@ -42,8 +43,7 @@ use utoipa::OpenApi;
         crate::routes::db::DbTypeParam,
         crate::routes::db::Queries,
         crate::routes::db::QueriesResults,
-        crate::routes::db::ServerDatabaseSize,
-        crate::routes::db::ServerDatabaseWithRole,
+        crate::routes::db::ServerDatabase,
         crate::routes::db::ServerDatabaseRename,
         crate::routes::db::user::DbUser,
         crate::routes::db::user::DbUserRole,

diff --git a/agdb_server/src/app.rs b/agdb_server/src/app.rs
@@ -52,6 +52,10 @@ pub(crate) fn app(config: Config, shutdown_sender: Sender<()>, db_pool: DbPool)
             "/admin/db/:user/:db/remove",
             routing::delete(routes::admin::db::remove),
         )
+        .route(
+            "/admin/db/:user/:db/rename",
+            routing::post(routes::admin::db::rename),
+        )
         .route(
             "/admin/db/:user/:db/user/list",
             routing::get(routes::admin::db::user::list),