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(documents): create documents and folders with their source's dates (#8923)

Wolf Mermelstein4cc0644f1566
diff --git a/.sqlx/query-933dfce0a31e88e5aeefacfbc04301874e36cc9b22b07598ec907cd233b732d8.json b/.sqlx/query-1d071485d4fcabfa6eb9fa59c1ca9bf7d78fe66b337258bbc9b41eee45f3d4dc.json
similarity index 69%
rename from .sqlx/query-933dfce0a31e88e5aeefacfbc04301874e36cc9b22b07598ec907cd233b732d8.json
rename to .sqlx/query-1d071485d4fcabfa6eb9fa59c1ca9bf7d78fe66b337258bbc9b41eee45f3d4dc.json
index 43a580906b..19813a430e 100644
--- a/.sqlx/query-933dfce0a31e88e5aeefacfbc04301874e36cc9b22b07598ec907cd233b732d8.json
+++ b/.sqlx/query-1d071485d4fcabfa6eb9fa59c1ca9bf7d78fe66b337258bbc9b41eee45f3d4dc.json
@@ -1,6 +1,6 @@
{
"db_name": "PostgreSQL",
- "query": "\n INSERT INTO \"Project\" (name, \"userId\", \"parentId\", \"createdAt\", \"updatedAt\")\n VALUES ($1, $2, $3, NOW(), NOW())\n RETURNING\n id,\n name,\n \"userId\" AS user_id,\n \"parentId\" AS parent_id,\n \"createdAt\"::timestamptz AS created_at,\n \"updatedAt\"::timestamptz AS updated_at,\n \"deletedAt\"::timestamptz AS deleted_at\n ",
+ "query": "\n INSERT INTO \"Project\" (name, \"userId\", \"parentId\", \"createdAt\", \"updatedAt\")\n VALUES ($1, $2, $3, NOW(), COALESCE($4::timestamp, NOW()::timestamp))\n RETURNING\n id,\n name,\n \"userId\" AS user_id,\n \"parentId\" AS parent_id,\n \"createdAt\"::timestamptz AS created_at,\n \"updatedAt\"::timestamptz AS updated_at,\n \"deletedAt\"::timestamptz AS deleted_at\n ",
"describe": {
"columns": [
{
@@ -43,7 +43,8 @@
"Left": [
"Text",
"Text",
- "Text"
+ "Text",
+ "Timestamp"
]
},
"nullable": [
@@ -56,5 +57,5 @@
null
]
},
- "hash": "933dfce0a31e88e5aeefacfbc04301874e36cc9b22b07598ec907cd233b732d8"
+ "hash": "1d071485d4fcabfa6eb9fa59c1ca9bf7d78fe66b337258bbc9b41eee45f3d4dc"
}
diff --git a/.sqlx/query-56c77c77c471379c21fda2e70adcba10ac8dba67e9db2e6f75247b98e1534060.json b/.sqlx/query-56c77c77c471379c21fda2e70adcba10ac8dba67e9db2e6f75247b98e1534060.json
new file mode 100644
index 0000000000..3d2cdfd32e
--- /dev/null
+++ b/.sqlx/query-56c77c77c471379c21fda2e70adcba10ac8dba67e9db2e6f75247b98e1534060.json
@@ -0,0 +1,16 @@
+{
+ "db_name": "PostgreSQL",
+ "query": "\n WITH RECURSIVE ancestors AS (\n SELECT id, \"parentId\" FROM \"Project\" WHERE id = $1\n UNION\n SELECT p.id, p.\"parentId\"\n FROM \"Project\" p\n JOIN ancestors a ON p.id = a.\"parentId\"\n )\n UPDATE \"Project\"\n SET \"createdAt\" = LEAST(\"createdAt\", $2),\n \"updatedAt\" = GREATEST(\"updatedAt\", $3)\n WHERE id IN (SELECT id FROM ancestors)\n ",
+ "describe": {
+ "columns": [],
+ "parameters": {
+ "Left": [
+ "Text",
+ "Timestamp",
+ "Timestamp"
+ ]
+ },
+ "nullable": []
+ },
+ "hash": "56c77c77c471379c21fda2e70adcba10ac8dba67e9db2e6f75247b98e1534060"
+}
diff --git a/.sqlx/query-f249e23685d626a0e63015828655a4dc7053d1e1d6425b9de339986d41c8e180.json b/.sqlx/query-d7e559e6c5bbbd340084a0a2745a9251345a39f9cda053f9fba28b3609952e53.json
similarity index 70%
rename from .sqlx/query-f249e23685d626a0e63015828655a4dc7053d1e1d6425b9de339986d41c8e180.json
rename to .sqlx/query-d7e559e6c5bbbd340084a0a2745a9251345a39f9cda053f9fba28b3609952e53.json
index 4153fa8d99..7539b6384a 100644
--- a/.sqlx/query-f249e23685d626a0e63015828655a4dc7053d1e1d6425b9de339986d41c8e180.json
+++ b/.sqlx/query-d7e559e6c5bbbd340084a0a2745a9251345a39f9cda053f9fba28b3609952e53.json
@@ -1,6 +1,6 @@
{
"db_name": "PostgreSQL",
- "query": "\n INSERT INTO \"Document\" (id, owner, name, \"fileType\", \"projectId\", \"createdAt\", \"updatedAt\")\n VALUES ($1, $2, $3, $4, $5, $6, $6)\n ",
+ "query": "\n INSERT INTO \"Document\" (id, owner, name, \"fileType\", \"projectId\", \"createdAt\", \"updatedAt\")\n VALUES ($1, $2, $3, $4, $5, $6, $7)\n ",
"describe": {
"columns": [],
"parameters": {
@@ -10,10 +10,11 @@
"Text",
"Text",
"Text",
+ "Timestamp",
"Timestamp"
]
},
"nullable": []
},
- "hash": "f249e23685d626a0e63015828655a4dc7053d1e1d6425b9de339986d41c8e180"
+ "hash": "d7e559e6c5bbbd340084a0a2745a9251345a39f9cda053f9fba28b3609952e53"
}
diff --git a/crates/documents/AGENTS.md b/crates/documents/AGENTS.md
index 05bd365fdb..371131fa8b 100644
--- a/crates/documents/AGENTS.md
+++ b/crates/documents/AGENTS.md
@@ -74,6 +74,10 @@ word docs, Illustrator/Photoshop files).
(`src/domain/create.rs`) with a `NotionMarkdown` (`src/domain/notion_markdown.rs`);
lexical-service converts it through `MarkdownInitializationPort::initialize_existing_notion`
and returns the Macro markdown that mention tracking reads.
+- Create a document with its source's dates (an import): set
+ `NewDocumentMetadata::builder(..).created_at(..).updated_at(..)`. Its folder
+ and every folder above it then widen to those dates (`extend_project_dates`)
+ instead of being marked updated now.
- Change content storage/markdown lifecycle: `src/domain/content.rs` →
`src/outbound/s3_markdown_source.rs` / `src/outbound/markdown_init.rs` →
`src/bin/backfill_markdown_content_location.rs` if existing documents need
diff --git a/crates/documents/src/domain/create.rs b/crates/documents/src/domain/create.rs
index 32160bc454..71868b78b6 100644
--- a/crates/documents/src/domain/create.rs
+++ b/crates/documents/src/domain/create.rs
@@ -37,6 +37,7 @@ pub struct NewDocumentMetadata {
document_name: String,
project_id: Option<uuid::Uuid>,
created_at: Option<chrono::DateTime<chrono::Utc>>,
+ updated_at: Option<chrono::DateTime<chrono::Utc>>,
skip_history: bool,
initial_link_share: InitialLinkShare,
}
@@ -55,6 +56,7 @@ impl NewDocumentMetadata {
document_name: document_name.into(),
project_id: None,
created_at: None,
+ updated_at: None,
skip_history: false,
initial_link_share: InitialLinkShare::EntityDefault,
},
@@ -71,6 +73,7 @@ impl NewDocumentMetadata {
team_id: kind.team_id,
share_with_team: kind.share_with_team,
created_at: self.created_at,
+ updated_at: self.updated_at,
sub_type: kind.subtype.sub_type(),
skip_history: self.skip_history,
initial_link_share: self.initial_link_share,
@@ -103,6 +106,12 @@ impl NewDocumentMetadataBuilder {
self
}
+ /// Set a custom last-edit timestamp; defaults to the creation timestamp.
+ pub fn updated_at(mut self, updated_at: chrono::DateTime<chrono::Utc>) -> Self {
+ self.metadata.updated_at = Some(updated_at);
+ self
+ }
+
/// Skip adding this document to user history.
pub fn skip_history(mut self) -> Self {
self.metadata.skip_history = true;
diff --git a/crates/documents/src/domain/models.rs b/crates/documents/src/domain/models.rs
index b3747c9bc8..f28fcf75f4 100644
--- a/crates/documents/src/domain/models.rs
+++ b/crates/documents/src/domain/models.rs
@@ -393,6 +393,8 @@ pub struct NewDocument {
pub share_with_team: bool,
/// Custom creation timestamp.
pub created_at: Option<chrono::DateTime<chrono::Utc>>,
+ /// Custom last-edit timestamp; defaults to `created_at`.
+ pub updated_at: Option<chrono::DateTime<chrono::Utc>>,
/// Sub type of the document — task or snippet (MD files only).
pub sub_type: Option<document_sub_type::DocumentSubType>,
/// Whether to skip adding to user history.
diff --git a/crates/documents/src/domain/ports.rs b/crates/documents/src/domain/ports.rs
index 637cb19c64..923996b09c 100644
--- a/crates/documents/src/domain/ports.rs
+++ b/crates/documents/src/domain/ports.rs
@@ -199,6 +199,16 @@ pub trait DocumentRepo: Send + Sync + 'static {
project_id: &str,
) -> impl Future<Output = Result<(), Self::Err>> + Send;
+ /// Widen project `project_id` and every project above it to span a
+ /// document created in it with its own dates: creation moves back to
+ /// `created_at` and last edit forward to `updated_at`, never the other way.
+ fn extend_project_dates(
+ &self,
+ project_id: &str,
+ created_at: chrono::DateTime<chrono::Utc>,
+ updated_at: chrono::DateTime<chrono::Utc>,
+ ) -> impl Future<Output = Result<(), Self::Err>> + Send;
+
/// Delete a document by ID (used for error cleanup).
fn delete_document_by_id(
&self,
diff --git a/crates/documents/src/domain/service.rs b/crates/documents/src/domain/service.rs
index e981f6e379..6fbb1d9428 100644
--- a/crates/documents/src/domain/service.rs
+++ b/crates/documents/src/domain/service.rs
@@ -213,6 +213,23 @@ fn published_document_actors(auth: &EntityAccessAuth) -> PublishedDocumentActors
}
}
+/// The dates a document was created with, when its creator supplied them
+/// rather than taking now.
+#[derive(Debug, Clone, Copy)]
+struct DocumentDates {
+ created_at: chrono::DateTime<chrono::Utc>,
+ updated_at: chrono::DateTime<chrono::Utc>,
+}
+
+impl DocumentDates {
+ fn of(document: &NewDocument) -> Option<Self> {
+ document.created_at.map(|created_at| Self {
+ created_at,
+ updated_at: document.updated_at.unwrap_or(created_at),
+ })
+ }
+}
+
fn short_id_for_entity_id(entity_id: &str) -> Result<String, DocumentError> {
let uuid = macro_uuid::string_to_uuid(entity_id)
.map_err(|e| DocumentError::BadRequest(format!("invalid entity_id: {e}")))?;
@@ -707,11 +724,16 @@ impl<
})
}
+ #[expect(
+ clippy::too_many_arguments,
+ reason = "a created document carries its type, folder, dates, content hash, attribution and job"
+ )]
async fn finish_created_document(
&self,
document_metadata: DocumentMetadata,
file_type: Option<FileType>,
project_id: Option<uuid::Uuid>,
+ dates: Option<DocumentDates>,
sha: String,
attribution: Attribution,
job_id: Option<String>,
@@ -809,7 +831,20 @@ impl<
.entity_access_management_service
.add_entity_to_project(&document_uuid, EntityType::Document, project_id)
.await.inspect_err(|e| tracing::error!(error=?e, project_id=?project_id, "unable to update entity access for project"));
- let _ = self.repo.update_project_modified(&project_id_str).await.inspect_err(
+ // A document carrying its own dates dates its folders by them
+ // rather than by now.
+ let updated = match dates {
+ Some(DocumentDates {
+ created_at,
+ updated_at,
+ }) => {
+ self.repo
+ .extend_project_dates(&project_id_str, created_at, updated_at)
+ .await
+ }
+ None => self.repo.update_project_modified(&project_id_str).await,
+ };
+ let _ = updated.inspect_err(
|e| tracing::error!(error=?e, project_id=?project_id, "unable to update project modified date"),
);
}
@@ -1527,6 +1562,7 @@ impl<
let owner = principal.owner();
let file_type = document.file_type;
let project_id = document.project_id;
+ let dates = DocumentDates::of(&document);
let sha = document.sha.clone();
let share_permission = match document.initial_link_share {
@@ -1553,6 +1589,7 @@ impl<
document_metadata,
file_type,
project_id,
+ dates,
sha,
Attribution::from(principal),
job_id,
@@ -1582,6 +1619,7 @@ impl<
let file_type = args.document.file_type;
let project_id = args.document.project_id;
+ let dates = DocumentDates::of(&args.document);
let sha = args.document.sha.clone();
let attribution = Attribution::direct(Actor::new_from_bot(bot_id::MACRO_SYSTEM_BOT_ID));
@@ -1605,6 +1643,7 @@ impl<
document_metadata,
file_type,
project_id,
+ dates,
sha,
attribution,
None,
diff --git a/crates/documents/src/domain/service/tests.rs b/crates/documents/src/domain/service/tests.rs
index ef3d0de8c7..d014c68c6c 100644
--- a/crates/documents/src/domain/service/tests.rs
+++ b/crates/documents/src/domain/service/tests.rs
@@ -2431,6 +2431,7 @@ fn new_document(file_type: FileType) -> NewDocument {
team_id: None,
share_with_team: false,
created_at: None,
+ updated_at: None,
sub_type: None,
skip_history: false,
initial_link_share: InitialLinkShare::EntityDefault,
@@ -3722,3 +3723,81 @@ async fn native_canvas_location_uses_sync_without_an_object_url() {
LocationResponseV3::SyncServiceContent { .. }
));
}
+
+#[tokio::test]
+async fn a_document_with_its_own_dates_dates_its_folder_by_them() {
+ let created_at = chrono::DateTime::parse_from_rfc3339("2021-03-01T00:00:00Z")
+ .unwrap()
+ .to_utc();
+ let updated_at = chrono::DateTime::parse_from_rfc3339("2024-02-01T00:00:00Z")
+ .unwrap()
+ .to_utc();
+ let mut repo = make_mock_repo();
+ repo.expect_get_owner_team()
+ .returning(|_| Box::pin(std::future::ready(Ok(None))));
+ repo.expect_create_document().returning(|_, _| {
+ let mut metadata = make_test_metadata();
+ metadata.document_id = "00000000-0000-0000-0000-000000000001".to_string();
+ Box::pin(std::future::ready(Ok(metadata)))
+ });
+ repo.expect_set_document_content()
+ .returning(|_, _| Box::pin(std::future::ready(Ok(()))));
+ repo.expect_get_team_task_metadata()
+ .returning(|_| Box::pin(std::future::ready(Ok(None))));
+ repo.expect_update_project_modified().times(0);
+ repo.expect_extend_project_dates()
+ .withf(move |project_id, created, updated| {
+ project_id == "00000000-0000-0000-0000-000000000009"
+ && *created == created_at
+ && *updated == updated_at
+ })
+ .times(1)
+ .returning(|_, _, _| Box::pin(std::future::ready(Ok(()))));
+ let (service, _event_broker) = make_test_service_with_event_broker(repo);
+
+ let mut document = new_document(FileType::Txt);
+ document.project_id = Some(uuid::Uuid::from_u128(9));
+ document.created_at = Some(created_at);
+ document.updated_at = Some(updated_at);
+ crate::domain::ports::DocumentService::create_document(
+ &service,
+ &CreationPrincipal::User(test_user()),
+ document,
+ None,
+ )
+ .await
+ .unwrap();
+}
+
+#[tokio::test]
+async fn a_document_without_dates_marks_its_folder_updated_now() {
+ let mut repo = make_mock_repo();
+ repo.expect_get_owner_team()
+ .returning(|_| Box::pin(std::future::ready(Ok(None))));
+ repo.expect_create_document().returning(|_, _| {
+ let mut metadata = make_test_metadata();
+ metadata.document_id = "00000000-0000-0000-0000-000000000001".to_string();
+ Box::pin(std::future::ready(Ok(metadata)))
+ });
+ repo.expect_set_document_content()
+ .returning(|_, _| Box::pin(std::future::ready(Ok(()))));
+ repo.expect_get_team_task_metadata()
+ .returning(|_| Box::pin(std::future::ready(Ok(None))));
+ repo.expect_extend_project_dates().times(0);
+ repo.expect_update_project_modified()
+ .withf(|project_id| project_id == "00000000-0000-0000-0000-000000000009")
+ .times(1)
+ .returning(|_| Box::pin(std::future::ready(Ok(()))));
+ let (service, _event_broker) = make_test_service_with_event_broker(repo);
+
+ let mut document = new_document(FileType::Txt);
+ document.project_id = Some(uuid::Uuid::from_u128(9));
+ crate::domain::ports::DocumentService::create_document(
+ &service,
+ &CreationPrincipal::User(test_user()),
+ document,
+ None,
+ )
+ .await
+ .unwrap();
+}
diff --git a/crates/documents/src/inbound/axum_router/create_document.rs b/crates/documents/src/inbound/axum_router/create_document.rs
index 2d0573dc6a..e31f0b4aaf 100644
--- a/crates/documents/src/inbound/axum_router/create_document.rs
+++ b/crates/documents/src/inbound/axum_router/create_document.rs
@@ -153,6 +153,7 @@ fn new_document(req: CreateDocumentRequest) -> NewDocument {
team_id: req.team_id,
share_with_team: false,
created_at: req.created_at,
+ updated_at: None,
sub_type: req
.is_task
.then_some(document_sub_type::DocumentSubType::Task),
diff --git a/crates/documents/src/outbound/pg_document_repo.rs b/crates/documents/src/outbound/pg_document_repo.rs
index 4df66a12b7..64424e119a 100644
--- a/crates/documents/src/outbound/pg_document_repo.rs
+++ b/crates/documents/src/outbound/pg_document_repo.rs
@@ -719,6 +719,37 @@ impl<B: BotFacts + 'static> DocumentRepo for PgDocumentRepo<B> {
Ok(())
}
+ #[tracing::instrument(err, skip(self))]
+ async fn extend_project_dates(
+ &self,
+ project_id: &str,
+ created_at: chrono::DateTime<chrono::Utc>,
+ updated_at: chrono::DateTime<chrono::Utc>,
+ ) -> Result<(), Self::Err> {
+ sqlx::query!(
+ r#"
+ WITH RECURSIVE ancestors AS (
+ SELECT id, "parentId" FROM "Project" WHERE id = $1
+ UNION
+ SELECT p.id, p."parentId"
+ FROM "Project" p
+ JOIN ancestors a ON p.id = a."parentId"
+ )
+ UPDATE "Project"
+ SET "createdAt" = LEAST("createdAt", $2),
+ "updatedAt" = GREATEST("updatedAt", $3)
+ WHERE id IN (SELECT id FROM ancestors)
+ "#,
+ project_id,
+ created_at.naive_utc(),
+ updated_at.naive_utc(),
+ )
+ .execute(&self.pool)
+ .await?;
+
+ Ok(())
+ }
+
#[tracing::instrument(err, skip(self))]
async fn delete_document_by_id(&self, document_id: &str) -> Result<(), Self::Err> {
let mut transaction = self.pool.begin().await?;
diff --git a/crates/documents/src/outbound/pg_document_repo/create.rs b/crates/documents/src/outbound/pg_document_repo/create.rs
index a245e6688d..76ea809a29 100644
--- a/crates/documents/src/outbound/pg_document_repo/create.rs
+++ b/crates/documents/src/outbound/pg_document_repo/create.rs
@@ -13,6 +13,10 @@ use crate::domain::models::{CreateDocumentRepoArgs, DocumentError, NewDocument};
/// Inserts a record into the document table
/// Returns the document id
#[tracing::instrument(skip(transaction), err)]
+#[expect(
+ clippy::too_many_arguments,
+ reason = "a document row carries its id, owner, name, type, folder and both dates"
+)]
pub async fn insert_document_row(
transaction: &mut sqlx::Transaction<'_, sqlx::Postgres>,
document_id: Option<&uuid::Uuid>,
@@ -21,6 +25,7 @@ pub async fn insert_document_row(
file_type: Option<FileType>,
project_id: Option<&uuid::Uuid>,
created_at: &chrono::DateTime<chrono::Utc>,
+ updated_at: &chrono::DateTime<chrono::Utc>,
) -> Result<uuid::Uuid, DocumentError> {
// Generate id if one is not provided
let id = macro_uuid::generate_uuid_v7();
@@ -30,14 +35,15 @@ pub async fn insert_document_row(
let result = sqlx::query!(
r#"
INSERT INTO "Document" (id, owner, name, "fileType", "projectId", "createdAt", "updatedAt")
- VALUES ($1, $2, $3, $4, $5, $6, $6)
+ VALUES ($1, $2, $3, $4, $5, $6, $7)
"#,
&document_id.to_string(),
owner.principal_id(),
document_name,
file_type.map(|ft| ft.as_str().to_string()),
project_id.map(|s| s.to_string()),
- created_at.naive_utc()
+ created_at.naive_utc(),
+ updated_at.naive_utc()
)
.execute(transaction.as_mut())
.await;
@@ -402,6 +408,7 @@ pub async fn insert_new_document<B: BotFacts>(
team_id,
share_with_team,
created_at: provided_created_at,
+ updated_at: provided_updated_at,
sub_type: requested_sub_type,
skip_history,
initial_link_share: _,
@@ -409,6 +416,7 @@ pub async fn insert_new_document<B: BotFacts>(
let now = chrono::Utc::now();
let created_at = provided_created_at.as_ref().unwrap_or(&now);
+ let updated_at = provided_updated_at.as_ref().unwrap_or(created_at);
let project_name: Option<String> = if let Some(ref proj_id) = project_id {
sqlx::query_scalar!(
@@ -429,6 +437,7 @@ pub async fn insert_new_document<B: BotFacts>(
file_type,
project_id.as_ref(),
created_at,
+ updated_at,
)
.await?;
diff --git a/crates/documents/src/outbound/pg_document_repo/tests.rs b/crates/documents/src/outbound/pg_document_repo/tests.rs
index ed31f0ef02..2cf3e16ef0 100644
--- a/crates/documents/src/outbound/pg_document_repo/tests.rs
+++ b/crates/documents/src/outbound/pg_document_repo/tests.rs
@@ -607,6 +607,7 @@ fn create_document_args(
team_id,
share_with_team: false,
created_at: None,
+ updated_at: None,
sub_type: is_task.then_some(document_sub_type::DocumentSubType::Task),
skip_history: false,
initial_link_share: InitialLinkShare::EntityDefault,
@@ -976,6 +977,122 @@ async fn test_soft_delete_document(pool: Pool<Postgres>) {
assert!(entity.deleted_at.is_some());
}
+#[sqlx::test(
+ migrator = "MACRO_DB_MIGRATIONS",
+ fixtures(path = "../../../fixtures", scripts("documents_test_data"))
+)]
+async fn create_document_keeps_the_dates_it_is_given(pool: Pool<Postgres>) {
+ let repo = test_repo(pool.clone());
+ let mut args = create_document_args(TEST_DOCUMENT_OWNER_ID, false, None);
+ args.document.created_at = Some(
+ chrono::DateTime::parse_from_rfc3339("2021-03-01T00:00:00Z")
+ .unwrap()
+ .to_utc(),
+ );
+ args.document.updated_at = Some(
+ chrono::DateTime::parse_from_rfc3339("2024-02-01T00:00:00Z")
+ .unwrap()
+ .to_utc(),
+ );
+ let created = repo
+ .create_document(args, md_share_permission())
+ .await
+ .unwrap();
+
+ let row = sqlx::query!(
+ r#"SELECT "createdAt"::text AS "created_at!", "updatedAt"::text AS "updated_at!" FROM "Document" WHERE id = $1"#,
+ created.document_id,
+ )
+ .fetch_one(&pool)
+ .await
+ .unwrap();
+ assert_eq!(
+ (row.created_at.as_str(), row.updated_at.as_str()),
+ ("2021-03-01 00:00:00", "2024-02-01 00:00:00")
+ );
+}
+
+#[sqlx::test(
+ migrator = "MACRO_DB_MIGRATIONS",
+ fixtures(path = "../../../fixtures", scripts("documents_test_data"))
+)]
+async fn extend_project_dates_widens_the_project_and_those_above_it(pool: Pool<Postgres>) {
+ // child_project sits in test_project_name.
+ sqlx::query!(
+ r#"
+ UPDATE "Project"
+ SET "createdAt" = '2026-01-01 00:00:00', "updatedAt" = '2026-02-01 00:00:00'
+ WHERE id IN ('d0000000-0000-0000-0000-100000000001', 'd0000000-0000-0000-0000-100000000002')
+ "#,
+ )
+ .execute(&pool)
+ .await
+ .unwrap();
+ let repo = test_repo(pool.clone());
+
+ // Inside the projects' span: nothing moves.
+ repo.extend_project_dates(
+ "d0000000-0000-0000-0000-100000000002",
+ chrono::DateTime::parse_from_rfc3339("2026-01-10T00:00:00Z")
+ .unwrap()
+ .to_utc(),
+ chrono::DateTime::parse_from_rfc3339("2026-01-20T00:00:00Z")
+ .unwrap()
+ .to_utc(),
+ )
+ .await
+ .unwrap();
+ // Wider: creation moves back and last edit forward, up the tree.
+ repo.extend_project_dates(
+ "d0000000-0000-0000-0000-100000000002",
+ chrono::DateTime::parse_from_rfc3339("2021-03-01T00:00:00Z")
+ .unwrap()
+ .to_utc(),
+ chrono::DateTime::parse_from_rfc3339("2026-03-01T00:00:00Z")
+ .unwrap()
+ .to_utc(),
+ )
+ .await
+ .unwrap();
+
+ let rows = sqlx::query!(
+ r#"
+ SELECT id, "createdAt"::text AS "created_at!", "updatedAt"::text AS "updated_at!"
+ FROM "Project"
+ WHERE id IN ('d0000000-0000-0000-0000-100000000001', 'd0000000-0000-0000-0000-100000000002')
+ ORDER BY id
+ "#,
+ )
+ .fetch_all(&pool)
+ .await
+ .unwrap();
+ let rows: Vec<(&str, &str, &str)> = rows
+ .iter()
+ .map(|row| {
+ (
+ row.id.as_str(),
+ row.created_at.as_str(),
+ row.updated_at.as_str(),
+ )
+ })
+ .collect();
+ assert_eq!(
+ rows,
+ vec![
+ (
+ "d0000000-0000-0000-0000-100000000001",
+ "2021-03-01 00:00:00",
+ "2026-03-01 00:00:00"
+ ),
+ (
+ "d0000000-0000-0000-0000-100000000002",
+ "2021-03-01 00:00:00",
+ "2026-03-01 00:00:00"
+ ),
+ ]
+ );
+}
+
#[sqlx::test(
migrator = "MACRO_DB_MIGRATIONS",
fixtures(path = "../../../fixtures", scripts("documents_test_data"))
@@ -2535,6 +2652,7 @@ fn import_email_document_args(
team_id: None,
share_with_team: false,
created_at: None,
+ updated_at: None,
sub_type: None,
skip_history: true,
initial_link_share: InitialLinkShare::EntityDefault,
diff --git a/crates/projects/AGENTS.md b/crates/projects/AGENTS.md
index 7bbbe51b75..a111c2fdb6 100644
--- a/crates/projects/AGENTS.md
+++ b/crates/projects/AGENTS.md
@@ -42,6 +42,10 @@ soft delete/restore/purge, and bulk upload into a project tree.
`src/domain/service.rs` → `src/inbound/axum_router.rs`.
- Add an AI tool: `src/inbound/toolset.rs` → the `ai_tools` feature gate in
`Cargo.toml`.
+- Copy a folder tree in from elsewhere (an import): create each folder with
+ `ProjectService::create_project_dated_by_contents`. It starts never edited
+ and leaves its parent alone; documents created in it with their own dates
+ date it and the folders above it.
## Tool contracts
diff --git a/crates/projects/src/domain/models.rs b/crates/projects/src/domain/models.rs
index c8bca18588..1a77b89d94 100644
--- a/crates/projects/src/domain/models.rs
+++ b/crates/projects/src/domain/models.rs
@@ -19,6 +19,8 @@ pub struct CreateProjectArgs {
pub parent_id: Option<String>,
/// Initial sharing configuration.
pub share_permission: SharePermissionV2,
+ /// Last-edit timestamp; `None` takes now.
+ pub updated_at: Option<chrono::DateTime<chrono::Utc>>,
}
/// Arguments for editing a project.
diff --git a/crates/projects/src/domain/ports.rs b/crates/projects/src/domain/ports.rs
index dcc8796dd8..8afd466b5e 100644
--- a/crates/projects/src/domain/ports.rs
+++ b/crates/projects/src/domain/ports.rs
@@ -451,6 +451,16 @@ pub trait ProjectService: Send + Sync + 'static {
args: CreateProjectRequest,
) -> impl Future<Output = Result<Project, ProjectError>> + Send;
+ /// Create a project that takes its last-edit time from what is put in
+ /// it: it starts never edited and does not mark its parent updated, and
+ /// documents created in it with their own dates date it and the projects
+ /// above it. For importers, so a copied tree keeps its source's dates.
+ fn create_project_dated_by_contents(
+ &self,
+ principal: &CreationPrincipal,
+ args: CreateProjectRequest,
+ ) -> impl Future<Output = Result<Project, ProjectError>> + Send;
+
/// Edit project metadata and sharing settings.
fn edit_project(
&self,
diff --git a/crates/projects/src/domain/service.rs b/crates/projects/src/domain/service.rs
index 0837671fec..a41ee4c66e 100644
--- a/crates/projects/src/domain/service.rs
+++ b/crates/projects/src/domain/service.rs
@@ -149,6 +149,75 @@ where
});
}
+ /// Create a project. With `updated_at` it starts last edited then and
+ /// leaves its parent's last-edit time alone; otherwise both take now.
+ async fn insert_project(
+ &self,
+ principal: &CreationPrincipal,
+ args: CreateProjectRequest,
+ updated_at: Option<chrono::DateTime<chrono::Utc>>,
+ ) -> Result<Project, ProjectError> {
+ validate_project_name(&args.name)?;
+
+ let owner = principal.owner();
+ // The owner's team default link-share preference decides the initial
+ // share permission; without a team, projects default to link sharing off.
+ let team_default = self
+ .repo
+ .get_team_default_link_share(&owner)
+ .await
+ .map_err(|error| internal_error(error, "unable to resolve team default link share"))?;
+
+ let parent_id = args.project_parent_id.map(|id| id.to_string());
+ let project = self
+ .repo
+ .create_project(CreateProjectArgs {
+ owner: owner.clone(),
+ name: args.name,
+ parent_id: parent_id.clone(),
+ share_permission: SharePermissionV2::new_project_share_permission(team_default),
+ updated_at,
+ })
+ .await
+ .map_err(|error| internal_error(error, "unable to create project"))?;
+
+ let entity_id = args
+ .project_parent_id
+ .map(|_| parse_internal_uuid(&project.id, "created project ID"))
+ .transpose()?;
+
+ if let Some((parent_id, entity_id)) = args.project_parent_id.zip(entity_id) {
+ let _ = self
+ .entity_access_management_service
+ .add_entity_to_project(&entity_id, EntityType::Project, &parent_id)
+ .await
+ .inspect_err(|error| {
+ tracing::error!(
+ error = ?error,
+ %entity_id,
+ project_id = %parent_id,
+ "unable to update entity access for project"
+ );
+ });
+ if updated_at.is_none() {
+ self.bump_project_modified(&parent_id.to_string()).await;
+ }
+ }
+
+ self.publish_project_event(&ProjectMacroEvent::created(
+ project.id.clone(),
+ ProjectCreatedMetadata {
+ project_id: project.id.clone(),
+ owner,
+ name: project.name.clone(),
+ parent_project_id: project.parent_id.clone(),
+ created_at: project.created_at,
+ },
+ ));
+
+ Ok(project)
+ }
+
async fn authorize_project_team_share(
&self,
receipt: &EntityAccessReceipt<EditAccessLevel>,
@@ -370,62 +439,16 @@ where
principal: &CreationPrincipal,
args: CreateProjectRequest,
) -> Result<Project, ProjectError> {
- validate_project_name(&args.name)?;
-
- let owner = principal.owner();
- // The owner's team default link-share preference decides the initial
- // share permission; without a team, projects default to link sharing off.
- let team_default = self
- .repo
- .get_team_default_link_share(&owner)
- .await
- .map_err(|error| internal_error(error, "unable to resolve team default link share"))?;
+ self.insert_project(principal, args, None).await
+ }
- let parent_id = args.project_parent_id.map(|id| id.to_string());
- let project = self
- .repo
- .create_project(CreateProjectArgs {
- owner: owner.clone(),
- name: args.name,
- parent_id: parent_id.clone(),
- share_permission: SharePermissionV2::new_project_share_permission(team_default),
- })
+ async fn create_project_dated_by_contents(
+ &self,
+ principal: &CreationPrincipal,
+ args: CreateProjectRequest,
+ ) -> Result<Project, ProjectError> {
+ self.insert_project(principal, args, Some(chrono::DateTime::UNIX_EPOCH))
.await
- .map_err(|error| internal_error(error, "unable to create project"))?;
-
- let entity_id = args
- .project_parent_id
- .map(|_| parse_internal_uuid(&project.id, "created project ID"))
- .transpose()?;
-
- if let Some((parent_id, entity_id)) = args.project_parent_id.zip(entity_id) {
- let _ = self
- .entity_access_management_service
- .add_entity_to_project(&entity_id, EntityType::Project, &parent_id)
- .await
- .inspect_err(|error| {
- tracing::error!(
- error = ?error,
- %entity_id,
- project_id = %parent_id,
- "unable to update entity access for project"
- );
- });
- self.bump_project_modified(&parent_id.to_string()).await;
- }
-
- self.publish_project_event(&ProjectMacroEvent::created(
- project.id.clone(),
- ProjectCreatedMetadata {
- project_id: project.id.clone(),
- owner,
- name: project.name.clone(),
- parent_project_id: project.parent_id.clone(),
- created_at: project.created_at,
- },
- ));
-
- Ok(project)
}
async fn edit_project(
diff --git a/crates/projects/src/domain/service/tests.rs b/crates/projects/src/domain/service/tests.rs
index 83b285d089..360abdee56 100644
--- a/crates/projects/src/domain/service/tests.rs
+++ b/crates/projects/src/domain/service/tests.rs
@@ -797,6 +797,43 @@ async fn create_project_publishes_repository_metadata_after_success() {
assert_eq!(metadata["created_at"], expected_created_at);
}
+#[tokio::test]
+async fn a_project_dated_by_contents_starts_never_edited_and_leaves_its_parent_alone() {
+ let parent_id = Uuid::new_v4();
+ let mut repo = MockProjectRepo::new();
+ repo.expect_get_team_default_link_share()
+ .returning(|_| Box::pin(async { Ok(None) }));
+ repo.expect_create_project()
+ .withf(|args| args.updated_at == Some(chrono::DateTime::UNIX_EPOCH))
+ .return_once(move |_| {
+ Box::pin(async move {
+ Ok(project(
+ &Uuid::new_v4().to_string(),
+ Some(&parent_id.to_string()),
+ ))
+ })
+ });
+ repo.expect_update_project_modified().times(0);
+ let service = mutation_service_with_event_broker(
+ repo,
+ RecordingEam::default(),
+ RecordingIndexer::default(),
+ TestEventBroker::default(),
+ );
+
+ service
+ .create_project_dated_by_contents(
+ &CreationPrincipal::User(user_id("macro|[email protected]")),
+ CreateProjectRequest {
+ name: "Imported".to_string(),
+ project_parent_id: Some(parent_id),
+ },
+ )
+ .await
+ .unwrap();
+}
+
#[tokio::test]
async fn create_project_failures_publish_no_event() {
let mut repo = MockProjectRepo::new();
diff --git a/crates/projects/src/inbound/axum_router/tests.rs b/crates/projects/src/inbound/axum_router/tests.rs
index 45ac863679..343f4899d6 100644
--- a/crates/projects/src/inbound/axum_router/tests.rs
+++ b/crates/projects/src/inbound/axum_router/tests.rs
@@ -173,6 +173,14 @@ impl ProjectService for FakeProjectService {
Ok(project())
}
+ async fn create_project_dated_by_contents(
+ &self,
+ _principal: &CreationPrincipal,
+ _args: CreateProjectRequest,
+ ) -> Result<Project, ProjectError> {
+ panic!("dated projects are not created by these tests")
+ }
+
async fn edit_project(
&self,
_receipt: EntityAccessReceipt<entity_access::domain::models::EditAccessLevel>,
diff --git a/crates/projects/src/outbound/pg_project_repo/create.rs b/crates/projects/src/outbound/pg_project_repo/create.rs
index cfc50d2f75..63970cb432 100644
--- a/crates/projects/src/outbound/pg_project_repo/create.rs
+++ b/crates/projects/src/outbound/pg_project_repo/create.rs
@@ -15,7 +15,7 @@ pub(super) async fn create_project<B: BotFacts>(
let row = sqlx::query!(
r#"
INSERT INTO "Project" (name, "userId", "parentId", "createdAt", "updatedAt")
- VALUES ($1, $2, $3, NOW(), NOW())
+ VALUES ($1, $2, $3, NOW(), COALESCE($4::timestamp, NOW()::timestamp))
RETURNING
id,
name,
@@ -28,6 +28,7 @@ pub(super) async fn create_project<B: BotFacts>(
args.name,
args.owner.principal_id(),
args.parent_id,
+ args.updated_at.map(|updated_at| updated_at.naive_utc()),
)
.fetch_one(transaction.as_mut())
.await?;
diff --git a/crates/projects/src/outbound/pg_project_repo/team_share/test.rs b/crates/projects/src/outbound/pg_project_repo/team_share/test.rs
index 135606082c..fb92a3fd6b 100644
--- a/crates/projects/src/outbound/pg_project_repo/team_share/test.rs
+++ b/crates/projects/src/outbound/pg_project_repo/team_share/test.rs
@@ -34,6 +34,7 @@ async fn create_project(repo: &TestRepo, name: &str) -> String {
name: name.to_string(),
parent_id: None,
share_permission: SharePermissionV2::new_project_share_permission(None),
+ updated_at: None,
})
.await
.unwrap()
@@ -598,6 +599,7 @@ async fn bot_owned_child_under_team_shared_parent_inherits_and_keeps_its_own_gra
name: "Bot child".to_string(),
parent_id: Some(parent_id.clone()),
share_permission: SharePermissionV2::new_project_share_permission(None),
+ updated_at: None,
})
.await
.unwrap();
diff --git a/crates/projects/src/outbound/pg_project_repo/tests.rs b/crates/projects/src/outbound/pg_project_repo/tests.rs
index 4479d8c6c8..8c6604a218 100644
--- a/crates/projects/src/outbound/pg_project_repo/tests.rs
+++ b/crates/projects/src/outbound/pg_project_repo/tests.rs
@@ -344,6 +344,32 @@ async fn reads_share_permissions_and_bumps_modified_timestamp(
Ok(())
}
+#[sqlx::test(
+ migrator = "MACRO_DB_MIGRATIONS",
+ fixtures(path = "../../../fixtures", scripts("projects_test_data"))
+)]
+async fn create_keeps_the_last_edit_time_it_is_given(pool: Pool<Postgres>) -> anyhow::Result<()> {
+ let repo = test_repo(pool.clone());
+ let project = repo
+ .create_project(CreateProjectArgs {
+ owner: project_owner(),
+ name: "Imported".to_owned(),
+ parent_id: Some(ROOT_ID.to_owned()),
+ share_permission: SharePermissionV2::new_project_share_permission(None),
+ updated_at: Some(chrono::DateTime::UNIX_EPOCH),
+ })
+ .await?;
+
+ let updated_at = sqlx::query_scalar!(
+ r#"SELECT "updatedAt"::text AS "updated_at!" FROM "Project" WHERE id = $1"#,
+ project.id,
+ )
+ .fetch_one(&pool)
+ .await?;
+ assert_eq!(updated_at, "1970-01-01 00:00:00");
+ Ok(())
+}
+
#[sqlx::test(
migrator = "MACRO_DB_MIGRATIONS",
fixtures(path = "../../../fixtures", scripts("projects_test_data"))
@@ -357,6 +383,7 @@ async fn create_is_atomic_and_inserts_all_metadata(pool: Pool<Postgres>) -> anyh
name: "Created".to_owned(),
parent_id: Some(ROOT_ID.to_owned()),
share_permission: permission.clone(),
+ updated_at: None,
})
.await?;
@@ -397,6 +424,7 @@ async fn create_is_atomic_and_inserts_all_metadata(pool: Pool<Postgres>) -> anyh
name: "Must roll back".to_owned(),
parent_id: Some("missing-parent".to_owned()),
share_permission: permission,
+ updated_at: None,
})
.await
.is_err()
@@ -457,6 +485,7 @@ async fn unsponsored_bot_owner_leaves_no_project_rows(pool: Pool<Postgres>) -> a
name: "Bot project".to_owned(),
parent_id: None,
share_permission: SharePermissionV2::new_project_share_permission(None),
+ updated_at: None,
};
let before = ownership_row_counts(&pool).await;
@@ -497,6 +526,7 @@ async fn create_defaults_enabled_link_share_to_view(pool: Pool<Postgres>) -> any
name: "Team project".to_owned(),
parent_id: None,
share_permission: permission,
+ updated_at: None,
})
.await?;