nils/papercrate
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

revert document types

Browse Source
This commit is contained in:
nils
2025-10-31 12:56:09 +01:00
parent 0a87f33d89
commit faf8fec9c7
20 changed files with 12 additions and 1984 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/routes/documents.rs
+3 -193
View File
@@ -37,13 +37,12 @@ use crate::documents::{
use crate::error::{AppError, AppResult};
use crate::jobs::{enqueue_job, JOB_ANALYZE_DOCUMENT, JOB_INDEX_DOCUMENT_TEXT};
use crate::models::{
Document, DocumentAsset, DocumentAssetObject, DocumentType, DocumentVersion, NewDocument,
NewDocumentTag, NewDocumentVersion, Tag,
Document, DocumentAsset, DocumentAssetObject, DocumentVersion, NewDocument, NewDocumentTag,
NewDocumentVersion, Tag,
};
use crate::schema::{
document_asset_objects, document_assets, document_correspondents, document_tags,
document_types, document_versions, documents, folders, refresh_tokens::dsl as refresh_dsl,
tags,
document_versions, documents, folders, refresh_tokens::dsl as refresh_dsl, tags,
};
use crate::state::AppState;
use crate::utils::{
@@ -68,7 +67,6 @@ pub struct DocumentListQuery {
pub query: Option<String>,
pub tags: Option<String>,
pub correspondents: Option<String>,
pub document_types: Option<String>,
#[serde(default = "default_document_status_filter")]
#[schema(default = "active")]
pub status: DocumentStatusFilter,
@@ -141,21 +139,6 @@ impl From<Tag> for TagResponse {
}
}
#[derive(Clone, Serialize, Deserialize, ToSchema)]
pub struct DocumentTypeResponse {
pub id: Uuid,
pub name: String,
}
impl From<DocumentType> for DocumentTypeResponse {
fn from(value: DocumentType) -> Self {
Self {
id: value.id,
name: value.name,
}
}
}
#[derive(Serialize, ToSchema)]
pub struct DocumentResponse {
pub id: Uuid,
@@ -174,12 +157,6 @@ pub struct DocumentResponse {
pub issued_at: Option<String>,
#[schema(value_type = Object)]
pub metadata: Value,
#[serde(skip_serializing_if = "Option::is_none")]
#[schema(nullable)]
pub document_type_id: Option<Uuid>,
#[serde(skip_serializing_if = "Option::is_none")]
#[schema(nullable)]
pub document_type: Option<DocumentTypeResponse>,
pub tags: Vec<TagResponse>,
#[serde(default, skip_serializing_if = "Vec::is_empty")]
pub correspondents: Vec<DocumentCorrespondentResponse>,
@@ -223,9 +200,6 @@ pub struct UpdateDocumentRequest {
#[serde(default)]
#[schema(nullable, value_type = Object)]
pub metadata: Option<DocumentMetadataUpdate>,
#[serde(default)]
#[schema(nullable, value_type = Option<Uuid>)]
pub document_type_id: Option<Uuid>,
}
#[derive(Serialize, ToSchema)]
@@ -280,7 +254,6 @@ struct DocumentUpdateChangeset {
issued_at: Option<Option<NaiveDateTime>>,
metadata: Option<Value>,
updated_at: Option<NaiveDateTime>,
document_type_id: Option<Option<Uuid>>,
}
#[derive(Deserialize, Copy, Clone, PartialEq, Eq, ToSchema)]
@@ -325,7 +298,6 @@ struct UploadRequest {
correspondents: Vec<CorrespondentAssignmentInput>,
issued_at_override: Option<NaiveDateTime>,
skip_if_existing: bool,
document_type_id: Option<Uuid>,
}
enum UploadOutcome {
@@ -402,7 +374,6 @@ pub async fn list_documents(
query,
tags,
correspondents,
document_types,
status,
} = params;
@@ -435,12 +406,6 @@ pub async fn list_documents(
.map(|s| s.trim())
.filter(|s| !s.is_empty())
.map(|s| s.to_owned());
let document_types_param = document_types
.as_ref()
.map(|s| s.trim())
.filter(|s| !s.is_empty())
.map(|s| s.to_owned());
let include_descendants = include_descendants.unwrap_or(true);
match (folder_id, include_descendants) {
@@ -579,20 +544,6 @@ pub async fn list_documents(
}
}
if let Some(document_types_param) = document_types_param.as_ref() {
let type_ids: Result<Vec<Uuid>, _> = document_types_param
.split(',')
.map(|s| Uuid::parse_str(s.trim()))
.collect();
if let Ok(ids) = type_ids {
if !ids.is_empty() {
let filter_values: Vec<Option<Uuid>> = ids.into_iter().map(Some).collect();
docs_query = docs_query.filter(documents::document_type_id.eq_any(filter_values));
}
}
}
if let Some(ref set) = filter_ids {
if set.is_empty() {
return Ok(Json(vec![]));
@@ -735,8 +686,6 @@ pub async fn get_document(
.find(doc.current_version_id)
.first(&mut conn)?;
let doc_type = load_document_type(&mut conn, tenant_id, doc.document_type_id)?;
let tags_map = load_tags_for_documents(&mut conn, &[document_id])?;
let mut correspondents_map = load_correspondents_for_documents(&mut conn, &[document_id])?;
let version_id = current_version.id;
@@ -753,7 +702,6 @@ pub async fn get_document(
tags_map.get(&document_id).cloned(),
correspondents_map.remove(&document_id).unwrap_or_default(),
Some((version_response, assets)),
doc_type,
)?,
}))
}
@@ -786,7 +734,6 @@ pub async fn upload_document(
let mut issued_at_override: Option<NaiveDateTime> = None;
let mut skip_if_existing = false;
let mut title_override: Option<String> = None;
let mut document_type_id: Option<Uuid> = None;
while let Some(field) = multipart.next_field().await.map_err(|err| {
let msg = format!("invalid multipart data: {err}");
@@ -905,20 +852,6 @@ pub async fn upload_document(
"1" | "true" | "yes"
);
}
Some("document_type_id") => {
let value = field.text().await.map_err(|err| {
let msg = format!("invalid document_type_id: {err}");
error!(error = %err, "invalid document_type payload");
AppError::bad_request(msg)
})?;
let trimmed = value.trim();
if !trimmed.is_empty() {
let parsed = Uuid::parse_str(trimmed).map_err(|_| {
AppError::bad_request("document_type_id must be a valid UUID")
})?;
document_type_id = Some(parsed);
}
}
_ => {}
}
}
@@ -949,7 +882,6 @@ pub async fn upload_document(
correspondents,
issued_at_override,
skip_if_existing,
document_type_id,
};
let outcome = match process_upload(&state, request, tenant_id, user_id).await {
@@ -1482,46 +1414,6 @@ pub async fn update_document(
}
}
let doc_type_update =
classify_nullable(payload_obj.get("document_type_id")).map_err(AppError::bad_request)?;
match doc_type_update {
NullableValue::Omitted => {}
NullableValue::Null => {
if document.document_type_id.is_some() {
changes.document_type_id = Some(None);
has_changes = true;
}
}
NullableValue::String(raw) => {
let trimmed = raw.trim();
if trimmed.is_empty() {
return Err(AppError::bad_request(
"document_type_id must not be empty when provided",
));
}
let parsed = Uuid::parse_str(trimmed)
.map_err(|_| AppError::bad_request("document_type_id must be a valid UUID"))?;
if document.document_type_id != Some(parsed) {
let exists = document_types::table
.filter(document_types::tenant_id.eq(tenant_id))
.find(parsed)
.first::<DocumentType>(&mut conn)
.optional()?;
if exists.is_none() {
return Err(AppError::bad_request(
"document_type_id does not exist for this tenant",
));
}
changes.document_type_id = Some(Some(parsed));
has_changes = true;
}
}
}
if !has_changes {
return Err(AppError::bad_request("no changes provided"));
}
@@ -1555,8 +1447,6 @@ pub async fn update_document(
.find(document.current_version_id)
.first(&mut conn)?;
let doc_type = load_document_type(&mut conn, tenant_id, document.document_type_id)?;
if title_changed {
if let Err(err) = enqueue_job(
&mut conn,
@@ -1593,7 +1483,6 @@ pub async fn update_document(
tags_map.get(&document_id).cloned(),
correspondents_map.remove(&document_id).unwrap_or_default(),
Some((version_response, assets)),
doc_type,
)?,
}))
}
@@ -2195,23 +2084,8 @@ async fn process_upload(
correspondents,
issued_at_override,
skip_if_existing,
document_type_id,
} = request;
if let Some(type_id) = document_type_id {
let mut conn = state.db_for_tenant(tenant_id)?;
let exists = document_types::table
.filter(document_types::tenant_id.eq(tenant_id))
.find(type_id)
.first::<DocumentType>(&mut conn)
.optional()?;
if exists.is_none() {
return Err(AppError::bad_request(
"document_type_id does not exist for this tenant",
));
}
}
if let Some(folder) = folder_id {
let mut conn = state.db_for_tenant(tenant_id)?;
ensure_folder_exists_on_conn(&mut conn, tenant_id, folder)?;
@@ -2292,24 +2166,6 @@ async fn process_upload(
)?;
}
if let Some(type_id) = document_type_id {
if document.document_type_id != Some(type_id) {
let now = Utc::now().naive_utc();
diesel::update(
documents::table
.find(document.id)
.filter(documents::tenant_id.eq(tenant_id)),
)
.set((
documents::document_type_id.eq(Some(type_id)),
documents::updated_at.eq(now),
))
.execute(&mut conn)?;
document.document_type_id = Some(type_id);
document.updated_at = now;
}
}
if document.deleted_at.is_some() {
let now = Utc::now().naive_utc();
diesel::update(documents::table.find(document.id))
@@ -2322,7 +2178,6 @@ async fn process_upload(
document.updated_at = now;
}
let doc_type = load_document_type(&mut conn, tenant_id, document.document_type_id)?;
let tags_map = load_tags_for_documents(&mut conn, &[document.id])?;
let mut correspondents_map =
load_correspondents_for_documents(&mut conn, &[document.id])?;
@@ -2346,7 +2201,6 @@ async fn process_upload(
tags,
correspondents,
Some((version_response, assets)),
doc_type,
)?,
}));
}
@@ -2386,7 +2240,6 @@ async fn process_upload(
title: derived_title.clone(),
metadata: metadata_value.clone(),
tenant_id,
document_type_id,
};
diesel::insert_into(documents::table)
.values(&new_document)
@@ -2445,7 +2298,6 @@ async fn process_upload(
)?;
}
let doc_type = load_document_type(&mut conn, tenant_id, document.document_type_id)?;
let tags_map = load_tags_for_documents(&mut conn, &[doc_id])?;
let mut correspondents_map = load_correspondents_for_documents(&mut conn, &[doc_id])?;
let tags = tags_map.get(&doc_id).cloned();
@@ -2460,7 +2312,6 @@ async fn process_upload(
tags,
correspondents,
Some((to_version_response(version.clone()), Vec::new())),
doc_type,
)?,
}
};
@@ -2493,7 +2344,6 @@ pub(crate) fn to_document_response(
tags: Option<Vec<Tag>>,
correspondents: Vec<DocumentCorrespondentResponse>,
current_version: Option<(DocumentVersionResponse, Vec<DocumentAssetResponse>)>,
doc_type: Option<DocumentType>,
) -> AppResult<DocumentResponse> {
let current_version = if let Some((version, assets)) = current_version {
let download_path = build_download_path(state, &doc, user_id)?;
@@ -2518,11 +2368,6 @@ pub(crate) fn to_document_response(
deleted_at: doc.deleted_at.map(to_iso),
issued_at: doc.issued_at.map(to_iso),
metadata: doc.metadata,
document_type_id: doc.document_type_id,
document_type: doc_type.map(|typ| DocumentTypeResponse {
id: typ.id,
name: typ.name,
}),
tags: tags
.unwrap_or_default()
.into_iter()
@@ -2533,22 +2378,6 @@ pub(crate) fn to_document_response(
})
}
fn load_document_type(
conn: &mut PgConnection,
tenant_id: Uuid,
type_id: Option<Uuid>,
) -> diesel::QueryResult<Option<DocumentType>> {
if let Some(id) = type_id {
document_types::table
.filter(document_types::tenant_id.eq(tenant_id))
.find(id)
.first::<DocumentType>(conn)
.optional()
} else {
Ok(None)
}
}
pub(crate) fn hydrate_documents(
state: &AppState,
conn: &mut PgConnection,
@@ -2560,20 +2389,6 @@ pub(crate) fn hydrate_documents(
return Ok(Vec::new());
}
let type_ids: HashSet<Uuid> = docs.iter().filter_map(|doc| doc.document_type_id).collect();
let doc_type_map: HashMap<Uuid, DocumentType> = if type_ids.is_empty() {
HashMap::new()
} else {
let ids: Vec<Uuid> = type_ids.iter().copied().collect();
document_types::table
.filter(document_types::tenant_id.eq(tenant_id))
.filter(document_types::id.eq_any(&ids))
.load::<DocumentType>(conn)?
.into_iter()
.map(|typ| (typ.id, typ))
.collect()
};
let doc_ids: Vec<Uuid> = docs.iter().map(|doc| doc.id).collect();
let tags_map = load_tags_for_documents(conn, &doc_ids)?;
let mut correspondents_map = load_correspondents_for_documents(conn, &doc_ids)?;
@@ -2584,9 +2399,6 @@ pub(crate) fn hydrate_documents(
let tags = tags_map.get(&doc.id).cloned();
let correspondents = correspondents_map.remove(&doc.id).unwrap_or_default();
let current_version = primary_versions.get(&doc.id).cloned();
let doc_type = doc
.document_type_id
.and_then(|id| doc_type_map.get(&id).cloned());
responses.push(to_document_response(
state,
user_id,
@@ -2594,7 +2406,6 @@ pub(crate) fn hydrate_documents(
tags,
correspondents,
current_version,
doc_type,
)?);
}
@@ -2636,7 +2447,6 @@ pub(crate) fn hydrate_documents(
crate::routes::documents::DocumentResponse,
crate::routes::documents::DocumentDetailResponse,
crate::routes::documents::DocumentMetadataUpdate,
crate::routes::documents::DocumentTypeResponse,
crate::routes::documents::TagResponse,
crate::routes::documents::CorrespondentAssignmentInput,
crate::routes::documents::AssignCorrespondentsRequest,