Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions src/SharedKernel/JsonConverters/CustomDateOnlyConverter.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
using System.Text.Json;
using System.Text.Json.Serialization;

namespace SharedKernel.JsonConverters;

public class CustomDateOnlyConverter : JsonConverter<DateOnly>
{
private const string DateFormat = "dd-MM-yyyy";
public override DateOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
{
var dateString = reader.GetString();

if (DateOnly.TryParseExact(dateString, DateFormat, null, System.Globalization.DateTimeStyles.None, out var date))
{
return date;
}

throw new JsonException($"Unable to parse date: {dateString}");
}

public override void Write(Utf8JsonWriter writer, DateOnly value, JsonSerializerOptions options)
{
writer.WriteStringValue(value.ToString(DateFormat));
}
}
33 changes: 33 additions & 0 deletions src/SharedKernel/JsonConverters/EnumConverterFactory.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Text.Json;
using System.Text.Json.Serialization;
using System.Threading.Tasks;

namespace SharedKernel.JsonConverters;

public class EnumConverterFactory : JsonConverterFactory
{
public override bool CanConvert(Type typeToConvert)
{
return typeToConvert.IsEnum ||
(Nullable.GetUnderlyingType(typeToConvert)?.IsEnum ?? false);
}

public override JsonConverter CreateConverter(Type typeToConvert, JsonSerializerOptions options)
{
var underlyingType = Nullable.GetUnderlyingType(typeToConvert);
if (underlyingType != null) // It's a nullable enum
{
Type converterType = typeof(NullableEnumConverter<>).MakeGenericType(underlyingType);
return (JsonConverter)Activator.CreateInstance(converterType)!;
}
else // Non-nullable enum
{
Type converterType = typeof(NonNullableEnumConverter<>).MakeGenericType(typeToConvert);
return (JsonConverter)Activator.CreateInstance(converterType)!;
}
}
}
34 changes: 34 additions & 0 deletions src/SharedKernel/JsonConverters/NonNullableEnumConverter.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
using System.Text.Json;
using System.Text.Json.Serialization;

namespace SharedKernel.JsonConverters;

public class NonNullableEnumConverter<T> : JsonConverter<T> where T : struct, Enum
{
public override T Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
{
if (reader.TokenType == JsonTokenType.String)
{
var enumString = reader.GetString();
if (Enum.TryParse(enumString, true, out T result))
{
return result;
}
}
else if (reader.TokenType == JsonTokenType.Number)
{
int enumValue = reader.GetInt32();
if (Enum.IsDefined(typeof(T), enumValue))
{
return (T)Enum.ToObject(typeof(T), enumValue);
}
}

throw new JsonException($"Unable to convert value to enum {typeof(T)}");
}

public override void Write(Utf8JsonWriter writer, T value, JsonSerializerOptions options)
{
writer.WriteStringValue(value.ToString());
}
}
46 changes: 46 additions & 0 deletions src/SharedKernel/JsonConverters/NullableEnumConverter.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
using System.Text.Json;
using System.Text.Json.Serialization;

namespace SharedKernel.JsonConverters;

public class NullableEnumConverter<T> : JsonConverter<T?> where T : struct, Enum
{
public override T? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
{
if (reader.TokenType == JsonTokenType.Null)
{
return null;
}

if (reader.TokenType == JsonTokenType.String)
{
var enumString = reader.GetString();
if (Enum.TryParse(enumString, true, out T result))
{
return result;
}
}
else if (reader.TokenType == JsonTokenType.Number)
{
int enumValue = reader.GetInt32();
if (Enum.IsDefined(typeof(T), enumValue))
{
return (T)Enum.ToObject(typeof(T), enumValue);
}
}

throw new JsonException($"Unable to convert value to nullable enum {typeof(T)}");
}

public override void Write(Utf8JsonWriter writer, T? value, JsonSerializerOptions options)
{
if (value.HasValue)
{
writer.WriteStringValue(value.Value.ToString());
}
else
{
writer.WriteNullValue();
}
}
}
52 changes: 26 additions & 26 deletions src/SharedKernel/SharedKernel.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,56 +8,56 @@
<PackageReadmeFile>Readme.md</PackageReadmeFile>
<Authors>Pandatech</Authors>
<Copyright>MIT</Copyright>
<Version>1.8.10</Version>
<Version>1.9.0</Version>
<PackageId>Pandatech.SharedKernel</PackageId>
<Title>Pandatech Shared Kernel Library</Title>
<PackageTags>Pandatech, shared kernel, library, OpenAPI, Swagger, utilities, scalar</PackageTags>
<Description>Pandatech.SharedKernel provides centralized configurations, utilities, and extensions for ASP.NET Core projects. For more information refere to readme.md document.</Description>
<RepositoryUrl>https://github.com/PandaTechAM/be-lib-sharedkernel</RepositoryUrl>
<PackageReleaseNotes>nuget updates</PackageReleaseNotes>
<PackageReleaseNotes>New json covnerters added to reduce code reduncancy across projects.</PackageReleaseNotes>
</PropertyGroup>

<ItemGroup>
<None Include="..\..\pandatech.png" Pack="true" PackagePath="\"/>
<None Include="..\..\Readme.md" Pack="true" PackagePath="\"/>
<None Include="..\..\pandatech.png" Pack="true" PackagePath="\" />
<None Include="..\..\Readme.md" Pack="true" PackagePath="\" />
</ItemGroup>

<ItemGroup>
<EmbeddedResource Include="OpenApi\UiAssets\**\*"/>
<EmbeddedResource Include="OpenApi\UiAssets\**\*" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="AspNetCore.HealthChecks.Prometheus.Metrics" Version="9.0.0"/>
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="9.0.0"/>
<PackageReference Include="Elastic.CommonSchema.Serilog" Version="9.0.0"/>
<PackageReference Include="FluentDateTime" Version="3.0.0"/>
<PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="12.0.0"/>
<PackageReference Include="HtmlSanitizer" Version="9.0.886"/>
<PackageReference Include="MediatR" Version="[12.5.0]"/>
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.8"/>
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="9.0.8"/>
<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="9.0.8"/>
<PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="9.0.8"/>
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="9.8.0"/>
<PackageReference Include="AspNetCore.HealthChecks.Prometheus.Metrics" Version="9.0.0" />
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="9.0.0" />
<PackageReference Include="Elastic.CommonSchema.Serilog" Version="9.0.0" />
<PackageReference Include="FluentDateTime" Version="3.0.0" />
<PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="12.0.0" />
<PackageReference Include="HtmlSanitizer" Version="9.0.886" />
<PackageReference Include="MediatR" Version="[12.5.0]" />
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.8" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="9.0.8" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="9.0.8" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="9.0.8" />
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="9.8.0" />
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.13.1" />
<PackageReference Include="OpenTelemetry.Exporter.Prometheus.AspNetCore" Version="1.8.0-rc.1"/>
<PackageReference Include="OpenTelemetry.Exporter.Prometheus.AspNetCore" Version="1.8.0-rc.1" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.13.1" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.13.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.EntityFrameworkCore" Version="1.0.0-beta.12"/>
<PackageReference Include="OpenTelemetry.Instrumentation.EntityFrameworkCore" Version="1.0.0-beta.12" />
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.13.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.13.0" />
<PackageReference Include="Pandatech.CommissionCalculator" Version="4.0.1" />
<PackageReference Include="Pandatech.Crypto" Version="6.1.1" />
<PackageReference Include="Pandatech.DistributedCache" Version="4.0.9"/>
<PackageReference Include="Pandatech.DistributedCache" Version="4.0.9" />
<PackageReference Include="PandaTech.FileExporter" Version="5.0.3" />
<PackageReference Include="PandaTech.FluentImporter" Version="3.0.9"/>
<PackageReference Include="Pandatech.FluentMinimalApiMapper" Version="2.0.4"/>
<PackageReference Include="Pandatech.PandaVaultClient" Version="4.0.6"/>
<PackageReference Include="PandaTech.FluentImporter" Version="3.0.9" />
<PackageReference Include="Pandatech.FluentMinimalApiMapper" Version="2.0.4" />
<PackageReference Include="Pandatech.PandaVaultClient" Version="4.0.6" />
<PackageReference Include="Pandatech.ResponseCrafter" Version="5.3.0" />
<PackageReference Include="Scalar.AspNetCore" Version="2.9.0" />
<PackageReference Include="Serilog.AspNetCore" Version="9.0.0"/>
<PackageReference Include="Serilog.Sinks.Async" Version="2.1.0"/>
<PackageReference Include="Serilog.Sinks.Grafana.Loki" Version="8.3.1"/>
<PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
<PackageReference Include="Serilog.Sinks.Async" Version="2.1.0" />
<PackageReference Include="Serilog.Sinks.Grafana.Loki" Version="8.3.1" />
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="9.0.6" />
</ItemGroup>

Expand Down