From 833b4db6eca82905ce7d857304516a9db4ba1567 Mon Sep 17 00:00:00 2001 From: mtaku3 Date: Mon, 6 Feb 2023 21:55:31 +0900 Subject: [PATCH 1/2] fix: add json serializer options to make it case insensitive --- src/PocketBaseClient/Extensions/PocketBaseExtensions.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/PocketBaseClient/Extensions/PocketBaseExtensions.cs b/src/PocketBaseClient/Extensions/PocketBaseExtensions.cs index 77f2701..3fdcfab 100644 --- a/src/PocketBaseClient/Extensions/PocketBaseExtensions.cs +++ b/src/PocketBaseClient/Extensions/PocketBaseExtensions.cs @@ -70,7 +70,7 @@ private static void Send(this PocketBase pocketBase, string path, HttpMethod met response.EnsureSuccessStatusCode(); using (var stream = response.Content.ReadAsStream()) - return JsonSerializer.Deserialize(stream); + return JsonSerializer.Deserialize(stream, new JsonSerializerOptions(JsonSerializerDefaults.Web)); } catch (Exception ex) { From b0cc594a6d2fdda713b40cac6f76e30cf912cd1d Mon Sep 17 00:00:00 2001 From: mtaku3 Date: Tue, 7 Feb 2023 14:24:50 +0900 Subject: [PATCH 2/2] fix: fix invalid json deserialization --- src/PocketBaseClient.CodeGenerator/Generation/ItemInfo.cs | 3 ++- src/PocketBaseClient/Orm/ItemBase.cs | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/PocketBaseClient.CodeGenerator/Generation/ItemInfo.cs b/src/PocketBaseClient.CodeGenerator/Generation/ItemInfo.cs index a73be2d..a388f98 100644 --- a/src/PocketBaseClient.CodeGenerator/Generation/ItemInfo.cs +++ b/src/PocketBaseClient.CodeGenerator/Generation/ItemInfo.cs @@ -164,8 +164,9 @@ public override void UpdateWith(ItemBase itemBase) : base(id, created, updated) {{"); foreach (var field in Fields) - sb.AppendLine($@" {field.PropertyName} = {GetParameterNameForConstructor(field)};"); + sb.AppendLine($@" this.{field.PropertyName} = {GetParameterNameForConstructor(field)};"); sb.AppendLine($@" + AddInternal(this); }} #endregion"); diff --git a/src/PocketBaseClient/Orm/ItemBase.cs b/src/PocketBaseClient/Orm/ItemBase.cs index ad43fc6..45b1865 100644 --- a/src/PocketBaseClient/Orm/ItemBase.cs +++ b/src/PocketBaseClient/Orm/ItemBase.cs @@ -289,12 +289,13 @@ public ItemBase() [JsonConstructor] public ItemBase(string? id, DateTime? created, DateTime? updated) { - Id = id; + _Id = id; Created = created; Updated = updated; + Metadata_.SetLoaded(); } - //protected object? AddInternal(object? element) => Collection.AddInternal(element); + protected object? AddInternal(object? element) => Collection.AddInternal(element); /// public override string ToString()