From 6303be1abc5ae0a8b36e3d29cc10a715a93d01ed Mon Sep 17 00:00:00 2001
From: milimoe <mili@wrss.org>
Date: Tue, 7 Jan 2025 01:31:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=94=B3=E8=AF=B7=E5=92=8C?=
 =?UTF-8?q?=E5=8A=A0=E5=85=A5=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Entity/System/Club.cs                         |  2 ++
 Library/Common/JsonConverter/ClubConverter.cs | 21 ++++++++++++++++---
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/Entity/System/Club.cs b/Entity/System/Club.cs
index 2c646ce..e9654c1 100644
--- a/Entity/System/Club.cs
+++ b/Entity/System/Club.cs
@@ -13,6 +13,8 @@ namespace Milimoe.FunGame.Core.Entity
         public Dictionary<long, User> Admins { get; set; } = [];
         public Dictionary<long, User> Members { get; set; } = [];
         public Dictionary<long, User> Applicants { get; set; } = [];
+        public Dictionary<long, DateTime> MemberJoinTime { get; set; } = [];
+        public Dictionary<long, DateTime> ApplicationTime { get; set; } = [];
 
         public override bool Equals(IBaseEntity? other)
         {
diff --git a/Library/Common/JsonConverter/ClubConverter.cs b/Library/Common/JsonConverter/ClubConverter.cs
index 3cc771a..9d04bcf 100644
--- a/Library/Common/JsonConverter/ClubConverter.cs
+++ b/Library/Common/JsonConverter/ClubConverter.cs
@@ -1,10 +1,7 @@
 using System.Text.Json;
 using Milimoe.FunGame.Core.Api.Utility;
 using Milimoe.FunGame.Core.Entity;
-using Milimoe.FunGame.Core.Interface.Entity;
 using Milimoe.FunGame.Core.Library.Common.Architecture;
-using Milimoe.FunGame.Core.Library.Constant;
-using Milimoe.FunGame.Core.Library.SQLScript.Entity;
 
 namespace Milimoe.FunGame.Core.Library.Common.JsonConverter
 {
@@ -68,6 +65,20 @@ namespace Milimoe.FunGame.Core.Library.Common.JsonConverter
                         result.Applicants[id] = new(id);
                     }
                     break;
+                case nameof(Club.MemberJoinTime):
+                    Dictionary<long, DateTime> memberJoinTime = NetworkUtility.JsonDeserialize<Dictionary<long, DateTime>>(ref reader, options) ?? [];
+                    foreach (long id in memberJoinTime.Keys)
+                    {
+                        result.MemberJoinTime[id] = memberJoinTime[id];
+                    }
+                    break;
+                case nameof(Club.ApplicationTime):
+                    Dictionary<long, DateTime> applicationTime = NetworkUtility.JsonDeserialize<Dictionary<long, DateTime>>(ref reader, options) ?? [];
+                    foreach (long id in applicationTime.Keys)
+                    {
+                        result.ApplicationTime[id] = applicationTime[id];
+                    }
+                    break;
             }
         }
 
@@ -91,6 +102,10 @@ namespace Milimoe.FunGame.Core.Library.Common.JsonConverter
             JsonSerializer.Serialize(writer, value.Members.Keys, options);
             writer.WritePropertyName(nameof(Club.Applicants));
             JsonSerializer.Serialize(writer, value.Applicants.Keys, options);
+            writer.WritePropertyName(nameof(Club.MemberJoinTime));
+            JsonSerializer.Serialize(writer, value.MemberJoinTime, options);
+            writer.WritePropertyName(nameof(Club.ApplicationTime));
+            JsonSerializer.Serialize(writer, value.ApplicationTime, options);
 
             writer.WriteEndObject();
         }