github-mirrors/AppFlowy-Cloud
1
0
Fork 0
mirror of https://github.com/AppFlowy-IO/AppFlowy-Cloud.git synced 2025-04-19 03:24:42 -04:00
Code Issues Projects Releases Packages Wiki Activity

feat: added test case and use triggers

Browse source
This commit is contained in:
Fu Zi Xiang 2024-01-23 14:48:25 +08:00
parent 27b7b8b5b8
commit 7c95f6556a
No known key found for this signature in database
10 changed files with 84 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
.sqlx/query-4775e2efabeb435663e9de51b21d6182040e714499adc0b58937c226c5993a80.json generated
View file

@ -1,25 +0,0 @@
{
"db_name": "PostgreSQL",
"query": "\n WITH ins_user AS (\n INSERT INTO af_user (uid, uuid, email, name)\n VALUES ($1, $2, $3, $4) \n ON CONFLICT(email) DO NOTHING\n RETURNING uid\n ),\n owner_role AS (\n SELECT id FROM af_roles WHERE name = 'Owner'\n ),\n ins_workspace AS (\n INSERT INTO af_workspace (owner_uid)\n SELECT uid FROM ins_user\n RETURNING workspace_id, owner_uid\n ),\n ins_collab_member AS (\n INSERT INTO af_collab_member (uid, oid, permission_id)\n SELECT ins_workspace.owner_uid,\n ins_workspace.workspace_id::TEXT, \n (SELECT permission_id FROM af_role_permissions WHERE role_id = owner_role.id)\n FROM ins_workspace, owner_role\n ),\n ins_workspace_member AS (\n INSERT INTO af_workspace_member (uid, role_id, workspace_id)\n SELECT ins_workspace.owner_uid, owner_role.id, ins_workspace.workspace_id\n FROM ins_workspace, owner_role\n )\n SELECT workspace_id FROM ins_workspace;\n ",
"describe": {
"columns": [
{
"ordinal": 0,
"name": "workspace_id",
"type_info": "Uuid"
}
],
"parameters": {
"Left": [
"Int8",
"Uuid",
"Text",
"Text"
]
},
"nullable": [
false
]
},
"hash": "4775e2efabeb435663e9de51b21d6182040e714499adc0b58937c226c5993a80"
}

25
.sqlx/query-b4fa2e732c975fbb23c346981c4fb1e2e0aab6f3a1ac9c2fc99b4cdee9e58cbe.json generated Normal file
View file

@ -0,0 +1,25 @@
{
"db_name": "PostgreSQL",
"query": "\n WITH ins_user AS (\n INSERT INTO af_user (uid, uuid, email, name)\n VALUES ($1, $2, $3, $4)\n ON CONFLICT(email) DO NOTHING\n RETURNING uid\n ),\n owner_role AS (\n SELECT id FROM af_roles WHERE name = 'Owner'\n ),\n ins_workspace AS (\n INSERT INTO af_workspace (owner_uid)\n SELECT uid FROM ins_user\n RETURNING workspace_id, owner_uid\n ),\n ins_collab_member AS (\n INSERT INTO af_collab_member (uid, oid, permission_id)\n SELECT ins_workspace.owner_uid,\n ins_workspace.workspace_id::TEXT,\n (SELECT permission_id FROM af_role_permissions WHERE role_id = owner_role.id)\n FROM ins_workspace, owner_role\n )\n SELECT workspace_id FROM ins_workspace;\n ",
"describe": {
"columns": [
{
"ordinal": 0,
"name": "workspace_id",
"type_info": "Uuid"
}
],
"parameters": {
"Left": [
"Int8",
"Uuid",
"Text",
"Text"
]
},
"nullable": [
false
]
},
"hash": "b4fa2e732c975fbb23c346981c4fb1e2e0aab6f3a1ac9c2fc99b4cdee9e58cbe"
}

4
.sqlx/query-c95a9130eb573498248beab702f0fd3d173b6456d079466683be78f1c9bb4f76.json → .sqlx/query-d61523de25986b47a382d36a1f18e590420f1b1285d024f5554cc02c375d6476.json generated
View file

@ -1,6 +1,6 @@
{
"db_name": "PostgreSQL",
"query": "\n SELECT EXISTS(\n SELECT 1 \n FROM af_user \n WHERE uuid = $1\n ) AS user_exists;\n ",
"query": "\n SELECT EXISTS(\n SELECT 1\n FROM af_user\n WHERE uuid = $1\n ) AS user_exists;\n ",
"describe": {
"columns": [
{
@ -18,5 +18,5 @@
null
]
},
"hash": "c95a9130eb573498248beab702f0fd3d173b6456d079466683be78f1c9bb4f76"
"hash": "d61523de25986b47a382d36a1f18e590420f1b1285d024f5554cc02c375d6476"
}

13
libs/client-api/src/http.rs
View file

@ -489,6 +489,19 @@ impl Client {
.into_data()
}
#[instrument(level = "debug", skip_all, err)]
pub async fn delete_workspace(&self, workspace_id: &str) -> Result<(), AppResponseError> {
let url = format!("{}/api/workspace/{}", self.base_url, workspace_id);
let resp = self
.http_client_with_auth(Method::DELETE, &url)
.await?
.send()
.await?;
log_request_id(&resp);
AppResponse::<()>::from_response(resp).await?.into_error()?;
Ok(())
}
#[instrument(level = "debug", skip_all, err)]
pub async fn add_workspace(&self) -> Result<AFWorkspace, AppResponseError> {
let url = format!("{}/api/workspace", self.base_url);

2
libs/database/src/pg_row.rs
View file

@ -108,7 +108,7 @@ pub struct AFWorkspaceMemberPermRow {
pub workspace_id: Uuid,
}
#[derive(FromRow, Serialize, Deserialize)]
#[derive(Debug, FromRow, Serialize, Deserialize)]
pub struct AFWorkspaceMemberRow {
pub uid: i64,
pub name: String,

13
libs/database/src/user.rs
View file

@ -93,7 +93,7 @@ pub async fn create_user<'a, E: Executor<'a, Database = Postgres>>(
r#"
WITH ins_user AS (
INSERT INTO af_user (uid, uuid, email, name)
VALUES ($1, $2, $3, $4)
VALUES ($1, $2, $3, $4)
ON CONFLICT(email) DO NOTHING
RETURNING uid
),
@ -108,14 +108,9 @@ pub async fn create_user<'a, E: Executor<'a, Database = Postgres>>(
ins_collab_member AS (
INSERT INTO af_collab_member (uid, oid, permission_id)
SELECT ins_workspace.owner_uid,
ins_workspace.workspace_id::TEXT,
ins_workspace.workspace_id::TEXT,
(SELECT permission_id FROM af_role_permissions WHERE role_id = owner_role.id)
FROM ins_workspace, owner_role
),
ins_workspace_member AS (
INSERT INTO af_workspace_member (uid, role_id, workspace_id)
SELECT ins_workspace.owner_uid, owner_role.id, ins_workspace.workspace_id
FROM ins_workspace, owner_role
)
SELECT workspace_id FROM ins_workspace;
"#,
@ -173,8 +168,8 @@ pub async fn is_user_exist<'a, E: Executor<'a, Database = Postgres>>(
let exists = sqlx::query_scalar!(
r#"
SELECT EXISTS(
SELECT 1
FROM af_user
SELECT 1
FROM af_user
WHERE uuid = $1
) AS user_exists;
"#,

20
migrations/20240123140707_workspace_owner_trigger.sql Normal file
View file

@ -0,0 +1,20 @@
CREATE OR REPLACE FUNCTION af_workspace_insert_trigger()
RETURNS TRIGGER AS $$
BEGIN
-- Insert a record into af_workspace_member
INSERT INTO public.af_workspace_member (
uid, role_id,
workspace_id, created_at, updated_at)
VALUES (
NEW.owner_uid, (SELECT id FROM public.af_roles WHERE name = 'Owner'),
NEW.workspace_id, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
-- Return the new record to complete the insert operation
RETURN NEW;
END;
$$ LANGUAGE plpgsql;
CREATE TRIGGER af_workspace_after_insert
AFTER INSERT ON public.af_workspace
FOR EACH ROW
EXECUTE FUNCTION af_workspace_insert_trigger();

4
src/api/workspace.rs
View file

@ -40,10 +40,10 @@ pub const COLLAB_OBJECT_ID_PATH: &str = "object_id";
pub fn workspace_scope() -> Scope {
web::scope("/api/workspace")
// deprecated, use `/` instead
// deprecated, use the api below instead
.service(web::resource("/list").route(web::get().to(list_workspace_handler)))
.service(web::resource("/")
.service(web::resource("")
.route(web::get().to(list_workspace_handler))
.route(web::post().to(add_workpace_handler))
)

1
src/biz/casbin/access_control.rs
View file

@ -398,6 +398,7 @@ impl WorkspaceAccessControl for CasbinWorkspaceAccessControl {
.await?;
self.get_role_from_uid(&uid, workspace_id).await
}
async fn get_role_from_uid(&self, uid: &i64, workspace_id: &Uuid) -> Result<AFRole, AppError> {
let policies = self
.casbin_access_control

16
tests/workspace/workspace_crud.rs
View file

@ -1 +1,17 @@
use crate::user::utils::generate_unique_registered_user_client;
#[tokio::test]
async fn add_and_delete_workspace_for_user() {
let (c, _user) = generate_unique_registered_user_client().await;
let workspaces = c.get_workspaces().await.unwrap();
assert_eq!(workspaces.0.len(), 1);
let newly_addad_workspace = c.add_workspace().await.unwrap();
let workspaces = c.get_workspaces().await.unwrap();
assert_eq!(workspaces.0.len(), 2);
c.delete_workspace(&newly_addad_workspace.workspace_id.to_string())
.await
.unwrap();
let workspaces = c.get_workspaces().await.unwrap();
assert_eq!(workspaces.0.len(), 1);
}