🐛 Fix stuff I think

2025-07-18 12:20:47 +08:00
parent 651820e384
commit 086a12f971
23 changed files with 5114 additions and 850 deletions
--- a/DysonNetwork.Pass/Account/Account.cs
+++ b/DysonNetwork.Pass/Account/Account.cs
@@ -6,6 +6,7 @@ using Microsoft.EntityFrameworkCore;
 using NodaTime;
 using NodaTime.Serialization.Protobuf;
 using OtpNet;
+using VerificationMark = DysonNetwork.Shared.Data.VerificationMark;

 namespace DysonNetwork.Pass.Account;

@@ -41,7 +42,9 @@ public class Account : ModelBase
            Language = Language,
            ActivatedAt = ActivatedAt?.ToTimestamp(),
            IsSuperuser = IsSuperuser,
-            Profile = Profile.ToProtoValue()
+            Profile = Profile.ToProtoValue(),
+            CreatedAt = CreatedAt.ToTimestamp(),
+            UpdatedAt = UpdatedAt.ToTimestamp()
        };

        // Add contacts
@@ -54,6 +57,32 @@ public class Account : ModelBase

        return proto;
    }
+
+
+    public static Account FromProtoValue(Shared.Proto.Account proto)
+    {
+        var account = new Account
+        {
+            Id = Guid.Parse(proto.Id),
+            Name = proto.Name,
+            Nick = proto.Nick,
+            Language = proto.Language,
+            ActivatedAt = proto.ActivatedAt?.ToInstant(),
+            IsSuperuser = proto.IsSuperuser,
+            CreatedAt = proto.CreatedAt.ToInstant(),
+            UpdatedAt = proto.UpdatedAt.ToInstant(),
+        };
+
+        account.Profile = AccountProfile.FromProtoValue(proto.Profile);
+
+        foreach (var contactProto in proto.Contacts)
+            account.Contacts.Add(AccountContact.FromProtoValue(contactProto));
+
+        foreach (var badgeProto in proto.Badges)
+            account.Badges.Add(AccountBadge.FromProtoValue(badgeProto));
+
+        return account;
+    }
 }

 public abstract class Leveling
@@ -132,12 +161,42 @@ public class AccountProfile : ModelBase, IIdentifiedResource
            Background = Background?.ToProtoValue(),
            AccountId = AccountId.ToString(),
            Verification = Verification?.ToProtoValue(),
-            ActiveBadge = ActiveBadge?.ToProtoValue()
+            ActiveBadge = ActiveBadge?.ToProtoValue(),
+            CreatedAt = CreatedAt.ToTimestamp(),
+            UpdatedAt = UpdatedAt.ToTimestamp()
        };

        return proto;
    }

+    public static AccountProfile FromProtoValue(Shared.Proto.AccountProfile proto)
+    {
+        var profile = new AccountProfile
+        {
+            Id = Guid.Parse(proto.Id),
+            FirstName = proto.FirstName,
+            LastName = proto.LastName,
+            MiddleName = proto.MiddleName,
+            Bio = proto.Bio,
+            Gender = proto.Gender,
+            Pronouns = proto.Pronouns,
+            TimeZone = proto.TimeZone,
+            Location = proto.Location,
+            Birthday = proto.Birthday?.ToInstant(),
+            LastSeenAt = proto.LastSeenAt?.ToInstant(),
+            Verification = proto.Verification is null ? null : VerificationMark.FromProtoValue(proto.Verification),
+            ActiveBadge = proto.ActiveBadge is null ? null : BadgeReferenceObject.FromProtoValue(proto.ActiveBadge),
+            Experience = proto.Experience,
+            Picture = proto.Picture is null ? null : CloudFileReferenceObject.FromProtoValue(proto.Picture),
+            Background = proto.Background is null ? null : CloudFileReferenceObject.FromProtoValue(proto.Background),
+            AccountId = Guid.Parse(proto.AccountId),
+            CreatedAt = proto.CreatedAt.ToInstant(),
+            UpdatedAt = proto.UpdatedAt.ToInstant()
+        };
+
+        return profile;
+    }
+
    public string ResourceIdentifier => $"account:profile:{Id}";
 }

@@ -167,11 +226,36 @@ public class AccountContact : ModelBase
            Content = Content,
            IsPrimary = IsPrimary,
            VerifiedAt = VerifiedAt?.ToTimestamp(),
-            AccountId = AccountId.ToString()
+            AccountId = AccountId.ToString(),
+            CreatedAt = CreatedAt.ToTimestamp(),
+            UpdatedAt = UpdatedAt.ToTimestamp()
        };

        return proto;
    }
+
+    public static AccountContact FromProtoValue(Shared.Proto.AccountContact proto)
+    {
+        var contact = new AccountContact
+        {
+            Id = Guid.Parse(proto.Id),
+            AccountId = Guid.Parse(proto.AccountId),
+            Type = proto.Type switch
+            {
+                Shared.Proto.AccountContactType.Email => AccountContactType.Email,
+                Shared.Proto.AccountContactType.PhoneNumber => AccountContactType.PhoneNumber,
+                Shared.Proto.AccountContactType.Address => AccountContactType.Address,
+                _ => AccountContactType.Email
+            },
+            Content = proto.Content,
+            IsPrimary = proto.IsPrimary,
+            VerifiedAt = proto.VerifiedAt?.ToInstant(),
+            CreatedAt = proto.CreatedAt.ToInstant(),
+            UpdatedAt = proto.UpdatedAt.ToInstant()
+        };
+
+        return contact;
+    }
 }

 public enum AccountContactType
--- a/DysonNetwork.Pass/Account/AccountServiceGrpc.cs
+++ b/DysonNetwork.Pass/Account/AccountServiceGrpc.cs
@@ -49,6 +49,7 @@ public class AccountServiceGrpc(
        var accounts = await _db.Accounts
            .AsNoTracking()
            .Where(a => accountIds.Contains(a.Id))
+            .Include(a => a.Profile)
            .ToListAsync();

        var response = new GetAccountBatchResponse();
--- a/DysonNetwork.Pass/Account/Badge.cs
+++ b/DysonNetwork.Pass/Account/Badge.cs
@@ -15,7 +15,7 @@ public class AccountBadge : ModelBase
    [MaxLength(1024)] public string Type { get; set; } = null!;
    [MaxLength(1024)] public string? Label { get; set; }
    [MaxLength(4096)] public string? Caption { get; set; }
-    [Column(TypeName = "jsonb")] public Dictionary<string, object> Meta { get; set; } = new();
+    [Column(TypeName = "jsonb")] public Dictionary<string, object?> Meta { get; set; } = new();
    public Instant? ActivatedAt { get; set; }
    public Instant? ExpiredAt { get; set; }

@@ -33,7 +33,7 @@ public class AccountBadge : ModelBase
            Meta = Meta,
            ActivatedAt = ActivatedAt,
            ExpiredAt = ExpiredAt,
-            AccountId = AccountId
+            AccountId = AccountId,
        };
    }

@@ -48,11 +48,31 @@ public class AccountBadge : ModelBase
            ActivatedAt = ActivatedAt?.ToTimestamp(),
            ExpiredAt = ExpiredAt?.ToTimestamp(),
            AccountId = AccountId.ToString(),
+            CreatedAt = CreatedAt.ToTimestamp(),
+            UpdatedAt = UpdatedAt.ToTimestamp()
        };
        proto.Meta.Add(GrpcTypeHelper.ConvertToValueMap(Meta));

        return proto;
    }
+    
+    public static AccountBadge FromProtoValue(Shared.Proto.AccountBadge proto)
+    {
+        var badge = new AccountBadge
+        {
+            Id = Guid.Parse(proto.Id),
+            AccountId = Guid.Parse(proto.AccountId),
+            Type = proto.Type,
+            Label = proto.Label,
+            Caption = proto.Caption,
+            ActivatedAt = proto.ActivatedAt?.ToInstant(),
+            ExpiredAt = proto.ExpiredAt?.ToInstant(),
+            CreatedAt = proto.CreatedAt.ToInstant(),
+            UpdatedAt = proto.UpdatedAt.ToInstant()
+        };
+
+        return badge;
+    }
 }

 public class BadgeReferenceObject : ModelBase
@@ -61,7 +81,7 @@ public class BadgeReferenceObject : ModelBase
    public string Type { get; set; } = null!;
    public string? Label { get; set; }
    public string? Caption { get; set; }
-    public Dictionary<string, object>? Meta { get; set; }
+    public Dictionary<string, object?> Meta { get; set; }
    public Instant? ActivatedAt { get; set; }
    public Instant? ExpiredAt { get; set; }
    public Guid AccountId { get; set; }
@@ -78,9 +98,26 @@ public class BadgeReferenceObject : ModelBase
            ExpiredAt = ExpiredAt?.ToTimestamp(),
            AccountId = AccountId.ToString()
        };
-        if (Meta is not null)
-            proto.Meta.Add(GrpcTypeHelper.ConvertToValueMap(Meta!));
+        proto.Meta.Add(GrpcTypeHelper.ConvertToValueMap(Meta!));

        return proto;
    }
+    
+    
+    public static BadgeReferenceObject FromProtoValue(Shared.Proto.BadgeReferenceObject proto)
+    {
+        var badge = new BadgeReferenceObject
+        {
+            Id = Guid.Parse(proto.Id),
+            Type = proto.Type,
+            Label = proto.Label,
+            Caption = proto.Caption,
+            Meta = GrpcTypeHelper.ConvertFromValueMap(proto.Meta).ToDictionary(),
+            ActivatedAt = proto.ActivatedAt?.ToInstant(),
+            ExpiredAt = proto.ExpiredAt?.ToInstant(),
+            AccountId = Guid.Parse(proto.AccountId)
+        };
+        
+        return badge;
+    }
 }