🐛 Fix bugs

DysonNetwork.Drive/Storage/CloudFile.cs

@@ -9,22 +9,6 @@ using NodaTime.Serialization.Protobuf;
 
 namespace DysonNetwork.Drive.Storage;
 
-/// <summary>
-/// The class that used in jsonb columns which referenced the cloud file.
-/// The aim of this class is to store some properties that won't change to a file to reduce the database load.
-/// </summary>
-public class CloudFileReferenceObject : ModelBase, ICloudFile
-{
-    public string Id { get; set; } = null!;
-    public string Name { get; set; } = string.Empty;
-    public Dictionary<string, object?> FileMeta { get; set; } = null!;
-    public Dictionary<string, object>? UserMeta { get; set; } = null!;
-    public string? MimeType { get; set; }
-    public string? Hash { get; set; }
-    public long Size { get; set; }
-    public bool HasCompression { get; set; } = false;
-}
-
 public class CloudFile : ModelBase, ICloudFile, IIdentifiedResource
 {
     /// The id generated by TuS, basically just UUID remove the dash lines
@@ -87,6 +71,7 @@ public class CloudFile : ModelBase, ICloudFile, IIdentifiedResource
             Name = Name,
             FileMeta = FileMeta,
             UserMeta = UserMeta,
+            SensitiveMarks = SensitiveMarks,
             MimeType = MimeType,
             Hash = Hash,
             Size = Size,
@@ -105,7 +90,7 @@ public class CloudFile : ModelBase, ICloudFile, IIdentifiedResource
         var proto = new Shared.Proto.CloudFile
         {
             Id = Id,
-            Name = Name ?? string.Empty,
+            Name = Name,
             MimeType = MimeType ?? string.Empty,
             Hash = Hash ?? string.Empty,
             Size = Size,

DysonNetwork.Drive/Storage/FileService.cs

@@ -12,6 +12,7 @@ using NetVips;
 using NodaTime;
 using tusdotnet.Stores;
 using System.Linq.Expressions;
+using DysonNetwork.Shared.Data;
 using Microsoft.EntityFrameworkCore.Query;
 
 namespace DysonNetwork.Drive.Storage;

DysonNetwork.Drive/Storage/FileServiceGrpc.cs

@@ -1,3 +1,4 @@
+using DysonNetwork.Shared.Data;
 using DysonNetwork.Shared.Proto;
 using Google.Protobuf.WellKnownTypes;
 using Grpc.Core;

DysonNetwork.Shared/Data/CloudFileReferenceObject.cs

@@ -31,6 +31,7 @@ public class CloudFileReferenceObject : ModelBase, ICloudFile
     public string Name { get; set; } = string.Empty;
     public Dictionary<string, object?> FileMeta { get; set; } = null!;
     public Dictionary<string, object?> UserMeta { get; set; } = null!;
+    public List<ContentSensitiveMark>? SensitiveMarks { get; set; }
     public string? MimeType { get; set; }
     public string? Hash { get; set; }
     public long Size { get; set; }
@@ -44,6 +45,7 @@ public class CloudFileReferenceObject : ModelBase, ICloudFile
             Name = proto.Name,
             FileMeta = GrpcTypeHelper.ConvertByteStringToObject<Dictionary<string, object?>>(proto.FileMeta) ?? [],
             UserMeta = GrpcTypeHelper.ConvertByteStringToObject<Dictionary<string, object?>>(proto.UserMeta) ?? [],
+            SensitiveMarks = GrpcTypeHelper.ConvertByteStringToObject<List<ContentSensitiveMark>>(proto.SensitiveMarks) ?? [],
             MimeType = proto.MimeType,
             Hash = proto.Hash,
             Size = proto.Size,
@@ -73,6 +75,8 @@ public class CloudFileReferenceObject : ModelBase, ICloudFile
 
         // Convert user metadata
         proto.UserMeta = GrpcTypeHelper.ConvertObjectToByteString(UserMeta);
+        
+        proto.SensitiveMarks = GrpcTypeHelper.ConvertObjectToByteString(SensitiveMarks);
 
         return proto;
     }

DysonNetwork.Shared/Proto/file.proto

@@ -24,6 +24,7 @@ message CloudFile {
   bytes file_meta = 3;
   // User-defined metadata
   bytes user_meta = 4;
+  bytes sensitive_marks = 12;
 
   // MIME type of the file
   string mime_type = 5;