diff --git a/DysonNetwork.Drive/Migrations/20260112170805_RemoveAccountFromFileObject.Designer.cs b/DysonNetwork.Drive/Migrations/20260112170805_RemoveAccountFromFileObject.Designer.cs
new file mode 100644
index 00000000..f13f6868
--- /dev/null
+++ b/DysonNetwork.Drive/Migrations/20260112170805_RemoveAccountFromFileObject.Designer.cs
@@ -0,0 +1,654 @@
+//
+using System;
+using System.Collections.Generic;
+using DysonNetwork.Drive;
+using DysonNetwork.Shared.Models;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using NodaTime;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace DysonNetwork.Drive.Migrations
+{
+ [DbContext(typeof(AppDatabase))]
+ [Migration("20260112170805_RemoveAccountFromFileObject")]
+ partial class RemoveAccountFromFileObject
+ {
+ ///
+ protected override void BuildTargetModel(ModelBuilder modelBuilder)
+ {
+#pragma warning disable 612, 618
+ modelBuilder
+ .HasAnnotation("ProductVersion", "10.0.1")
+ .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+ NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+ modelBuilder.Entity("DysonNetwork.Drive.Billing.QuotaRecord", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("uuid")
+ .HasColumnName("id");
+
+ b.Property("AccountId")
+ .HasColumnType("uuid")
+ .HasColumnName("account_id");
+
+ b.Property("CreatedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("created_at");
+
+ b.Property("DeletedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("deleted_at");
+
+ b.Property("Description")
+ .IsRequired()
+ .HasColumnType("text")
+ .HasColumnName("description");
+
+ b.Property("ExpiredAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("expired_at");
+
+ b.Property("Name")
+ .IsRequired()
+ .HasColumnType("text")
+ .HasColumnName("name");
+
+ b.Property("Quota")
+ .HasColumnType("bigint")
+ .HasColumnName("quota");
+
+ b.Property("UpdatedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("updated_at");
+
+ b.HasKey("Id")
+ .HasName("pk_quota_records");
+
+ b.ToTable("quota_records", (string)null);
+ });
+
+ modelBuilder.Entity("DysonNetwork.Drive.Storage.Model.PersistentTask", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("uuid")
+ .HasColumnName("id");
+
+ b.Property("AccountId")
+ .HasColumnType("uuid")
+ .HasColumnName("account_id");
+
+ b.Property("CompletedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("completed_at");
+
+ b.Property("CreatedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("created_at");
+
+ b.Property("DeletedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("deleted_at");
+
+ b.Property("Description")
+ .HasMaxLength(1024)
+ .HasColumnType("character varying(1024)")
+ .HasColumnName("description");
+
+ b.Property("ErrorMessage")
+ .HasMaxLength(1024)
+ .HasColumnType("character varying(1024)")
+ .HasColumnName("error_message");
+
+ b.Property("EstimatedDurationSeconds")
+ .HasColumnType("bigint")
+ .HasColumnName("estimated_duration_seconds");
+
+ b.Property("ExpiredAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("expired_at");
+
+ b.Property("LastActivity")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("last_activity");
+
+ b.Property("Name")
+ .IsRequired()
+ .HasMaxLength(256)
+ .HasColumnType("character varying(256)")
+ .HasColumnName("name");
+
+ b.Property>("Parameters")
+ .IsRequired()
+ .HasColumnType("jsonb")
+ .HasColumnName("parameters");
+
+ b.Property("Priority")
+ .HasColumnType("integer")
+ .HasColumnName("priority");
+
+ b.Property("Progress")
+ .HasColumnType("double precision")
+ .HasColumnName("progress");
+
+ b.Property>("Results")
+ .IsRequired()
+ .HasColumnType("jsonb")
+ .HasColumnName("results");
+
+ b.Property("StartedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("started_at");
+
+ b.Property("Status")
+ .HasColumnType("integer")
+ .HasColumnName("status");
+
+ b.Property("TaskId")
+ .IsRequired()
+ .HasMaxLength(64)
+ .HasColumnType("character varying(64)")
+ .HasColumnName("task_id");
+
+ b.Property("Type")
+ .HasColumnType("integer")
+ .HasColumnName("type");
+
+ b.Property("UpdatedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("updated_at");
+
+ b.HasKey("Id")
+ .HasName("pk_tasks");
+
+ b.ToTable("tasks", (string)null);
+ });
+
+ modelBuilder.Entity("DysonNetwork.Shared.Models.FilePool", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("uuid")
+ .HasColumnName("id");
+
+ b.Property("AccountId")
+ .HasColumnType("uuid")
+ .HasColumnName("account_id");
+
+ b.Property("BillingConfig")
+ .IsRequired()
+ .HasColumnType("jsonb")
+ .HasColumnName("billing_config");
+
+ b.Property("CreatedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("created_at");
+
+ b.Property("DeletedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("deleted_at");
+
+ b.Property("Description")
+ .IsRequired()
+ .HasMaxLength(8192)
+ .HasColumnType("character varying(8192)")
+ .HasColumnName("description");
+
+ b.Property("IsHidden")
+ .HasColumnType("boolean")
+ .HasColumnName("is_hidden");
+
+ b.Property("Name")
+ .IsRequired()
+ .HasMaxLength(1024)
+ .HasColumnType("character varying(1024)")
+ .HasColumnName("name");
+
+ b.Property("PolicyConfig")
+ .IsRequired()
+ .HasColumnType("jsonb")
+ .HasColumnName("policy_config");
+
+ b.Property("StorageConfig")
+ .IsRequired()
+ .HasColumnType("jsonb")
+ .HasColumnName("storage_config");
+
+ b.Property("UpdatedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("updated_at");
+
+ b.HasKey("Id")
+ .HasName("pk_pools");
+
+ b.ToTable("pools", (string)null);
+ });
+
+ modelBuilder.Entity("DysonNetwork.Shared.Models.SnCloudFile", b =>
+ {
+ b.Property("Id")
+ .HasMaxLength(32)
+ .HasColumnType("character varying(32)")
+ .HasColumnName("id");
+
+ b.Property("AccountId")
+ .HasColumnType("uuid")
+ .HasColumnName("account_id");
+
+ b.Property("BundleId")
+ .HasColumnType("uuid")
+ .HasColumnName("bundle_id");
+
+ b.Property("CreatedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("created_at");
+
+ b.Property("DeletedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("deleted_at");
+
+ b.Property("Description")
+ .HasMaxLength(4096)
+ .HasColumnType("character varying(4096)")
+ .HasColumnName("description");
+
+ b.Property("ExpiredAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("expired_at");
+
+ b.Property("IsMarkedRecycle")
+ .HasColumnType("boolean")
+ .HasColumnName("is_marked_recycle");
+
+ b.Property("Name")
+ .IsRequired()
+ .HasMaxLength(1024)
+ .HasColumnType("character varying(1024)")
+ .HasColumnName("name");
+
+ b.Property("ObjectId")
+ .HasMaxLength(32)
+ .HasColumnType("character varying(32)")
+ .HasColumnName("object_id");
+
+ b.Property("PoolId")
+ .HasColumnType("uuid")
+ .HasColumnName("pool_id");
+
+ b.PrimitiveCollection("SensitiveMarks")
+ .HasColumnType("jsonb")
+ .HasColumnName("sensitive_marks");
+
+ b.Property("StorageId")
+ .HasMaxLength(32)
+ .HasColumnType("character varying(32)")
+ .HasColumnName("storage_id");
+
+ b.Property("StorageUrl")
+ .HasMaxLength(4096)
+ .HasColumnType("character varying(4096)")
+ .HasColumnName("storage_url");
+
+ b.Property("UpdatedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("updated_at");
+
+ b.Property("UploadedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("uploaded_at");
+
+ b.Property>("UserMeta")
+ .HasColumnType("jsonb")
+ .HasColumnName("user_meta");
+
+ b.HasKey("Id")
+ .HasName("pk_files");
+
+ b.HasIndex("BundleId")
+ .HasDatabaseName("ix_files_bundle_id");
+
+ b.HasIndex("ObjectId")
+ .HasDatabaseName("ix_files_object_id");
+
+ b.HasIndex("PoolId")
+ .HasDatabaseName("ix_files_pool_id");
+
+ b.ToTable("files", (string)null);
+ });
+
+ modelBuilder.Entity("DysonNetwork.Shared.Models.SnCloudFileIndex", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("uuid")
+ .HasColumnName("id");
+
+ b.Property("AccountId")
+ .HasColumnType("uuid")
+ .HasColumnName("account_id");
+
+ b.Property("CreatedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("created_at");
+
+ b.Property("DeletedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("deleted_at");
+
+ b.Property("FileId")
+ .IsRequired()
+ .HasMaxLength(32)
+ .HasColumnType("character varying(32)")
+ .HasColumnName("file_id");
+
+ b.Property("Path")
+ .IsRequired()
+ .HasMaxLength(8192)
+ .HasColumnType("character varying(8192)")
+ .HasColumnName("path");
+
+ b.Property("UpdatedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("updated_at");
+
+ b.HasKey("Id")
+ .HasName("pk_file_indexes");
+
+ b.HasIndex("FileId")
+ .HasDatabaseName("ix_file_indexes_file_id");
+
+ b.HasIndex("Path", "AccountId")
+ .HasDatabaseName("ix_file_indexes_path_account_id");
+
+ b.ToTable("file_indexes", (string)null);
+ });
+
+ modelBuilder.Entity("DysonNetwork.Shared.Models.SnFileBundle", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("uuid")
+ .HasColumnName("id");
+
+ b.Property("AccountId")
+ .HasColumnType("uuid")
+ .HasColumnName("account_id");
+
+ b.Property("CreatedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("created_at");
+
+ b.Property("DeletedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("deleted_at");
+
+ b.Property("Description")
+ .HasMaxLength(8192)
+ .HasColumnType("character varying(8192)")
+ .HasColumnName("description");
+
+ b.Property("ExpiredAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("expired_at");
+
+ b.Property("Name")
+ .IsRequired()
+ .HasMaxLength(1024)
+ .HasColumnType("character varying(1024)")
+ .HasColumnName("name");
+
+ b.Property("Passcode")
+ .HasMaxLength(256)
+ .HasColumnType("character varying(256)")
+ .HasColumnName("passcode");
+
+ b.Property("Slug")
+ .IsRequired()
+ .HasMaxLength(1024)
+ .HasColumnType("character varying(1024)")
+ .HasColumnName("slug");
+
+ b.Property("UpdatedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("updated_at");
+
+ b.HasKey("Id")
+ .HasName("pk_bundles");
+
+ b.HasIndex("Slug")
+ .IsUnique()
+ .HasDatabaseName("ix_bundles_slug");
+
+ b.ToTable("bundles", (string)null);
+ });
+
+ modelBuilder.Entity("DysonNetwork.Shared.Models.SnFileObject", b =>
+ {
+ b.Property("Id")
+ .HasMaxLength(32)
+ .HasColumnType("character varying(32)")
+ .HasColumnName("id");
+
+ b.Property("CreatedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("created_at");
+
+ b.Property("DeletedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("deleted_at");
+
+ b.Property("HasCompression")
+ .HasColumnType("boolean")
+ .HasColumnName("has_compression");
+
+ b.Property("HasThumbnail")
+ .HasColumnType("boolean")
+ .HasColumnName("has_thumbnail");
+
+ b.Property("Hash")
+ .HasMaxLength(256)
+ .HasColumnType("character varying(256)")
+ .HasColumnName("hash");
+
+ b.Property>("Meta")
+ .HasColumnType("jsonb")
+ .HasColumnName("meta");
+
+ b.Property("MimeType")
+ .HasMaxLength(256)
+ .HasColumnType("character varying(256)")
+ .HasColumnName("mime_type");
+
+ b.Property("Size")
+ .HasColumnType("bigint")
+ .HasColumnName("size");
+
+ b.Property("UpdatedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("updated_at");
+
+ b.HasKey("Id")
+ .HasName("pk_file_objects");
+
+ b.ToTable("file_objects", (string)null);
+ });
+
+ modelBuilder.Entity("DysonNetwork.Shared.Models.SnFilePermission", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("uuid")
+ .HasColumnName("id");
+
+ b.Property("CreatedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("created_at");
+
+ b.Property("DeletedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("deleted_at");
+
+ b.Property("FileId")
+ .IsRequired()
+ .HasColumnType("text")
+ .HasColumnName("file_id");
+
+ b.Property("Permission")
+ .HasColumnType("integer")
+ .HasColumnName("permission");
+
+ b.Property("SubjectId")
+ .IsRequired()
+ .HasColumnType("text")
+ .HasColumnName("subject_id");
+
+ b.Property("SubjectType")
+ .HasColumnType("integer")
+ .HasColumnName("subject_type");
+
+ b.Property("UpdatedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("updated_at");
+
+ b.HasKey("Id")
+ .HasName("pk_file_permissions");
+
+ b.ToTable("file_permissions", (string)null);
+ });
+
+ modelBuilder.Entity("DysonNetwork.Shared.Models.SnFileReplica", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("uuid")
+ .HasColumnName("id");
+
+ b.Property("CreatedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("created_at");
+
+ b.Property("DeletedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("deleted_at");
+
+ b.Property("IsPrimary")
+ .HasColumnType("boolean")
+ .HasColumnName("is_primary");
+
+ b.Property("ObjectId")
+ .IsRequired()
+ .HasMaxLength(32)
+ .HasColumnType("character varying(32)")
+ .HasColumnName("object_id");
+
+ b.Property("PoolId")
+ .HasColumnType("uuid")
+ .HasColumnName("pool_id");
+
+ b.Property("Status")
+ .HasColumnType("integer")
+ .HasColumnName("status");
+
+ b.Property("StorageId")
+ .IsRequired()
+ .HasMaxLength(128)
+ .HasColumnType("character varying(128)")
+ .HasColumnName("storage_id");
+
+ b.Property("UpdatedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("updated_at");
+
+ b.HasKey("Id")
+ .HasName("pk_file_replicas");
+
+ b.HasIndex("ObjectId")
+ .HasDatabaseName("ix_file_replicas_object_id");
+
+ b.HasIndex("PoolId")
+ .HasDatabaseName("ix_file_replicas_pool_id");
+
+ b.ToTable("file_replicas", (string)null);
+ });
+
+ modelBuilder.Entity("DysonNetwork.Shared.Models.SnCloudFile", b =>
+ {
+ b.HasOne("DysonNetwork.Shared.Models.SnFileBundle", "Bundle")
+ .WithMany("Files")
+ .HasForeignKey("BundleId")
+ .HasConstraintName("fk_files_bundles_bundle_id");
+
+ b.HasOne("DysonNetwork.Shared.Models.SnFileObject", "Object")
+ .WithMany()
+ .HasForeignKey("ObjectId")
+ .HasConstraintName("fk_files_file_objects_object_id");
+
+ b.HasOne("DysonNetwork.Shared.Models.FilePool", "Pool")
+ .WithMany()
+ .HasForeignKey("PoolId")
+ .HasConstraintName("fk_files_pools_pool_id");
+
+ b.Navigation("Bundle");
+
+ b.Navigation("Object");
+
+ b.Navigation("Pool");
+ });
+
+ modelBuilder.Entity("DysonNetwork.Shared.Models.SnCloudFileIndex", b =>
+ {
+ b.HasOne("DysonNetwork.Shared.Models.SnCloudFile", "File")
+ .WithMany("FileIndexes")
+ .HasForeignKey("FileId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired()
+ .HasConstraintName("fk_file_indexes_files_file_id");
+
+ b.Navigation("File");
+ });
+
+ modelBuilder.Entity("DysonNetwork.Shared.Models.SnFileReplica", b =>
+ {
+ b.HasOne("DysonNetwork.Shared.Models.SnFileObject", "Object")
+ .WithMany("FileReplicas")
+ .HasForeignKey("ObjectId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired()
+ .HasConstraintName("fk_file_replicas_file_objects_object_id");
+
+ b.HasOne("DysonNetwork.Shared.Models.FilePool", "Pool")
+ .WithMany()
+ .HasForeignKey("PoolId")
+ .HasConstraintName("fk_file_replicas_pools_pool_id");
+
+ b.Navigation("Object");
+
+ b.Navigation("Pool");
+ });
+
+ modelBuilder.Entity("DysonNetwork.Shared.Models.SnCloudFile", b =>
+ {
+ b.Navigation("FileIndexes");
+ });
+
+ modelBuilder.Entity("DysonNetwork.Shared.Models.SnFileBundle", b =>
+ {
+ b.Navigation("Files");
+ });
+
+ modelBuilder.Entity("DysonNetwork.Shared.Models.SnFileObject", b =>
+ {
+ b.Navigation("FileReplicas");
+ });
+#pragma warning restore 612, 618
+ }
+ }
+}
diff --git a/DysonNetwork.Drive/Migrations/20260112170805_RemoveAccountFromFileObject.cs b/DysonNetwork.Drive/Migrations/20260112170805_RemoveAccountFromFileObject.cs
new file mode 100644
index 00000000..7849c751
--- /dev/null
+++ b/DysonNetwork.Drive/Migrations/20260112170805_RemoveAccountFromFileObject.cs
@@ -0,0 +1,30 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace DysonNetwork.Drive.Migrations
+{
+ ///
+ public partial class RemoveAccountFromFileObject : Migration
+ {
+ ///
+ protected override void Up(MigrationBuilder migrationBuilder)
+ {
+ migrationBuilder.DropColumn(
+ name: "account_id",
+ table: "file_objects");
+ }
+
+ ///
+ protected override void Down(MigrationBuilder migrationBuilder)
+ {
+ migrationBuilder.AddColumn(
+ name: "account_id",
+ table: "file_objects",
+ type: "uuid",
+ nullable: false,
+ defaultValue: new Guid("00000000-0000-0000-0000-000000000000"));
+ }
+ }
+}
diff --git a/DysonNetwork.Drive/Migrations/AppDatabaseModelSnapshot.cs b/DysonNetwork.Drive/Migrations/AppDatabaseModelSnapshot.cs
index 2cc14389..b8aa2936 100644
--- a/DysonNetwork.Drive/Migrations/AppDatabaseModelSnapshot.cs
+++ b/DysonNetwork.Drive/Migrations/AppDatabaseModelSnapshot.cs
@@ -434,10 +434,6 @@ namespace DysonNetwork.Drive.Migrations
.HasColumnType("character varying(32)")
.HasColumnName("id");
- b.Property("AccountId")
- .HasColumnType("uuid")
- .HasColumnName("account_id");
-
b.Property("CreatedAt")
.HasColumnType("timestamp with time zone")
.HasColumnName("created_at");
diff --git a/DysonNetwork.Drive/Storage/FileService.cs b/DysonNetwork.Drive/Storage/FileService.cs
index 292ff8b0..514a5b17 100644
--- a/DysonNetwork.Drive/Storage/FileService.cs
+++ b/DysonNetwork.Drive/Storage/FileService.cs
@@ -194,7 +194,6 @@ public class FileService(
return new SnFileObject
{
Id = fileId,
- AccountId = accountId,
MimeType = contentType,
Size = fileSize,
};
diff --git a/DysonNetwork.Shared/Models/CloudFileObject.cs b/DysonNetwork.Shared/Models/CloudFileObject.cs
index b45cd9d8..044af461 100644
--- a/DysonNetwork.Shared/Models/CloudFileObject.cs
+++ b/DysonNetwork.Shared/Models/CloudFileObject.cs
@@ -7,7 +7,6 @@ namespace DysonNetwork.Shared.Models;
public class SnFileObject : ModelBase
{
[MaxLength(32)] public string Id { get; set; }
- public Guid AccountId { get; set; }
public long Size { get; set; }