cjw/Oxicloud
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

feat(drive): remove all owner_id from {File,Folder}Dto

Browse Source
This commit is contained in:
Edouard Vanbelle
2026-07-03 00:48:14 +02:00
parent 29bcf48eb7
commit 37467ed9d3
33 changed files with 116 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/infrastructure/repositories/pg/folder_db_repository.rs
+8 -12
View File
@@ -1390,7 +1390,6 @@ impl FolderDbRepository {
-1::bigint AS size,
f.created_at,
f.updated_at AS modified_at,
f.user_id,
f.drive_id,
NULL::text AS blob_hash,
LOWER(f.name) AS sort_str,
@@ -1410,7 +1409,6 @@ impl FolderDbRepository {
fm.size::bigint,
fm.created_at,
fm.updated_at AS modified_at,
fm.user_id,
fm.drive_id,
fm.blob_hash,
LOWER(fm.name) AS sort_str,
@@ -1536,7 +1534,7 @@ impl FolderDbRepository {
let sql = format!(
"WITH resources AS ({cte_inner}) \
SELECT resource_type, id, name, folder_id, mime_type, size, \
created_at, modified_at, user_id, drive_id, blob_hash, \
created_at, modified_at, drive_id, blob_hash, \
sort_str, type_order, folder_first \
FROM resources \
{where_clause} \
@@ -1545,7 +1543,7 @@ impl FolderDbRepository {
);
// Row: (resource_type, id, name, folder_id, mime_type, size,
// created_at, modified_at, user_id, drive_id, blob_hash,
// created_at, modified_at, drive_id, blob_hash,
// sort_str, type_order, folder_first)
type Row = (
String,
@@ -1556,8 +1554,7 @@ impl FolderDbRepository {
i64,
chrono::DateTime<chrono::Utc>,
chrono::DateTime<chrono::Utc>,
Option<Uuid>, // user_id (post-D7: nullable on new rows)
Uuid,
Uuid, // drive_id
Option<String>,
String,
i64,
@@ -1588,12 +1585,11 @@ impl FolderDbRepository {
size: r.5,
created_at: r.6,
modified_at: r.7,
owner_id: r.8,
drive_id: r.9,
blob_hash: r.10,
sort_str: r.11,
type_order: r.12,
folder_first: r.13,
drive_id: r.8,
blob_hash: r.9,
sort_str: r.10,
type_order: r.11,
folder_first: r.12,
})
.collect())
}