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.

fix(search): read the markdown fallback under the stored document owner (#7890)

teo82741e75af17
diff --git a/services/search_processing_service/src/process/document/raw_document.rs b/services/search_processing_service/src/process/document/raw_document.rs
index 5d0a2734da..6535bee2a0 100644
--- a/services/search_processing_service/src/process/document/raw_document.rs
+++ b/services/search_processing_service/src/process/document/raw_document.rs
@@ -237,6 +237,28 @@ async fn update_search_with_unreadable_design(
update_search_with_parent_only_document(opensearch_client, db, search_extractor_message).await
}
+/// The S3 key of the content to index, or `None` when the message names a
+/// superseded version. Content is stored under the document's owner; sync
+/// messages carry no `user_id`.
+fn raw_document_key(
+ owner: &Owner,
+ search_extractor_message: &SearchExtractorMessage,
+ document_version_id: &str,
+) -> Option<String> {
+ let document_id = &search_extractor_message.document_id;
+ if document_version_id == CONVERTED_DOCUMENT_FILE_NAME {
+ return Some(build_docx_to_pdf_converted_document_key(owner, document_id));
+ }
+ match search_extractor_message.document_version_id.as_deref() {
+ Some(msg_version_id) if msg_version_id != document_version_id => None,
+ _ => Some(build_cloud_storage_bucket_document_key(
+ owner,
+ document_id,
+ document_version_id,
+ )),
+ }
+}
+
/// Processes a message for a standard document and reads the updated contents from s3 and updates
/// the document in opensearch.
#[tracing::instrument(skip(opensearch_client, db, s3_client, document_storage_bucket, search_extractor_message), fields(document_id=search_extractor_message.document_id, file_type=?search_extractor_message.file_type))]
@@ -309,25 +331,17 @@ pub async fn update_search_with_raw_document(
.as_str(),
)?;
- let key_owner = Owner::from_principal_str(&search_extractor_message.user_id)
- .context("search extractor message user_id is not an owner principal")?;
- let key = if document_version_id == CONVERTED_DOCUMENT_FILE_NAME {
- build_docx_to_pdf_converted_document_key(&key_owner, &search_extractor_message.document_id)
- } else if let Some(msg_version_id) = search_extractor_message.document_version_id.as_ref()
- && msg_version_id != &document_version_id
- {
+ let Some(key) = raw_document_key(
+ &document_info.owner,
+ search_extractor_message,
+ &document_version_id,
+ ) else {
tracing::debug!(
- msg_version_id,
+ msg_version_id = ?search_extractor_message.document_version_id,
document_version_id,
"document version is not latest, skipping"
);
return Ok(());
- } else {
- build_cloud_storage_bucket_document_key(
- &key_owner,
- &search_extractor_message.document_id,
- &document_version_id,
- )
};
let content = s3_client
diff --git a/services/search_processing_service/src/process/document/raw_document/test.rs b/services/search_processing_service/src/process/document/raw_document/test.rs
index 866f825460..708593b0e6 100644
--- a/services/search_processing_service/src/process/document/raw_document/test.rs
+++ b/services/search_processing_service/src/process/document/raw_document/test.rs
@@ -175,6 +175,42 @@ fn test_design_content_is_indexed_but_other_vector_files_are_name_only() {
assert!(should_index_parent_only(&FileType::Dwg));
}
+#[test]
+fn raw_document_key_is_under_the_stored_owner() {
+ let owner: Owner = "macro|[email protected]".to_string().try_into().unwrap();
+ let message = |user_id: &str, version: Option<&str>| SearchExtractorMessage {
+ user_id: user_id.to_string(),
+ document_id: "DDD".to_string(),
+ file_type: FileType::Md,
+ document_version_id: version.map(str::to_string),
+ index_override: None,
+ };
+ let latest = build_cloud_storage_bucket_document_key(&owner, "DDD", "7");
+ let converted = build_docx_to_pdf_converted_document_key(&owner, "DDD");
+
+ let check = |message: SearchExtractorMessage, version: &str, expected: Option<&str>| {
+ assert_eq!(
+ raw_document_key(&owner, &message, version).as_deref(),
+ expected,
+ "{message:?} at version {version}"
+ );
+ };
+
+ check(message("", None), "7", Some(&latest));
+ check(message("", Some("7")), "7", Some(&latest));
+ check(
+ message("macro|[email protected]", Some("7")),
+ "7",
+ Some(&latest),
+ );
+ check(message("", Some("6")), "7", None);
+ check(
+ message("", Some(CONVERTED_DOCUMENT_FILE_NAME)),
+ CONVERTED_DOCUMENT_FILE_NAME,
+ Some(&converted),
+ );
+}
+
#[tokio::test]
async fn test_unreadable_designs_are_read_errors() {
for file_type in [FileType::Psd, FileType::Psb, FileType::Ai, FileType::Md] {