fix(merge): fix merge of mount + is_favorite feature

fix the merge of moun feature and is_favorite + is_shared feature
    together it was raising an impossible build due to missing schema
This commit is contained in:
Edouard Vanbelle
2026-07-22 08:30:02 +02:00
parent 06875bc728
commit 53077e0fa3
3 changed files with 18 additions and 1 deletions
Generated
+1 -1
View File
@@ -4322,7 +4322,7 @@ dependencies = [
[[package]] [[package]]
name = "oxicloud" name = "oxicloud"
version = "0.8.2" version = "0.8.7"
dependencies = [ dependencies = [
"accept-language", "accept-language",
"aes-gcm", "aes-gcm",
+11
View File
@@ -67,6 +67,11 @@ pub fn mount_folder_dto(cfg: &MountConfig, parent_id: &str, stat: &MountStat) ->
category: Arc::from("Folder"), category: Arc::from("Folder"),
created_by: Some(cfg.owner_id), created_by: Some(cfg.owner_id),
updated_by: Some(cfg.owner_id), updated_by: Some(cfg.owner_id),
// Mount entries carry synthetic `ext:*` ids that don't exist in
// `auth.user_favorites` or `storage.role_grants`, so both flags
// are always false — they can't be favorited or grant-listed.
is_favorite: false,
is_shared: false,
} }
} }
@@ -88,6 +93,8 @@ pub fn mount_entry_folder_dto(cfg: &MountConfig, parent_id: &str, entry: &MountE
category: Arc::from("Folder"), category: Arc::from("Folder"),
created_by: Some(cfg.owner_id), created_by: Some(cfg.owner_id),
updated_by: Some(cfg.owner_id), updated_by: Some(cfg.owner_id),
is_favorite: false,
is_shared: false,
} }
} }
@@ -115,6 +122,8 @@ pub fn mount_entry_file_dto(cfg: &MountConfig, parent_id: &str, entry: &MountEnt
etag: virtual_file_etag(entry.size, entry.modified_at), etag: virtual_file_etag(entry.size, entry.modified_at),
created_by: Some(cfg.owner_id), created_by: Some(cfg.owner_id),
updated_by: Some(cfg.owner_id), updated_by: Some(cfg.owner_id),
is_favorite: false,
is_shared: false,
} }
} }
@@ -141,5 +150,7 @@ pub fn mount_file_dto(cfg: &MountConfig, parent_id: &str, stat: &MountStat) -> F
etag: virtual_file_etag(stat.size, stat.modified_at), etag: virtual_file_etag(stat.size, stat.modified_at),
created_by: Some(cfg.owner_id), created_by: Some(cfg.owner_id),
updated_by: Some(cfg.owner_id), updated_by: Some(cfg.owner_id),
is_favorite: false,
is_shared: false,
} }
} }
@@ -686,6 +686,10 @@ fn mount_entry_to_item(
category: Arc::from("Folder"), category: Arc::from("Folder"),
created_by: Some(cfg.owner_id), created_by: Some(cfg.owner_id),
updated_by: Some(cfg.owner_id), updated_by: Some(cfg.owner_id),
// Mount entries use synthetic `ext:*` ids — no favorites /
// grants rows can ever key against them.
is_favorite: false,
is_shared: false,
}; };
FolderResourceItemDto { FolderResourceItemDto {
resource_type: ResourceTypeDto::Folder, resource_type: ResourceTypeDto::Folder,
@@ -713,6 +717,8 @@ fn mount_entry_to_item(
etag: virtual_file_etag(entry.size, entry.modified_at), etag: virtual_file_etag(entry.size, entry.modified_at),
created_by: Some(cfg.owner_id), created_by: Some(cfg.owner_id),
updated_by: Some(cfg.owner_id), updated_by: Some(cfg.owner_id),
is_favorite: false,
is_shared: false,
}; };
FolderResourceItemDto { FolderResourceItemDto {
resource_type: ResourceTypeDto::File, resource_type: ResourceTypeDto::File,