Skip to content

armgit / macro

Public Imported from GitHub
0

Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.

feat(ownership): refactor projects typed owner in project models restorepurge and poller (#6689)

Will Hutchinsoncfed3fe35e35
diff --git a/Cargo.lock b/Cargo.lock
index 3f26ebd95f..12d500eb3f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5128,9 +5128,9 @@ dependencies = [
"macro_env_var",
"macro_event_broker",
"macro_queues",
- "macro_user_id",
"macro_uuid",
"model",
+ "model_owner",
"projects",
"serde",
"serde_json",
diff --git a/crates/entity_access/src/inbound/axum_extractors/project.rs b/crates/entity_access/src/inbound/axum_extractors/project.rs
index 27149c44db..777b8f3953 100644
--- a/crates/entity_access/src/inbound/axum_extractors/project.rs
+++ b/crates/entity_access/src/inbound/axum_extractors/project.rs
@@ -96,7 +96,7 @@ where
};
if let Some(ref user_id) = macro_user_id
- && project_context.user_id == *user_id
+ && project_context.user_id.is_user(user_id)
{
return Ok(Self {
entity_access_receipt: project_access_receipt(
diff --git a/crates/entity_access/src/inbound/axum_extractors/project/test.rs b/crates/entity_access/src/inbound/axum_extractors/project/test.rs
index 6b4f305a12..80d823aab4 100644
--- a/crates/entity_access/src/inbound/axum_extractors/project/test.rs
+++ b/crates/entity_access/src/inbound/axum_extractors/project/test.rs
@@ -13,6 +13,8 @@ use macro_authorization::{
MacroAuthorizationError, MacroAuthorizationService, MacroAuthorizationState,
};
use macro_user_id::{lowercased::Lowercase, user_id::MacroUserId, user_id::MacroUserIdStr};
+use model::project::BasicProject;
+use model_owner::Owner;
use model_user::UserContext;
use rootcause::Report;
use uuid::Uuid;
@@ -342,7 +344,7 @@ fn project(deleted: bool) -> BasicProject {
fn project_owned_by(deleted: bool, owner_id: &'static str) -> BasicProject {
BasicProject {
id: PROJECT_ID.to_string(),
- user_id: MacroUserIdStr::parse_from_str(owner_id).expect("owner id should be valid"),
+ user_id: Owner::from_principal_str(owner_id).expect("owner id should be valid"),
parent_id: None,
name: "Test project".to_string(),
deleted_at: deleted.then(|| {
@@ -424,6 +426,56 @@ async fn authenticated_project_owner_bypasses_access_lookup() {
assert!(state.entity_access.calls().is_empty());
}
+#[tokio::test]
+async fn bot_owner_does_not_take_user_owner_fast_path() {
+ let state = TestState::new(Some(AccessLevel::Edit));
+ let mut project = project(false);
+ project.user_id = Owner::from_principal_str("bot|00000000-0000-0000-0000-00000000a1a1")
+ .expect("bot owner should be valid");
+
+ let extracted =
+ extract_project_access::<EditAccessLevel>(project_request(Some("valid"), project), &state)
+ .await
+ .expect("non-owner should fall through to entity_access");
+
+ assert!(matches!(
+ extracted.entity_access_receipt.entity_permission(),
+ EntityPermission::AccessLevel {
+ access_level: AccessLevel::Edit
+ }
+ ));
+ assert_eq!(state.entity_access.calls().len(), 1);
+ assert_eq!(
+ state.entity_access.calls()[0].user_id.as_deref(),
+ Some(USER_ID)
+ );
+}
+
+#[tokio::test]
+async fn team_owner_does_not_take_user_owner_fast_path() {
+ let state = TestState::new(Some(AccessLevel::View));
+ let mut project = project(false);
+ project.user_id = Owner::from_principal_str("01234567-89ab-cdef-0123-456789abcdef")
+ .expect("team owner should be valid");
+
+ let extracted =
+ extract_project_access::<ViewAccessLevel>(project_request(Some("valid"), project), &state)
+ .await
+ .expect("non-owner should fall through to entity_access");
+
+ assert!(matches!(
+ extracted.entity_access_receipt.entity_permission(),
+ EntityPermission::AccessLevel {
+ access_level: AccessLevel::View
+ }
+ ));
+ assert_eq!(state.entity_access.calls().len(), 1);
+ assert_eq!(
+ state.entity_access.calls()[0].user_id.as_deref(),
+ Some(USER_ID)
+ );
+}
+
#[tokio::test]
async fn user_scoped_bot_project_owner_delegates_to_the_service() {
let state = TestState::new(Some(AccessLevel::Owner));
diff --git a/crates/macro_db_client/src/document/initialize_onboarding_documents.rs b/crates/macro_db_client/src/document/initialize_onboarding_documents.rs
index c81af63422..98509fdd0d 100644
--- a/crates/macro_db_client/src/document/initialize_onboarding_documents.rs
+++ b/crates/macro_db_client/src/document/initialize_onboarding_documents.rs
@@ -21,8 +21,7 @@ pub async fn create_project_transaction(
parent_id: Option<String>,
share_permission: &SharePermissionV2,
) -> anyhow::Result<Project> {
- let project = sqlx::query_as!(
- Project,
+ let row = sqlx::query!(
r#"
INSERT INTO "Project" ("name", "userId", "parentId", "createdAt", "updatedAt")
VALUES ($1, $2, $3, NOW(), NOW())
@@ -35,6 +34,15 @@ pub async fn create_project_transaction(
)
.fetch_one(transaction.as_mut())
.await?;
+ let project = Project {
+ id: row.id,
+ name: row.name,
+ user_id: Owner::from_principal_str(&row.user_id)?,
+ parent_id: row.parent_id,
+ created_at: row.created_at,
+ updated_at: row.updated_at,
+ deleted_at: row.deleted_at,
+ };
create_project_permission(transaction, &project.id, share_permission).await?;
upsert_user_history(transaction, user_id.copied(), &project.id, "project").await?;
diff --git a/crates/macro_db_client/src/history.rs b/crates/macro_db_client/src/history.rs
index 7d9661489d..b3cb60d7a4 100644
--- a/crates/macro_db_client/src/history.rs
+++ b/crates/macro_db_client/src/history.rs
@@ -177,15 +177,21 @@ pub async fn get_user_history(db: &Pool<Postgres>, user_id: &str) -> anyhow::Res
})?;
Ok(Item::Chat(chat))
}
- "project" => Ok(Item::Project(map_project_item(
- r.id,
- r.user_id,
- r.name,
- r.created_at,
- r.updated_at,
- r.deleted_at,
- r.project_id,
- ))),
+ "project" => {
+ let project = map_project_item(
+ r.id,
+ r.user_id,
+ r.name,
+ r.created_at,
+ r.updated_at,
+ r.deleted_at,
+ r.project_id,
+ )
+ .map_err(|e| sqlx::Error::TypeNotFound {
+ type_name: e.to_string(),
+ })?;
+ Ok(Item::Project(project))
+ }
_ => Err(sqlx::Error::TypeNotFound {
type_name: r.item_type,
}),
diff --git a/crates/macro_db_client/src/notification.rs b/crates/macro_db_client/src/notification.rs
index 9221697e79..ffeba0c2d1 100644
--- a/crates/macro_db_client/src/notification.rs
+++ b/crates/macro_db_client/src/notification.rs
@@ -84,10 +84,14 @@ pub async fn get_basic_cloud_storage_item_metadata(
let project_metadata = get_basic_project(db, item_id)
.await
.context("unable to get project metadata")?;
+ let item_owner = match project_metadata.user_id {
+ Owner::User(user_id) => user_id,
+ owner => anyhow::bail!("project {item_id} is owned by {owner}, not a user"),
+ };
Ok(BasicCloudStorageItemMetadata {
item_id: project_metadata.id,
item_name: project_metadata.name,
- item_owner: project_metadata.user_id,
+ item_owner,
file_type: None,
sub_type: None,
})
diff --git a/crates/macro_db_client/src/pins.rs b/crates/macro_db_client/src/pins.rs
index f537f78776..aed8e0f8bd 100644
--- a/crates/macro_db_client/src/pins.rs
+++ b/crates/macro_db_client/src/pins.rs
@@ -240,7 +240,10 @@ pub async fn get_pins(db: Pool<Postgres>, user_id: &str) -> anyhow::Result<Vec<P
r.updated_at,
None, // Will never be deleted
r.project_id,
- );
+ )
+ .map_err(|e| sqlx::Error::TypeNotFound {
+ type_name: e.to_string(),
+ })?;
Ok(PinnedItem {
pin_index,
item: Item::Project(project.clone()),
diff --git a/crates/macro_db_client/src/projects/get_project/get_basic_project.rs b/crates/macro_db_client/src/projects/get_project/get_basic_project.rs
index 5a8c40c5cf..41fbbc9150 100644
--- a/crates/macro_db_client/src/projects/get_project/get_basic_project.rs
+++ b/crates/macro_db_client/src/projects/get_project/get_basic_project.rs
@@ -1,4 +1,4 @@
-use macro_user_id::{cowlike::CowLike, user_id::MacroUserIdStr};
+use model_owner::Owner;
use sqlx::{Pool, Postgres};
use model::project::BasicProject;
@@ -24,9 +24,8 @@ pub async fn get_basic_project(
.try_map(|row| {
Ok(BasicProject {
id: row.id,
- user_id: MacroUserIdStr::parse_from_str(&row.user_id)
- .map_err(|e| sqlx::Error::Decode(Box::new(e)))?
- .into_owned(),
+ user_id: Owner::from_principal_str(&row.user_id)
+ .map_err(|e| sqlx::Error::Decode(Box::new(e)))?,
parent_id: row.parent_id,
name: row.name,
deleted_at: row.deleted_at,
diff --git a/crates/macro_db_client/src/projects/get_project/get_project_by_id.rs b/crates/macro_db_client/src/projects/get_project/get_project_by_id.rs
index 9921050cfa..15fe4a8bf2 100644
--- a/crates/macro_db_client/src/projects/get_project/get_project_by_id.rs
+++ b/crates/macro_db_client/src/projects/get_project/get_project_by_id.rs
@@ -1,6 +1,6 @@
-use sqlx::{Pool, Postgres};
-
use model::project::Project;
+use model_owner::Owner;
+use sqlx::{Pool, Postgres};
/// Fetch a project row for search indexing. Soft-deleted rows are returned
/// so the caller can turn the upsert into a
@@ -10,8 +10,7 @@ pub async fn get_project_for_search(
db: &Pool<Postgres>,
project_id: &str,
) -> anyhow::Result<Option<Project>> {
- let result = sqlx::query_as!(
- Project,
+ let result = sqlx::query!(
r#"
SELECT
p.id,
@@ -26,6 +25,18 @@ pub async fn get_project_for_search(
"#,
project_id
)
+ .try_map(|row| {
+ Ok(Project {
+ id: row.id,
+ name: row.name,
+ user_id: Owner::from_principal_str(&row.user_id)
+ .map_err(|error| sqlx::Error::Decode(Box::new(error)))?,
+ parent_id: row.parent_id,
+ created_at: row.created_at,
+ updated_at: row.updated_at,
+ deleted_at: row.deleted_at,
+ })
+ })
.fetch_optional(db)
.await?;
diff --git a/crates/macro_db_client/src/recents/deleted.rs b/crates/macro_db_client/src/recents/deleted.rs
index 6125a75d86..8100bdc893 100644
--- a/crates/macro_db_client/src/recents/deleted.rs
+++ b/crates/macro_db_client/src/recents/deleted.rs
@@ -149,15 +149,21 @@ pub async fn get_recently_deleted(
})?;
Ok(Item::Chat(chat))
}
- "project" => Ok(Item::Project(map_project_item(
- r.id,
- r.user_id,
- r.name,
- r.created_at,
- r.updated_at,
- r.deleted_at,
- r.project_id,
- ))),
+ "project" => {
+ let project = map_project_item(
+ r.id,
+ r.user_id,
+ r.name,
+ r.created_at,
+ r.updated_at,
+ r.deleted_at,
+ r.project_id,
+ )
+ .map_err(|e| sqlx::Error::TypeNotFound {
+ type_name: e.to_string(),
+ })?;
+ Ok(Item::Project(project))
+ }
_ => Err(sqlx::Error::TypeNotFound {
type_name: r.item_type,
}),
diff --git a/crates/model/src/item/map_item.rs b/crates/model/src/item/map_item.rs
index fd34a1b8c4..a7c61c1bd9 100644
--- a/crates/model/src/item/map_item.rs
+++ b/crates/model/src/item/map_item.rs
@@ -83,14 +83,14 @@ pub fn map_project_item(
updated_at: Option<chrono::DateTime<chrono::Utc>>,
deleted_at: Option<chrono::DateTime<chrono::Utc>>,
parent_id: Option<String>,
-) -> Project {
- Project {
+) -> anyhow::Result<Project> {
+ Ok(Project {
id,
- user_id,
+ user_id: Owner::from_principal_str(&user_id)?,
name,
created_at,
updated_at,
deleted_at,
parent_id,
- }
+ })
}
diff --git a/crates/model/src/item/tests.rs b/crates/model/src/item/tests.rs
index b394d2c7df..2630efc0f8 100644
--- a/crates/model/src/item/tests.rs
+++ b/crates/model/src/item/tests.rs
@@ -177,7 +177,7 @@ fn test_project_serde() {
let project = Project {
id: "proj123".to_string(),
name: "Test Project".to_string(),
- user_id: "user1".to_string(),
+ user_id: Owner::from_principal_str("macro|[email protected]").unwrap(),
parent_id: None,
created_at: Some(chrono::Utc::now()),
updated_at: Some(chrono::Utc::now()),
diff --git a/crates/model/src/project.rs b/crates/model/src/project.rs
index b49a25fad7..9545b2e51f 100644
--- a/crates/model/src/project.rs
+++ b/crates/model/src/project.rs
@@ -1,4 +1,4 @@
-use macro_user_id::user_id::MacroUserIdStr;
+use model_owner::Owner;
use models_bulk_upload::ProjectDocumentStatus;
use serde::{Deserialize, Serialize};
use utoipa::ToSchema;
@@ -6,6 +6,9 @@ use utoipa::ToSchema;
pub mod request;
pub mod response;
+#[cfg(test)]
+mod test;
+
#[derive(Serialize, Deserialize, Debug, ToSchema, Clone, Eq, PartialEq, sqlx::FromRow)]
#[serde(rename_all = "camelCase")]
pub struct Project {
@@ -14,7 +17,9 @@ pub struct Project {
/// The name of the project
pub name: String,
/// The user id of who created the project
- pub user_id: String,
+ #[schema(value_type = String)]
+ #[sqlx(try_from = "String")]
+ pub user_id: Owner,
/// The parent project id
#[serde(skip_serializing_if = "Option::is_none")]
pub parent_id: Option<String>,
@@ -45,7 +50,7 @@ pub struct BasicProject {
pub id: String,
#[schema(value_type = String)]
#[sqlx(try_from = "String")]
- pub user_id: MacroUserIdStr<'static>,
+ pub user_id: Owner,
pub parent_id: Option<String>,
pub name: String,
pub deleted_at: Option<chrono::DateTime<chrono::Utc>>,
@@ -64,7 +69,9 @@ pub enum ProjectPreview {
pub struct ProjectPreviewData {
pub id: String,
pub name: String,
- pub owner: String,
+ #[schema(value_type = String)]
+ #[sqlx(try_from = "String")]
+ pub owner: Owner,
pub path: Vec<String>,
pub updated_at: Option<chrono::DateTime<chrono::Utc>>,
}
diff --git a/crates/model/src/project/test.rs b/crates/model/src/project/test.rs
new file mode 100644
index 0000000000..5ef57d2d89
--- /dev/null
+++ b/crates/model/src/project/test.rs
@@ -0,0 +1,80 @@
+use super::{BasicProject, Project, ProjectPreviewData};
+use model_owner::Owner;
+use serde_json::json;
+
+fn owner(principal: &str) -> Owner {
+ Owner::from_principal_str(principal).unwrap()
+}
+
+#[test]
+fn project_serde_keeps_user_id_wire_name() {
+ let original = Project {
+ id: "proj-1".to_string(),
+ name: "Project".to_string(),
+ user_id: owner("macro|[email protected]"),
+ parent_id: None,
+ created_at: None,
+ updated_at: None,
+ deleted_at: None,
+ };
+
+ let serialized = serde_json::to_value(&original).unwrap();
+ assert_eq!(serialized["userId"], "macro|[email protected]");
+ let deserialized: Project = serde_json::from_value(serialized).unwrap();
+ assert_eq!(original, deserialized);
+}
+
+#[test]
+fn project_serde_accepts_bot_and_team_owners() {
+ for principal in [
+ "bot|00000000-0000-0000-0000-00000000a1a1",
+ "01234567-89ab-cdef-0123-456789abcdef",
+ ] {
+ let original = Project {
+ id: "proj-1".to_string(),
+ name: "Project".to_string(),
+ user_id: owner(principal),
+ parent_id: None,
+ created_at: None,
+ updated_at: None,
+ deleted_at: None,
+ };
+ let serialized = serde_json::to_value(&original).unwrap();
+ assert_eq!(serialized["userId"], principal);
+ let deserialized: Project = serde_json::from_value(serialized).unwrap();
+ assert_eq!(original, deserialized);
+ }
+}
+
+#[test]
+fn basic_project_serde_keeps_user_id_wire_name() {
+ let original = BasicProject {
+ id: "proj-1".to_string(),
+ user_id: owner("macro|[email protected]"),
+ parent_id: None,
+ name: "Project".to_string(),
+ deleted_at: None,
+ };
+
+ let serialized = serde_json::to_value(&original).unwrap();
+ assert_eq!(serialized["userId"], "macro|[email protected]");
+ let deserialized: BasicProject = serde_json::from_value(serialized).unwrap();
+ assert_eq!(original, deserialized);
+}
+
+#[test]
+fn project_preview_data_serde_keeps_owner_wire_name() {
+ let original = ProjectPreviewData {
+ id: "proj-1".to_string(),
+ name: "Project".to_string(),
+ owner: owner("macro|[email protected]"),
+ path: vec!["Project".to_string()],
+ updated_at: None,
+ };
+
+ let serialized = serde_json::to_value(&original).unwrap();
+ assert_eq!(serialized["owner"], "macro|[email protected]");
+ assert_eq!(serialized["path"], json!(["Project"]));
+ let deserialized: ProjectPreviewData = serde_json::from_value(serialized).unwrap();
+ assert_eq!(original, deserialized);
+}
diff --git a/crates/projects/Cargo.toml b/crates/projects/Cargo.toml
index 481081702b..d87ab2b17d 100644
--- a/crates/projects/Cargo.toml
+++ b/crates/projects/Cargo.toml
@@ -32,7 +32,6 @@ outbound = [
"dep:entity_registry_db_utils",
"dep:hex",
"dep:macro_sha_count_client",
- "dep:model_owner",
"dep:share_permission_db_utils",
"dep:sqlx",
"dep:sqs_client",
@@ -71,6 +70,7 @@ macro_user_id = { path = "../macro_user_id" }
macro_uuid = { path = "../macro_uuid" }
model = { path = "../model" }
model-entity = { path = "../model-entity" }
+model_owner = { path = "../model_owner" }
models_bulk_upload = { path = "../models_bulk_upload" }
models_permissions = { path = "../models_permissions" }
rootcause = { workspace = true }
@@ -104,7 +104,6 @@ entity_access_db_utils = { path = "../entity_access_db_utils", optional = true }
entity_registry_db_utils = { path = "../entity_registry/entity_registry_db_utils", optional = true }
hex = { workspace = true, optional = true }
macro_sha_count_client = { path = "../macro_sha_count_client", optional = true }
-model_owner = { path = "../model_owner", optional = true }
share_permission_db_utils = { path = "../share_permission_db_utils", optional = true }
sqlx = { workspace = true, optional = true }
sqs_client = { path = "../sqs_client", default-features = false, features = [
diff --git a/crates/projects/src/domain/activity.rs b/crates/projects/src/domain/activity.rs
index 741d9c7a12..9b7c01e51d 100644
--- a/crates/projects/src/domain/activity.rs
+++ b/crates/projects/src/domain/activity.rs
@@ -8,10 +8,19 @@ mod test;
use ::activity::{Activity, ActivitySource, Actor, CommonAction, EntityType, Ingest, event_time};
use chrono::{DateTime, Utc};
+use model_owner::Owner;
use uuid::Uuid;
use super::events::ProjectTopicEvent;
+fn actor_from_owner(owner: &Owner) -> Option<Actor<'static>> {
+ match owner {
+ Owner::User(user) => Some(Actor::new_from_user(user.clone())),
+ Owner::Bot(bot_id) => Some(Actor::new_from_bot(*bot_id)),
+ Owner::Team(_) => None,
+ }
+}
+
impl ActivitySource for ProjectTopicEvent {
/// Maps one `macro.projects` event to its ingest outcome.
///
@@ -34,12 +43,10 @@ impl ActivitySource for ProjectTopicEvent {
};
match self {
- ProjectTopicEvent::Created(m) => single(
- Actor::new_from_user(m.owner.clone()),
- CommonAction::Created,
- &m.project_id,
- now(),
- ),
+ ProjectTopicEvent::Created(m) => match actor_from_owner(&m.owner) {
+ Some(actor) => single(actor, CommonAction::Created, &m.project_id, now()),
+ None => Ingest::Ignore,
+ },
ProjectTopicEvent::Updated(m) => match &m.actor_user_id {
Some(actor) => single(
Actor::new_from_user(actor.clone()),
diff --git a/crates/projects/src/domain/activity/test.rs b/crates/projects/src/domain/activity/test.rs
index a77643f49e..10d3ff623d 100644
--- a/crates/projects/src/domain/activity/test.rs
+++ b/crates/projects/src/domain/activity/test.rs
@@ -8,10 +8,16 @@ use macro_event_broker::Event;
use super::*;
use crate::domain::events::{ProjectDeletedMetadata, ProjectPermanentlyDeletedMetadata};
+use model_owner::Owner;
+
fn user(id: &str) -> MacroUserIdStr<'static> {
MacroUserIdStr::try_from(id.to_string()).expect("valid user id")
}
+fn owner(id: &str) -> Owner {
+ Owner::from_principal_str(id).expect("valid owner")
+}
+
fn envelope(event: ProjectTopicEvent) -> Event<ProjectTopicEvent> {
Event::with_event_id(Uuid::now_v7(), event)
}
@@ -20,7 +26,7 @@ fn envelope(event: ProjectTopicEvent) -> Event<ProjectTopicEvent> {
fn attributed_delete_maps_and_unattributed_is_dropped() {
let attributed = envelope(ProjectTopicEvent::Deleted(ProjectDeletedMetadata {
project_id: "proj-1".to_string(),
- owner: user("macro|[email protected]"),
+ owner: owner("macro|[email protected]"),
actor_user_id: Some(user("macro|[email protected]")),
parent_project_id: None,
deleted_project_ids: vec!["proj-2".to_string()],
@@ -36,7 +42,7 @@ fn attributed_delete_maps_and_unattributed_is_dropped() {
let unattributed = envelope(ProjectTopicEvent::Deleted(ProjectDeletedMetadata {
project_id: "proj-1".to_string(),
- owner: user("macro|[email protected]"),
+ owner: owner("macro|[email protected]"),
actor_user_id: None,
parent_project_id: None,
deleted_project_ids: vec![],
@@ -54,7 +60,7 @@ fn permanent_delete_purges_the_whole_cascade() {
let event = envelope(ProjectTopicEvent::PermanentlyDeleted(
ProjectPermanentlyDeletedMetadata {
project_id: "proj-1".to_string(),
- owner: user("macro|[email protected]"),
+ owner: owner("macro|[email protected]"),
actor_user_id: None,
parent_project_id: None,
purged_project_ids: vec!["proj-2".to_string()],
diff --git a/crates/projects/src/domain/events.rs b/crates/projects/src/domain/events.rs
index 0a9a93b1bc..c288c60935 100644
--- a/crates/projects/src/domain/events.rs
+++ b/crates/projects/src/domain/events.rs
@@ -4,6 +4,7 @@ use chrono::{DateTime, Utc};
use macro_event_broker::{Event, MacroEvent, TopicEvent};
use macro_event_topics::MacroProjectsTopic;
use macro_user_id::user_id::MacroUserIdStr;
+use model_owner::Owner;
use serde::{Deserialize, Serialize};
/// Metadata for [`ProjectTopicEvent::Created`].
@@ -12,7 +13,7 @@ pub struct ProjectCreatedMetadata {
/// The id of the created project.
pub project_id: String,
/// The owner and creator of the project.
- pub owner: MacroUserIdStr<'static>,
+ pub owner: Owner,
/// The project name.
pub name: String,
/// The parent project id, when the project has a parent.
@@ -27,7 +28,7 @@ pub struct ProjectUpdatedMetadata {
/// The id of the updated project.
pub project_id: String,
/// The owner of the project.
- pub owner: MacroUserIdStr<'static>,
+ pub owner: Owner,
/// The authenticated user who performed the update, if any.
pub actor_user_id: Option<MacroUserIdStr<'static>>,
/// The new project name, or `None` when unchanged.
@@ -46,7 +47,7 @@ pub struct ProjectDeletedMetadata {
/// The id of the root project that was deleted.
pub project_id: String,
/// The owner of the root project.
- pub owner: MacroUserIdStr<'static>,
+ pub owner: Owner,
/// The authenticated user who performed the deletion, if any.
pub actor_user_id: Option<MacroUserIdStr<'static>>,
/// The parent of the root project, when any.
@@ -65,7 +66,7 @@ pub struct ProjectRestoredMetadata {
/// The id of the root project that was restored.
pub project_id: String,
/// The owner of the root project.
- pub owner: MacroUserIdStr<'static>,
+ pub owner: Owner,
/// The authenticated user who performed the restoration, if any.
pub actor_user_id: Option<MacroUserIdStr<'static>>,
/// The parent under which the root project was restored, when any.
@@ -80,7 +81,7 @@ pub struct ProjectPermanentlyDeletedMetadata {
/// The id of the root project that was permanently deleted.
pub project_id: String,
/// The owner of the root project.
- pub owner: MacroUserIdStr<'static>,
+ pub owner: Owner,
/// The authenticated user who performed the deletion, if any.
pub actor_user_id: Option<MacroUserIdStr<'static>>,
/// The parent of the root project, when any.
@@ -99,7 +100,7 @@ pub struct ProjectUploadedMetadata {
/// The id of the root project in the uploaded tree.
pub root_project_id: String,
/// The owner of the uploaded tree.
- pub owner: MacroUserIdStr<'static>,
+ pub owner: Owner,
/// The name of the root project.
pub name: String,
/// The parent of the root project, when any.
diff --git a/crates/projects/src/domain/service.rs b/crates/projects/src/domain/service.rs
index a41d730a01..1c9ade222b 100644
--- a/crates/projects/src/domain/service.rs
+++ b/crates/projects/src/domain/service.rs
@@ -18,6 +18,7 @@ use model::project::{
BasicProject, PendingProject, Project, ProjectPreview, ProjectPreviewData, ProjectPreviewV2,
WithProjectId,
};
+use model_owner::Owner;
use models_bulk_upload::{UploadExtractFolderRequest, UploadExtractFolderResponseData};
use models_permissions::share_permission::SharePermissionV2;
use models_permissions::share_permission::access_level::AccessLevel;
@@ -298,7 +299,7 @@ where
) -> Result<Vec<ItemWithUserAccessLevel>, ProjectError> {
let project_access_level = receipt_access_level(&receipt)?;
let actor = match receipt.auth() {
- EntityAccessAuth::Authenticated(user_id) => Some(user_id.as_ref()),
+ EntityAccessAuth::Authenticated(user_id) => Some(user_id),
_ => None,
};
let internal = matches!(receipt.auth(), EntityAccessAuth::Internal);
@@ -394,7 +395,7 @@ where
project.id.clone(),
ProjectCreatedMetadata {
project_id: project.id.clone(),
- owner: actor,
+ owner: Owner::User(actor),
name: project.name.clone(),
parent_project_id: project.parent_id.clone(),
created_at: project.created_at,
@@ -721,7 +722,7 @@ where
root_project_id.clone(),
ProjectUploadedMetadata {
root_project_id: root_project_id.clone(),
- owner: event_owner,
+ owner: Owner::User(event_owner),
name: event_name,
parent_project_id: event_parent_project_id,
project_ids: uploaded.project_ids,
@@ -785,7 +786,7 @@ where
uploaded_tree.id.clone(),
ProjectUploadedMetadata {
root_project_id: uploaded_tree.id,
- owner: uploaded_tree.user_id,
+ owner: Owner::User(uploaded_tree.user_id),
name: uploaded_tree.name,
parent_project_id: uploaded_tree.parent_id,
project_ids: uploaded_tree.project_ids.clone(),
@@ -869,11 +870,11 @@ where
}
}
-fn owns(item: &Item, actor: &str) -> bool {
+fn owns(item: &Item, actor: &MacroUserIdStr<'_>) -> bool {
match item {
- Item::Project(project) => project.user_id == actor,
- Item::Document(document) => document.owner.principal_id() == actor,
- Item::Chat(chat) => chat.user_id.principal_id() == actor,
+ Item::Project(project) => project.user_id.is_user(actor),
+ Item::Document(document) => document.owner.is_user(actor),
+ Item::Chat(chat) => chat.user_id.is_user(actor),
}
}
diff --git a/crates/projects/src/domain/service/tests.rs b/crates/projects/src/domain/service/tests.rs
index acf0caba66..22beee030c 100644
--- a/crates/projects/src/domain/service/tests.rs
+++ b/crates/projects/src/domain/service/tests.rs
@@ -19,6 +19,7 @@ use model::project::request::{CreateProjectRequest, PatchProjectRequestV2};
use model::project::{
BasicProject, Project, ProjectPreviewData, ProjectPreviewV2, ProjectWithUploadRequest,
};
+use model_owner::Owner;
use models_bulk_upload::{
BulkUploadRequest, BulkUploadRequestDocuments, ProjectDocumentStatus, UploadDocumentStatus,
UploadExtractFolderRequest, UploadFolderStatus,
@@ -342,6 +343,10 @@ fn user_id(value: &str) -> MacroUserIdStr<'static> {
MacroUserIdStr::try_from(value.to_string()).unwrap()
}
+fn owner(value: &str) -> Owner {
+ Owner::from_principal_str(value).unwrap()
+}
+
#[test]
fn event_actor_user_id_only_maps_authenticated_users() {
let user_id = user_id("macro|[email protected]");
@@ -370,7 +375,7 @@ async fn publish_project_event_records_the_serialized_envelope() {
"project-id",
ProjectCreatedMetadata {
project_id: "project-id".to_string(),
- owner: user_id("macro|[email protected]"),
+ owner: owner("macro|[email protected]"),
name: "Project".to_string(),
parent_project_id: None,
created_at: None,
@@ -399,7 +404,7 @@ fn publish_project_event_errors_are_non_fatal() {
"project-id",
ProjectCreatedMetadata {
project_id: "project-id".to_string(),
- owner: user_id("macro|[email protected]"),
+ owner: owner("macro|[email protected]"),
name: "Project".to_string(),
parent_project_id: None,
created_at: None,
@@ -409,11 +414,11 @@ fn publish_project_event_errors_are_non_fatal() {
service.publish_project_event(&event);
}
-fn project(id: &str, owner: &str, parent_id: Option<&str>) -> Project {
+fn project(id: &str, owner_id: &str, parent_id: Option<&str>) -> Project {
Project {
id: id.to_string(),
name: id.to_string(),
- user_id: owner.to_string(),
+ user_id: owner(owner_id),
parent_id: parent_id.map(str::to_string),
created_at: None,
updated_at: None,
@@ -439,7 +444,7 @@ fn receipt(
fn basic_project(id: Uuid, parent_id: Option<Uuid>, deleted: bool) -> BasicProject {
BasicProject {
id: id.to_string(),
- user_id: user_id("macro|[email protected]"),
+ user_id: owner("macro|[email protected]"),
parent_id: parent_id.map(|id| id.to_string()),
name: "Project".to_string(),
deleted_at: deleted.then(chrono::Utc::now),
@@ -536,6 +541,39 @@ async fn content_attributes_owner_access_to_owned_items() {
assert_eq!(content[1].user_access_level, AccessLevel::Edit);
}
+#[tokio::test]
+async fn content_does_not_attribute_bot_or_team_owned_items_to_the_user() {
+ let mut repo = MockProjectRepo::new();
+ repo.expect_get_project_children().return_once(|_| {
+ Box::pin(async {
+ Ok(vec![
+ Item::Project(project(
+ "bot-owned",
+ "bot|00000000-0000-0000-0000-00000000a1a1",
+ Some("root"),
+ )),
+ Item::Project(project(
+ "team-owned",
+ "01234567-89ab-cdef-0123-456789abcdef",
+ Some("root"),
+ )),
+ ])
+ })
+ });
+ let service = service(repo, RecordingBulkUpload::default());
+
+ let content = service
+ .get_project_content(receipt(
+ EntityAccessAuth::Authenticated(user_id("macro|[email protected]")),
+ AccessLevel::Edit,
+ ))
+ .await
+ .unwrap();
+
+ assert_eq!(content[0].user_access_level, AccessLevel::Edit);
+ assert_eq!(content[1].user_access_level, AccessLevel::Edit);
+}
+
#[tokio::test]
async fn content_attributes_owner_access_to_every_item_for_internal_receipts() {
let mut repo = MockProjectRepo::new();
@@ -565,19 +603,19 @@ async fn pending_projects_isolate_status_failures_and_root_mismatches() {
Box::pin(async {
Ok(vec![
ProjectWithUploadRequest {
- project: project("failed", "owner", None),
+ project: project("failed", "macro|[email protected]", None),
upload_request_id: Some("failed".to_string()),
},
ProjectWithUploadRequest {
- project: project("mismatch", "owner", None),
+ project: project("mismatch", "macro|[email protected]", None),
upload_request_id: Some("mismatch".to_string()),
},
ProjectWithUploadRequest {
- project: project("nested", "owner", Some("root")),
+ project: project("nested", "macro|[email protected]", Some("root")),
upload_request_id: Some("nested".to_string()),
},
ProjectWithUploadRequest {
- project: project("without-request", "owner", None),
+ project: project("without-request", "macro|[email protected]", None),
upload_request_id: None,
},
])
@@ -621,7 +659,7 @@ async fn preview_deduplicates_ids_before_calling_repository() {
Ok(vec![ProjectPreviewV2::Found(ProjectPreviewData {
id: "one".to_string(),
name: "One".to_string(),
- owner: "owner".to_string(),
+ owner: owner("macro|[email protected]"),
path: Vec::new(),
updated_at: None,
})])
@@ -714,7 +752,7 @@ async fn create_project_publishes_repository_metadata_after_success() {
Box::pin(async move {
let mut created = project(
&project_id.to_string(),
- "ignored-repository-owner",
Some(&parent_id.to_string()),
);
created.name = "Repository name".to_string();
diff --git a/crates/projects/src/inbound/axum_router/tests.rs b/crates/projects/src/inbound/axum_router/tests.rs
index 178d86a978..30c93c827b 100644
--- a/crates/projects/src/inbound/axum_router/tests.rs
+++ b/crates/projects/src/inbound/axum_router/tests.rs
@@ -32,6 +32,7 @@ use model::{
response::GetProjectResponseData,
},
};
+use model_owner::Owner;
use model_user::UserContext;
use models_bulk_upload::{UploadExtractFolderRequest, UploadExtractFolderResponseData};
use models_permissions::share_permission::{
@@ -66,7 +67,7 @@ impl FakeProjectService {
Self {
basic_project: Arc::new(Mutex::new(Ok(BasicProject {
id: PROJECT_ID.to_string(),
- user_id: user_id(owner),
+ user_id: Owner::from_principal_str(owner).expect("owner id should be valid"),
parent_id: None,
name: "Project".to_string(),
deleted_at: deleted.then(chrono::Utc::now),
@@ -405,10 +406,6 @@ fn router(service: FakeProjectService, access_level: Option<AccessLevel>) -> Rou
)
}
-fn user_id(value: &str) -> MacroUserIdStr<'static> {
- MacroUserIdStr::try_from(value.to_string()).expect("test user id should be valid")
-}
-
fn user_context(value: &str) -> UserContext {
UserContext {
user_id: value.to_string(),
@@ -422,7 +419,7 @@ fn project() -> Project {
Project {
id: PROJECT_ID.to_string(),
name: "Project".to_string(),
- user_id: USER_ID.to_string(),
+ user_id: Owner::from_principal_str(USER_ID).expect("user id should be valid"),
parent_id: None,
created_at: None,
updated_at: None,
diff --git a/crates/projects/src/outbound/pg_project_repo.rs b/crates/projects/src/outbound/pg_project_repo.rs
index 95664bae16..32025247ab 100644
--- a/crates/projects/src/outbound/pg_project_repo.rs
+++ b/crates/projects/src/outbound/pg_project_repo.rs
@@ -14,11 +14,11 @@ mod tests;
use std::collections::HashMap;
-use macro_user_id::{cowlike::CowLike, user_id::MacroUserIdStr};
use model::project::{
BasicProject, Project, ProjectPreviewData, ProjectPreviewV2, ProjectWithUploadRequest,
WithProjectId,
};
+use model_owner::Owner;
use sqlx::PgPool;
use crate::domain::models::{
@@ -40,6 +40,30 @@ impl PgProjectRepo {
}
}
+fn decode_owner(value: &str) -> Result<Owner, sqlx::Error> {
+ Owner::from_principal_str(value).map_err(|error| sqlx::Error::Decode(Box::new(error)))
+}
+
+fn map_project(
+ id: String,
+ name: String,
+ user_id: String,
+ parent_id: Option<String>,
+ created_at: Option<chrono::DateTime<chrono::Utc>>,
+ updated_at: Option<chrono::DateTime<chrono::Utc>>,
+ deleted_at: Option<chrono::DateTime<chrono::Utc>>,
+) -> Result<Project, sqlx::Error> {
+ Ok(Project {
+ id,
+ name,
+ user_id: decode_owner(&user_id)?,
+ parent_id,
+ created_at,
+ updated_at,
+ deleted_at,
+ })
+}
+
impl ProjectRepo for PgProjectRepo {
type Err = sqlx::Error;
@@ -69,9 +93,7 @@ impl ProjectRepo for PgProjectRepo {
.try_map(|row| {
Ok(BasicProject {
id: row.id,
- user_id: MacroUserIdStr::parse_from_str(&row.user_id)
- .map_err(|error| sqlx::Error::Decode(Box::new(error)))?
- .into_owned(),
+ user_id: decode_owner(&row.user_id)?,
parent_id: row.parent_id,
name: row.name,
deleted_at: row.deleted_at,
@@ -83,8 +105,7 @@ impl ProjectRepo for PgProjectRepo {
#[tracing::instrument(err, skip(self))]
async fn get_project_by_id(&self, project_id: &str) -> Result<Option<Project>, Self::Err> {
- sqlx::query_as!(
- Project,
+ sqlx::query!(
r#"
SELECT
p.id,
@@ -99,14 +120,24 @@ impl ProjectRepo for PgProjectRepo {
"#,
project_id,
)
+ .try_map(|row| {
+ map_project(
+ row.id,
+ row.name,
+ row.user_id,
+ row.parent_id,
+ row.created_at,
+ row.updated_at,
+ row.deleted_at,
+ )
+ })
.fetch_optional(&self.pool)
.await
}
#[tracing::instrument(err, skip(self))]
async fn get_projects_for_user(&self, user_id: &str) -> Result<Vec<Project>, Self::Err> {
- sqlx::query_as!(
- Project,
+ sqlx::query!(
r#"
SELECT
p.id,
@@ -126,6 +157,17 @@ impl ProjectRepo for PgProjectRepo {
"#,
user_id,
)
+ .try_map(|row| {
+ map_project(
+ row.id,
+ row.name,
+ row.user_id,
+ row.parent_id,
+ row.created_at,
+ row.updated_at,
+ row.deleted_at,
+ )
+ })
.fetch_all(&self.pool)
.await
}
@@ -154,17 +196,19 @@ impl ProjectRepo for PgProjectRepo {
"#,
user_id,
)
- .map(|row| ProjectWithUploadRequest {
- project: Project {
- id: row.id,
- name: row.name,
- user_id: row.user_id,
- parent_id: row.parent_id,
- created_at: row.created_at,
- updated_at: row.updated_at,
- deleted_at: None,
- },
- upload_request_id: row.upload_request_id,
+ .try_map(|row| {
+ Ok(ProjectWithUploadRequest {
+ project: map_project(
+ row.id,
+ row.name,
+ row.user_id,
+ row.parent_id,
+ row.created_at,
+ row.updated_at,
+ None,
+ )?,
+ upload_request_id: row.upload_request_id,
+ })
})
.fetch_all(&self.pool)
.await
@@ -200,8 +244,7 @@ impl ProjectRepo for PgProjectRepo {
&self,
project_ids: &[String],
) -> Result<Vec<ProjectPreviewV2>, Self::Err> {
- let found = sqlx::query_as!(
- ProjectPreviewData,
+ let found = sqlx::query!(
r#"
WITH RECURSIVE project_path AS (
SELECT
@@ -238,6 +281,15 @@ impl ProjectRepo for PgProjectRepo {
"#,
project_ids,
)
+ .try_map(|row| {
+ Ok(ProjectPreviewData {
+ id: row.id,
+ name: row.name,
+ owner: decode_owner(&row.owner)?,
+ path: row.path,
+ updated_at: row.updated_at,
+ })
+ })
.fetch_all(&self.pool)
.await?;
diff --git a/crates/projects/src/outbound/pg_project_repo/content.rs b/crates/projects/src/outbound/pg_project_repo/content.rs
index ea4a367880..319c0895c8 100644
--- a/crates/projects/src/outbound/pg_project_repo/content.rs
+++ b/crates/projects/src/outbound/pg_project_repo/content.rs
@@ -23,8 +23,7 @@ pub(super) async fn get_project_children(
}
async fn get_sub_projects(pool: &PgPool, project_id: &str) -> Result<Vec<Project>, sqlx::Error> {
- sqlx::query_as!(
- Project,
+ sqlx::query!(
r#"
SELECT
p.id,
@@ -40,6 +39,17 @@ async fn get_sub_projects(pool: &PgPool, project_id: &str) -> Result<Vec<Project
"#,
project_id,
)
+ .try_map(|row| {
+ super::map_project(
+ row.id,
+ row.name,
+ row.user_id,
+ row.parent_id,
+ row.created_at,
+ row.updated_at,
+ row.deleted_at,
+ )
+ })
.fetch_all(pool)
.await
}
diff --git a/crates/projects/src/outbound/pg_project_repo/create.rs b/crates/projects/src/outbound/pg_project_repo/create.rs
index 0247995583..3a5562c184 100644
--- a/crates/projects/src/outbound/pg_project_repo/create.rs
+++ b/crates/projects/src/outbound/pg_project_repo/create.rs
@@ -13,8 +13,7 @@ pub(super) async fn create_project(
transaction: &mut Transaction<'_, Postgres>,
args: &CreateProjectArgs,
) -> Result<Project, sqlx::Error> {
- let project = sqlx::query_as!(
- Project,
+ let row = sqlx::query!(
r#"
INSERT INTO "Project" (name, "userId", "parentId", "createdAt", "updatedAt")
VALUES ($1, $2, $3, NOW(), NOW())
@@ -33,6 +32,15 @@ pub(super) async fn create_project(
)
.fetch_one(transaction.as_mut())
.await?;
+ let project = super::map_project(
+ row.id,
+ row.name,
+ row.user_id,
+ row.parent_id,
+ row.created_at,
+ row.updated_at,
+ row.deleted_at,
+ )?;
share::create_project_share_permission(transaction, &project.id, &args.share_permission)
.await?;
diff --git a/crates/projects/src/outbound/pg_project_repo/edit.rs b/crates/projects/src/outbound/pg_project_repo/edit.rs
index f65eae93bb..5c198e7705 100644
--- a/crates/projects/src/outbound/pg_project_repo/edit.rs
+++ b/crates/projects/src/outbound/pg_project_repo/edit.rs
@@ -11,8 +11,7 @@ pub(super) async fn edit_project(
) -> Result<Project, sqlx::Error> {
// Separate flags make all three parent states compile checked: unchanged,
// set to an ID, and explicitly cleared to NULL.
- let project = sqlx::query_as!(
- Project,
+ let row = sqlx::query!(
r#"
UPDATE "Project"
SET
@@ -37,6 +36,15 @@ pub(super) async fn edit_project(
)
.fetch_one(transaction.as_mut())
.await?;
+ let project = super::map_project(
+ row.id,
+ row.name,
+ row.user_id,
+ row.parent_id,
+ row.created_at,
+ row.updated_at,
+ row.deleted_at,
+ )?;
if let Some(permission) = args.share_permission.as_ref() {
share::edit_project_share_permission(transaction, &args.project_id, permission).await?;
diff --git a/crates/projects/src/outbound/pg_project_repo/revert_delete.rs b/crates/projects/src/outbound/pg_project_repo/revert_delete.rs
index e08202377c..865ece5d48 100644
--- a/crates/projects/src/outbound/pg_project_repo/revert_delete.rs
+++ b/crates/projects/src/outbound/pg_project_repo/revert_delete.rs
@@ -1,3 +1,4 @@
+use model_owner::Owner;
use sqlx::{Postgres, Transaction};
use crate::domain::models::RevertDeleteResult;
@@ -134,6 +135,7 @@ async fn restore_items(
}
_ => unreachable!("known item type"),
};
+ let (history_item_ids, history_owner_ids) = user_history_pairs(item_ids, owner_ids)?;
sqlx::query!(
r#"
INSERT INTO "UserHistory" ("userId", "itemId", "itemType", "createdAt", "updatedAt")
@@ -142,8 +144,8 @@ async fn restore_items(
ON CONFLICT ("userId", "itemId", "itemType") DO UPDATE
SET "updatedAt" = NOW()
"#,
- item_ids,
- owner_ids,
+ &history_item_ids,
+ &history_owner_ids,
item_type,
)
.execute(transaction.as_mut())
@@ -151,6 +153,24 @@ async fn restore_items(
Ok(())
}
+fn user_history_pairs(
+ item_ids: &[String],
+ owner_ids: &[String],
+) -> Result<(Vec<String>, Vec<String>), sqlx::Error> {
+ item_ids
+ .iter()
+ .zip(owner_ids)
+ .filter_map(
+ |(item_id, owner_id)| match Owner::from_principal_str(owner_id) {
+ Ok(Owner::User(user_id)) => Some(Ok((item_id.clone(), user_id.to_string()))),
+ Ok(Owner::Bot(_) | Owner::Team(_)) => None,
+ Err(error) => Some(Err(sqlx::Error::Decode(Box::new(error)))),
+ },
+ )
+ .collect::<Result<Vec<_>, _>>()
+ .map(|pairs| pairs.into_iter().unzip())
+}
+
async fn clear_registered_entities(
transaction: &mut Transaction<'_, Postgres>,
ids: &[String],
@@ -165,3 +185,45 @@ async fn clear_registered_entities(
}
Ok(())
}
+
+#[cfg(test)]
+mod tests {
+ use super::*;
+
+ #[test]
+ fn user_history_pairs_keeps_users_and_skips_bot_and_team() {
+ let item_ids = [
+ "project-user".to_string(),
+ "project-bot".to_string(),
+ "project-team".to_string(),
+ ];
+ let owner_ids = [
+ "macro|[email protected]".to_string(),
+ "bot|00000000-0000-0000-0000-00000000a1a1".to_string(),
+ "01234567-89ab-cdef-0123-456789abcdef".to_string(),
+ ];
+
+ let (history_item_ids, history_owner_ids) =
+ user_history_pairs(&item_ids, &owner_ids).expect("valid principals should parse");
+
+ assert_eq!(history_item_ids, vec!["project-user".to_string()]);
+ assert_eq!(
+ history_owner_ids,
+ vec!["macro|[email protected]".to_string()]
+ );
+ }
+
+ #[test]
+ fn user_history_pairs_fails_the_restore_on_malformed_owners() {
+ let item_ids = ["project-one".to_string(), "project-two".to_string()];
+ let owner_ids = [
+ "not-a-macro-user".to_string(),
+ "macro|[email protected]".to_string(),
+ ];
+
+ let error = user_history_pairs(&item_ids, &owner_ids)
+ .expect_err("malformed owners should fail restore");
+
+ assert!(matches!(error, sqlx::Error::Decode(_)));
+ }
+}
diff --git a/crates/projects/src/outbound/pg_project_repo/upload_folder.rs b/crates/projects/src/outbound/pg_project_repo/upload_folder.rs
index d337e39780..6afb7fb521 100644
--- a/crates/projects/src/outbound/pg_project_repo/upload_folder.rs
+++ b/crates/projects/src/outbound/pg_project_repo/upload_folder.rs
@@ -135,8 +135,7 @@ async fn create_pending_project(
parent_id: Option<&str>,
upload_request_id: &str,
) -> Result<Project, sqlx::Error> {
- let project = sqlx::query_as!(
- Project,
+ let row = sqlx::query!(
r#"
INSERT INTO "Project"
(name, "userId", "parentId", "createdAt", "updatedAt", "uploadPending", "uploadRequestId")
@@ -157,6 +156,15 @@ async fn create_pending_project(
)
.fetch_one(transaction.as_mut())
.await?;
+ let project = super::map_project(
+ row.id,
+ row.name,
+ row.user_id,
+ row.parent_id,
+ row.created_at,
+ row.updated_at,
+ row.deleted_at,
+ )?;
share::create_project_share_permission(transaction, &project.id, share_permission).await?;
let entity_id = project
diff --git a/crates/soup_realtime/src/inbound/kafka_consumer/test.rs b/crates/soup_realtime/src/inbound/kafka_consumer/test.rs
index 79949c262e..9099e9041f 100644
--- a/crates/soup_realtime/src/inbound/kafka_consumer/test.rs
+++ b/crates/soup_realtime/src/inbound/kafka_consumer/test.rs
@@ -229,7 +229,7 @@ fn project_deletion_maps_cascade_entities_to_deleted_patches() {
let chat_id = Uuid::now_v7().to_string();
let event = ProjectTopicEvent::Deleted(ProjectDeletedMetadata {
project_id: project_id.clone(),
- owner: user(),
+ owner: Owner::User(user()),
actor_user_id: None,
parent_project_id: None,
deleted_project_ids: vec![project_id.clone(), child_id.clone()],
diff --git a/services/deleted_item_poller/Cargo.toml b/services/deleted_item_poller/Cargo.toml
index 9830e145f2..c27614467a 100644
--- a/services/deleted_item_poller/Cargo.toml
+++ b/services/deleted_item_poller/Cargo.toml
@@ -21,9 +21,9 @@ macro_env = { path = "../../crates/macro_env" }
macro_env_var = { path = "../../crates/macro_env_var" }
macro_event_broker = { path = "../../crates/macro_event_broker" }
macro_queues = { path = "../../crates/macro_queues" }
-macro_user_id = { path = "../../crates/macro_user_id", default-features = false }
macro_uuid = { path = "../../crates/macro_uuid" }
model = { path = "../../crates/model" }
+model_owner = { path = "../../crates/model_owner" }
projects = { path = "../../crates/projects", default-features = false }
serde = { workspace = true }
serde_json = { workspace = true }
diff --git a/services/deleted_item_poller/src/handler.rs b/services/deleted_item_poller/src/handler.rs
index 4c83b94f89..3957d2f686 100644
--- a/services/deleted_item_poller/src/handler.rs
+++ b/services/deleted_item_poller/src/handler.rs
@@ -13,7 +13,7 @@ use lambda_runtime::{
};
use macro_db_client::projects::ProjectToDelete;
use macro_event_broker::MacroEventBroker;
-use macro_user_id::user_id::MacroUserIdStr;
+use model_owner::Owner;
use projects::domain::events::{ProjectMacroEvent, ProjectPermanentlyDeletedMetadata};
#[tracing::instrument(skip(ctx, _event), err)]
@@ -76,7 +76,7 @@ async fn publish_project_purge_events<B: MacroEventBroker>(
.iter()
.map(|project| {
let project_id = project.project_id.clone();
- let owner: MacroUserIdStr<'static> = MacroUserIdStr::try_from(project.user_id.clone())
+ let owner = Owner::from_principal_str(&project.user_id)
.with_context(|| format!("invalid owner for project {}", project.project_id))?;
Ok(ProjectMacroEvent::permanently_deleted(
diff --git a/services/deleted_item_poller/src/handler/test.rs b/services/deleted_item_poller/src/handler/test.rs
index 55791e2c81..c96f1255a0 100644
--- a/services/deleted_item_poller/src/handler/test.rs
+++ b/services/deleted_item_poller/src/handler/test.rs
@@ -254,19 +254,65 @@ async fn publish_project_purge_events_returns_publication_failures() {
#[tokio::test]
async fn publish_project_purge_events_rejects_malformed_owners() {
let event_broker = FakeEventBroker::default();
- let projects = vec![ProjectToDelete {
- project_id: "project-one".to_string(),
- user_id: "not-a-macro-user".to_string(),
- }];
+ let projects = vec![
+ ProjectToDelete {
+ project_id: "project-one".to_string(),
+ user_id: "not-a-macro-user".to_string(),
+ },
+ ProjectToDelete {
+ project_id: "project-two".to_string(),
+ user_id: "macro|[email protected]".to_string(),
+ },
+ ];
let error = publish_project_purge_events(&event_broker, &projects)
.await
- .expect_err("malformed owners should be returned");
+ .expect_err("malformed owners should fail the whole batch");
assert!(format!("{error:#}").contains("invalid owner for project project-one"));
assert!(event_broker.published().is_empty());
}
+#[tokio::test]
+async fn publish_project_purge_events_accepts_bot_owners() {
+ let event_broker = FakeEventBroker::default();
+ let projects = vec![ProjectToDelete {
+ project_id: "project-bot".to_string(),
+ user_id: "bot|00000000-0000-0000-0000-00000000a1a1".to_string(),
+ }];
+
+ publish_project_purge_events(&event_broker, &projects)
+ .await
+ .unwrap();
+
+ let published = event_broker.published();
+ assert_eq!(published.len(), 1);
+ assert_eq!(
+ published[0].envelope["metadata"]["owner"],
+ json!("bot|00000000-0000-0000-0000-00000000a1a1")
+ );
+}
+
+#[tokio::test]
+async fn publish_project_purge_events_accepts_team_owners() {
+ let event_broker = FakeEventBroker::default();
+ let projects = vec![ProjectToDelete {
+ project_id: "project-team".to_string(),
+ user_id: "01234567-89ab-cdef-0123-456789abcdef".to_string(),
+ }];
+
+ publish_project_purge_events(&event_broker, &projects)
+ .await
+ .unwrap();
+
+ let published = event_broker.published();
+ assert_eq!(published.len(), 1);
+ assert_eq!(
+ published[0].envelope["metadata"]["owner"],
+ json!("01234567-89ab-cdef-0123-456789abcdef")
+ );
+}
+
#[tokio::test]
async fn publish_chat_purge_events_publishes_separately_keyed_events() {
let event_broker = FakeEventBroker::default();
diff --git a/services/document_storage_service/src/api/documents/initialize_user_documents.rs b/services/document_storage_service/src/api/documents/initialize_user_documents.rs
index 54ad6d09e3..6e1114f1c3 100644
--- a/services/document_storage_service/src/api/documents/initialize_user_documents.rs
+++ b/services/document_storage_service/src/api/documents/initialize_user_documents.rs
@@ -11,6 +11,7 @@ use model::{
document::BasicDocument,
response::{ErrorResponse, GenericErrorResponse, GenericSuccessResponse},
};
+use model_owner::Owner;
use models_permissions::share_permission::SharePermissionV2;
use projects_hex::domain::events::{ProjectCreatedMetadata, ProjectMacroEvent};
use reqwest::StatusCode;
@@ -253,7 +254,7 @@ pub async fn handler(
project.id.clone(),
ProjectCreatedMetadata {
project_id: project.id.clone(),
- owner: user_context.authorization.user.macro_user_id.clone(),
+ owner: Owner::User(user_context.authorization.user.macro_user_id.clone()),
name: PROJECT_NAME.to_string(),
parent_project_id: None,
created_at: project.created_at,
diff --git a/services/search_processing_service/src/inbound/kafka_consumer/test.rs b/services/search_processing_service/src/inbound/kafka_consumer/test.rs
index 051fc77d47..39086526f3 100644
--- a/services/search_processing_service/src/inbound/kafka_consumer/test.rs
+++ b/services/search_processing_service/src/inbound/kafka_consumer/test.rs
@@ -976,7 +976,7 @@ fn document_event_cases() -> Vec<(DocumentTopicEvent, DocumentEventDescription)>
}
fn project_event_cases() -> Vec<(ProjectTopicEvent, ProjectEventDescription<'static>)> {
- let owner = user_id();
+ let owner = Owner::User(user_id());
vec![
(
@@ -1663,7 +1663,7 @@ fn calendar_events_shard_by_event_id_so_one_event_stays_ordered() {
fn project_envelope_decodes_round_trip_with_string_key() {
let event = ProjectTopicEvent::Restored(ProjectRestoredMetadata {
project_id: PROJECT_ID.to_string(),
- owner: user_id(),
+ owner: Owner::User(user_id()),
actor_user_id: Some(user_id()),
parent_project_id: Some(PARENT_PROJECT_ID.to_string()),
restored_project_ids: vec![PROJECT_ID.to_string(), CHILD_PROJECT_ID.to_string()],
@@ -1887,7 +1887,7 @@ async fn malformed_and_unsupported_chat_messages_are_commit_safe() {
async fn unsupported_project_schema_message_is_commit_safe() {
let event = ProjectTopicEvent::Restored(ProjectRestoredMetadata {
project_id: PROJECT_ID.to_string(),
- owner: user_id(),
+ owner: Owner::User(user_id()),
actor_user_id: Some(user_id()),
parent_project_id: None,
restored_project_ids: vec![PROJECT_ID.to_string()],
diff --git a/services/search_processing_service/src/process/project.rs b/services/search_processing_service/src/process/project.rs
index 28ed839d17..7785b5b10d 100644
--- a/services/search_processing_service/src/process/project.rs
+++ b/services/search_processing_service/src/process/project.rs
@@ -73,7 +73,7 @@ pub async fn upsert_project(
&UpsertProjectArgs {
project_id: project.id,
name: project.name,
- owner_id: project.user_id,
+ owner_id: project.user_id.principal_id(),
parent_project_id: project.parent_id,
created_at_millis: EpochMillis::new(created_at.timestamp_millis())?,
updated_at_millis: EpochMillis::new(updated_at.timestamp_millis())?,