Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.
TypeScript agentaiai-agentsall-in-onecrmcrm-systememaillinearmcpmessagingnotesnotionofficerustslackslack-alternativestartupstartup-toolstypescriptworkspace
feat(initiatives): add Initiative to get_share_permission_id and team_share (#6413)
Will Hutchinson6c43dbb66872
diff --git a/.sqlx/query-1c82e790d584a66621fce3191cb07d87e885c254bd4ef4d599511128a80a6f97.json b/.sqlx/query-1c82e790d584a66621fce3191cb07d87e885c254bd4ef4d599511128a80a6f97.jsonnew file mode 100644index 0000000000..ceb4976bd6--- /dev/null+++ b/.sqlx/query-1c82e790d584a66621fce3191cb07d87e885c254bd4ef4d599511128a80a6f97.json@@ -0,0 +1,16 @@+{+ "db_name": "PostgreSQL",+ "query": "INSERT INTO entity_access\n (entity_id, entity_type, source_id, source_type, access_level, granted_from_project_id)\n VALUES ($1, $2, $3, 'team', 'edit', '20000000-0000-0000-0000-000000000001')",+ "describe": {+ "columns": [],+ "parameters": {+ "Left": [+ "Uuid",+ "Text",+ "Text"+ ]+ },+ "nullable": []+ },+ "hash": "1c82e790d584a66621fce3191cb07d87e885c254bd4ef4d599511128a80a6f97"+}diff --git a/.sqlx/query-2e0fad4fd34050bb71e4e58b7b0101313981f4f3cb43e6929e4dec9190708544.json b/.sqlx/query-2e0fad4fd34050bb71e4e58b7b0101313981f4f3cb43e6929e4dec9190708544.jsonnew file mode 100644index 0000000000..70a67434ac--- /dev/null+++ b/.sqlx/query-2e0fad4fd34050bb71e4e58b7b0101313981f4f3cb43e6929e4dec9190708544.json@@ -0,0 +1,22 @@+{+ "db_name": "PostgreSQL",+ "query": "\n SELECT share_permission_id as \"share_permission_id!\"\n FROM initiative WHERE id = $1::uuid\n ",+ "describe": {+ "columns": [+ {+ "ordinal": 0,+ "name": "share_permission_id!",+ "type_info": "Text"+ }+ ],+ "parameters": {+ "Left": [+ "Uuid"+ ]+ },+ "nullable": [+ false+ ]+ },+ "hash": "2e0fad4fd34050bb71e4e58b7b0101313981f4f3cb43e6929e4dec9190708544"+}diff --git a/.sqlx/query-aab0a1bf68d63f534ec4c3014d3abee18bd3f454d90a890c03b1d686f9b84a26.json b/.sqlx/query-9140f56c5b6db76d141ad41ea212ddee952e1cc9ab09a05bced79927433b5935.jsonsimilarity index 76%rename from .sqlx/query-aab0a1bf68d63f534ec4c3014d3abee18bd3f454d90a890c03b1d686f9b84a26.jsonrename to .sqlx/query-9140f56c5b6db76d141ad41ea212ddee952e1cc9ab09a05bced79927433b5935.jsonindex bdc8676526..809958e4b7 100644--- a/.sqlx/query-aab0a1bf68d63f534ec4c3014d3abee18bd3f454d90a890c03b1d686f9b84a26.json+++ b/.sqlx/query-9140f56c5b6db76d141ad41ea212ddee952e1cc9ab09a05bced79927433b5935.json@@ -1,6 +1,6 @@{"db_name": "PostgreSQL",- "query": "WITH entity AS (\n SELECT d.owner, dp.\"sharePermissionId\" AS permission_id\n FROM \"Document\" d LEFT JOIN \"DocumentPermission\" dp ON dp.\"documentId\" = d.id\n WHERE $2 = 'document' AND d.id = $1\n UNION ALL\n SELECT p.\"userId\", pp.\"sharePermissionId\"\n FROM \"Project\" p LEFT JOIN \"ProjectPermission\" pp ON pp.\"projectId\" = p.id\n WHERE $2 = 'project' AND p.id = $1\n UNION ALL\n SELECT c.\"userId\", cp.\"sharePermissionId\"\n FROM \"Chat\" c LEFT JOIN \"ChatPermission\" cp ON cp.\"chatId\" = c.id\n WHERE $2 = 'chat' AND c.id = $1\n UNION ALL\n SELECT l.macro_id, tp.\"sharePermissionId\"\n FROM email_threads t JOIN email_links l ON l.id = t.link_id\n LEFT JOIN \"EmailThreadPermission\" tp ON tp.\"threadId\" = t.id::text\n WHERE $2 = 'email_thread' AND t.id = $3\n UNION ALL\n SELECT c.created_by, c.share_permission_id FROM calls c\n WHERE $2 = 'call' AND c.id = $3\n UNION ALL\n SELECT c.created_by, c.share_permission_id FROM call_records c\n WHERE $2 = 'call' AND c.id = $3 AND NOT EXISTS (SELECT 1 FROM calls WHERE id = $3)\n )\n SELECT e.owner AS \"owner!\", e.permission_id,\n sp.id AS \"stored_permission_id?\",\n sp.team_share_access_level AS \"level: AccessLevel\",\n sp.team_share_team_id AS team_id, sp.team_share_revision AS \"revision?\",\n (SELECT tu.team_id FROM team_user tu WHERE tu.user_id = e.owner\n ORDER BY tu.team_role DESC LIMIT 1) AS owner_team_id\n FROM entity e LEFT JOIN \"SharePermission\" sp ON sp.id = e.permission_id",+ "query": "WITH entity AS (\n SELECT d.owner, dp.\"sharePermissionId\" AS permission_id\n FROM \"Document\" d LEFT JOIN \"DocumentPermission\" dp ON dp.\"documentId\" = d.id\n WHERE $2 = 'document' AND d.id = $1\n UNION ALL\n SELECT p.\"userId\", pp.\"sharePermissionId\"\n FROM \"Project\" p LEFT JOIN \"ProjectPermission\" pp ON pp.\"projectId\" = p.id\n WHERE $2 = 'project' AND p.id = $1\n UNION ALL\n SELECT c.\"userId\", cp.\"sharePermissionId\"\n FROM \"Chat\" c LEFT JOIN \"ChatPermission\" cp ON cp.\"chatId\" = c.id\n WHERE $2 = 'chat' AND c.id = $1\n UNION ALL\n SELECT l.macro_id, tp.\"sharePermissionId\"\n FROM email_threads t JOIN email_links l ON l.id = t.link_id\n LEFT JOIN \"EmailThreadPermission\" tp ON tp.\"threadId\" = t.id::text\n WHERE $2 = 'email_thread' AND t.id = $3\n UNION ALL\n SELECT c.created_by, c.share_permission_id FROM calls c\n WHERE $2 = 'call' AND c.id = $3\n UNION ALL\n SELECT c.created_by, c.share_permission_id FROM call_records c\n WHERE $2 = 'call' AND c.id = $3 AND NOT EXISTS (SELECT 1 FROM calls WHERE id = $3)\n UNION ALL\n SELECT i.owner_user_id, i.share_permission_id FROM initiative i\n WHERE $2 = 'initiative' AND i.id = $3\n )\n SELECT e.owner AS \"owner!\", e.permission_id,\n sp.id AS \"stored_permission_id?\",\n sp.team_share_access_level AS \"level: AccessLevel\",\n sp.team_share_team_id AS team_id, sp.team_share_revision AS \"revision?\",\n (SELECT tu.team_id FROM team_user tu WHERE tu.user_id = e.owner\n ORDER BY tu.team_role DESC LIMIT 1) AS owner_team_id\n FROM entity e LEFT JOIN \"SharePermission\" sp ON sp.id = e.permission_id","describe": {"columns": [{@@ -68,5 +68,5 @@null]},- "hash": "aab0a1bf68d63f534ec4c3014d3abee18bd3f454d90a890c03b1d686f9b84a26"+ "hash": "9140f56c5b6db76d141ad41ea212ddee952e1cc9ab09a05bced79927433b5935"}diff --git a/.sqlx/query-b181eaf749c1a976dcde865659e0008923f4bc951a3de6cc02f8718246f244bf.json b/.sqlx/query-b181eaf749c1a976dcde865659e0008923f4bc951a3de6cc02f8718246f244bf.jsonnew file mode 100644index 0000000000..64c5ef09d8--- /dev/null+++ b/.sqlx/query-b181eaf749c1a976dcde865659e0008923f4bc951a3de6cc02f8718246f244bf.json@@ -0,0 +1,35 @@+{+ "db_name": "PostgreSQL",+ "query": "SELECT access_level AS \"access_level: AccessLevel\"\n FROM entity_access\n WHERE entity_id = $1 AND entity_type = $2 AND source_type = 'team'\n AND granted_from_project_id IS NOT NULL",+ "describe": {+ "columns": [+ {+ "ordinal": 0,+ "name": "access_level: AccessLevel",+ "type_info": {+ "Custom": {+ "name": "\"AccessLevel\"",+ "kind": {+ "Enum": [+ "view",+ "comment",+ "edit",+ "owner"+ ]+ }+ }+ }+ }+ ],+ "parameters": {+ "Left": [+ "Uuid",+ "Text"+ ]+ },+ "nullable": [+ false+ ]+ },+ "hash": "b181eaf749c1a976dcde865659e0008923f4bc951a3de6cc02f8718246f244bf"+}diff --git a/.sqlx/query-f4bf6e89d050cab822d5ff9a0ed992e69e9d253a5dc6440b0066dc542b8d7e07.json b/.sqlx/query-f4bf6e89d050cab822d5ff9a0ed992e69e9d253a5dc6440b0066dc542b8d7e07.jsonnew file mode 100644index 0000000000..d68ac0ad08--- /dev/null+++ b/.sqlx/query-f4bf6e89d050cab822d5ff9a0ed992e69e9d253a5dc6440b0066dc542b8d7e07.json@@ -0,0 +1,36 @@+{+ "db_name": "PostgreSQL",+ "query": "SELECT access_level AS \"access_level: AccessLevel\"\n FROM entity_access\n WHERE entity_id = $1 AND entity_type = $2 AND source_type = 'team'\n AND source_id = $3 AND granted_from_project_id IS NULL\n ORDER BY access_level",+ "describe": {+ "columns": [+ {+ "ordinal": 0,+ "name": "access_level: AccessLevel",+ "type_info": {+ "Custom": {+ "name": "\"AccessLevel\"",+ "kind": {+ "Enum": [+ "view",+ "comment",+ "edit",+ "owner"+ ]+ }+ }+ }+ }+ ],+ "parameters": {+ "Left": [+ "Uuid",+ "Text",+ "Text"+ ]+ },+ "nullable": [+ false+ ]+ },+ "hash": "f4bf6e89d050cab822d5ff9a0ed992e69e9d253a5dc6440b0066dc542b8d7e07"+}diff --git a/crates/share_permission_db_utils/fixtures/team_share.sql b/crates/share_permission_db_utils/fixtures/team_share.sqlindex 46e7ecef96..dec4eb349e 100644--- a/crates/share_permission_db_utils/fixtures/team_share.sql+++ b/crates/share_permission_db_utils/fixtures/team_share.sql@@ -14,7 +14,9 @@ INSERT INTO "Document" (id, name, owner) VALUES('20000000-0000-0000-0000-000000000002', 'Document', 'macro|[email protected]');INSERT INTO "Chat" (id, name, "userId") VALUES('20000000-0000-0000-0000-000000000003', 'Chat', 'macro|[email protected]');-INSERT INTO "SharePermission" (id) VALUES ('project'), ('document'), ('chat'), ('active-call'), ('archived-call');+INSERT INTO "SharePermission" (id) VALUES ('project'), ('document'), ('chat'), ('active-call'), ('archived-call'), ('initiative');+INSERT INTO initiative (id, name, owner_user_id, share_permission_id) VALUES+ ('20000000-0000-0000-0000-000000000007', 'Initiative', 'macro|[email protected]', 'initiative');INSERT INTO "ProjectPermission" ("projectId", "sharePermissionId") VALUES ('20000000-0000-0000-0000-000000000001', 'project');INSERT INTO "DocumentPermission" ("documentId", "sharePermissionId") VALUES ('20000000-0000-0000-0000-000000000002', 'document');INSERT INTO "ChatPermission" ("chatId", "sharePermissionId") VALUES ('20000000-0000-0000-0000-000000000003', 'chat');diff --git a/crates/share_permission_db_utils/src/lib.rs b/crates/share_permission_db_utils/src/lib.rsindex e9b4b69c98..93a3ca01e7 100644--- a/crates/share_permission_db_utils/src/lib.rs+++ b/crates/share_permission_db_utils/src/lib.rs@@ -125,6 +125,18 @@ where.fetch_one(executor).await?}+ "initiative" => {+ let item_id = macro_uuid::string_to_uuid(item_id)?;+ sqlx::query_scalar!(+ r#"+ SELECT share_permission_id as "share_permission_id!"+ FROM initiative WHERE id = $1::uuid+ "#,+ item_id,+ )+ .fetch_one(executor)+ .await?+ }_ => anyhow::bail!("unsupported item type {item_type}"),};diff --git a/crates/share_permission_db_utils/src/team_share.rs b/crates/share_permission_db_utils/src/team_share.rsindex 9a6e12bc0a..0781820186 100644--- a/crates/share_permission_db_utils/src/team_share.rs+++ b/crates/share_permission_db_utils/src/team_share.rs@@ -95,6 +95,7 @@ fn entity_uuid(entity: &Entity<'_>) -> TeamShareResult<Uuid> {| EntityType::Chat| EntityType::EmailThread| EntityType::Call+ | EntityType::Initiative) {return Err(report!(TeamShareError::InvalidEntity));}@@ -140,6 +141,9 @@ async fn load_state(connection: &mut PgConnection, entity: &Entity<'_>) -> TeamSUNION ALLSELECT c.created_by, c.share_permission_id FROM call_records cWHERE $2 = 'call' AND c.id = $3 AND NOT EXISTS (SELECT 1 FROM calls WHERE id = $3)+ UNION ALL+ SELECT i.owner_user_id, i.share_permission_id FROM initiative i+ WHERE $2 = 'initiative' AND i.id = $3)SELECT e.owner AS "owner!", e.permission_id,sp.id AS "stored_permission_id?",diff --git a/crates/share_permission_db_utils/src/team_share/test.rs b/crates/share_permission_db_utils/src/team_share/test.rsindex 22b907919f..7f266a40c8 100644--- a/crates/share_permission_db_utils/src/team_share/test.rs+++ b/crates/share_permission_db_utils/src/team_share/test.rs@@ -7,6 +7,10 @@ fn document() -> Entity<'static> {EntityType::Document.with_entity_string("20000000-0000-0000-0000-000000000002".to_string())}+fn initiative() -> Entity<'static> {+ EntityType::Initiative.with_entity_string("20000000-0000-0000-0000-000000000007".to_string())+}+fn command(facts: &TeamShareFacts, level: Option<AccessLevel>) -> AuthorizedTeamShareCommand {authorize_team_share(Some(&facts.owner),@@ -23,73 +27,144 @@ fn command(facts: &TeamShareFacts, level: Option<AccessLevel>) -> AuthorizedTeamasync fn direct_team_rows(tx: &mut Transaction<'_, Postgres>,- document_id: &Uuid,+ entity_id: &Uuid,+ entity_type: EntityType,team_id: Uuid,) -> sqlx::Result<Vec<AccessLevel>> {sqlx::query_scalar!(r#"SELECT access_level AS "access_level: AccessLevel"FROM entity_access- WHERE entity_id = $1 AND entity_type = 'document' AND source_type = 'team'- AND source_id = $2 AND granted_from_project_id IS NULL+ WHERE entity_id = $1 AND entity_type = $2 AND source_type = 'team'+ AND source_id = $3 AND granted_from_project_id IS NULLORDER BY access_level"#,- document_id,+ entity_id,+ entity_type.as_ref(),team_id.to_string(),).fetch_all(tx.as_mut()).await}-#[sqlx::test(- migrator = "MACRO_DB_MIGRATIONS",- fixtures(path = "../../fixtures", scripts("team_share"))-)]-async fn apply_inserts_updates_and_deletes_direct_team_entity_access(- pool: PgPool,+async fn apply_comment_view_and_clear(+ tx: &mut Transaction<'_, Postgres>,+ entity: &Entity<'_>,) -> rootcause::Result<()> {- let entity = document();let uuid = Uuid::parse_str(&entity.entity_id)?;- let mut tx = pool.begin().await?;- let facts = load_facts(&mut tx, &entity).await?;+ let facts = load_facts(tx, entity).await?;let team_id = facts.owner_team_id.expect("fixture owner belongs to a team");- apply(&mut tx, &command(&facts, Some(AccessLevel::Comment))).await?;+ apply(tx, &command(&facts, Some(AccessLevel::Comment))).await?;assert_eq!(- direct_team_rows(&mut tx, &uuid, team_id).await?,+ direct_team_rows(tx, &uuid, entity.entity_type, team_id).await?,vec![AccessLevel::Comment]);- let facts = load_facts(&mut tx, &entity).await?;- apply(&mut tx, &command(&facts, Some(AccessLevel::View))).await?;+ let facts = load_facts(tx, entity).await?;+ apply(tx, &command(&facts, Some(AccessLevel::View))).await?;assert_eq!(- direct_team_rows(&mut tx, &uuid, team_id).await?,+ direct_team_rows(tx, &uuid, entity.entity_type, team_id).await?,vec![AccessLevel::View]);sqlx::query!(r#"INSERT INTO entity_access(entity_id, entity_type, source_id, source_type, access_level, granted_from_project_id)- VALUES ($1, 'document', $2, 'team', 'edit', '20000000-0000-0000-0000-000000000001')"#,+ VALUES ($1, $2, $3, 'team', 'edit', '20000000-0000-0000-0000-000000000001')"#,uuid,+ entity.entity_type.as_ref(),team_id.to_string(),).execute(tx.as_mut()).await?;- let facts = load_facts(&mut tx, &entity).await?;- apply(&mut tx, &command(&facts, None)).await?;- assert!(direct_team_rows(&mut tx, &uuid, team_id).await?.is_empty());+ let facts = load_facts(tx, entity).await?;+ apply(tx, &command(&facts, None)).await?;+ assert!(+ direct_team_rows(tx, &uuid, entity.entity_type, team_id)+ .await?+ .is_empty()+ );let inherited = sqlx::query_scalar!(r#"SELECT access_level AS "access_level: AccessLevel"FROM entity_access- WHERE entity_id = $1 AND entity_type = 'document' AND source_type = 'team'+ WHERE entity_id = $1 AND entity_type = $2 AND source_type = 'team'AND granted_from_project_id IS NOT NULL"#,uuid,+ entity.entity_type.as_ref(),).fetch_one(tx.as_mut()).await?;assert_eq!(inherited, AccessLevel::Edit);- assert_eq!(load_facts(&mut tx, &entity).await?.current, None);+ assert_eq!(load_facts(tx, entity).await?.current, None);+ Ok(())+}++#[sqlx::test(+ migrator = "MACRO_DB_MIGRATIONS",+ fixtures(path = "../../fixtures", scripts("team_share"))+)]+async fn apply_inserts_updates_and_deletes_direct_team_entity_access(+ pool: PgPool,+) -> rootcause::Result<()> {+ let mut tx = pool.begin().await?;+ apply_comment_view_and_clear(&mut tx, &document()).await+}++#[sqlx::test(+ migrator = "MACRO_DB_MIGRATIONS",+ fixtures(path = "../../fixtures", scripts("team_share"))+)]+async fn apply_inserts_updates_and_deletes_direct_team_entity_access_for_initiative(+ pool: PgPool,+) -> rootcause::Result<()> {+ let mut tx = pool.begin().await?;+ apply_comment_view_and_clear(&mut tx, &initiative()).await+}++#[sqlx::test(+ migrator = "MACRO_DB_MIGRATIONS",+ fixtures(path = "../../fixtures", scripts("team_share"))+)]+async fn initialize_grants_comment_to_owner_team_for_initiative(+ pool: PgPool,+) -> rootcause::Result<()> {+ let entity = initiative();+ let uuid = Uuid::parse_str(&entity.entity_id)?;+ let mut tx = pool.begin().await?;++ let facts = load_facts(&mut tx, &entity).await?;+ let team_id = facts+ .owner_team_id+ .expect("fixture owner belongs to a team");+ assert_eq!(facts.current, None);+ assert_eq!(facts.revision, 0);++ initialize(&mut tx, &entity, TeamShareCreation::ExplicitTask).await?;++ let facts = load_facts(&mut tx, &entity).await?;+ assert_eq!(+ facts.current,+ Some(TeamShareGrant {+ team_id,+ level: TeamShareLevel::Comment,+ })+ );+ assert_eq!(facts.revision, 1);+ assert_eq!(+ direct_team_rows(&mut tx, &uuid, EntityType::Initiative, team_id).await?,+ vec![AccessLevel::Comment]+ );+ Ok(())+}++#[sqlx::test(migrator = "MACRO_DB_MIGRATIONS")]+async fn load_facts_rejects_unsupported_entity_type(pool: PgPool) -> rootcause::Result<()> {+ let entity =+ EntityType::User.with_entity_string("20000000-0000-0000-0000-000000000001".to_string());+ let mut tx = pool.begin().await?;+ let error = load_facts(&mut tx, &entity).await.unwrap_err();+ assert_eq!(*error.current_context(), TeamShareError::InvalidEntity);Ok(())}diff --git a/crates/share_permission_db_utils/src/test.rs b/crates/share_permission_db_utils/src/test.rsindex 319b695178..f22f712e88 100644--- a/crates/share_permission_db_utils/src/test.rs+++ b/crates/share_permission_db_utils/src/test.rs@@ -46,3 +46,29 @@ async fn get_team_default_link_share_returns_none_without_a_team(Ok(())}++#[sqlx::test(+ migrator = "MACRO_DB_MIGRATIONS",+ fixtures(path = "../fixtures", scripts("team_share"))+)]+async fn get_share_permission_id_returns_initiative_share_permission(+ pool: Pool<Postgres>,+) -> anyhow::Result<()> {+ assert_eq!(+ get_share_permission_id(&pool, "20000000-0000-0000-0000-000000000007", "initiative")+ .await?,+ "initiative"+ );+ Ok(())+}++#[sqlx::test(migrator = "MACRO_DB_MIGRATIONS")]+async fn get_share_permission_id_rejects_unsupported_item_type(+ pool: Pool<Postgres>,+) -> anyhow::Result<()> {+ let error = get_share_permission_id(&pool, "20000000-0000-0000-0000-000000000007", "reminder")+ .await+ .unwrap_err();+ assert_eq!(error.to_string(), "unsupported item type reminder");+ Ok(())+}