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 Admins { get; set; } = []; public Dictionary Members { get; set; } = []; public Dictionary Applicants { get; set; } = []; + public Dictionary MemberJoinTime { get; set; } = []; + public Dictionary 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 memberJoinTime = NetworkUtility.JsonDeserialize>(ref reader, options) ?? []; + foreach (long id in memberJoinTime.Keys) + { + result.MemberJoinTime[id] = memberJoinTime[id]; + } + break; + case nameof(Club.ApplicationTime): + Dictionary applicationTime = NetworkUtility.JsonDeserialize>(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(); }