Refactor usings, DI, and add StringSerialiser services

SecurityService.BusinessLogic/RequestHandlers/UserRequestHandler.cs

@@ -175,7 +175,7 @@ public async Task<Result> Handle(SecurityServiceCommands.CreateUserCommand comma
             MiddleName = command.MiddleName,
             FamilyName = command.FamilyName,
             EmailConfirmed = string.IsNullOrWhiteSpace(command.EmailAddress),
-            RegistrationDateTime = DateTime.Now,
+            RegistrationDateTime = DateTime.UtcNow,
         };
 
         Result<String> passwordValueResult = String.IsNullOrEmpty(command.Password) ? PasswordGenerator.GenerateRandomPassword(this.Options.Value.PasswordOptions) : command.Password;

SecurityService.IntegrationTesting.Helpers/ReqnrollExtensions.cs

@@ -306,7 +306,7 @@ public static List<UserResponse> ToUserResponses(this DataTableRows tableRows){
                 }
 
                 DateTime dateTime = ReqnrollTableHelper.GetDateForDateString(ReqnrollTableHelper.GetStringRowValue(tableRow, "RegistrationDate"), DateTime.Now);
-                //userDetails.RegistrationDateTime = dateTime;
+                userDetails.RegistrationDateTime = dateTime;
                 userDetailsList.Add(userDetails);
             }
             return userDetailsList;

SecurityService/Handlers/UserHandler.cs

@@ -25,14 +25,22 @@ public static async Task<IResult> GetUser(IMediator mediator,
 
         Result<UserDetails> result = await mediator.Send(query, cancellationToken);
 
-        return ResponseFactory.FromResult(result, ModelFactory.ConvertFrom);
+        if (result.IsFailed) {
+            return OidcResponseFactory.TranslateResultStatus(result);
+        }
+
+        return Results.Ok(ModelFactory.ConvertFrom(result.Data));
     }
 
     public static async Task<IResult> GetUsers(IMediator mediator, string? userName, CancellationToken cancellationToken) {
         SecurityServiceQueries.GetUsersQuery query = new(userName);
 
         Result<List<UserDetails>> result = await mediator.Send(query, cancellationToken);
 
-        return ResponseFactory.FromResult(result, ModelFactory.ConvertFrom);
+        if (result.IsFailed) {
+            return OidcResponseFactory.TranslateResultStatus(result);
+        }
+
+        return Results.Ok(ModelFactory.ConvertFrom(result.Data));
     }
-}
+}

SecurityService/Program.cs

@@ -11,12 +11,14 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.IdentityModel.Tokens;
 using NLog;
+using NLog.Extensions.Logging;
 using OpenIddict.Abstractions;
 using SecurityService.BusinessLogic;
 using SecurityService.BusinessLogic.Requests;
 using SecurityService.Common;
 using SecurityService.Configuration;
 using SecurityService.Database.DbContexts;
+using SecurityService.Database.Entities;
 using SecurityService.Endpoints;
 using SecurityService.HealthChecks;
 using SecurityService.HostedServices;
@@ -26,15 +28,14 @@
 using Shared.Logger;
 using Shared.Logger.TennantContext;
 using Shared.Middleware;
+using Shared.Serialisation;
 using System.Reflection;
 using System.Security.Cryptography;
 using static OpenIddict.Abstractions.OpenIddictConstants;
 using static OpenIddict.Abstractions.OpenIddictConstants.Permissions;
 using ILogger = Microsoft.Extensions.Logging.ILogger;
 using Logger = Shared.Logger.Logger;
-using NLog.Extensions.Logging;
 using LogLevel = Microsoft.Extensions.Logging.LogLevel;
-using SecurityService.Database.Entities;
 
 var builder = WebApplication.CreateBuilder(new WebApplicationOptions
 {
@@ -162,6 +163,10 @@
     builder.Services.RegisterHttpClient<IMessagingServiceClient, MessagingServiceClient>();
 }
 
+StringSerialiser.Initialise(new SystemTextJsonSerializer(SystemTextJsonSerializer.GetDefaultJsonSerializerOptions()));
+
+builder.Services.AddSingleton<Func<Object, String>>(_ => obj => StringSerialiser.Serialise(obj));
+builder.Services.AddSingleton<Func<String, Type, Object>>(_ => (str, type) => StringSerialiser.DeserializeObject<Object>(str, type));
 builder.Services.AddSingleton<Func<String, String>>(container => serviceName => { return ConfigurationReader.GetBaseServerUri(serviceName).OriginalString; });
 
 bool logRequests = ConfigurationReader.GetValueOrDefault<Boolean>("MiddlewareLogging", "LogRequests", true);
@@ -179,7 +184,7 @@
 {
     configuration.RegisterServicesFromAssembly(typeof(SecurityServiceCommands).Assembly);
 });
-builder.Services.ConfigureHttpJsonOptions(jsonOptions => JsonSerializerConfiguration.ConfigureMinimalApi(jsonOptions.SerializerOptions));
+builder.Services.ConfigureHttpJsonOptions(jsonOptions => SecurityService.Configuration.JsonSerializerConfiguration.ConfigureMinimalApi(jsonOptions.SerializerOptions));
 builder.Services.AddRazorPages();
 builder.Services.AddEndpointsApiExplorer();
 builder.Services.AddSwaggerGen();