From 2c3166e5a1e7d4824e059d26193351b2585b0ae5 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Sat, 21 Jan 2023 23:34:03 +0100 Subject: [PATCH 001/185] Format amount decimal --- src/Web/Components/Pages/Reviews/MutateReview.razor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Web/Components/Pages/Reviews/MutateReview.razor b/src/Web/Components/Pages/Reviews/MutateReview.razor index f3bc0f12..8a07e20e 100644 --- a/src/Web/Components/Pages/Reviews/MutateReview.razor +++ b/src/Web/Components/Pages/Reviews/MutateReview.razor @@ -50,7 +50,7 @@ Src="_content/XClaim.Web.Components/vectors/money_savings.svg" Alt="review_image" /> - N @(Item.Amount) + N @($"{Item.Amount:N0}") @(Item.Notes) From 24c82735b862e9360764202c7fb6052e8d7dfc3d Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Sun, 22 Jan 2023 00:00:50 +0100 Subject: [PATCH 002/185] Use string interpolation for currency format on app --- src/Mobile/Views/Claim/ClaimDetailView.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Mobile/Views/Claim/ClaimDetailView.cs b/src/Mobile/Views/Claim/ClaimDetailView.cs index 7835e40b..cfd12715 100644 --- a/src/Mobile/Views/Claim/ClaimDetailView.cs +++ b/src/Mobile/Views/Claim/ClaimDetailView.cs @@ -63,7 +63,7 @@ protected override void Build() { .Text("."), new Label { Padding = 1, Margin = 2 } .Font(size: 12) - .Text("Catgory") + .Text("Category") //.Bind(Label.TextProperty, "Item.Category") }, new Label().Bind(Label.TextProperty, "Item.Notes") @@ -72,7 +72,7 @@ protected override void Build() { }.Margins(0, 0, 0, 24) .CenterHorizontal(), new Label().Bind(Label.TextProperty, "Item.Amount", - convert: (decimal value) => AppConst.Naira + string.Format("{0:N0}", value)) + convert: (decimal value) => $"{AppConst.Naira}{value:N0}") .Font(size: 32, family: "RobotoMedium") .CenterHorizontal() } From 4e237bee96849f19fda169186f1b8f4442a1db27 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Sun, 22 Jan 2023 10:13:02 +0100 Subject: [PATCH 003/185] Update .gitignore --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 90700a8f..86179b2b 100644 --- a/.gitignore +++ b/.gitignore @@ -476,7 +476,6 @@ $RECYCLE.BIN/ # Windows shortcuts *.lnk .idea -.config .fleet *.sqlite3* StaticFiles From 759df74b12f1a77797d231630d292deef787c525 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Sun, 22 Jan 2023 10:13:31 +0100 Subject: [PATCH 004/185] Added run-script tool and commands --- .config/dotnet-tools.json | 18 ++++++++++++++++++ global.json | 13 +++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 .config/dotnet-tools.json create mode 100644 global.json diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json new file mode 100644 index 00000000..8edb95f6 --- /dev/null +++ b/.config/dotnet-tools.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "isRoot": true, + "tools": { + "dotnet-ef": { + "version": "7.0.2", + "commands": [ + "dotnet-ef" + ] + }, + "run-script": { + "version": "0.5.0", + "commands": [ + "r" + ] + } + } +} \ No newline at end of file diff --git a/global.json b/global.json new file mode 100644 index 00000000..bcb51093 --- /dev/null +++ b/global.json @@ -0,0 +1,13 @@ +{ + "sdk": { + "version": "7.0.102", + "rollForward": "latestPatch" + }, + "scripts": { + "build": "dotnet build --configuration Debug", + "format": "dotnet format ./XClaim.sln", + "web": "dotnet watch --project src/Web/Server/XClaim.Web.Server.csproj", + "dev:blazor": "DOTNET_USE_POLLING_FILE_WATCHER=true dotnet watch --project src/Web/Client/XClaim.Web.Client.csproj", + "dev:web": "DOTNET_USE_POLLING_FILE_WATCHER=true dotnet r web" + } +} \ No newline at end of file From 3b84119ee9c4d6676e3b7e47ffebab441ac9f577 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Sun, 22 Jan 2023 10:13:53 +0100 Subject: [PATCH 005/185] Update auth API address --- src/Mobile/App.xaml.cs | 1 + src/Mobile/AppConst.cs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Mobile/App.xaml.cs b/src/Mobile/App.xaml.cs index 73269efd..55b16687 100644 --- a/src/Mobile/App.xaml.cs +++ b/src/Mobile/App.xaml.cs @@ -1,4 +1,5 @@ using System.ComponentModel; +using Microsoft.Maui.Platform; using XClaim.Mobile.Services; namespace XClaim.Mobile; diff --git a/src/Mobile/AppConst.cs b/src/Mobile/AppConst.cs index f00584fc..0f510c79 100644 --- a/src/Mobile/AppConst.cs +++ b/src/Mobile/AppConst.cs @@ -6,7 +6,7 @@ public static class AppConst { public const string AppUId = "dev.gpproton.xclaim"; public static readonly string BaseAddress = DeviceInfo.Platform == DevicePlatform.Android ? "https://10.0.2.2:7001" : "https://localhost:7001"; - public static readonly string AuthUri = $"{BaseAddress}/api/v1/auth/sign-in/mobile"; + public static readonly string AuthUri = $"{BaseAddress}/auth/sign-in/mobile"; // Shared constants public const string Naira = "₦"; From 68619f6dbeccdb0a6c580e47cae05d4defbb2640 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Sun, 22 Jan 2023 10:15:35 +0100 Subject: [PATCH 006/185] Update profile response init --- src/Mobile/Views/Home/HomeView.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Mobile/Views/Home/HomeView.cs b/src/Mobile/Views/Home/HomeView.cs index 22ab7644..f5630114 100644 --- a/src/Mobile/Views/Home/HomeView.cs +++ b/src/Mobile/Views/Home/HomeView.cs @@ -220,7 +220,7 @@ private async void HandleSelectionChanged(object? sender, SelectionChangedEventA var cx = (CollectionView)sender; cx.SelectedItem = null; if (e.CurrentSelection.FirstOrDefault() is EventResponse item) - if (item is not null) + if (item.Id != null) await MauiPopup.PopupAction.DisplayPopup(new HomeEventPop(item)); } } @@ -234,7 +234,7 @@ public partial class HomeViewModel : ListViewModel { private async Task LoadDefaults() { IsLoading = true; await Task.Delay(500); - Status = new ProfileResponse("saurav#email.me", "Saurav", "Argawal", "+234", UserPermission.Administrator); + Status = new ProfileResponse { FirstName = "Saurav", LastName = "Argawal", Balance = 2000, Permission = UserPermission.Administrator }; RecentItems = new ObservableCollection { }; IsLoading = false; } From 113e8f81c919c23e19f97adcdca42e395a4324ea Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Sun, 22 Jan 2023 13:15:41 +0100 Subject: [PATCH 007/185] Added libman to project --- .config/dotnet-tools.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 8edb95f6..8d14b8a2 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -13,6 +13,12 @@ "commands": [ "r" ] + }, + "microsoft.web.librarymanager.cli": { + "version": "2.1.175", + "commands": [ + "libman" + ] } } } \ No newline at end of file From f6e7a011cfe9398475873bd9de7dbaba8b60119f Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Sun, 22 Jan 2023 15:03:20 +0100 Subject: [PATCH 008/185] Update .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 86179b2b..60125140 100644 --- a/.gitignore +++ b/.gitignore @@ -479,3 +479,4 @@ $RECYCLE.BIN/ .fleet *.sqlite3* StaticFiles +**/wwwroot/lib \ No newline at end of file From a2c21ca0cacdcff6ea8eeb17d98533be3423c790 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Sun, 22 Jan 2023 18:33:14 +0100 Subject: [PATCH 009/185] Added build improvements to components class lib project --- .../Components/XClaim.Web.Components.csproj | 11 ++--- src/Web/Components/bundleconfig.json | 1 + src/Web/Components/libman.json | 8 ++- src/Web/Components/sasscompiler.json | 15 ++++++ src/Web/Server/Program.cs | 49 ++++++++++--------- 5 files changed, 55 insertions(+), 29 deletions(-) create mode 100644 src/Web/Components/bundleconfig.json create mode 100644 src/Web/Components/sasscompiler.json diff --git a/src/Web/Components/XClaim.Web.Components.csproj b/src/Web/Components/XClaim.Web.Components.csproj index e6804833..efa5b55e 100644 --- a/src/Web/Components/XClaim.Web.Components.csproj +++ b/src/Web/Components/XClaim.Web.Components.csproj @@ -5,13 +5,16 @@ enable enable - + + + + @@ -19,8 +22,4 @@ - - - - - + \ No newline at end of file diff --git a/src/Web/Components/bundleconfig.json b/src/Web/Components/bundleconfig.json new file mode 100644 index 00000000..0637a088 --- /dev/null +++ b/src/Web/Components/bundleconfig.json @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/src/Web/Components/libman.json b/src/Web/Components/libman.json index ceee2710..8981317a 100644 --- a/src/Web/Components/libman.json +++ b/src/Web/Components/libman.json @@ -1,5 +1,11 @@ { "version": "1.0", "defaultProvider": "cdnjs", - "libraries": [] + "libraries": [ + { + "provider": "unpkg", + "library": "@fontsource/roboto@4.5.8", + "destination": "wwwroot/lib/roboto" + } + ] } \ No newline at end of file diff --git a/src/Web/Components/sasscompiler.json b/src/Web/Components/sasscompiler.json new file mode 100644 index 00000000..26236f47 --- /dev/null +++ b/src/Web/Components/sasscompiler.json @@ -0,0 +1,15 @@ +{ + "ScopedCssFolders": [ + "Layouts", + "Pages", + "Controls", + "Shared" + ], + "GenerateScopedCss": true, + "Arguments": "--style=compressed", + "Configurations": { + "Debug": { + "Arguments": "--style=expanded" + } + } +} \ No newline at end of file diff --git a/src/Web/Server/Program.cs b/src/Web/Server/Program.cs index f858c75e..8bb15cc5 100644 --- a/src/Web/Server/Program.cs +++ b/src/Web/Server/Program.cs @@ -12,11 +12,11 @@ using XClaim.Web.Server.Data; using XClaim.Web.Server.Helpers; -var builder = WebApplication.CreateBuilder(args); +WebApplicationBuilder builder = WebApplication.CreateBuilder(args); -var connectionString = builder.Configuration.GetConnectionString("Default"); +string? connectionString = builder.Configuration.GetConnectionString("Default"); builder.Services.AddDbContext(options => { - options.UseSqlite(connectionString).UseSnakeCaseNamingConvention(); + _ = options.UseSqlite(connectionString).UseSnakeCaseNamingConvention(); }); builder.Services.Configure(options => { @@ -38,8 +38,8 @@ opt.SlidingExpiration = true; }) .AddMicrosoftAccount(opt => { - var clientId = builder.Configuration.GetValue("Microsoft:ClientId") ?? ""; - var clientSecret = builder.Configuration.GetValue("Microsoft:ClientSecret") ?? ""; + string clientId = builder.Configuration.GetValue("Microsoft:ClientId") ?? ""; + string clientSecret = builder.Configuration.GetValue("Microsoft:ClientSecret") ?? ""; opt.SignInScheme = "Cookies"; opt.ClientId = clientId; @@ -52,7 +52,7 @@ builder.Services.AddEndpointsApiExplorer(); builder.Services.AddSwaggerGen(opt => { - opt.UseAutoFiltererParameters(); + _ = opt.UseAutoFiltererParameters(); opt.SwaggerDoc("v1", new OpenApiInfo { Title = $"X-Claim", Version = "v1" }); }); builder.Services.AddAutoMapper(typeof(Program).Assembly); @@ -60,20 +60,20 @@ builder.Services.AddRazorPages(); builder.Services.RegisterModules(); -var healthCheck = builder.Services.AddHealthChecks() +IHealthChecksBuilder healthCheck = builder.Services.AddHealthChecks() .AddApplicationStatus(); builder.Services.AddHealthChecksUI() .AddInMemoryStorage(); if (connectionString != null) { - healthCheck.AddSqlite(connectionString); + _ = healthCheck.AddSqlite(connectionString); } -var app = builder.Build(); +WebApplication app = builder.Build(); if (app.Environment.IsDevelopment()) { app.UseWebAssemblyDebugging(); - app.UseSwagger(); - app.UseSwaggerUI(opt => { + _ = app.UseSwagger(); + _ = app.UseSwaggerUI(opt => { const string path = "/swagger/v1/swagger.json"; opt.SwaggerEndpoint(path, "X-Claim V1 Docs"); opt.DefaultModelExpandDepth(3); @@ -82,9 +82,9 @@ opt.ShowExtensions(); }); } -else - app.UseExceptionHandler("/Error"); - +else { + _ = app.UseExceptionHandler("/Error"); +} app.UseCookiePolicy(new CookiePolicyOptions { MinimumSameSitePolicy = SameSiteMode.Lax @@ -101,20 +101,25 @@ // INFO: Disabled due to mobile self signed certificate // app.UseHttpsRedirection(); -var uploadService = app.Services.GetService(); +FileUploadService? uploadService = app.Services.GetService(); if (uploadService != null) { - var fullUploadPath = uploadService.GetUploadRootPath(); + string fullUploadPath = uploadService.GetUploadRootPath(); if (!Directory.Exists(fullUploadPath)) { Console.WriteLine("Creating static files directory"); - Directory.CreateDirectory(fullUploadPath); + _ = Directory.CreateDirectory(fullUploadPath); } - app.UseStaticFiles(); + _ = app.UseStaticFiles(); - void OnPrepareResponse(StaticFileResponseContext ctx) { - if (!ctx.Context.Request.Path.StartsWithSegments("/static")) return; + static void OnPrepareResponse(StaticFileResponseContext ctx) { + if (!ctx.Context.Request.Path.StartsWithSegments("/static")) { + return; + } ctx.Context.Response.Headers.Add("Cache-Control", "no-store"); - if (ctx.Context.User.Identity == null || ctx.Context.User.Identity.IsAuthenticated) return; + if (ctx.Context.User.Identity == null || ctx.Context.User.Identity.IsAuthenticated) { + return; + } + ctx.Context.Response.StatusCode = (int)HttpStatusCode.Unauthorized; ctx.Context.Response.ContentLength = 0; ctx.Context.Response.Body = Stream.Null; @@ -122,7 +127,7 @@ void OnPrepareResponse(StaticFileResponseContext ctx) { // JsonSerializer.Serialize(new { Status = 401, Message = "UnAuthorized file access" }); } - app.UseStaticFiles(new StaticFileOptions { + _ = app.UseStaticFiles(new StaticFileOptions { FileProvider = new PhysicalFileProvider(fullUploadPath), RequestPath = new PathString("/static"), OnPrepareResponse = OnPrepareResponse From fd80a9840c71f96e4e42557124120193717e6bdc Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Sun, 22 Jan 2023 18:33:18 +0100 Subject: [PATCH 010/185] Create .hintrc --- .hintrc | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 .hintrc diff --git a/.hintrc b/.hintrc new file mode 100644 index 00000000..5b18485f --- /dev/null +++ b/.hintrc @@ -0,0 +1,8 @@ +{ + "extends": [ + "development" + ], + "hints": { + "meta-viewport": "off" + } +} \ No newline at end of file From 92664bc1732f956137909f93145b909b658a7b09 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Sun, 22 Jan 2023 18:33:26 +0100 Subject: [PATCH 011/185] Update AuthView.cs --- src/Mobile/Views/Startup/AuthView.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Mobile/Views/Startup/AuthView.cs b/src/Mobile/Views/Startup/AuthView.cs index 4ceeac39..3d6d44b7 100644 --- a/src/Mobile/Views/Startup/AuthView.cs +++ b/src/Mobile/Views/Startup/AuthView.cs @@ -48,7 +48,7 @@ protected override void OnAppearing() { public partial class AuthViewModel : BaseViewModel { [RelayCommand] private async void NavigateToHome() { - var redirect = $"{AppConst.AppId}://"; + const string redirect = $"{AppConst.AppId}://"; try { WebAuthenticatorResult result = await WebAuthenticator.Default.AuthenticateAsync( new Uri($"{AppConst.AuthUri}"), From 349ab345280fa86549c953d199507004ffb88b35 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Sun, 22 Jan 2023 18:33:48 +0100 Subject: [PATCH 012/185] Use local google fonts --- src/Web/Server/appsettings.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Web/Server/appsettings.json b/src/Web/Server/appsettings.json index d0310989..42f06016 100644 --- a/src/Web/Server/appsettings.json +++ b/src/Web/Server/appsettings.json @@ -1,8 +1,8 @@ { "Microsoft": { - "ClientId": "client-id", + "ClientId": "0b5d9d09-3e70-4f62-bbe8-4081c0cc1a5d", "CallbackPath": "/signin-microsoft", - "ClientSecret": "client-secret" + "ClientSecret": "d3m8Q~q5O5lW4LnX1ZCrg9qXiqg0PkOgAmjKPb4t" }, "Logging": { "LogLevel": { From 6f162124571f1868327ebb2cf3f8fac2cafe4744 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Sun, 22 Jan 2023 18:53:11 +0100 Subject: [PATCH 013/185] Remove secrets from config --- global.json | 6 ++++-- src/Web/Server/appsettings.json | 7 +------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/global.json b/global.json index bcb51093..d936b9af 100644 --- a/global.json +++ b/global.json @@ -5,9 +5,11 @@ }, "scripts": { "build": "dotnet build --configuration Debug", + "build:web": "dotnet build src/Web/Server/", + "build:app": "dotnet build src/Mobile/XClaim.Mobile.csproj", "format": "dotnet format ./XClaim.sln", - "web": "dotnet watch --project src/Web/Server/XClaim.Web.Server.csproj", - "dev:blazor": "DOTNET_USE_POLLING_FILE_WATCHER=true dotnet watch --project src/Web/Client/XClaim.Web.Client.csproj", + "web": "dotnet watch --project src/Web/Server/", + "dev:blazor": "DOTNET_USE_POLLING_FILE_WATCHER=true dotnet watch --project src/Web/Client/", "dev:web": "DOTNET_USE_POLLING_FILE_WATCHER=true dotnet r web" } } \ No newline at end of file diff --git a/src/Web/Server/appsettings.json b/src/Web/Server/appsettings.json index 42f06016..a10ae235 100644 --- a/src/Web/Server/appsettings.json +++ b/src/Web/Server/appsettings.json @@ -1,9 +1,4 @@ { - "Microsoft": { - "ClientId": "0b5d9d09-3e70-4f62-bbe8-4081c0cc1a5d", - "CallbackPath": "/signin-microsoft", - "ClientSecret": "d3m8Q~q5O5lW4LnX1ZCrg9qXiqg0PkOgAmjKPb4t" - }, "Logging": { "LogLevel": { "Default": "Information", @@ -14,4 +9,4 @@ "ConnectionStrings": { "Default": "Data Source=app-data.sqlite3" } -} +} \ No newline at end of file From 9f6bc54b4c2c874cf84e4f17db0505b270fce8ea Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Mon, 23 Jan 2023 12:33:28 +0100 Subject: [PATCH 014/185] Added new secrects --- src/Web/Server/XClaim.Web.Server.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Web/Server/XClaim.Web.Server.csproj b/src/Web/Server/XClaim.Web.Server.csproj index 934a1d61..a50fe573 100644 --- a/src/Web/Server/XClaim.Web.Server.csproj +++ b/src/Web/Server/XClaim.Web.Server.csproj @@ -4,6 +4,7 @@ net7.0 enable enable + 4102fda6-15af-4599-9d0f-a2916d92f41a From be95932e7f8238c95f21a3cc33d5dc942d3e98e8 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Mon, 23 Jan 2023 12:34:04 +0100 Subject: [PATCH 015/185] Change config format to ini --- src/Web/Server/Constants.cs | 1 + src/Web/Server/Helpers/ConfigHelper.cs | 27 +++++++++++++++++++++ src/Web/Server/Program.cs | 15 ++++++------ src/Web/Server/appsettings.Development.json | 8 ------ src/Web/Server/appsettings.json | 12 --------- src/Web/Server/config.Development.ini | 9 +++++++ src/Web/Server/config.ini | 9 +++++++ 7 files changed, 54 insertions(+), 27 deletions(-) create mode 100644 src/Web/Server/Helpers/ConfigHelper.cs delete mode 100644 src/Web/Server/appsettings.Development.json delete mode 100644 src/Web/Server/appsettings.json create mode 100644 src/Web/Server/config.Development.ini create mode 100644 src/Web/Server/config.ini diff --git a/src/Web/Server/Constants.cs b/src/Web/Server/Constants.cs index 30d42737..d9220b7d 100644 --- a/src/Web/Server/Constants.cs +++ b/src/Web/Server/Constants.cs @@ -3,4 +3,5 @@ namespace XClaim.Web.Server; public static class Constants { public const string RootApi = "/api/v1"; public const string AppUri = "xclaim"; + public const string AppSessionName = "AuthCookie"; } \ No newline at end of file diff --git a/src/Web/Server/Helpers/ConfigHelper.cs b/src/Web/Server/Helpers/ConfigHelper.cs new file mode 100644 index 00000000..aedd48f3 --- /dev/null +++ b/src/Web/Server/Helpers/ConfigHelper.cs @@ -0,0 +1,27 @@ +using System.Diagnostics.CodeAnalysis; +using System.Reflection; + +namespace XClaim.Web.Server.Helpers; + +public static class ConfigHelper { + public static void ApplyDefaultAppConfiguration(HostBuilderContext hostingContext, IConfigurationBuilder appConfigBuilder, string[]? args) { + IHostEnvironment env = hostingContext.HostingEnvironment; + bool reloadOnChange = GetReloadConfigOnChangeValue(hostingContext); + + appConfigBuilder.AddIniFile("config.ini", optional: true, reloadOnChange: reloadOnChange) + .AddIniFile($"config{env.EnvironmentName}.ini", optional: true, reloadOnChange: reloadOnChange); + + if (env.IsDevelopment() && env.ApplicationName is { Length: > 0 }) { + var appAssembly = Assembly.Load(new AssemblyName(env.ApplicationName)); + if (appAssembly != null) + appConfigBuilder.AddUserSecrets(appAssembly, optional: true, reloadOnChange: reloadOnChange); + } + + appConfigBuilder.AddEnvironmentVariables(); { + appConfigBuilder.AddCommandLine(args!); + } + + [UnconditionalSuppressMessage("ReflectionAnalysis", "IL2026:RequiresUnreferencedCode", Justification = "Calling IConfiguration.GetValue is safe when the T is bool.")] + static bool GetReloadConfigOnChangeValue(HostBuilderContext hostingContext) => hostingContext.Configuration.GetValue("hostBuilder:reloadConfigOnChange", defaultValue: true); + } +} \ No newline at end of file diff --git a/src/Web/Server/Program.cs b/src/Web/Server/Program.cs index 8bb15cc5..59da39b0 100644 --- a/src/Web/Server/Program.cs +++ b/src/Web/Server/Program.cs @@ -14,9 +14,13 @@ WebApplicationBuilder builder = WebApplication.CreateBuilder(args); +builder.Host.ConfigureServices((ctx, srv) => { + ConfigHelper.ApplyDefaultAppConfiguration(ctx, builder.Configuration, args); +}); + string? connectionString = builder.Configuration.GetConnectionString("Default"); builder.Services.AddDbContext(options => { - _ = options.UseSqlite(connectionString).UseSnakeCaseNamingConvention(); + options.UseSqlite(connectionString).UseSnakeCaseNamingConvention(); }); builder.Services.Configure(options => { @@ -32,18 +36,15 @@ builder.Services.AddAuthentication("Cookies") .AddCookie(opt => { - opt.Cookie.Name = "AuthCookie"; + opt.Cookie.Name = Constants.AppSessionName; opt.Cookie.IsEssential = true; opt.ExpireTimeSpan = TimeSpan.FromDays(7); opt.SlidingExpiration = true; }) .AddMicrosoftAccount(opt => { - string clientId = builder.Configuration.GetValue("Microsoft:ClientId") ?? ""; - string clientSecret = builder.Configuration.GetValue("Microsoft:ClientSecret") ?? ""; - opt.SignInScheme = "Cookies"; - opt.ClientId = clientId; - opt.ClientSecret = clientSecret; + opt.ClientId = builder.Configuration.GetValue("Microsoft:ClientId") ?? "client-id"; + opt.ClientSecret = builder.Configuration.GetValue("Microsoft:ClientSecret") ?? "client-secret"; opt.SignInScheme = CookieAuthenticationDefaults.AuthenticationScheme; opt.SaveTokens = true; }); diff --git a/src/Web/Server/appsettings.Development.json b/src/Web/Server/appsettings.Development.json deleted file mode 100644 index 0c208ae9..00000000 --- a/src/Web/Server/appsettings.Development.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "Logging": { - "LogLevel": { - "Default": "Information", - "Microsoft.AspNetCore": "Warning" - } - } -} diff --git a/src/Web/Server/appsettings.json b/src/Web/Server/appsettings.json deleted file mode 100644 index a10ae235..00000000 --- a/src/Web/Server/appsettings.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "Logging": { - "LogLevel": { - "Default": "Information", - "Microsoft.AspNetCore": "Warning" - } - }, - "AllowedHosts": "*", - "ConnectionStrings": { - "Default": "Data Source=app-data.sqlite3" - } -} \ No newline at end of file diff --git a/src/Web/Server/config.Development.ini b/src/Web/Server/config.Development.ini new file mode 100644 index 00000000..7bff08da --- /dev/null +++ b/src/Web/Server/config.Development.ini @@ -0,0 +1,9 @@ +AllowedHosts=* +Database=sqlite + +[Logging.LogLevel] +Default=Information +Microsoft.AspNetCore=Warning + +[ConnectionStrings] +Default="Data Source=app-data.sqlite3" diff --git a/src/Web/Server/config.ini b/src/Web/Server/config.ini new file mode 100644 index 00000000..7bff08da --- /dev/null +++ b/src/Web/Server/config.ini @@ -0,0 +1,9 @@ +AllowedHosts=* +Database=sqlite + +[Logging.LogLevel] +Default=Information +Microsoft.AspNetCore=Warning + +[ConnectionStrings] +Default="Data Source=app-data.sqlite3" From 071519f6268fa4e3594f8638932477eb46cc021d Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Mon, 23 Jan 2023 12:34:14 +0100 Subject: [PATCH 016/185] Update XClaim.sln.DotSettings --- XClaim.sln.DotSettings | 1 + 1 file changed, 1 insertion(+) diff --git a/XClaim.sln.DotSettings b/XClaim.sln.DotSettings index ce9cdb7b..205f2e8d 100644 --- a/XClaim.sln.DotSettings +++ b/XClaim.sln.DotSettings @@ -1,4 +1,5 @@  + True True True True From b7a27106105b8c14c9b4f9e8ba2b4e182f044c68 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Mon, 23 Jan 2023 12:34:49 +0100 Subject: [PATCH 017/185] Use local roboto font --- src/Web/Client/wwwroot/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Web/Client/wwwroot/index.html b/src/Web/Client/wwwroot/index.html index 0ef52956..bb700d3c 100644 --- a/src/Web/Client/wwwroot/index.html +++ b/src/Web/Client/wwwroot/index.html @@ -6,7 +6,7 @@ X-Claim - + From 82d7e1f594cad1c07c7b0f5fb93be4351f5806fc Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Mon, 23 Jan 2023 12:44:31 +0100 Subject: [PATCH 018/185] Delete 20230115181843_Initial.cs --- .../Migrations/20230115181843_Initial.cs | 816 ------------------ 1 file changed, 816 deletions(-) delete mode 100644 src/Web/Server/Migrations/20230115181843_Initial.cs diff --git a/src/Web/Server/Migrations/20230115181843_Initial.cs b/src/Web/Server/Migrations/20230115181843_Initial.cs deleted file mode 100644 index ce259e01..00000000 --- a/src/Web/Server/Migrations/20230115181843_Initial.cs +++ /dev/null @@ -1,816 +0,0 @@ -using System; -using Microsoft.EntityFrameworkCore.Migrations; - -#nullable disable - -#pragma warning disable CA1814 // Prefer jagged arrays over multidimensional - -namespace XClaim.Web.Server.Migrations -{ - /// - public partial class Initial : Migration - { - /// - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.CreateTable( - name: "banks", - columns: table => new - { - id = table.Column(type: "TEXT", nullable: false), - name = table.Column(type: "TEXT", maxLength: 128, nullable: false), - description = table.Column(type: "TEXT", nullable: false), - active = table.Column(type: "INTEGER", nullable: false), - createdat = table.Column(name: "created_at", type: "TEXT", nullable: false), - modifiedat = table.Column(name: "modified_at", type: "TEXT", nullable: true), - deletedat = table.Column(name: "deleted_at", type: "TEXT", nullable: true) - }, - constraints: table => - { - table.PrimaryKey("pk_banks", x => x.id); - }); - - migrationBuilder.CreateTable( - name: "currency_entity", - columns: table => new - { - id = table.Column(type: "TEXT", nullable: false), - name = table.Column(type: "TEXT", nullable: false), - symbol = table.Column(type: "TEXT", nullable: false), - description = table.Column(type: "TEXT", nullable: false), - active = table.Column(type: "INTEGER", nullable: false), - createdat = table.Column(name: "created_at", type: "TEXT", nullable: false), - modifiedat = table.Column(name: "modified_at", type: "TEXT", nullable: true), - deletedat = table.Column(name: "deleted_at", type: "TEXT", nullable: true) - }, - constraints: table => - { - table.PrimaryKey("pk_currency_entity", x => x.id); - }); - - migrationBuilder.CreateTable( - name: "bank_accounts", - columns: table => new - { - id = table.Column(type: "TEXT", nullable: false), - fullname = table.Column(name: "full_name", type: "TEXT", nullable: false), - bankid = table.Column(name: "bank_id", type: "TEXT", nullable: false), - ownerid = table.Column(name: "owner_id", type: "TEXT", nullable: true), - number = table.Column(type: "TEXT", maxLength: 20, nullable: false), - description = table.Column(type: "TEXT", maxLength: 1024, nullable: true), - createdat = table.Column(name: "created_at", type: "TEXT", nullable: false), - modifiedat = table.Column(name: "modified_at", type: "TEXT", nullable: true), - deletedat = table.Column(name: "deleted_at", type: "TEXT", nullable: true) - }, - constraints: table => - { - table.PrimaryKey("pk_bank_accounts", x => x.id); - table.ForeignKey( - name: "fk_bank_accounts_banks_bank_id", - column: x => x.bankid, - principalTable: "banks", - principalColumn: "id", - onDelete: ReferentialAction.Cascade); - }); - - migrationBuilder.CreateTable( - name: "categories", - columns: table => new - { - id = table.Column(type: "TEXT", nullable: false), - name = table.Column(type: "TEXT", maxLength: 128, nullable: false), - companyid = table.Column(name: "company_id", type: "TEXT", nullable: true), - description = table.Column(type: "TEXT", maxLength: 1024, nullable: true), - active = table.Column(type: "INTEGER", nullable: false), - icon = table.Column(type: "TEXT", maxLength: 64, nullable: true), - createdat = table.Column(name: "created_at", type: "TEXT", nullable: false), - modifiedat = table.Column(name: "modified_at", type: "TEXT", nullable: true), - deletedat = table.Column(name: "deleted_at", type: "TEXT", nullable: true) - }, - constraints: table => - { - table.PrimaryKey("pk_categories", x => x.id); - }); - - migrationBuilder.CreateTable( - name: "claims", - columns: table => new - { - id = table.Column(type: "TEXT", nullable: false), - description = table.Column(type: "TEXT", maxLength: 256, nullable: false), - notes = table.Column(type: "TEXT", maxLength: 1024, nullable: true), - amount = table.Column(type: "TEXT", nullable: false), - paymentid = table.Column(name: "payment_id", type: "TEXT", nullable: true), - categoryid = table.Column(name: "category_id", type: "TEXT", nullable: false), - companyid = table.Column(name: "company_id", type: "TEXT", nullable: true), - status = table.Column(type: "INTEGER", nullable: false), - ownerid = table.Column(name: "owner_id", type: "TEXT", nullable: false), - reviewedbyid = table.Column(name: "reviewed_by_id", type: "TEXT", nullable: true), - reviewedat = table.Column(name: "reviewed_at", type: "TEXT", nullable: true), - confirmedbyid = table.Column(name: "confirmed_by_id", type: "TEXT", nullable: true), - confirmedat = table.Column(name: "confirmed_at", type: "TEXT", nullable: true), - approvedbyid = table.Column(name: "approved_by_id", type: "TEXT", nullable: true), - approvedat = table.Column(name: "approved_at", type: "TEXT", nullable: true), - createdat = table.Column(name: "created_at", type: "TEXT", nullable: false), - modifiedat = table.Column(name: "modified_at", type: "TEXT", nullable: true), - deletedat = table.Column(name: "deleted_at", type: "TEXT", nullable: true) - }, - constraints: table => - { - table.PrimaryKey("pk_claims", x => x.id); - table.ForeignKey( - name: "fk_claims_categories_category_id", - column: x => x.categoryid, - principalTable: "categories", - principalColumn: "id", - onDelete: ReferentialAction.Cascade); - }); - - migrationBuilder.CreateTable( - name: "comments", - columns: table => new - { - id = table.Column(type: "TEXT", nullable: false), - claimid = table.Column(name: "claim_id", type: "TEXT", nullable: true), - paymentid = table.Column(name: "payment_id", type: "TEXT", nullable: true), - ownerid = table.Column(name: "owner_id", type: "TEXT", nullable: false), - content = table.Column(type: "TEXT", maxLength: 1024, nullable: false), - createdat = table.Column(name: "created_at", type: "TEXT", nullable: false), - modifiedat = table.Column(name: "modified_at", type: "TEXT", nullable: true), - deletedat = table.Column(name: "deleted_at", type: "TEXT", nullable: true) - }, - constraints: table => - { - table.PrimaryKey("pk_comments", x => x.id); - table.ForeignKey( - name: "fk_comments_claims_claim_id", - column: x => x.claimid, - principalTable: "claims", - principalColumn: "id"); - }); - - migrationBuilder.CreateTable( - name: "companies", - columns: table => new - { - id = table.Column(type: "TEXT", nullable: false), - shortname = table.Column(name: "short_name", type: "TEXT", maxLength: 64, nullable: false), - fullname = table.Column(name: "full_name", type: "TEXT", maxLength: 128, nullable: false), - adminemail = table.Column(name: "admin_email", type: "TEXT", maxLength: 256, nullable: false), - managerid = table.Column(name: "manager_id", type: "TEXT", nullable: true), - createdat = table.Column(name: "created_at", type: "TEXT", nullable: false), - modifiedat = table.Column(name: "modified_at", type: "TEXT", nullable: true), - deletedat = table.Column(name: "deleted_at", type: "TEXT", nullable: true) - }, - constraints: table => - { - table.PrimaryKey("pk_companies", x => x.id); - }); - - migrationBuilder.CreateTable( - name: "domain_entity", - columns: table => new - { - id = table.Column(type: "TEXT", nullable: false), - address = table.Column(type: "TEXT", nullable: false), - companyentityid = table.Column(name: "company_entity_id", type: "TEXT", nullable: true), - createdat = table.Column(name: "created_at", type: "TEXT", nullable: false), - modifiedat = table.Column(name: "modified_at", type: "TEXT", nullable: true), - deletedat = table.Column(name: "deleted_at", type: "TEXT", nullable: true) - }, - constraints: table => - { - table.PrimaryKey("pk_domain_entity", x => x.id); - table.ForeignKey( - name: "fk_domain_entity_companies_company_entity_id", - column: x => x.companyentityid, - principalTable: "companies", - principalColumn: "id"); - }); - - migrationBuilder.CreateTable( - name: "events", - columns: table => new - { - id = table.Column(type: "TEXT", nullable: false), - type = table.Column(type: "INTEGER", nullable: false), - claimid = table.Column(name: "claim_id", type: "TEXT", nullable: true), - paymentid = table.Column(name: "payment_id", type: "TEXT", nullable: true), - description = table.Column(type: "TEXT", maxLength: 512, nullable: false), - createdat = table.Column(name: "created_at", type: "TEXT", nullable: false), - modifiedat = table.Column(name: "modified_at", type: "TEXT", nullable: true), - deletedat = table.Column(name: "deleted_at", type: "TEXT", nullable: true) - }, - constraints: table => - { - table.PrimaryKey("pk_events", x => x.id); - table.ForeignKey( - name: "fk_events_claims_claim_id", - column: x => x.claimid, - principalTable: "claims", - principalColumn: "id"); - }); - - migrationBuilder.CreateTable( - name: "files", - columns: table => new - { - id = table.Column(type: "TEXT", nullable: false), - name = table.Column(type: "TEXT", maxLength: 256, nullable: false), - path = table.Column(type: "TEXT", maxLength: 1024, nullable: false), - extension = table.Column(type: "TEXT", maxLength: 8, nullable: true), - ownerid = table.Column(name: "owner_id", type: "TEXT", nullable: true), - claimentityid = table.Column(name: "claim_entity_id", type: "TEXT", nullable: true), - paymententityid = table.Column(name: "payment_entity_id", type: "TEXT", nullable: true), - createdat = table.Column(name: "created_at", type: "TEXT", nullable: false), - modifiedat = table.Column(name: "modified_at", type: "TEXT", nullable: true), - deletedat = table.Column(name: "deleted_at", type: "TEXT", nullable: true) - }, - constraints: table => - { - table.PrimaryKey("pk_files", x => x.id); - table.ForeignKey( - name: "fk_files_claims_claim_entity_id", - column: x => x.claimentityid, - principalTable: "claims", - principalColumn: "id"); - }); - - migrationBuilder.CreateTable( - name: "payments", - columns: table => new - { - id = table.Column(type: "TEXT", nullable: false), - description = table.Column(type: "TEXT", maxLength: 256, nullable: true), - notes = table.Column(type: "TEXT", maxLength: 1024, nullable: true), - amount = table.Column(type: "TEXT", nullable: false), - ownerid = table.Column(name: "owner_id", type: "TEXT", nullable: false), - completedat = table.Column(name: "completed_at", type: "TEXT", nullable: true), - completedbyid = table.Column(name: "completed_by_id", type: "TEXT", nullable: true), - createdat = table.Column(name: "created_at", type: "TEXT", nullable: false), - modifiedat = table.Column(name: "modified_at", type: "TEXT", nullable: true), - deletedat = table.Column(name: "deleted_at", type: "TEXT", nullable: true) - }, - constraints: table => - { - table.PrimaryKey("pk_payments", x => x.id); - }); - - migrationBuilder.CreateTable( - name: "teams", - columns: table => new - { - id = table.Column(type: "TEXT", nullable: false), - name = table.Column(type: "TEXT", maxLength: 128, nullable: false), - companyid = table.Column(name: "company_id", type: "TEXT", nullable: true), - managerid = table.Column(name: "manager_id", type: "TEXT", nullable: true), - createdat = table.Column(name: "created_at", type: "TEXT", nullable: false), - modifiedat = table.Column(name: "modified_at", type: "TEXT", nullable: true), - deletedat = table.Column(name: "deleted_at", type: "TEXT", nullable: true) - }, - constraints: table => - { - table.PrimaryKey("pk_teams", x => x.id); - table.ForeignKey( - name: "fk_teams_companies_company_id", - column: x => x.companyid, - principalTable: "companies", - principalColumn: "id"); - }); - - migrationBuilder.CreateTable( - name: "users", - columns: table => new - { - id = table.Column(type: "TEXT", nullable: false), - email = table.Column(type: "TEXT", maxLength: 256, nullable: false), - profileimage = table.Column(name: "profile_image", type: "TEXT", nullable: true), - phone = table.Column(type: "TEXT", maxLength: 64, nullable: false), - username = table.Column(name: "user_name", type: "TEXT", maxLength: 128, nullable: false), - firstname = table.Column(name: "first_name", type: "TEXT", maxLength: 128, nullable: false), - lastname = table.Column(name: "last_name", type: "TEXT", maxLength: 128, nullable: false), - balance = table.Column(type: "TEXT", nullable: false), - permission = table.Column(type: "INTEGER", nullable: false), - companyid = table.Column(name: "company_id", type: "TEXT", nullable: true), - companymanagedid = table.Column(name: "company_managed_id", type: "TEXT", nullable: true), - managerid = table.Column(name: "manager_id", type: "TEXT", nullable: true), - teamid = table.Column(name: "team_id", type: "TEXT", nullable: true), - teammanagedid = table.Column(name: "team_managed_id", type: "TEXT", nullable: true), - bankaccountid = table.Column(name: "bank_account_id", type: "TEXT", nullable: true), - active = table.Column(type: "INTEGER", nullable: false), - token = table.Column(type: "TEXT", maxLength: 128, nullable: true), - image = table.Column(type: "TEXT", nullable: true), - createdat = table.Column(name: "created_at", type: "TEXT", nullable: false), - modifiedat = table.Column(name: "modified_at", type: "TEXT", nullable: true), - deletedat = table.Column(name: "deleted_at", type: "TEXT", nullable: true) - }, - constraints: table => - { - table.PrimaryKey("pk_users", x => x.id); - table.ForeignKey( - name: "fk_users_companies_company_id", - column: x => x.companyid, - principalTable: "companies", - principalColumn: "id"); - table.ForeignKey( - name: "fk_users_teams_team_id", - column: x => x.teamid, - principalTable: "teams", - principalColumn: "id"); - table.ForeignKey( - name: "fk_users_users_manager_id", - column: x => x.managerid, - principalTable: "users", - principalColumn: "id"); - }); - - migrationBuilder.InsertData( - table: "banks", - columns: new[] { "id", "active", "created_at", "deleted_at", "description", "modified_at", "name" }, - values: new object[,] - { - { new Guid("2416552e-495b-49de-8a2c-48aa7e55941a"), false, new DateTime(2023, 1, 15, 19, 18, 43, 214, DateTimeKind.Local).AddTicks(7158), null, "", null, "Zenith Bank" }, - { new Guid("2b90a7c1-b184-4a81-90d5-064ac5ce04c7"), false, new DateTime(2023, 1, 15, 19, 18, 43, 214, DateTimeKind.Local).AddTicks(7158), null, "", null, "GT Bank" }, - { new Guid("3e54f0c5-70e2-4007-afad-2eece797bd1d"), false, new DateTime(2023, 1, 15, 19, 18, 43, 214, DateTimeKind.Local).AddTicks(7158), null, "", null, "United Bank for Africa" }, - { new Guid("3eaaa9ee-9370-42db-80b5-8b9506f6eb1b"), false, new DateTime(2023, 1, 15, 19, 18, 43, 214, DateTimeKind.Local).AddTicks(7158), null, "", null, "Polaris Bank Limited" }, - { new Guid("60dc66e7-10ce-4313-993b-ea528ee3e6b7"), false, new DateTime(2023, 1, 15, 19, 18, 43, 214, DateTimeKind.Local).AddTicks(7158), null, "", null, "Access Bank" }, - { new Guid("7b19efc3-7772-4e4c-84c3-b62888b69b2b"), false, new DateTime(2023, 1, 15, 19, 18, 43, 214, DateTimeKind.Local).AddTicks(7158), null, "", null, "Keystone Bank Limited" }, - { new Guid("7bdace1e-f7e5-4c4f-b759-4a3dc02cb6c6"), false, new DateTime(2023, 1, 15, 19, 18, 43, 214, DateTimeKind.Local).AddTicks(7158), null, "", null, "Fidelity Bank" }, - { new Guid("9591ce72-fa44-4337-a477-dd68e90d86a1"), false, new DateTime(2023, 1, 15, 19, 18, 43, 214, DateTimeKind.Local).AddTicks(7158), null, "", null, "Wema Bank" }, - { new Guid("bc55b8e1-2c15-4844-aca8-198392129eea"), false, new DateTime(2023, 1, 15, 19, 18, 43, 214, DateTimeKind.Local).AddTicks(7158), null, "", null, "Sterling Bank" }, - { new Guid("beac0a9e-9724-49ff-a75f-411247bf613b"), false, new DateTime(2023, 1, 15, 19, 18, 43, 214, DateTimeKind.Local).AddTicks(7158), null, "", null, "First Bank" }, - { new Guid("cb2af089-4476-4f99-b496-a9b5a09420f6"), false, new DateTime(2023, 1, 15, 19, 18, 43, 214, DateTimeKind.Local).AddTicks(7158), null, "", null, "First City Monument Bank" }, - { new Guid("fb1b15ca-481d-4409-aad1-2638e9d830bc"), false, new DateTime(2023, 1, 15, 19, 18, 43, 214, DateTimeKind.Local).AddTicks(7158), null, "", null, "Stanbic IBTC Bank" }, - { new Guid("fd6dfacb-7c41-478f-a346-46142a5f1680"), false, new DateTime(2023, 1, 15, 19, 18, 43, 214, DateTimeKind.Local).AddTicks(7158), null, "", null, "Union Bank of Nigeria" } - }); - - migrationBuilder.InsertData( - table: "categories", - columns: new[] { "id", "active", "company_id", "created_at", "deleted_at", "description", "icon", "modified_at", "name" }, - values: new object[,] - { - { new Guid("186c18f4-e02c-48f8-b5c4-868fef9e0cf8"), false, null, new DateTime(2023, 1, 15, 19, 18, 43, 214, DateTimeKind.Local).AddTicks(7158), null, "", "", null, "General Fuelling" }, - { new Guid("83ab2715-50ce-47d2-90bc-18c0a5581115"), false, null, new DateTime(2023, 1, 15, 19, 18, 43, 214, DateTimeKind.Local).AddTicks(7158), null, "", "", null, "Internet Service" } - }); - - migrationBuilder.InsertData( - table: "companies", - columns: new[] { "id", "admin_email", "created_at", "deleted_at", "full_name", "manager_id", "modified_at", "short_name" }, - values: new object[,] - { - { new Guid("71927876-903a-4b7a-a5a6-a3bef7321ec3"), "", new DateTime(2023, 1, 15, 19, 18, 43, 214, DateTimeKind.Local).AddTicks(7158), null, "Multi Consumer Product LTD", null, null, "MCPL LTD" }, - { new Guid("94d47c0b-fdba-4806-9357-4a2934b05fbd"), "", new DateTime(2023, 1, 15, 19, 18, 43, 214, DateTimeKind.Local).AddTicks(7158), null, "Dufil Prima Foods Plc", null, null, "Dufil" }, - { new Guid("c42df454-1b41-470d-9ec8-11b9e4c9f5a4"), "", new DateTime(2023, 1, 15, 19, 18, 43, 214, DateTimeKind.Local).AddTicks(7158), null, "MCPL LTD - BHN Division", null, null, "BHN LTD" } - }); - - migrationBuilder.InsertData( - table: "currency_entity", - columns: new[] { "id", "active", "created_at", "deleted_at", "description", "modified_at", "name", "symbol" }, - values: new object[,] - { - { new Guid("6f514f6d-de6b-46a7-aabe-448a1d1682cb"), false, new DateTime(2023, 1, 15, 19, 18, 43, 214, DateTimeKind.Local).AddTicks(7158), null, "", null, "Dollar", "$" }, - { new Guid("d7e33ed0-453d-45a8-aea0-fb989624869f"), false, new DateTime(2023, 1, 15, 19, 18, 43, 214, DateTimeKind.Local).AddTicks(7158), null, "", null, "Naira", "₦" } - }); - - migrationBuilder.InsertData( - table: "domain_entity", - columns: new[] { "id", "address", "company_entity_id", "created_at", "deleted_at", "modified_at" }, - values: new object[,] - { - { new Guid("3906d110-193c-4029-b1c8-7db06100e7dd"), "dufil.com", null, new DateTime(2023, 1, 15, 19, 18, 43, 214, DateTimeKind.Local).AddTicks(7158), null, null }, - { new Guid("61f19266-2b6f-4ab0-a080-c69637169cde"), "agboolas@outlook.com", null, new DateTime(2023, 1, 15, 19, 18, 43, 214, DateTimeKind.Local).AddTicks(7158), null, null }, - { new Guid("a4c3605d-cc20-4da5-8f8d-32ee6cea14ca"), "tolaram.com", null, new DateTime(2023, 1, 15, 19, 18, 43, 214, DateTimeKind.Local).AddTicks(7158), null, null } - }); - - migrationBuilder.InsertData( - table: "categories", - columns: new[] { "id", "active", "company_id", "created_at", "deleted_at", "description", "icon", "modified_at", "name" }, - values: new object[,] - { - { new Guid("01069213-1141-4fdd-8618-4de210f95c80"), false, new Guid("71927876-903a-4b7a-a5a6-a3bef7321ec3"), new DateTime(2023, 1, 15, 19, 18, 43, 214, DateTimeKind.Local).AddTicks(7158), null, "", "", null, "MCPL - Monthly training expense" }, - { new Guid("4cad163d-ec4c-468b-bb9b-7c894b8485d2"), false, new Guid("c42df454-1b41-470d-9ec8-11b9e4c9f5a4"), new DateTime(2023, 1, 15, 19, 18, 43, 214, DateTimeKind.Local).AddTicks(7158), null, "", "", null, "BHN - Weekly meeting expense" } - }); - - migrationBuilder.InsertData( - table: "teams", - columns: new[] { "id", "company_id", "created_at", "deleted_at", "manager_id", "modified_at", "name" }, - values: new object[,] - { - { new Guid("567851e6-955f-4f2a-928b-1db6d2b493ad"), new Guid("c42df454-1b41-470d-9ec8-11b9e4c9f5a4"), new DateTime(2023, 1, 15, 19, 18, 43, 214, DateTimeKind.Local).AddTicks(7158), null, null, null, "Account Dept" }, - { new Guid("acf60b30-6128-481c-a643-19bc2a2db6ad"), new Guid("94d47c0b-fdba-4806-9357-4a2934b05fbd"), new DateTime(2023, 1, 15, 19, 18, 43, 214, DateTimeKind.Local).AddTicks(7158), null, null, null, "QA Dept" }, - { new Guid("b13dd109-9d5a-416b-a3dc-ea7ce734969f"), new Guid("71927876-903a-4b7a-a5a6-a3bef7321ec3"), new DateTime(2023, 1, 15, 19, 18, 43, 214, DateTimeKind.Local).AddTicks(7158), null, null, null, "Logistics Dept" } - }); - - migrationBuilder.InsertData( - table: "users", - columns: new[] { "id", "active", "balance", "bank_account_id", "company_id", "company_managed_id", "created_at", "deleted_at", "email", "first_name", "image", "last_name", "manager_id", "modified_at", "permission", "phone", "profile_image", "team_id", "team_managed_id", "token", "user_name" }, - values: new object[,] - { - { new Guid("28bdb705-e568-49c7-8217-74d44b57461e"), false, 0m, null, new Guid("71927876-903a-4b7a-a5a6-a3bef7321ec3"), null, new DateTime(2023, 1, 15, 19, 18, 43, 214, DateTimeKind.Local).AddTicks(7158), null, "jane.doe@test.com", "Jane", null, "Doe", null, null, 1, "+23402", null, new Guid("b13dd109-9d5a-416b-a3dc-ea7ce734969f"), null, null, "jane_doe" }, - { new Guid("557afd14-d7c3-4015-a0b6-0a745df7e9cd"), false, 0m, null, new Guid("94d47c0b-fdba-4806-9357-4a2934b05fbd"), null, new DateTime(2023, 1, 15, 19, 18, 43, 214, DateTimeKind.Local).AddTicks(7158), null, "johnny.test@test.com", "Johnny ", null, "Test", null, null, 1, "+23403", null, new Guid("acf60b30-6128-481c-a643-19bc2a2db6ad"), null, null, "johnny_test" }, - { new Guid("64a4fd2d-f81a-4b91-ae8f-33e790d9f93a"), false, 0m, null, new Guid("c42df454-1b41-470d-9ec8-11b9e4c9f5a4"), null, new DateTime(2023, 1, 15, 19, 18, 43, 214, DateTimeKind.Local).AddTicks(7158), null, "john.doe@test.com", "John", null, "Doe", null, null, 4, "+23401", null, new Guid("567851e6-955f-4f2a-928b-1db6d2b493ad"), null, null, "john_doe" } - }); - - migrationBuilder.CreateIndex( - name: "ix_bank_accounts_bank_id", - table: "bank_accounts", - column: "bank_id"); - - migrationBuilder.CreateIndex( - name: "ix_bank_accounts_deleted_at", - table: "bank_accounts", - column: "deleted_at"); - - migrationBuilder.CreateIndex( - name: "ix_bank_accounts_owner_id", - table: "bank_accounts", - column: "owner_id", - unique: true); - - migrationBuilder.CreateIndex( - name: "ix_banks_deleted_at", - table: "banks", - column: "deleted_at"); - - migrationBuilder.CreateIndex( - name: "ix_banks_name", - table: "banks", - column: "name", - unique: true); - - migrationBuilder.CreateIndex( - name: "ix_categories_company_id", - table: "categories", - column: "company_id"); - - migrationBuilder.CreateIndex( - name: "ix_categories_deleted_at", - table: "categories", - column: "deleted_at"); - - migrationBuilder.CreateIndex( - name: "ix_claims_approved_by_id", - table: "claims", - column: "approved_by_id"); - - migrationBuilder.CreateIndex( - name: "ix_claims_category_id", - table: "claims", - column: "category_id"); - - migrationBuilder.CreateIndex( - name: "ix_claims_company_id", - table: "claims", - column: "company_id"); - - migrationBuilder.CreateIndex( - name: "ix_claims_confirmed_by_id", - table: "claims", - column: "confirmed_by_id"); - - migrationBuilder.CreateIndex( - name: "ix_claims_deleted_at", - table: "claims", - column: "deleted_at"); - - migrationBuilder.CreateIndex( - name: "ix_claims_owner_id", - table: "claims", - column: "owner_id"); - - migrationBuilder.CreateIndex( - name: "ix_claims_payment_id", - table: "claims", - column: "payment_id"); - - migrationBuilder.CreateIndex( - name: "ix_claims_reviewed_by_id", - table: "claims", - column: "reviewed_by_id"); - - migrationBuilder.CreateIndex( - name: "ix_comments_claim_id", - table: "comments", - column: "claim_id"); - - migrationBuilder.CreateIndex( - name: "ix_comments_deleted_at", - table: "comments", - column: "deleted_at"); - - migrationBuilder.CreateIndex( - name: "ix_comments_owner_id", - table: "comments", - column: "owner_id"); - - migrationBuilder.CreateIndex( - name: "ix_comments_payment_id", - table: "comments", - column: "payment_id"); - - migrationBuilder.CreateIndex( - name: "ix_companies_deleted_at", - table: "companies", - column: "deleted_at"); - - migrationBuilder.CreateIndex( - name: "ix_companies_manager_id", - table: "companies", - column: "manager_id", - unique: true); - - migrationBuilder.CreateIndex( - name: "ix_currency_entity_name", - table: "currency_entity", - column: "name", - unique: true); - - migrationBuilder.CreateIndex( - name: "ix_domain_entity_company_entity_id", - table: "domain_entity", - column: "company_entity_id"); - - migrationBuilder.CreateIndex( - name: "ix_domain_entity_deleted_at", - table: "domain_entity", - column: "deleted_at"); - - migrationBuilder.CreateIndex( - name: "ix_events_claim_id", - table: "events", - column: "claim_id"); - - migrationBuilder.CreateIndex( - name: "ix_events_deleted_at", - table: "events", - column: "deleted_at"); - - migrationBuilder.CreateIndex( - name: "ix_events_payment_id", - table: "events", - column: "payment_id"); - - migrationBuilder.CreateIndex( - name: "ix_files_claim_entity_id", - table: "files", - column: "claim_entity_id"); - - migrationBuilder.CreateIndex( - name: "ix_files_deleted_at", - table: "files", - column: "deleted_at"); - - migrationBuilder.CreateIndex( - name: "ix_files_owner_id", - table: "files", - column: "owner_id"); - - migrationBuilder.CreateIndex( - name: "ix_files_payment_entity_id", - table: "files", - column: "payment_entity_id"); - - migrationBuilder.CreateIndex( - name: "ix_payments_completed_by_id", - table: "payments", - column: "completed_by_id"); - - migrationBuilder.CreateIndex( - name: "ix_payments_deleted_at", - table: "payments", - column: "deleted_at"); - - migrationBuilder.CreateIndex( - name: "ix_payments_owner_id", - table: "payments", - column: "owner_id"); - - migrationBuilder.CreateIndex( - name: "ix_teams_company_id", - table: "teams", - column: "company_id"); - - migrationBuilder.CreateIndex( - name: "ix_teams_deleted_at", - table: "teams", - column: "deleted_at"); - - migrationBuilder.CreateIndex( - name: "ix_teams_manager_id", - table: "teams", - column: "manager_id", - unique: true); - - migrationBuilder.CreateIndex( - name: "ix_users_company_id", - table: "users", - column: "company_id"); - - migrationBuilder.CreateIndex( - name: "ix_users_deleted_at", - table: "users", - column: "deleted_at"); - - migrationBuilder.CreateIndex( - name: "ix_users_email", - table: "users", - column: "email", - unique: true); - - migrationBuilder.CreateIndex( - name: "ix_users_manager_id", - table: "users", - column: "manager_id"); - - migrationBuilder.CreateIndex( - name: "ix_users_phone", - table: "users", - column: "phone", - unique: true); - - migrationBuilder.CreateIndex( - name: "ix_users_team_id", - table: "users", - column: "team_id"); - - migrationBuilder.CreateIndex( - name: "ix_users_user_name", - table: "users", - column: "user_name", - unique: true); - - migrationBuilder.AddForeignKey( - name: "fk_bank_accounts_users_owner_id1", - table: "bank_accounts", - column: "owner_id", - principalTable: "users", - principalColumn: "id"); - - migrationBuilder.AddForeignKey( - name: "fk_categories_companies_company_id", - table: "categories", - column: "company_id", - principalTable: "companies", - principalColumn: "id"); - - migrationBuilder.AddForeignKey( - name: "fk_claims_companies_company_id", - table: "claims", - column: "company_id", - principalTable: "companies", - principalColumn: "id"); - - migrationBuilder.AddForeignKey( - name: "fk_claims_payments_payment_id", - table: "claims", - column: "payment_id", - principalTable: "payments", - principalColumn: "id"); - - migrationBuilder.AddForeignKey( - name: "fk_claims_users_approved_by_id", - table: "claims", - column: "approved_by_id", - principalTable: "users", - principalColumn: "id"); - - migrationBuilder.AddForeignKey( - name: "fk_claims_users_confirmed_by_id", - table: "claims", - column: "confirmed_by_id", - principalTable: "users", - principalColumn: "id"); - - migrationBuilder.AddForeignKey( - name: "fk_claims_users_owner_id", - table: "claims", - column: "owner_id", - principalTable: "users", - principalColumn: "id", - onDelete: ReferentialAction.Cascade); - - migrationBuilder.AddForeignKey( - name: "fk_claims_users_reviewed_by_id", - table: "claims", - column: "reviewed_by_id", - principalTable: "users", - principalColumn: "id"); - - migrationBuilder.AddForeignKey( - name: "fk_comments_payments_payment_id", - table: "comments", - column: "payment_id", - principalTable: "payments", - principalColumn: "id"); - - migrationBuilder.AddForeignKey( - name: "fk_comments_users_owner_id", - table: "comments", - column: "owner_id", - principalTable: "users", - principalColumn: "id", - onDelete: ReferentialAction.Cascade); - - migrationBuilder.AddForeignKey( - name: "fk_companies_users_manager_id", - table: "companies", - column: "manager_id", - principalTable: "users", - principalColumn: "id"); - - migrationBuilder.AddForeignKey( - name: "fk_events_payments_payment_id", - table: "events", - column: "payment_id", - principalTable: "payments", - principalColumn: "id"); - - migrationBuilder.AddForeignKey( - name: "fk_files_payments_payment_entity_id", - table: "files", - column: "payment_entity_id", - principalTable: "payments", - principalColumn: "id"); - - migrationBuilder.AddForeignKey( - name: "fk_files_users_owner_id", - table: "files", - column: "owner_id", - principalTable: "users", - principalColumn: "id"); - - migrationBuilder.AddForeignKey( - name: "fk_payments_users_completed_by_id", - table: "payments", - column: "completed_by_id", - principalTable: "users", - principalColumn: "id"); - - migrationBuilder.AddForeignKey( - name: "fk_payments_users_owner_id", - table: "payments", - column: "owner_id", - principalTable: "users", - principalColumn: "id", - onDelete: ReferentialAction.Cascade); - - migrationBuilder.AddForeignKey( - name: "fk_teams_users_manager_id", - table: "teams", - column: "manager_id", - principalTable: "users", - principalColumn: "id"); - } - - /// - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropForeignKey( - name: "fk_companies_users_manager_id", - table: "companies"); - - migrationBuilder.DropForeignKey( - name: "fk_teams_users_manager_id", - table: "teams"); - - migrationBuilder.DropTable( - name: "bank_accounts"); - - migrationBuilder.DropTable( - name: "comments"); - - migrationBuilder.DropTable( - name: "currency_entity"); - - migrationBuilder.DropTable( - name: "domain_entity"); - - migrationBuilder.DropTable( - name: "events"); - - migrationBuilder.DropTable( - name: "files"); - - migrationBuilder.DropTable( - name: "banks"); - - migrationBuilder.DropTable( - name: "claims"); - - migrationBuilder.DropTable( - name: "categories"); - - migrationBuilder.DropTable( - name: "payments"); - - migrationBuilder.DropTable( - name: "users"); - - migrationBuilder.DropTable( - name: "teams"); - - migrationBuilder.DropTable( - name: "companies"); - } - } -} From 96bbb288b3db885ec9fbc20544d2d3189b49d6e2 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Mon, 23 Jan 2023 13:06:14 +0100 Subject: [PATCH 019/185] Update auth view --- src/Web/Components/Pages/Startup/Auth.razor | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/Web/Components/Pages/Startup/Auth.razor b/src/Web/Components/Pages/Startup/Auth.razor index 34dd960f..6a7736d1 100644 --- a/src/Web/Components/Pages/Startup/Auth.razor +++ b/src/Web/Components/Pages/Startup/Auth.razor @@ -1,11 +1,15 @@ +@inject NavigationManager Nav @page "/app/auth" @code { - + private void BackHome() => Nav.NavigateTo(WebConst.AppHome); } Sign In - - - \ No newline at end of file + + + + Home + + \ No newline at end of file From 4a4193a058d643a7d9af456bdec1864477650166 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Tue, 24 Jan 2023 16:18:22 +0100 Subject: [PATCH 020/185] Create CookieHandler.cs --- src/Web/Client/Handler/CookieHandler.cs | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 src/Web/Client/Handler/CookieHandler.cs diff --git a/src/Web/Client/Handler/CookieHandler.cs b/src/Web/Client/Handler/CookieHandler.cs new file mode 100644 index 00000000..8bde2bfd --- /dev/null +++ b/src/Web/Client/Handler/CookieHandler.cs @@ -0,0 +1,11 @@ +using Microsoft.AspNetCore.Components.WebAssembly.Http; + +namespace XClaim.Web.Client.Handler; + +public class CookieHandler : DelegatingHandler { + protected override async Task SendAsync(HttpRequestMessage request, CancellationToken cancellationToken) { + request.SetBrowserRequestCredentials(BrowserRequestCredentials.Include); + + return await base.SendAsync(request, cancellationToken); + } +} \ No newline at end of file From 886629dc87f064a02d646be049a170b5b4bc08c1 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Thu, 26 Jan 2023 11:10:30 +0100 Subject: [PATCH 021/185] Update AuthProvider.cs --- src/Web/Shared/AuthProvider.cs | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/Web/Shared/AuthProvider.cs b/src/Web/Shared/AuthProvider.cs index 4d5e179d..5ea512a6 100644 --- a/src/Web/Shared/AuthProvider.cs +++ b/src/Web/Shared/AuthProvider.cs @@ -6,6 +6,7 @@ namespace XClaim.Web.Shared; public class AuthProvider : AuthenticationStateProvider { + private const string SessionKey = "UserSession"; private readonly ISessionStorageService _sessionStorage; private readonly ClaimsPrincipal _anonymous = new ClaimsPrincipal(new ClaimsIdentity()); @@ -15,12 +16,12 @@ public AuthProvider(ISessionStorageService sessionStorage) { public override async Task GetAuthenticationStateAsync() { try { - var userSession = await _sessionStorage.GetAsync("UserSession"); + var userSession = await _sessionStorage.GetAsync(SessionKey); if (userSession == null) return await Task.FromResult(new AuthenticationState(_anonymous)); var claimsPrincipal = new ClaimsPrincipal(new ClaimsIdentity(new List { - new(ClaimTypes.Name, userSession.UserName), - new(ClaimTypes.Role, userSession.Role) + new Claim(ClaimTypes.Name, userSession.UserName), + new Claim(ClaimTypes.Role, userSession.Role) }, "SessionAuth")); return await Task.FromResult(new AuthenticationState(claimsPrincipal)); @@ -40,27 +41,27 @@ public async Task UpdateAuthenticationState(AuthResponse? userSession) { new Claim(ClaimTypes.Role, userSession.Role) })); userSession.ExpiryTimeStamp = DateTime.Now.AddSeconds(userSession.ExpiresIn); - await _sessionStorage.SaveAsync("UserSession", userSession); + await _sessionStorage.SaveAsync(SessionKey, userSession); } else { claimsPrincipal = _anonymous; - await _sessionStorage.RemoveItemAsync("UserSession"); + await _sessionStorage.RemoveItemAsync(SessionKey); } NotifyAuthenticationStateChanged(Task.FromResult(new AuthenticationState(claimsPrincipal))); } + public async Task ClearAuthInfo() => await this.UpdateAuthenticationState(null); + public async Task GetToken() { var result = string.Empty; try { - var userSession = await _sessionStorage.GetAsync("UserSession"); + var userSession = await _sessionStorage.GetAsync(SessionKey); if (userSession != null && DateTime.Now < userSession.ExpiryTimeStamp) result = userSession.Token; - } - catch { + } catch { // ignored } - return result; } } \ No newline at end of file From 7374fe58575b9e33cebb52c388844933c1d39d6f Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Thu, 26 Jan 2023 18:35:09 +0100 Subject: [PATCH 022/185] Minor improvement to auth endpoint --- src/Common/Dtos/UserResponse.cs | 2 +- src/Common/HTTP/IProfileService.cs | 3 ++- src/Common/HTTP/ProfileService.cs | 5 +++-- .../Server/Modules/ProfileModule/ProfileModule.cs | 15 ++++++++------- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/Common/Dtos/UserResponse.cs b/src/Common/Dtos/UserResponse.cs index 8f21d498..bd9157fc 100644 --- a/src/Common/Dtos/UserResponse.cs +++ b/src/Common/Dtos/UserResponse.cs @@ -12,7 +12,7 @@ public string FullName { get { return $"{FirstName} {LastName}"; } } public decimal Balance { get; set; } - public UserPermission Permission { get; set; } + public UserPermission Permission { get; set; } = UserPermission.Standard; public CompanyResponse? Company { get; set; } public Guid? CompanyId { get; set; } public CompanyResponse? CompanyManaged { get; set; } diff --git a/src/Common/HTTP/IProfileService.cs b/src/Common/HTTP/IProfileService.cs index 9b49320f..c02668bb 100644 --- a/src/Common/HTTP/IProfileService.cs +++ b/src/Common/HTTP/IProfileService.cs @@ -1,8 +1,9 @@ using XClaim.Common.Dtos; +using XClaim.Common.Wrappers; namespace XClaim.Common.HTTP; public interface IProfileService { - Task GetAsync(); + Task> GetAsync(); Task SignOutAsync(); } \ No newline at end of file diff --git a/src/Common/HTTP/ProfileService.cs b/src/Common/HTTP/ProfileService.cs index fa07ffd1..2c396da8 100644 --- a/src/Common/HTTP/ProfileService.cs +++ b/src/Common/HTTP/ProfileService.cs @@ -1,5 +1,6 @@ using XClaim.Common.Dtos; using XClaim.Common.Service; +using XClaim.Common.Wrappers; namespace XClaim.Common.HTTP; @@ -11,8 +12,8 @@ public ProfileService(IHttpService http) { _http = http; } - public async Task GetAsync() { - return await _http.Get($"{RootApi}/account"); + public async Task> GetAsync() { + return await _http.Get>($"{RootApi}/account"); } public async Task SignOutAsync() { diff --git a/src/Web/Server/Modules/ProfileModule/ProfileModule.cs b/src/Web/Server/Modules/ProfileModule/ProfileModule.cs index 4250dd6e..10367f75 100644 --- a/src/Web/Server/Modules/ProfileModule/ProfileModule.cs +++ b/src/Web/Server/Modules/ProfileModule/ProfileModule.cs @@ -2,6 +2,7 @@ using IdentityModel; using Microsoft.AspNetCore.Authentication; using XClaim.Common.Dtos; +using XClaim.Common.Wrappers; using XClaim.Web.Server.Modules.UserModule; namespace XClaim.Web.Server.Modules.ProfileModule; @@ -19,8 +20,9 @@ public IEndpointRouteBuilder MapEndpoints(IEndpointRouteBuilder endpoints) { group.MapGet("/account", async (HttpRequest request, UserService user) => { bool isAuth = request.HttpContext.User.Identity?.IsAuthenticated ?? false; - - if (!isAuth) return Results.Unauthorized(); + + if (!isAuth) return TypedResults.Unauthorized(); + var auth = await request.HttpContext.AuthenticateAsync("Microsoft"); var email = request.HttpContext.User.FindFirst(ClaimTypes.Email)?.Value ?? ""; var role = request.HttpContext.User.FindFirst(ClaimTypes.Role)?.Value ?? ""; @@ -41,8 +43,7 @@ public IEndpointRouteBuilder MapEndpoints(IEndpointRouteBuilder endpoints) { LastName = names[^1], Phone = phone }; - } - else { + } else { profile = new ProfileResponse { Email = account.Email, FirstName = account.FirstName, @@ -54,8 +55,8 @@ public IEndpointRouteBuilder MapEndpoints(IEndpointRouteBuilder endpoints) { }; } - var response = new AuthResponse { - Confirmed = false, + var result = new AuthResponse { + Confirmed = account != null, ExpiryTimeStamp = expiry, ExpiresIn = expireIn, Token = token, @@ -65,7 +66,7 @@ public IEndpointRouteBuilder MapEndpoints(IEndpointRouteBuilder endpoints) { UserName = fullName }; - return Results.Ok(response); + return Results.Ok(new Response(result) { Succeeded = expireIn > 0 }); }).WithName("AccountProfile").WithOpenApi(); return group; From 31abcd36804acf460c86856b9fac0036abc3600a Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Thu, 26 Jan 2023 18:36:01 +0100 Subject: [PATCH 023/185] Move all auth action to AuthState --- src/Web/Shared/AuthProvider.cs | 9 ++-- src/Web/Shared/SharedServiceExtensions.cs | 6 ++- src/Web/Shared/States/AuthState.cs | 56 ++++++++++++++--------- src/Web/Shared/WebConst.cs | 1 + 4 files changed, 43 insertions(+), 29 deletions(-) diff --git a/src/Web/Shared/AuthProvider.cs b/src/Web/Shared/AuthProvider.cs index 5ea512a6..cf2bc9bb 100644 --- a/src/Web/Shared/AuthProvider.cs +++ b/src/Web/Shared/AuthProvider.cs @@ -6,7 +6,6 @@ namespace XClaim.Web.Shared; public class AuthProvider : AuthenticationStateProvider { - private const string SessionKey = "UserSession"; private readonly ISessionStorageService _sessionStorage; private readonly ClaimsPrincipal _anonymous = new ClaimsPrincipal(new ClaimsIdentity()); @@ -16,7 +15,7 @@ public AuthProvider(ISessionStorageService sessionStorage) { public override async Task GetAuthenticationStateAsync() { try { - var userSession = await _sessionStorage.GetAsync(SessionKey); + var userSession = await _sessionStorage.GetAsync(WebConst.SessionKey); if (userSession == null) return await Task.FromResult(new AuthenticationState(_anonymous)); var claimsPrincipal = new ClaimsPrincipal(new ClaimsIdentity(new List { @@ -41,11 +40,11 @@ public async Task UpdateAuthenticationState(AuthResponse? userSession) { new Claim(ClaimTypes.Role, userSession.Role) })); userSession.ExpiryTimeStamp = DateTime.Now.AddSeconds(userSession.ExpiresIn); - await _sessionStorage.SaveAsync(SessionKey, userSession); + await _sessionStorage.SaveAsync(WebConst.SessionKey, userSession); } else { claimsPrincipal = _anonymous; - await _sessionStorage.RemoveItemAsync(SessionKey); + await _sessionStorage.RemoveItemAsync(WebConst.SessionKey); } NotifyAuthenticationStateChanged(Task.FromResult(new AuthenticationState(claimsPrincipal))); @@ -56,7 +55,7 @@ public async Task UpdateAuthenticationState(AuthResponse? userSession) { public async Task GetToken() { var result = string.Empty; try { - var userSession = await _sessionStorage.GetAsync(SessionKey); + var userSession = await _sessionStorage.GetAsync(WebConst.SessionKey); if (userSession != null && DateTime.Now < userSession.ExpiryTimeStamp) result = userSession.Token; } catch { diff --git a/src/Web/Shared/SharedServiceExtensions.cs b/src/Web/Shared/SharedServiceExtensions.cs index a03811b7..8a7ee0b0 100644 --- a/src/Web/Shared/SharedServiceExtensions.cs +++ b/src/Web/Shared/SharedServiceExtensions.cs @@ -12,11 +12,13 @@ public static IServiceCollection UseSharedExtensions(this IServiceCollection ser services.AddMudServices(); services.AddBlazoredSessionStorage(); services.AddScoped(); + services.AddScoped(); + services.AddAuthorizationCore(); + + // App States services.AddSingleton(); services.AddSingleton(); services.AddScoped(); - services.AddScoped(); - services.AddAuthorizationCore(); return services; } diff --git a/src/Web/Shared/States/AuthState.cs b/src/Web/Shared/States/AuthState.cs index 73f84db6..fa5761a6 100644 --- a/src/Web/Shared/States/AuthState.cs +++ b/src/Web/Shared/States/AuthState.cs @@ -1,39 +1,51 @@ +using System.Security.Claims; +using Blazored.SessionStorage; using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components.Authorization; +using XClaim.Common.Dtos; using XClaim.Common.HTTP; -using XClaim.Common.Service; namespace XClaim.Web.Shared.States; public class AuthState : RootState { - public AuthState(AuthenticationStateProvider authProvider, NavigationManager nav, IProfileService userService) { + private readonly NavigationManager _nav; + private readonly IProfileService _profileService; + private readonly AuthenticationStateProvider _authProvider; + private readonly ISessionStorageService _sessionStorage; + + public AuthState(AuthenticationStateProvider authProvider, NavigationManager nav, IProfileService profileService, ISessionStorageService sessionStorage) { _authProvider = authProvider; - Nav = nav; - UserService = userService; + _nav = nav; + _profileService = profileService; + _sessionStorage = sessionStorage; } - private NavigationManager Nav { get; set; } - - private IProfileService UserService { get; set; } + public async Task GetSession() => await _sessionStorage.GetAsync(WebConst.SessionKey); - private readonly AuthenticationStateProvider _authProvider; + private AuthProvider Profile { get { + return (AuthProvider)_authProvider; + } + } - public bool Register { get; set; } + private async Task GetState() => await Profile.GetAuthenticationStateAsync(); - public async Task BootstrapAuth() { - var auth = (AuthProvider)_authProvider; - var authState = await auth.GetAuthenticationStateAsync(); - var user = authState.User; - var isAuth = user.Identity?.IsAuthenticated ?? false; + private async Task GetUser() => (await GetState()).User; - if (!isAuth) { - var profile = await UserService.GetAsync()!; - if (profile is not null) { - await auth.UpdateAuthenticationState(profile); - if (!profile.Confirmed) Register = true; - } - } + public async Task IsAuth() => (await GetUser()).Identity!.IsAuthenticated; + + public async Task TriggerAuthentication() { + var response = await _profileService.GetAsync(); + if (response is { Data: { }, Succeeded: true }) + await Profile.UpdateAuthenticationState(response.Data); + else + await Profile.UpdateAuthenticationState(null); + } + + public void TriggerApiAuth() => _nav.NavigateTo($"{_nav.BaseUri}{WebConst.ApiAuth}", true); - Nav.NavigateTo(Register ? $"/{WebConst.AppHome}" : $"/{WebConst.AppRegister}"); + public async Task TriggerSignOut() { + await _profileService.SignOutAsync(); + await Profile.UpdateAuthenticationState(null); + _nav.NavigateTo(WebConst.AppAuth, true); } } \ No newline at end of file diff --git a/src/Web/Shared/WebConst.cs b/src/Web/Shared/WebConst.cs index 30890050..a1e54b93 100644 --- a/src/Web/Shared/WebConst.cs +++ b/src/Web/Shared/WebConst.cs @@ -9,6 +9,7 @@ public static class WebConst { public const string AppHome = "app/overview"; public const string AppAuth = "app/auth"; public const string AppRegister = "app/registration"; + public const string SessionKey = "UserSession"; public static readonly DateRange AppDateRange = new DateRange(DateTime.Now.AddDays(-7), DateTime.Now); public static readonly int[] AppPaged = new[] { 25, 100, 250, 2000 }; public const string TableHeight = "calc(100vh - 256px)"; From 17d1ca4384e2b9d659b9fe39edbaa7e0fdd1e0ea Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Thu, 26 Jan 2023 18:36:18 +0100 Subject: [PATCH 024/185] Fix empty layout --- src/Web/Components/Layouts/EmptyLayout.razor | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Web/Components/Layouts/EmptyLayout.razor b/src/Web/Components/Layouts/EmptyLayout.razor index d099c374..5721c77a 100644 --- a/src/Web/Components/Layouts/EmptyLayout.razor +++ b/src/Web/Components/Layouts/EmptyLayout.razor @@ -1 +1,3 @@ -@inherits LayoutComponentBase \ No newline at end of file +@inherits LayoutComponentBase + +
@Body
\ No newline at end of file From 610bd4b78318a6b18cea1a9d9583d817e16ad81f Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Thu, 26 Jan 2023 18:36:33 +0100 Subject: [PATCH 025/185] Remove index redirect --- src/Web/Components/Pages/Index.razor | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/src/Web/Components/Pages/Index.razor b/src/Web/Components/Pages/Index.razor index 3d1cc1ff..a04ae91d 100644 --- a/src/Web/Components/Pages/Index.razor +++ b/src/Web/Components/Pages/Index.razor @@ -1,14 +1,8 @@ @page "/" -@inject AuthState Auth +@layout EmptyLayout -@code { +Bootstrapping - protected override async Task OnInitializedAsync() { - await base.OnInitializedAsync(); - await Auth.BootstrapAuth(); - } -} - -Bootstrapping... - - \ No newline at end of file + + + \ No newline at end of file From c1388a728d0e4b934742dee6301f732e50f05ade Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Thu, 26 Jan 2023 18:37:14 +0100 Subject: [PATCH 026/185] Use authState triggers in layout UI --- src/Web/Components/Layouts/AuthLayout.razor | 6 +++--- src/Web/Components/Shared/AppBar.razor | 15 ++------------- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/src/Web/Components/Layouts/AuthLayout.razor b/src/Web/Components/Layouts/AuthLayout.razor index 5eebb8d4..a025356b 100644 --- a/src/Web/Components/Layouts/AuthLayout.razor +++ b/src/Web/Components/Layouts/AuthLayout.razor @@ -1,9 +1,9 @@ @inherits LayoutComponentBase -@inject NavigationManager Nav +@inject AuthState AuthState @code { - void SignIn() => Nav.NavigateTo($"{Nav.BaseUri}{WebConst.ApiAuth}", true); - void SignOut() => Console.WriteLine("Trigger SignOut"); + void SignIn() => AuthState.TriggerApiAuth(); + async Task SignOut() => await AuthState.TriggerSignOut(); } diff --git a/src/Web/Components/Shared/AppBar.razor b/src/Web/Components/Shared/AppBar.razor index 002d98b0..131158c4 100644 --- a/src/Web/Components/Shared/AppBar.razor +++ b/src/Web/Components/Shared/AppBar.razor @@ -1,13 +1,7 @@ -@using Blazored.SessionStorage -@using XClaim.Common.Dtos -@using XClaim.Common.HTTP @implements IDisposable @inject AppState AppState @inject ThemeState ThemeState -@inject NavigationManager Nav -@inject IProfileService UserService -@inject ISessionStorageService SessionStorage -@inject AuthenticationStateProvider AuthProvider +@inject AuthState AuthState @code { protected override void OnInitialized() { @@ -21,12 +15,7 @@ ThemeState.OnChange -= StateHasChanged; } - async Task SignOut() { - var auth = (AuthProvider)AuthProvider; - await UserService.SignOutAsync(); - await auth.UpdateAuthenticationState(null); - Nav.NavigateTo(WebConst.AppAuth, true); - } + async Task SignOut() => await AuthState.TriggerSignOut(); } From 34ce024b5cc4daefdec5aa4610935181a0e34051 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Thu, 26 Jan 2023 18:37:53 +0100 Subject: [PATCH 027/185] Handle authentication in root component OnNavigateAsync --- src/Web/Client/App.razor | 51 +++++++++++++++++++++++++++++++--------- 1 file changed, 40 insertions(+), 11 deletions(-) diff --git a/src/Web/Client/App.razor b/src/Web/Client/App.razor index 0c73aa2c..fe243099 100644 --- a/src/Web/Client/App.razor +++ b/src/Web/Client/App.razor @@ -1,26 +1,55 @@ -@code { } +@inject NavigationManager Nav +@inject AuthState AuthState + +@code { + private async Task OnNavigateAsync(NavigationContext args) { + var isRootPath = args.Path.Equals(string.Empty); + var isAuthPath = args.Path.Equals(WebConst.AppAuth); + var session = await AuthState.GetSession(); + var isAuth = await AuthState.IsAuth(); + switch (isAuth) { + case true when !session!.Confirmed && !args.Path.Equals(WebConst.AppRegister): + Nav.NavigateTo(WebConst.AppRegister, true); + break; + case false when isAuthPath: + break; + case true when isAuthPath || isRootPath: + Nav.NavigateTo(WebConst.AppHome, true); + break; + case false when isRootPath: + await AuthState.TriggerAuthentication(); + if (isAuth) Nav.NavigateTo(!session!.Confirmed ? WebConst.AppRegister : WebConst.AppHome, true); + else { + await Task.Delay(50); + Nav.NavigateTo(WebConst.AppAuth, true); + } + break; + case false: { + break; + } + } + } +} - + - @if (context.User.Identity?.IsAuthenticated != true) { - - } else { -

You are not authorized to access this resource.

- } + @if (context.User.Identity?.IsAuthenticated != true) { + + } else { +

You are not authorized to access this resource.

+ } - @* @if (Register) { *@ - @* *@ - @* } *@ + ... - Not found + Not Found

Sorry, there's nothing at this address.

 From 32625e52f5cc8131ef6b9d62dd8528cec497f58f Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Thu, 26 Jan 2023 18:38:29 +0100 Subject: [PATCH 028/185] Added initial registration binding --- .../Pages/Startup/Registration.razor | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/src/Web/Components/Pages/Startup/Registration.razor b/src/Web/Components/Pages/Startup/Registration.razor index c8860fb0..bfbb7064 100644 --- a/src/Web/Components/Pages/Startup/Registration.razor +++ b/src/Web/Components/Pages/Startup/Registration.razor @@ -1,11 +1,13 @@ @page "/app/registration" @using XClaim.Common.Dtos @using XClaim.Common.Helpers +@using Nextended.Core.Extensions @inject IUserService Http @inject ICompanyService CompanyService @inject ICurrencyService CurrencyService @inject NavigationManager Nav @inject ISnackbar Snackbar +@inject AuthState AuthState @attribute [Authorize] @code { @@ -27,6 +29,19 @@ protected override async Task OnInitializedAsync() { await base.OnInitializedAsync(); + var session = await AuthState.GetSession(); + + if (session?.Data != null) { + ProfileResponse data = session.Data; + + // Check domain validation + if (data.Email.IsNullOrEmpty()) await AuthState.TriggerSignOut(); + + Item.FirstName = data.FirstName; + Item.LastName = data.LastName; + Item.Email = data.Email; + Item.Phone = data.Phone; + } } async Task Verify() { @@ -34,9 +49,10 @@ Item.CurrencyId = Currency?.Id; var result = await Http.RegistrationAsync(Item); if (result.Succeeded) { + await AuthState.TriggerAuthentication(); Snackbar.Add("Verification successful..", Severity.Success); - await Task.Delay(1500); - Nav.NavigateTo(WebConst.AppHome); + await Task.Delay(500); + Nav.NavigateTo(WebConst.AppHome, true); } else { Snackbar.Add("Verification failed..", Severity.Error); } From c87e16097f8d9a7e9e8918c1c0d83d38b328728b Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Thu, 26 Jan 2023 22:49:30 +0100 Subject: [PATCH 029/185] Re-arrange user permission enum --- src/Common/Enums/UserPermission.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Common/Enums/UserPermission.cs b/src/Common/Enums/UserPermission.cs index b33a0554..7d7314fa 100644 --- a/src/Common/Enums/UserPermission.cs +++ b/src/Common/Enums/UserPermission.cs @@ -1,10 +1,10 @@ namespace XClaim.Common.Enums; public enum UserPermission { + System, + Administrator, + Finance, Cashier, - Standard, Lead, - Finance, - Administrator, - System + Standard } \ No newline at end of file From 7143fc9c24c34945245f0e832cebf0e18c264317 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Thu, 26 Jan 2023 22:50:05 +0100 Subject: [PATCH 030/185] Added extension for lazy DI resolution --- .../Extensions/LazyResolutionExtension.cs | 19 +++++++++++++++++++ src/Common/HTTP/HttpServiceExtensions.cs | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 src/Common/Extensions/LazyResolutionExtension.cs diff --git a/src/Common/Extensions/LazyResolutionExtension.cs b/src/Common/Extensions/LazyResolutionExtension.cs new file mode 100644 index 00000000..8d894d7d --- /dev/null +++ b/src/Common/Extensions/LazyResolutionExtension.cs @@ -0,0 +1,19 @@ +using Microsoft.Extensions.DependencyInjection; + +namespace XClaim.Common.Extensions; + +public static class LazyResolutionExtension { + public static IServiceCollection AddLazyResolution(this IServiceCollection services) + { + return services.AddTransient( + typeof(Lazy<>), + typeof(LazilyResolved<>)); + } + + private class LazilyResolved : Lazy where T : notnull { + public LazilyResolved(IServiceProvider serviceProvider) + : base(serviceProvider.GetRequiredService) + { + } + } +} \ No newline at end of file diff --git a/src/Common/HTTP/HttpServiceExtensions.cs b/src/Common/HTTP/HttpServiceExtensions.cs index 68cdde4b..a1d79d69 100644 --- a/src/Common/HTTP/HttpServiceExtensions.cs +++ b/src/Common/HTTP/HttpServiceExtensions.cs @@ -1,9 +1,11 @@ using Microsoft.Extensions.DependencyInjection; +using XClaim.Common.Extensions; namespace XClaim.Common.HTTP; public static class HttpServiceExtensions { public static IServiceCollection UseHttpServices(this IServiceCollection services) { + services.AddLazyResolution(); services.AddScoped(); services.AddScoped(); services.AddScoped(); From 6c217270126fd0d2bec1241eb39016f2af52b256 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Thu, 26 Jan 2023 22:50:13 +0100 Subject: [PATCH 031/185] Update HomeView.cs --- src/Mobile/Views/Home/HomeView.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Mobile/Views/Home/HomeView.cs b/src/Mobile/Views/Home/HomeView.cs index f5630114..6ec0517a 100644 --- a/src/Mobile/Views/Home/HomeView.cs +++ b/src/Mobile/Views/Home/HomeView.cs @@ -228,13 +228,13 @@ private async void HandleSelectionChanged(object? sender, SelectionChangedEventA public partial class HomeViewModel : ListViewModel { [ObservableProperty] private ObservableCollection? _recentItems; - [ObservableProperty] private ProfileResponse? _status; + [ObservableProperty] private UserResponse? _status; [RelayCommand] private async Task LoadDefaults() { IsLoading = true; await Task.Delay(500); - Status = new ProfileResponse { FirstName = "Saurav", LastName = "Argawal", Balance = 2000, Permission = UserPermission.Administrator }; + Status = new UserResponse { FirstName = "Saurav", LastName = "Argawal", Balance = 2000, Permission = UserPermission.Administrator }; RecentItems = new ObservableCollection { }; IsLoading = false; } From f177652a30bf3d4ce3e8d078dbbcdfd0f3195e96 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Thu, 26 Jan 2023 22:51:03 +0100 Subject: [PATCH 032/185] Update type on auth response --- src/Common/Dtos/AuthResponse.cs | 2 +- src/Web/Client/App.razor | 1 + .../Pages/Startup/Registration.razor | 3 +- .../Modules/ProfileModule/ProfileModule.cs | 46 ++++++++----------- 4 files changed, 21 insertions(+), 31 deletions(-) diff --git a/src/Common/Dtos/AuthResponse.cs b/src/Common/Dtos/AuthResponse.cs index 805e3222..c84e8bee 100644 --- a/src/Common/Dtos/AuthResponse.cs +++ b/src/Common/Dtos/AuthResponse.cs @@ -8,5 +8,5 @@ public class AuthResponse { public string Message { get; set; } = string.Empty; public string UserName { get; set; } = string.Empty; public string Role { get; set; } = string.Empty; - public ProfileResponse? Data { get; set; } + public UserResponse? Data { get; set; } } \ No newline at end of file diff --git a/src/Web/Client/App.razor b/src/Web/Client/App.razor index fe243099..71a59b56 100644 --- a/src/Web/Client/App.razor +++ b/src/Web/Client/App.razor @@ -7,6 +7,7 @@ var isAuthPath = args.Path.Equals(WebConst.AppAuth); var session = await AuthState.GetSession(); var isAuth = await AuthState.IsAuth(); + switch (isAuth) { case true when !session!.Confirmed && !args.Path.Equals(WebConst.AppRegister): Nav.NavigateTo(WebConst.AppRegister, true); diff --git a/src/Web/Components/Pages/Startup/Registration.razor b/src/Web/Components/Pages/Startup/Registration.razor index bfbb7064..810cb2bc 100644 --- a/src/Web/Components/Pages/Startup/Registration.razor +++ b/src/Web/Components/Pages/Startup/Registration.razor @@ -32,8 +32,7 @@ var session = await AuthState.GetSession(); if (session?.Data != null) { - ProfileResponse data = session.Data; - + UserResponse data = session.Data; // Check domain validation if (data.Email.IsNullOrEmpty()) await AuthState.TriggerSignOut(); diff --git a/src/Web/Server/Modules/ProfileModule/ProfileModule.cs b/src/Web/Server/Modules/ProfileModule/ProfileModule.cs index 10367f75..45198a45 100644 --- a/src/Web/Server/Modules/ProfileModule/ProfileModule.cs +++ b/src/Web/Server/Modules/ProfileModule/ProfileModule.cs @@ -2,6 +2,7 @@ using IdentityModel; using Microsoft.AspNetCore.Authentication; using XClaim.Common.Dtos; +using XClaim.Common.Enums; using XClaim.Common.Wrappers; using XClaim.Web.Server.Modules.UserModule; @@ -19,43 +20,34 @@ public IEndpointRouteBuilder MapEndpoints(IEndpointRouteBuilder endpoints) { var group = endpoints.MapGroup(url).WithTags(name); group.MapGet("/account", async (HttpRequest request, UserService user) => { - bool isAuth = request.HttpContext.User.Identity?.IsAuthenticated ?? false; - + var userContext = request.HttpContext.User; + bool isAuth = userContext.Identity?.IsAuthenticated ?? false; if (!isAuth) return TypedResults.Unauthorized(); var auth = await request.HttpContext.AuthenticateAsync("Microsoft"); - var email = request.HttpContext.User.FindFirst(ClaimTypes.Email)?.Value ?? ""; - var role = request.HttpContext.User.FindFirst(ClaimTypes.Role)?.Value ?? ""; - var fullName = request.HttpContext.User.FindFirst(ClaimTypes.Name)?.Value ?? ""; - var phone = request.HttpContext.User.FindFirst(ClaimTypes.MobilePhone)?.Value ?? ""; + var email = userContext.FindFirst(ClaimTypes.Email)?.Value ?? ""; + var fullName = userContext.FindFirst(ClaimTypes.Name)?.Value ?? ""; + var phone = userContext.FindFirst(ClaimTypes.HomePhone)?.Value ?? ""; var names = fullName.Split(" "); var token = auth?.Properties?.GetTokenValue("access_token"); var expiry = (auth?.Properties?.ExpiresUtc?.ToUnixTimeSeconds() ?? -1).ToDateTimeFromEpoch(); var expireIn = (int)expiry.Subtract(DateTime.Now).TotalSeconds; - ProfileResponse? profile; + UserResponse? profile = new UserResponse(); var account = (await user.GetByEmailAsync(email)).Data; - - if (account is null) { - profile = new ProfileResponse { - Email = email, - FirstName = names[0], - LastName = names[^1], - Phone = phone - }; + if (account == null) { + profile.Email = email; + profile.FirstName = names[0]; + profile.LastName = names[^1]; + profile.Phone = phone; } else { - profile = new ProfileResponse { - Email = account.Email, - FirstName = account.FirstName, - LastName = account.LastName, - Phone = account.LastName, - Permission = account.Permission, - Balance = account.Balance, - Team = account.Team - }; + profile = account; } + + var role = account?.Permission != null ? + account.Permission.ToString() : userContext.FindFirst(ClaimTypes.Role)?.Value ?? UserPermission.Standard.ToString(); - var result = new AuthResponse { + return Results.Ok(new Response(new AuthResponse { Confirmed = account != null, ExpiryTimeStamp = expiry, ExpiresIn = expireIn, @@ -64,9 +56,7 @@ public IEndpointRouteBuilder MapEndpoints(IEndpointRouteBuilder endpoints) { Message = "Success", Data = profile, UserName = fullName - }; - - return Results.Ok(new Response(result) { Succeeded = expireIn > 0 }); + }) { Succeeded = expireIn > 0 }); }).WithName("AccountProfile").WithOpenApi(); return group; From 31573dbb606e9a0f3a6c760a7451a9e0b85b02fa Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Thu, 26 Jan 2023 22:51:38 +0100 Subject: [PATCH 033/185] Added company, team and currency data to user response --- src/Web/Server/Modules/UserModule/UserService.cs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Web/Server/Modules/UserModule/UserService.cs b/src/Web/Server/Modules/UserModule/UserService.cs index efbb8490..2f11a263 100644 --- a/src/Web/Server/Modules/UserModule/UserService.cs +++ b/src/Web/Server/Modules/UserModule/UserService.cs @@ -14,7 +14,11 @@ public UserService(ServerContext ctx, IMapper mapper, ILogger logge public async Task> GetByEmailAsync(string email) { var item = await _ctx.Users .Where(x => x.DeletedAt == null) - .FirstOrDefaultAsync(u => u.Email == email); + .Where(x => x.Email == email) + .Include(x => x.Company) + .Include(x => x.Team) + .Include(x => x.Currency) + .FirstOrDefaultAsync(); var data = _mapper.Map(item); return new Response { @@ -58,6 +62,7 @@ public async Task>> GetAllAsync(UserFilter resp .Where(x => x.Id == id) .Include(x => x.Company) .Include(x => x.Team) + .Include(x => x.Currency) .FirstOrDefaultAsync(); var data = _mapper.Map(item); response.Data = data; From b493a71702a4c9e2beff4c829da368309cd81039 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Thu, 26 Jan 2023 22:51:59 +0100 Subject: [PATCH 034/185] Added token to request header --- src/Web/Shared/HttpService.cs | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/Web/Shared/HttpService.cs b/src/Web/Shared/HttpService.cs index 39e50ccb..4321f509 100644 --- a/src/Web/Shared/HttpService.cs +++ b/src/Web/Shared/HttpService.cs @@ -1,23 +1,23 @@ -using Microsoft.AspNetCore.Components; +using System.Net.Http.Headers; using XClaim.Common.Service; +using XClaim.Web.Shared.States; namespace XClaim.Web.Shared; public class HttpService : AbstractHttpService { - private readonly NavigationManager _navigation; + private readonly Lazy _state; - public HttpService(HttpClient http, NavigationManager navigation) : base(http) { - _navigation = navigation; + public HttpService(HttpClient http, Lazy state) : base(http) { + _state = state; } + protected override async Task AddJwtHeader(HttpRequestMessage request) { - // var user = await _localStorageService.GetItem("user"); - // var isApiUrl = !request.RequestUri.IsAbsoluteUri; - // if (user != null && isApiUrl) - // request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", user.Token); - await Task.CompletedTask; + var user = await _state.Value.GetSession(); + var isApiUrl = !request!.RequestUri!.IsAbsoluteUri; + if (user != null && isApiUrl) + request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", user.Token); } protected override async Task SignOut() { - _navigation.NavigateTo(""); - await Task.CompletedTask; + await _state.Value.TriggerSignOut(); } } \ No newline at end of file From 759c547b41cac903d20707518bac960f2cb69d9a Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Fri, 27 Jan 2023 00:24:52 +0100 Subject: [PATCH 035/185] Update AbstractHttpService.cs --- src/Common/Service/AbstractHttpService.cs | 44 ++++++++++++++--------- 1 file changed, 27 insertions(+), 17 deletions(-) diff --git a/src/Common/Service/AbstractHttpService.cs b/src/Common/Service/AbstractHttpService.cs index f8187424..cc32cdf1 100644 --- a/src/Common/Service/AbstractHttpService.cs +++ b/src/Common/Service/AbstractHttpService.cs @@ -70,30 +70,40 @@ private HttpRequestMessage CreateRequest(HttpMethod method, string uri, object? private async Task SendRequest(HttpRequestMessage request) { await AddJwtHeader(request); - using var response = await _http.SendAsync(request); - if (response.StatusCode == HttpStatusCode.Unauthorized) { - await SignOut(); - return; + try { + using var response = await _http.SendAsync(request); + if (response.StatusCode == HttpStatusCode.Unauthorized) { + await SignOut(); + return; + } + await HandleErrors(response); + } + catch (Exception) { + Console.WriteLine("A HTTP callback error occurred"); } - - await HandleErrors(response); } private async Task SendRequest(HttpRequestMessage request) { await AddJwtHeader(request); - using var response = await _http.SendAsync(request); - if (response.StatusCode == HttpStatusCode.Unauthorized) { - await SignOut(); - return default!; + try { + using var response = await _http.SendAsync(request); + if (response.StatusCode == HttpStatusCode.Unauthorized) { + await SignOut(); + return default!; + } + await HandleErrors(response); + var options = new JsonSerializerOptions { + PropertyNameCaseInsensitive = true + }; + options.Converters.Add(new StringConverter()); + + return (await response.Content.ReadFromJsonAsync(options))!; + } + catch (Exception) { + Console.WriteLine("A HTTP callback error occurred"); } - await HandleErrors(response); - var options = new JsonSerializerOptions { - PropertyNameCaseInsensitive = true - }; - options.Converters.Add(new StringConverter()); - - return (await response.Content.ReadFromJsonAsync(options))!; + return default!; } protected abstract Task AddJwtHeader(HttpRequestMessage request); From 506683d8a963d9d18e1ee02e42df98fce595d5c8 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Fri, 27 Jan 2023 01:00:24 +0100 Subject: [PATCH 036/185] Improve role permissions --- src/Web/Client/App.razor | 3 --- src/Web/Components/Pages/Reviews/Index.razor | 2 +- src/Web/Components/Pages/Settings/Bank/Index.razor | 2 +- src/Web/Components/Pages/Settings/Category/Index.razor | 2 +- src/Web/Components/Pages/Settings/Company/Index.razor | 2 +- src/Web/Components/Pages/Settings/Currency/Index.razor | 2 +- src/Web/Components/Pages/Settings/Domains/Index.razor | 2 +- src/Web/Components/Pages/Settings/Server.razor | 2 +- src/Web/Components/Pages/Settings/Teams/Index.razor | 2 +- src/Web/Components/Pages/Transactions/Index.razor | 2 +- src/Web/Components/Pages/User/Index.razor | 3 ++- src/Web/Server/Modules/ProfileModule/ProfileModule.cs | 4 ++-- 12 files changed, 13 insertions(+), 15 deletions(-) diff --git a/src/Web/Client/App.razor b/src/Web/Client/App.razor index 71a59b56..6e6b41e1 100644 --- a/src/Web/Client/App.razor +++ b/src/Web/Client/App.razor @@ -44,9 +44,6 @@

You are not authorized to access this resource.

} - - ... - diff --git a/src/Web/Components/Pages/Reviews/Index.razor b/src/Web/Components/Pages/Reviews/Index.razor index a6ca3bc2..407fcdeb 100644 --- a/src/Web/Components/Pages/Reviews/Index.razor +++ b/src/Web/Components/Pages/Reviews/Index.razor @@ -2,7 +2,7 @@ @using XClaim.Common.Helpers @inject IClaimService Http @page "/app/reviews" -@attribute [Authorize] +@attribute [Authorize(Roles = "System, Administrator, Finance, Lead")] @code { private string Search { get; set; } = string.Empty; diff --git a/src/Web/Components/Pages/Settings/Bank/Index.razor b/src/Web/Components/Pages/Settings/Bank/Index.razor index e9985e5c..a298e16c 100644 --- a/src/Web/Components/Pages/Settings/Bank/Index.razor +++ b/src/Web/Components/Pages/Settings/Bank/Index.razor @@ -2,7 +2,7 @@ @using XClaim.Common.Helpers @inject IBankService Http @page "/app/settings/banks" -@attribute [Authorize] +@attribute [Authorize(Roles = "System, Administrator")] @code { private string Search { get; set; } = string.Empty; diff --git a/src/Web/Components/Pages/Settings/Category/Index.razor b/src/Web/Components/Pages/Settings/Category/Index.razor index f76543fc..23d3c7c2 100644 --- a/src/Web/Components/Pages/Settings/Category/Index.razor +++ b/src/Web/Components/Pages/Settings/Category/Index.razor @@ -2,7 +2,7 @@ @using XClaim.Common.Helpers @inject ICategoryService Http @page "/app/settings/category" -@attribute [Authorize] +@attribute [Authorize(Roles = "System, Administrator")] @code { private string Search { get; set; } = string.Empty; diff --git a/src/Web/Components/Pages/Settings/Company/Index.razor b/src/Web/Components/Pages/Settings/Company/Index.razor index 912bab69..3be40e84 100644 --- a/src/Web/Components/Pages/Settings/Company/Index.razor +++ b/src/Web/Components/Pages/Settings/Company/Index.razor @@ -2,7 +2,7 @@ @using XClaim.Common.Helpers @inject ICompanyService Http @page "/app/settings/companies" -@attribute [Authorize] +@attribute [Authorize(Roles = "System")] @code { private string Search { get; set; } = string.Empty; diff --git a/src/Web/Components/Pages/Settings/Currency/Index.razor b/src/Web/Components/Pages/Settings/Currency/Index.razor index 4d1b1a53..ef389a8b 100644 --- a/src/Web/Components/Pages/Settings/Currency/Index.razor +++ b/src/Web/Components/Pages/Settings/Currency/Index.razor @@ -2,7 +2,7 @@ @using XClaim.Common.Helpers @inject ICurrencyService Http @page "/app/settings/currency" -@attribute [Authorize] +@attribute [Authorize(Roles = "System")] @code { private string Search { get; set; } = string.Empty; diff --git a/src/Web/Components/Pages/Settings/Domains/Index.razor b/src/Web/Components/Pages/Settings/Domains/Index.razor index b6c180d3..ed51f1fe 100644 --- a/src/Web/Components/Pages/Settings/Domains/Index.razor +++ b/src/Web/Components/Pages/Settings/Domains/Index.razor @@ -2,7 +2,7 @@ @using XClaim.Common.Helpers @inject IDomainService Http @page "/app/settings/domains" -@attribute [Authorize] +@attribute [Authorize(Roles = "System")] @code { private string Search { get; set; } = string.Empty; diff --git a/src/Web/Components/Pages/Settings/Server.razor b/src/Web/Components/Pages/Settings/Server.razor index b993f9b3..05f1b4ef 100644 --- a/src/Web/Components/Pages/Settings/Server.razor +++ b/src/Web/Components/Pages/Settings/Server.razor @@ -1,6 +1,6 @@ @inject NavigationManager Nav @page "/app/settings/server" -@attribute [Authorize] +@attribute [Authorize(Roles = "System")] @code { } diff --git a/src/Web/Components/Pages/Settings/Teams/Index.razor b/src/Web/Components/Pages/Settings/Teams/Index.razor index c3072ee5..db65bf47 100644 --- a/src/Web/Components/Pages/Settings/Teams/Index.razor +++ b/src/Web/Components/Pages/Settings/Teams/Index.razor @@ -2,7 +2,7 @@ @using XClaim.Common.Helpers @inject ITeamService Http @page "/app/settings/teams" -@attribute [Authorize] +@attribute [Authorize(Roles = "System, Administrator")] @code { private string Search { get; set; } = string.Empty; diff --git a/src/Web/Components/Pages/Transactions/Index.razor b/src/Web/Components/Pages/Transactions/Index.razor index f228518c..c62fd610 100644 --- a/src/Web/Components/Pages/Transactions/Index.razor +++ b/src/Web/Components/Pages/Transactions/Index.razor @@ -2,7 +2,7 @@ @using XClaim.Common.Helpers @inject IPaymentService Http @page "/app/transactions" -@attribute [Authorize] +@attribute [Authorize(Roles = "System, Administrator, Finance, Cashier")] @code { private string Search { get; set; } = string.Empty; diff --git a/src/Web/Components/Pages/User/Index.razor b/src/Web/Components/Pages/User/Index.razor index 8364776f..718fdb1c 100644 --- a/src/Web/Components/Pages/User/Index.razor +++ b/src/Web/Components/Pages/User/Index.razor @@ -1,8 +1,9 @@ @using XClaim.Common.Dtos +@using XClaim.Common.Enums @using XClaim.Common.Helpers @page "/app/users" @inject IUserService Http -@attribute [Authorize] +@attribute [Authorize(Roles = "System, Administrator")] @code { private string Search { get; set; } = string.Empty; diff --git a/src/Web/Server/Modules/ProfileModule/ProfileModule.cs b/src/Web/Server/Modules/ProfileModule/ProfileModule.cs index 45198a45..49ccb167 100644 --- a/src/Web/Server/Modules/ProfileModule/ProfileModule.cs +++ b/src/Web/Server/Modules/ProfileModule/ProfileModule.cs @@ -43,9 +43,9 @@ public IEndpointRouteBuilder MapEndpoints(IEndpointRouteBuilder endpoints) { } else { profile = account; } - + var role = account?.Permission != null ? - account.Permission.ToString() : userContext.FindFirst(ClaimTypes.Role)?.Value ?? UserPermission.Standard.ToString(); + Enum.GetName(account.Permission)! : userContext.FindFirst(ClaimTypes.Role)?.Value ?? Enum.GetName(UserPermission.Standard)!; return Results.Ok(new Response(new AuthResponse { Confirmed = account != null, From 3d6b14150d961848c81e98b4eb5e6f04c245039e Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Fri, 27 Jan 2023 08:31:32 +0100 Subject: [PATCH 037/185] Added 404 and UnAuthorized banner --- src/Web/Client/App.razor | 19 ++++++++++++++----- src/Web/Components/Pages/Startup/Auth.razor | 3 --- src/Web/Components/Shared/ErrorFound.razor | 12 ++++++++++++ src/Web/Components/Shared/NotAuthorized.razor | 12 ++++++++++++ src/Web/Components/Shared/UnAuthorized.razor | 1 - src/Web/Components/wwwroot/vectors/404.svg | 1 + .../wwwroot/vectors/not_permitted.svg | 1 + 7 files changed, 40 insertions(+), 9 deletions(-) create mode 100644 src/Web/Components/Shared/ErrorFound.razor create mode 100644 src/Web/Components/Shared/NotAuthorized.razor delete mode 100644 src/Web/Components/Shared/UnAuthorized.razor create mode 100644 src/Web/Components/wwwroot/vectors/404.svg create mode 100644 src/Web/Components/wwwroot/vectors/not_permitted.svg diff --git a/src/Web/Client/App.razor b/src/Web/Client/App.razor index 6e6b41e1..a9cd5f20 100644 --- a/src/Web/Client/App.razor +++ b/src/Web/Client/App.razor @@ -41,16 +41,25 @@ @if (context.User.Identity?.IsAuthenticated != true) { } else { -

You are not authorized to access this resource.

+ } - Not Found - -

Sorry, there's nothing at this address.

- + Not Found + + + + + + + + + + + + diff --git a/src/Web/Components/Pages/Startup/Auth.razor b/src/Web/Components/Pages/Startup/Auth.razor index 6a7736d1..541d357e 100644 --- a/src/Web/Components/Pages/Startup/Auth.razor +++ b/src/Web/Components/Pages/Startup/Auth.razor @@ -9,7 +9,4 @@ - - Home - \ No newline at end of file diff --git a/src/Web/Components/Shared/ErrorFound.razor b/src/Web/Components/Shared/ErrorFound.razor new file mode 100644 index 00000000..b079dac1 --- /dev/null +++ b/src/Web/Components/Shared/ErrorFound.razor @@ -0,0 +1,12 @@ +@inject NavigationManager Nav +@code { + private void BackHome() => Nav.NavigateTo(WebConst.AppHome); +} + + + + + Page Not Found + Home + + \ No newline at end of file diff --git a/src/Web/Components/Shared/NotAuthorized.razor b/src/Web/Components/Shared/NotAuthorized.razor new file mode 100644 index 00000000..6c32e51d --- /dev/null +++ b/src/Web/Components/Shared/NotAuthorized.razor @@ -0,0 +1,12 @@ +@inject NavigationManager Nav +@code { + private void BackHome() => Nav.NavigateTo(WebConst.AppHome); +} + + + + + Role Not Authorized + Home + + \ No newline at end of file diff --git a/src/Web/Components/Shared/UnAuthorized.razor b/src/Web/Components/Shared/UnAuthorized.razor deleted file mode 100644 index 7437745a..00000000 --- a/src/Web/Components/Shared/UnAuthorized.razor +++ /dev/null @@ -1 +0,0 @@ -

unauthorzed

diff --git a/src/Web/Components/wwwroot/vectors/404.svg b/src/Web/Components/wwwroot/vectors/404.svg new file mode 100644 index 00000000..8735cf86 --- /dev/null +++ b/src/Web/Components/wwwroot/vectors/404.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/Web/Components/wwwroot/vectors/not_permitted.svg b/src/Web/Components/wwwroot/vectors/not_permitted.svg new file mode 100644 index 00000000..1e569852 --- /dev/null +++ b/src/Web/Components/wwwroot/vectors/not_permitted.svg @@ -0,0 +1 @@ + \ No newline at end of file From ccc01fc7ab4e716796f4914e2b9c3557040b61af Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Fri, 27 Jan 2023 12:12:31 +0100 Subject: [PATCH 038/185] Fix permission --- src/Web/Components/Pages/Settings/Bank/Index.razor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Web/Components/Pages/Settings/Bank/Index.razor b/src/Web/Components/Pages/Settings/Bank/Index.razor index a298e16c..75dc8cac 100644 --- a/src/Web/Components/Pages/Settings/Bank/Index.razor +++ b/src/Web/Components/Pages/Settings/Bank/Index.razor @@ -2,7 +2,7 @@ @using XClaim.Common.Helpers @inject IBankService Http @page "/app/settings/banks" -@attribute [Authorize(Roles = "System, Administrator")] +@attribute [Authorize(Roles = "System")] @code { private string Search { get; set; } = string.Empty; From 7d37f98975d6d41575e1dfead9d56a19227332e3 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Fri, 27 Jan 2023 12:13:05 +0100 Subject: [PATCH 039/185] Added currency code to module --- src/Common/Dtos/CurrencyResponse.cs | 1 + .../Pages/Settings/Currency/Index.razor | 1 + .../Settings/Currency/MutateCurrency.razor | 22 +++++++++---------- src/Web/Server/Data/DbInitializer.cs | 20 +++++++++-------- src/Web/Server/Entities/CurrencyEntity.cs | 5 ++++- 5 files changed, 28 insertions(+), 21 deletions(-) diff --git a/src/Common/Dtos/CurrencyResponse.cs b/src/Common/Dtos/CurrencyResponse.cs index 1785e328..80892b80 100644 --- a/src/Common/Dtos/CurrencyResponse.cs +++ b/src/Common/Dtos/CurrencyResponse.cs @@ -6,6 +6,7 @@ public class CurrencyResponse : BaseResponse { public string Name { get; set; } = string.Empty; public string Symbol { get; set; } = string.Empty; + public string Code { get; set; } = string.Empty; public decimal Rate { get; set; } public string Description { get; set; } = string.Empty; public bool Active { get; set; } diff --git a/src/Web/Components/Pages/Settings/Currency/Index.razor b/src/Web/Components/Pages/Settings/Currency/Index.razor index ef389a8b..f6b17619 100644 --- a/src/Web/Components/Pages/Settings/Currency/Index.razor +++ b/src/Web/Components/Pages/Settings/Currency/Index.razor @@ -58,6 +58,7 @@ + diff --git a/src/Web/Components/Pages/Settings/Currency/MutateCurrency.razor b/src/Web/Components/Pages/Settings/Currency/MutateCurrency.razor index a6aab2ea..1b3aa0ee 100644 --- a/src/Web/Components/Pages/Settings/Currency/MutateCurrency.razor +++ b/src/Web/Components/Pages/Settings/Currency/MutateCurrency.razor @@ -55,27 +55,27 @@ - - - - + - - + + - - + + + + + - + - + @@ -83,6 +83,6 @@ - @ActionText + @ActionText \ No newline at end of file diff --git a/src/Web/Server/Data/DbInitializer.cs b/src/Web/Server/Data/DbInitializer.cs index 51415ec3..4f8858be 100644 --- a/src/Web/Server/Data/DbInitializer.cs +++ b/src/Web/Server/Data/DbInitializer.cs @@ -32,18 +32,21 @@ public void Seed() { var domains = new List { new DomainEntity { Id = Guid.NewGuid(), CreatedAt = time, Address = "tolaram.com" }, new DomainEntity { Id = Guid.NewGuid(), CreatedAt = time, Address = "dufil.com" }, - new DomainEntity { Id = Guid.NewGuid(), CreatedAt = time, Address = "agboolas@outlook.com"} + new DomainEntity { Id = Guid.NewGuid(), CreatedAt = time, Address = "outlook.com"} }; var currencies = new List { - new CurrencyEntity { Id = Guid.NewGuid(), CreatedAt = time, Name = "Naira", Symbol = "₦" }, - new CurrencyEntity { Id = Guid.NewGuid(), CreatedAt = time, Name = "Dollar", Symbol = "$" } + new CurrencyEntity { Id = Guid.NewGuid(), CreatedAt = time, Name = "Naira", Code = "NGN", Symbol = "₦" }, + new CurrencyEntity { Id = Guid.NewGuid(), CreatedAt = time, Name = "US Dollar", Code = "USD", Symbol = "$" }, + new CurrencyEntity { Id = Guid.NewGuid(), CreatedAt = time, Name = "Euro", Code = "EUR", Symbol = "€" }, + new CurrencyEntity { Id = Guid.NewGuid(), CreatedAt = time, Name = "British Pounds", Code = "GBP", Symbol = "£" }, + new CurrencyEntity { Id = Guid.NewGuid(), CreatedAt = time, Name = "Rupee", Code = "INR", Symbol = "₹" } }; var companies = new List { - new CompanyEntity() { Id = Guid.NewGuid(), CreatedAt = time, ShortName = "BHN LTD", FullName = "MCPL LTD - BHN Division" }, + new CompanyEntity() { Id = Guid.NewGuid(), CreatedAt = time, ShortName = "BHN Logistics", FullName = "MCPL LTD - BHN Division" }, new CompanyEntity() { Id = Guid.NewGuid(), CreatedAt = time, ShortName = "MCPL LTD", FullName = "Multi Consumer Product LTD" }, - new CompanyEntity() { Id = Guid.NewGuid(), CreatedAt = time, ShortName = "Dufil", FullName = "Dufil Prima Foods Plc" } + new CompanyEntity() { Id = Guid.NewGuid(), CreatedAt = time, ShortName = "Dufil Prima", FullName = "Dufil Prima Foods Plc" } }; var categories = new List { @@ -56,13 +59,12 @@ public void Seed() { var teams = new List { new TeamEntity { Id = Guid.NewGuid(), CreatedAt = time, Name = "Account Dept", CompanyId = companies[0].Id }, new TeamEntity { Id = Guid.NewGuid(), CreatedAt = time, Name = "Logistics Dept", CompanyId = companies[1].Id }, - new TeamEntity { Id = Guid.NewGuid(), CreatedAt = time, Name = "QA Dept", CompanyId = companies[2].Id } + new TeamEntity { Id = Guid.NewGuid(), CreatedAt = time, Name = "Packaging Dept", CompanyId = companies[2].Id } }; var users = new List { - new UserEntity { Id = Guid.NewGuid(), CreatedAt = time, Permission = UserPermission.Administrator, FirstName = "John", LastName = "Doe", Email = "john.doe@test.com", Phone = "+23401", TeamId = teams[0].Id,CompanyId = companies[0].Id }, - new UserEntity { Id = Guid.NewGuid(), CreatedAt = time, FirstName = "Jane", LastName = "Doe", Email = "jane.doe@test.com", Phone = "+23402", TeamId = teams[1].Id, CompanyId = companies[1].Id }, - new UserEntity { Id = Guid.NewGuid(), CreatedAt = time, FirstName = "Johnny ", LastName = "Test", Email = "johnny.test@test.com", Phone = "+23403", TeamId = teams[2].Id, CompanyId = companies[2].Id }, + new UserEntity { Id = Guid.NewGuid(), CreatedAt = time, FirstName = "John", LastName = "Doe", Email = "john.doe@tolaram.com", Phone = "+234012345567", TeamId = teams[0].Id, CompanyId = companies[0].Id }, + new UserEntity { Id = Guid.NewGuid(), CreatedAt = time, FirstName = "Jane", LastName = "Doe", Email = "jane.doe@tolaram.com", Phone = "+234022424553", TeamId = teams[1].Id, CompanyId = companies[1].Id } }; _modelBuilder.Entity().HasData(banks); diff --git a/src/Web/Server/Entities/CurrencyEntity.cs b/src/Web/Server/Entities/CurrencyEntity.cs index 2b69ff26..8cc21eca 100644 --- a/src/Web/Server/Entities/CurrencyEntity.cs +++ b/src/Web/Server/Entities/CurrencyEntity.cs @@ -5,10 +5,13 @@ namespace XClaim.Web.Server.Entities; [Index(nameof(Name), IsUnique = true)] +[Index(nameof(Code), IsUnique = true)] public class CurrencyEntity : BaseEntity { public string Name { get; set; } = string.Empty; - [MaxLength(4)] + [MaxLength(1)] public string Symbol { get; set; } = string.Empty; + [MaxLength(3)] + public string Code { get; set; } = string.Empty; public decimal Rate { get; set; } public string Description { get; set; } = string.Empty; public bool Active { get; set; } From 181af5d40da3182fc1ab0e361d86b9977c77b74c Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Fri, 27 Jan 2023 12:13:58 +0100 Subject: [PATCH 040/185] Added automatic migration --- src/Web/Server/Program.cs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/Web/Server/Program.cs b/src/Web/Server/Program.cs index 59da39b0..d9ffddef 100644 --- a/src/Web/Server/Program.cs +++ b/src/Web/Server/Program.cs @@ -71,6 +71,13 @@ } WebApplication app = builder.Build(); + +using (var scope = app.Services.CreateScope()) { + var services = scope.ServiceProvider; + var context = services.GetRequiredService(); + await context.Database.MigrateAsync(); +} + if (app.Environment.IsDevelopment()) { app.UseWebAssemblyDebugging(); _ = app.UseSwagger(); From 4106e17075e43d0bbaf5876ad9310e8c8bac9873 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Fri, 27 Jan 2023 12:17:00 +0100 Subject: [PATCH 041/185] Added custom registration and system admin to user service --- .../Server/Modules/UserModule/UserService.cs | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/src/Web/Server/Modules/UserModule/UserService.cs b/src/Web/Server/Modules/UserModule/UserService.cs index 2f11a263..b857d239 100644 --- a/src/Web/Server/Modules/UserModule/UserService.cs +++ b/src/Web/Server/Modules/UserModule/UserService.cs @@ -2,6 +2,7 @@ using AutoMapper; using Microsoft.EntityFrameworkCore; using XClaim.Common.Dtos; +using XClaim.Common.Enums; using XClaim.Common.Helpers; using XClaim.Common.Wrappers; using XClaim.Web.Server.Data; @@ -75,4 +76,25 @@ public async Task>> GetAllAsync(UserFilter resp return response; } + + new public async Task> CreateAsync(UserResponse value) { + var response = new Response(); + try { + var item = _mapper.Map(value); + var isAdmin = (await _ctx.Users.CountAsync(x => x.Permission == UserPermission.System)) < 1; + if (isAdmin) item.Permission = UserPermission.System; + await _ctx.Users.AddAsync(item); + await _ctx.SaveChangesAsync(); + var data = _mapper.Map(item); + response = new Response(data!) { + Succeeded = data != null + }; + } + catch (Exception e) { + response.Errors = new[] { e.ToString() }; + _logger.LogError(e.ToString()); + } + + return response; + } } \ No newline at end of file From 128d26f6b0682deb7c55472f0951652b848410fe Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Fri, 27 Jan 2023 16:33:58 +0100 Subject: [PATCH 042/185] Seal service classes --- src/Web/Server/Modules/BankModule/BankService.cs | 2 +- src/Web/Server/Modules/CategoryModule/CategoryService.cs | 4 ++-- src/Web/Server/Modules/ClaimModule/ClaimService.cs | 6 +++--- src/Web/Server/Modules/CompanyModule/CompanyService.cs | 2 +- src/Web/Server/Modules/CurrencyModule/CurrencyService.cs | 2 +- src/Web/Server/Modules/DomainModule/DomainService.cs | 2 +- src/Web/Server/Modules/EventModule/EventService.cs | 2 +- src/Web/Server/Modules/PaymentModule/PaymentService.cs | 2 +- src/Web/Server/Modules/TeamModule/TeamService.cs | 6 +++--- src/Web/Server/Modules/UserModule/UserService.cs | 4 ++-- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/Web/Server/Modules/BankModule/BankService.cs b/src/Web/Server/Modules/BankModule/BankService.cs index 1b0400d1..01d7a4c7 100644 --- a/src/Web/Server/Modules/BankModule/BankService.cs +++ b/src/Web/Server/Modules/BankModule/BankService.cs @@ -5,6 +5,6 @@ namespace XClaim.Web.Server.Modules.BankModule; -public class BankService : GenericService, IBankService { +public sealed class BankService : GenericService, IBankService { public BankService(ServerContext ctx, IMapper mapper, ILogger logger) : base(ctx, mapper, logger) { } } \ No newline at end of file diff --git a/src/Web/Server/Modules/CategoryModule/CategoryService.cs b/src/Web/Server/Modules/CategoryModule/CategoryService.cs index f5a360d7..cf6f7090 100644 --- a/src/Web/Server/Modules/CategoryModule/CategoryService.cs +++ b/src/Web/Server/Modules/CategoryModule/CategoryService.cs @@ -10,7 +10,7 @@ namespace XClaim.Web.Server.Modules.CategoryModule; -public class CategoryService : GenericService { +public sealed class CategoryService : GenericService { public CategoryService(ServerContext ctx, IMapper mapper, ILogger logger) : base(ctx, mapper, logger) { } new public async Task>> GetAllAsync(PaginationFilterBase responseFilter) { @@ -38,7 +38,7 @@ public CategoryService(ServerContext ctx, IMapper mapper, ILogger> GetByIdAsync(Guid id) { + new public async Task> GetByIdAsync(Guid id) { var result = new Response(); try { var item = await _ctx.Categories diff --git a/src/Web/Server/Modules/ClaimModule/ClaimService.cs b/src/Web/Server/Modules/ClaimModule/ClaimService.cs index 76704549..6d9b86f7 100644 --- a/src/Web/Server/Modules/ClaimModule/ClaimService.cs +++ b/src/Web/Server/Modules/ClaimModule/ClaimService.cs @@ -10,10 +10,10 @@ namespace XClaim.Web.Server.Modules.ClaimModule; -public class ClaimService : GenericService, IClaimService { +public sealed class ClaimService : GenericService, IClaimService { public ClaimService(ServerContext ctx, IMapper mapper, ILogger logger) : base(ctx, mapper, logger) { } - new public virtual async Task>> GetAllAsync(PaginationFilterBase responseFilter) { + new public async Task>> GetAllAsync(PaginationFilterBase responseFilter) { var result = new PagedResponse>(); var query = _ctx.Claims.Where(x => x.DeletedAt == null) .Include(x => x.Owner) @@ -38,7 +38,7 @@ public ClaimService(ServerContext ctx, IMapper mapper, ILogger log return result; } - new public virtual async Task> GetByIdAsync(Guid id) { + new public async Task> GetByIdAsync(Guid id) { var response = new Response(); try { var item = await _ctx.Claims.Where(x => x.Id == id) diff --git a/src/Web/Server/Modules/CompanyModule/CompanyService.cs b/src/Web/Server/Modules/CompanyModule/CompanyService.cs index e435c23c..f82594d9 100644 --- a/src/Web/Server/Modules/CompanyModule/CompanyService.cs +++ b/src/Web/Server/Modules/CompanyModule/CompanyService.cs @@ -10,7 +10,7 @@ namespace XClaim.Web.Server.Modules.CompanyModule; -public class CompanyService : GenericService { +public sealed class CompanyService : GenericService { public CompanyService(ServerContext ctx, IMapper mapper, ILogger logger) : base(ctx, mapper, logger) { } new public async Task>> GetAllAsync(PaginationFilterBase responseFilter) { diff --git a/src/Web/Server/Modules/CurrencyModule/CurrencyService.cs b/src/Web/Server/Modules/CurrencyModule/CurrencyService.cs index 835dabcc..88bc81c1 100644 --- a/src/Web/Server/Modules/CurrencyModule/CurrencyService.cs +++ b/src/Web/Server/Modules/CurrencyModule/CurrencyService.cs @@ -5,6 +5,6 @@ namespace XClaim.Web.Server.Modules.CurrencyModule; -public class CurrencyService : GenericService { +public sealed class CurrencyService : GenericService { public CurrencyService(ServerContext ctx, IMapper mapper, ILogger logger) : base(ctx, mapper, logger) { } } \ No newline at end of file diff --git a/src/Web/Server/Modules/DomainModule/DomainService.cs b/src/Web/Server/Modules/DomainModule/DomainService.cs index 4264b90b..a7fcbdac 100644 --- a/src/Web/Server/Modules/DomainModule/DomainService.cs +++ b/src/Web/Server/Modules/DomainModule/DomainService.cs @@ -5,6 +5,6 @@ namespace XClaim.Web.Server.Modules.DomainModule; -public class DomainService : GenericService { +public sealed class DomainService : GenericService { public DomainService(ServerContext ctx, IMapper mapper, ILogger logger) : base(ctx, mapper, logger) { } } \ No newline at end of file diff --git a/src/Web/Server/Modules/EventModule/EventService.cs b/src/Web/Server/Modules/EventModule/EventService.cs index c6a3483d..ae0cb6e4 100644 --- a/src/Web/Server/Modules/EventModule/EventService.cs +++ b/src/Web/Server/Modules/EventModule/EventService.cs @@ -5,7 +5,7 @@ namespace XClaim.Web.Server.Modules.EventModule; -public class EventService : GenericService, IEventService { +public sealed class EventService : GenericService, IEventService { public EventService(ServerContext ctx, IMapper mapper, ILogger logger) : base(ctx, mapper, logger) { } public Task ClearOld() { throw new NotImplementedException(); diff --git a/src/Web/Server/Modules/PaymentModule/PaymentService.cs b/src/Web/Server/Modules/PaymentModule/PaymentService.cs index e60f9d75..6a0a4fe1 100644 --- a/src/Web/Server/Modules/PaymentModule/PaymentService.cs +++ b/src/Web/Server/Modules/PaymentModule/PaymentService.cs @@ -5,6 +5,6 @@ namespace XClaim.Web.Server.Modules.PaymentModule; -public class PaymentService : GenericService { +public sealed class PaymentService : GenericService { public PaymentService(ServerContext ctx, IMapper mapper, ILogger logger) : base(ctx, mapper, logger) { } } \ No newline at end of file diff --git a/src/Web/Server/Modules/TeamModule/TeamService.cs b/src/Web/Server/Modules/TeamModule/TeamService.cs index 47de0685..228ba2d1 100644 --- a/src/Web/Server/Modules/TeamModule/TeamService.cs +++ b/src/Web/Server/Modules/TeamModule/TeamService.cs @@ -10,10 +10,10 @@ namespace XClaim.Web.Server.Modules.TeamModule; -public class TeamService : GenericService { +public sealed class TeamService : GenericService { public TeamService(ServerContext ctx, IMapper mapper, ILogger logger) : base(ctx, mapper, logger) { } - new public virtual async Task>> GetAllAsync(PaginationFilterBase responseFilter) { + new public async Task>> GetAllAsync(PaginationFilterBase responseFilter) { var result = new PagedResponse>(); var query = _ctx.Teams .Include(e => e.Company) @@ -41,7 +41,7 @@ public TeamService(ServerContext ctx, IMapper mapper, ILogger logge return result; } - new public virtual async Task> GetByIdAsync(Guid id) { + new public async Task> GetByIdAsync(Guid id) { var result = new Response(); try { var item = await _ctx.Teams diff --git a/src/Web/Server/Modules/UserModule/UserService.cs b/src/Web/Server/Modules/UserModule/UserService.cs index b857d239..2d4ca6e4 100644 --- a/src/Web/Server/Modules/UserModule/UserService.cs +++ b/src/Web/Server/Modules/UserModule/UserService.cs @@ -10,7 +10,7 @@ namespace XClaim.Web.Server.Modules.UserModule; -public class UserService : GenericService, IUserService { +public sealed class UserService : GenericService, IUserService { public UserService(ServerContext ctx, IMapper mapper, ILogger logger) : base(ctx, mapper, logger) { } public async Task> GetByEmailAsync(string email) { var item = await _ctx.Users @@ -56,7 +56,7 @@ public async Task>> GetAllAsync(UserFilter resp return result; } - new public virtual async Task> GetByIdAsync(Guid id) { + new public async Task> GetByIdAsync(Guid id) { var response = new Response(); try { var item = await _ctx.Users From e4a68e6524c42c17b80656b33125614a2892752c Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Fri, 27 Jan 2023 16:34:19 +0100 Subject: [PATCH 043/185] Added session extensions --- src/Web/Server/Program.cs | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/Web/Server/Program.cs b/src/Web/Server/Program.cs index d9ffddef..b6a44011 100644 --- a/src/Web/Server/Program.cs +++ b/src/Web/Server/Program.cs @@ -51,6 +51,13 @@ builder.Services.AddHttpContextAccessor(); ; builder.Services.AddAuthorization(); +builder.Services.AddDistributedMemoryCache(); +builder.Services.AddSession(options => { + options.IdleTimeout = TimeSpan.FromDays(7); + options.Cookie.HttpOnly = true; + options.Cookie.IsEssential = true; +}); + builder.Services.AddEndpointsApiExplorer(); builder.Services.AddSwaggerGen(opt => { _ = opt.UseAutoFiltererParameters(); @@ -95,17 +102,19 @@ } app.UseCookiePolicy(new CookiePolicyOptions { - MinimumSameSitePolicy = SameSiteMode.Lax + MinimumSameSitePolicy = SameSiteMode.None }); -app.RegisterApiEndpoints(); + app.UseBlazorFrameworkFiles(); app.UseStaticFiles(); app.UseRouting(); -app.MapRazorPages(); app.MapControllers(); app.MapFallbackToFile("index.html"); app.UseAuthentication(); app.UseAuthorization(); +app.UseSession(); +app.MapRazorPages(); +app.RegisterApiEndpoints(); // INFO: Disabled due to mobile self signed certificate // app.UseHttpsRedirection(); From 6d4d41b3ec307103aa37500b63bbffce8afb6db7 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Sat, 28 Jan 2023 03:12:05 +0100 Subject: [PATCH 044/185] Added identifier field to user entity and response --- src/Common/Dtos/UserResponse.cs | 1 + src/Web/Server/Data/DbInitializer.cs | 5 +++-- src/Web/Server/Entities/UserEntity.cs | 2 ++ src/Web/Server/XClaim.Web.Server.csproj | 1 + 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/Common/Dtos/UserResponse.cs b/src/Common/Dtos/UserResponse.cs index bd9157fc..34a66436 100644 --- a/src/Common/Dtos/UserResponse.cs +++ b/src/Common/Dtos/UserResponse.cs @@ -4,6 +4,7 @@ namespace XClaim.Common.Dtos; public class UserResponse : BaseResponse { + public string Identifier { get; set; } = string.Empty; public string Email { get; set; } = String.Empty; public string Phone { get; set; } = String.Empty; public string FirstName { get; set; } = String.Empty; diff --git a/src/Web/Server/Data/DbInitializer.cs b/src/Web/Server/Data/DbInitializer.cs index 4f8858be..7ed09b60 100644 --- a/src/Web/Server/Data/DbInitializer.cs +++ b/src/Web/Server/Data/DbInitializer.cs @@ -1,4 +1,5 @@ using Microsoft.EntityFrameworkCore; +using SourceExpress.ShorterGuid; using XClaim.Common.Enums; using XClaim.Web.Server.Entities; @@ -63,8 +64,8 @@ public void Seed() { }; var users = new List { - new UserEntity { Id = Guid.NewGuid(), CreatedAt = time, FirstName = "John", LastName = "Doe", Email = "john.doe@tolaram.com", Phone = "+234012345567", TeamId = teams[0].Id, CompanyId = companies[0].Id }, - new UserEntity { Id = Guid.NewGuid(), CreatedAt = time, FirstName = "Jane", LastName = "Doe", Email = "jane.doe@tolaram.com", Phone = "+234022424553", TeamId = teams[1].Id, CompanyId = companies[1].Id } + new UserEntity { Id = Guid.NewGuid(), Identifier = (Guid.NewGuid()).ToLowerShorterString(), CreatedAt = time, FirstName = "John", LastName = "Doe", Email = "john.doe@tolaram.com", Phone = "+234012345567", TeamId = teams[0].Id, CompanyId = companies[0].Id }, + new UserEntity { Id = Guid.NewGuid(), Identifier = (Guid.NewGuid()).ToLowerShorterString(), CreatedAt = time, FirstName = "Jane", LastName = "Doe", Email = "jane.doe@tolaram.com", Phone = "+234022424553", TeamId = teams[1].Id, CompanyId = companies[1].Id } }; _modelBuilder.Entity().HasData(banks); diff --git a/src/Web/Server/Entities/UserEntity.cs b/src/Web/Server/Entities/UserEntity.cs index dfd32c7a..62fda342 100644 --- a/src/Web/Server/Entities/UserEntity.cs +++ b/src/Web/Server/Entities/UserEntity.cs @@ -6,7 +6,9 @@ namespace XClaim.Web.Server.Entities; [Index(nameof(Email), IsUnique = true)] +[Index(nameof(Identifier), IsUnique = true)] public sealed class UserEntity : BaseEntity { + public string Identifier { get; set; } = string.Empty; [MaxLength(256)] public string Email { get; set; } = string.Empty; public string? ProfileImage { get; set; } diff --git a/src/Web/Server/XClaim.Web.Server.csproj b/src/Web/Server/XClaim.Web.Server.csproj index a50fe573..2a40bf07 100644 --- a/src/Web/Server/XClaim.Web.Server.csproj +++ b/src/Web/Server/XClaim.Web.Server.csproj @@ -36,6 +36,7 @@ + From cae13b059b2d6fb802181d37a8cce8fef6aeb0a7 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Sat, 28 Jan 2023 03:13:07 +0100 Subject: [PATCH 045/185] Added authentication and identity helper --- src/Web/Server/Helpers/IdentityHelper.cs | 76 +++++++++++++++++++ .../Modules/ProfileModule/ProfileModule.cs | 46 +++-------- .../Server/Modules/UserModule/UserService.cs | 23 +++++- src/Web/Server/Program.cs | 1 + 4 files changed, 110 insertions(+), 36 deletions(-) create mode 100644 src/Web/Server/Helpers/IdentityHelper.cs diff --git a/src/Web/Server/Helpers/IdentityHelper.cs b/src/Web/Server/Helpers/IdentityHelper.cs new file mode 100644 index 00000000..05506f04 --- /dev/null +++ b/src/Web/Server/Helpers/IdentityHelper.cs @@ -0,0 +1,76 @@ +using System.Security.Claims; +using IdentityModel; +using Microsoft.AspNetCore.Authentication; +using XClaim.Common.Dtos; +using XClaim.Web.Server.Data; +using XClaim.Web.Server.Entities; + +namespace XClaim.Web.Server.Helpers; + +public sealed class IdentityHelper { + + private readonly IHttpContextAccessor _contextAccessor; + private readonly ServerContext _ctx; + + public IdentityHelper(IHttpContextAccessor contextAccessor, ServerContext ctx) { + _contextAccessor = contextAccessor; + _ctx = ctx; + } + + private ClaimsPrincipal? Claim { + get { return _contextAccessor?.HttpContext?.User; } + } + + public string? NameIdentifier { + get { + return this.Claim!.FindFirstValue(ClaimTypes.NameIdentifier); + } + } + + public bool IsAuthenticated { + get { + return this.Claim?.Identity?.IsAuthenticated ?? false; + } + } + + public async Task GetAuthProfile() { + var ctx = _contextAccessor!.HttpContext; + var auth = await ctx!.AuthenticateAsync("Microsoft"); + + // Get required options + var email = this.Claim!.FindFirstValue(ClaimTypes.Email) ?? ""; + var fullName = this.Claim!.FindFirstValue(ClaimTypes.Name) ?? ""; + var phone = this.Claim!.FindFirstValue(ClaimTypes.HomePhone) ?? ""; + var token = auth?.Properties?.GetTokenValue("access_token"); + var expiry = (auth?.Properties?.ExpiresUtc?.ToUnixTimeSeconds() ?? -1).ToDateTimeFromEpoch(); + var expireIn = (int)expiry.Subtract(DateTime.Now).TotalSeconds; + + var names = fullName.Split(" "); + var data = new UserResponse { + Identifier = this.NameIdentifier ?? "", + Email = email, + FirstName = names[0], + LastName = names[^1], + Phone = phone + }; + + return new AuthResponse { + ExpiryTimeStamp = expiry, + ExpiresIn = expireIn, + Token = token, + Message = "Success", + UserName = fullName, + Data = data + }; + } + + public async Task GetUser() => default!; + + public async Task GetManager() => default!; + + public async Task HasManager() => default!; + + public async Task GetCompany() => default!; + + public async Task GetTeam() => default!; +} \ No newline at end of file diff --git a/src/Web/Server/Modules/ProfileModule/ProfileModule.cs b/src/Web/Server/Modules/ProfileModule/ProfileModule.cs index 49ccb167..85a2ec13 100644 --- a/src/Web/Server/Modules/ProfileModule/ProfileModule.cs +++ b/src/Web/Server/Modules/ProfileModule/ProfileModule.cs @@ -4,6 +4,7 @@ using XClaim.Common.Dtos; using XClaim.Common.Enums; using XClaim.Common.Wrappers; +using XClaim.Web.Server.Helpers; using XClaim.Web.Server.Modules.UserModule; namespace XClaim.Web.Server.Modules.ProfileModule; @@ -19,44 +20,19 @@ public IEndpointRouteBuilder MapEndpoints(IEndpointRouteBuilder endpoints) { var url = $"{Constants.RootApi}/{name.ToLower()}"; var group = endpoints.MapGroup(url).WithTags(name); - group.MapGet("/account", async (HttpRequest request, UserService user) => { - var userContext = request.HttpContext.User; - bool isAuth = userContext.Identity?.IsAuthenticated ?? false; - if (!isAuth) return TypedResults.Unauthorized(); + group.MapGet("/account", async (IdentityHelper identity, UserService user) => { + var authProfile = await identity.GetAuthProfile(); + if (!identity.IsAuthenticated) return TypedResults.Unauthorized(); - var auth = await request.HttpContext.AuthenticateAsync("Microsoft"); - var email = userContext.FindFirst(ClaimTypes.Email)?.Value ?? ""; - var fullName = userContext.FindFirst(ClaimTypes.Name)?.Value ?? ""; - var phone = userContext.FindFirst(ClaimTypes.HomePhone)?.Value ?? ""; - var names = fullName.Split(" "); - var token = auth?.Properties?.GetTokenValue("access_token"); - var expiry = (auth?.Properties?.ExpiresUtc?.ToUnixTimeSeconds() ?? -1).ToDateTimeFromEpoch(); - var expireIn = (int)expiry.Subtract(DateTime.Now).TotalSeconds; - - UserResponse? profile = new UserResponse(); - var account = (await user.GetByEmailAsync(email)).Data; - if (account == null) { - profile.Email = email; - profile.FirstName = names[0]; - profile.LastName = names[^1]; - profile.Phone = phone; - } else { - profile = account; + var account = (await user.GetByIdentifierAsync(authProfile!.Data!.Identifier)).Data; + if (account != null) { + authProfile!.Data = account; + authProfile.Confirmed = true; } + var role = account?.Permission != null ? Enum.GetName(account.Permission)! : Enum.GetName(UserPermission.Standard)!; + authProfile.Role = role; - var role = account?.Permission != null ? - Enum.GetName(account.Permission)! : userContext.FindFirst(ClaimTypes.Role)?.Value ?? Enum.GetName(UserPermission.Standard)!; - - return Results.Ok(new Response(new AuthResponse { - Confirmed = account != null, - ExpiryTimeStamp = expiry, - ExpiresIn = expireIn, - Token = token, - Role = role, - Message = "Success", - Data = profile, - UserName = fullName - }) { Succeeded = expireIn > 0 }); + return Results.Ok(new Response(authProfile) { Succeeded = authProfile.ExpiresIn > 0 }); }).WithName("AccountProfile").WithOpenApi(); return group; diff --git a/src/Web/Server/Modules/UserModule/UserService.cs b/src/Web/Server/Modules/UserModule/UserService.cs index 2d4ca6e4..0dcdd2b4 100644 --- a/src/Web/Server/Modules/UserModule/UserService.cs +++ b/src/Web/Server/Modules/UserModule/UserService.cs @@ -7,11 +7,15 @@ using XClaim.Common.Wrappers; using XClaim.Web.Server.Data; using XClaim.Web.Server.Entities; +using XClaim.Web.Server.Helpers; namespace XClaim.Web.Server.Modules.UserModule; public sealed class UserService : GenericService, IUserService { - public UserService(ServerContext ctx, IMapper mapper, ILogger logger) : base(ctx, mapper, logger) { } + private readonly IdentityHelper _identity; + public UserService(ServerContext ctx, IMapper mapper, ILogger logger, IdentityHelper identity) : base(ctx, mapper, logger) { + _identity = identity; + } public async Task> GetByEmailAsync(string email) { var item = await _ctx.Users .Where(x => x.DeletedAt == null) @@ -27,6 +31,22 @@ public UserService(ServerContext ctx, IMapper mapper, ILogger logge Succeeded = data != null }; } + + public async Task> GetByIdentifierAsync(string identifier) { + var item = await _ctx.Users + .Where(x => x.DeletedAt == null) + .Where(x => x.Identifier == identifier) + .Include(x => x.Company) + .Include(x => x.Team) + .Include(x => x.Currency) + .FirstOrDefaultAsync(); + var data = _mapper.Map(item); + + return new Response { + Data = data, + Succeeded = data != null + }; + } public async Task>> GetAllAsync(UserFilter responseFilter) { var result = new PagedResponse>(); @@ -81,6 +101,7 @@ public async Task>> GetAllAsync(UserFilter resp var response = new Response(); try { var item = _mapper.Map(value); + item.Identifier = _identity!.NameIdentifier!; var isAdmin = (await _ctx.Users.CountAsync(x => x.Permission == UserPermission.System)) < 1; if (isAdmin) item.Permission = UserPermission.System; await _ctx.Users.AddAsync(item); diff --git a/src/Web/Server/Program.cs b/src/Web/Server/Program.cs index b6a44011..a9b9b8d9 100644 --- a/src/Web/Server/Program.cs +++ b/src/Web/Server/Program.cs @@ -28,6 +28,7 @@ }); builder.Services.AddTransient(); +builder.Services.AddTransient(); builder.Services.Configure(options => { options.CheckConsentNeeded = _ => true; From 50d8691b8c76ca4ee8052fc8ca3bfdf9bfabce79 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Sat, 28 Jan 2023 11:44:31 +0100 Subject: [PATCH 046/185] Implement user identity helper --- .../Server/Extensions/SessionExtensions.cs | 16 ++++ src/Web/Server/Helpers/IdentityHelper.cs | 78 +++++++++++++++++-- .../Server/Modules/UserModule/UserService.cs | 2 +- src/Web/Server/Program.cs | 4 +- 4 files changed, 91 insertions(+), 9 deletions(-) create mode 100644 src/Web/Server/Extensions/SessionExtensions.cs diff --git a/src/Web/Server/Extensions/SessionExtensions.cs b/src/Web/Server/Extensions/SessionExtensions.cs new file mode 100644 index 00000000..7196b8e4 --- /dev/null +++ b/src/Web/Server/Extensions/SessionExtensions.cs @@ -0,0 +1,16 @@ +using System.Text.Json; + +namespace XClaim.Web.Server.Extensions; + +public static class SessionExtensions { + public static void Set(this ISession session, string key, T value) + { + session.SetString(key, JsonSerializer.Serialize(value)); + } + + public static T? Get(this ISession session, string key) + { + var value = session.GetString(key); + return value == null ? default : JsonSerializer.Deserialize(value); + } +} \ No newline at end of file diff --git a/src/Web/Server/Helpers/IdentityHelper.cs b/src/Web/Server/Helpers/IdentityHelper.cs index 05506f04..5bde796a 100644 --- a/src/Web/Server/Helpers/IdentityHelper.cs +++ b/src/Web/Server/Helpers/IdentityHelper.cs @@ -1,20 +1,28 @@ using System.Security.Claims; +using AutoMapper; using IdentityModel; using Microsoft.AspNetCore.Authentication; +using Microsoft.EntityFrameworkCore; using XClaim.Common.Dtos; using XClaim.Web.Server.Data; using XClaim.Web.Server.Entities; +using XClaim.Web.Server.Extensions; namespace XClaim.Web.Server.Helpers; public sealed class IdentityHelper { + + private const string UserKey = "identity-user-state"; + private const string ManagerKey = "identity-manager-state"; private readonly IHttpContextAccessor _contextAccessor; private readonly ServerContext _ctx; + private readonly IMapper _mapper; - public IdentityHelper(IHttpContextAccessor contextAccessor, ServerContext ctx) { + public IdentityHelper(IHttpContextAccessor contextAccessor, ServerContext ctx, IMapper mapper) { _contextAccessor = contextAccessor; _ctx = ctx; + _mapper = mapper; } private ClaimsPrincipal? Claim { @@ -64,13 +72,71 @@ public bool IsAuthenticated { }; } - public async Task GetUser() => default!; + private async Task GetByIdentifierAsync(string identifier) { + var query = _ctx.Users.Where(x => x.DeletedAt == null) + .Where(x => x.Identifier == identifier); + + return await this.GetUserEntity(query); + } - public async Task GetManager() => default!; + private async Task GetByIdAsync(Guid id) { + var query = _ctx.Users.Where(x => x.DeletedAt == null) + .Where(x => x.Id == id); + + return await this.GetUserEntity(query); + } - public async Task HasManager() => default!; + private async Task GetUserEntity (IQueryable queryable) { + var ctx = _contextAccessor!.HttpContext; + var cache = ctx!.Session.Get(UserKey); + if (cache != null) { + return cache; + } + + var query = await queryable.Include(x => x.Company) + .Include(x => x.Team) + .Include(x => x.Currency) + .FirstOrDefaultAsync(); + var result = _mapper.Map(query); + ctx!.Session.Set(UserKey, result); + + return result; + } + + public async Task GetUser() { + var id = this.NameIdentifier; + var response = await this.GetByIdentifierAsync(id!); + + return response; + } + + public async Task GetCompany() { + var user = await this.GetUser(); + + return user?.Company; + } + + public async Task GetTeam() { + var user = await this.GetUser(); + + return user?.Team; + } - public async Task GetCompany() => default!; + public async Task GetManager() { + var ctx = _contextAccessor!.HttpContext; + var cache = ctx!.Session.Get(ManagerKey); + if (cache != null) { + return cache; + } + + var team = await this.GetTeam(); + if (team!.ManagerId == null) return null; + Guid managerId = ((Guid)team!.ManagerId!); + var manager = await this.GetByIdAsync(managerId); + ctx!.Session.Set(ManagerKey, manager); + + return manager; + } - public async Task GetTeam() => default!; + public async Task HasManager() => await this.GetManager() != null; } \ No newline at end of file diff --git a/src/Web/Server/Modules/UserModule/UserService.cs b/src/Web/Server/Modules/UserModule/UserService.cs index 0dcdd2b4..6232f473 100644 --- a/src/Web/Server/Modules/UserModule/UserService.cs +++ b/src/Web/Server/Modules/UserModule/UserService.cs @@ -32,7 +32,7 @@ public UserService(ServerContext ctx, IMapper mapper, ILogger logge }; } - public async Task> GetByIdentifierAsync(string identifier) { + public async Task> GetByIdentifierAsync(string? identifier) { var item = await _ctx.Users .Where(x => x.DeletedAt == null) .Where(x => x.Identifier == identifier) diff --git a/src/Web/Server/Program.cs b/src/Web/Server/Program.cs index a9b9b8d9..61d84376 100644 --- a/src/Web/Server/Program.cs +++ b/src/Web/Server/Program.cs @@ -54,8 +54,8 @@ builder.Services.AddDistributedMemoryCache(); builder.Services.AddSession(options => { - options.IdleTimeout = TimeSpan.FromDays(7); - options.Cookie.HttpOnly = true; + options.IdleTimeout = TimeSpan.FromMinutes(2); + options.Cookie.HttpOnly = false; options.Cookie.IsEssential = true; }); From 775de2c0022f2dc56521f66b2875744d4ba6a243 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Sat, 28 Jan 2023 12:22:48 +0100 Subject: [PATCH 047/185] apply claim permission handler --- .../Modules/ClaimModule/ClaimService.cs | 31 ++++++++++++------- 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/src/Web/Server/Modules/ClaimModule/ClaimService.cs b/src/Web/Server/Modules/ClaimModule/ClaimService.cs index 6d9b86f7..c1491120 100644 --- a/src/Web/Server/Modules/ClaimModule/ClaimService.cs +++ b/src/Web/Server/Modules/ClaimModule/ClaimService.cs @@ -2,22 +2,33 @@ using AutoFilterer.Types; using AutoMapper; using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Query; using XClaim.Common.Dtos; using XClaim.Common.Helpers; using XClaim.Common.Wrappers; using XClaim.Web.Server.Data; using XClaim.Web.Server.Entities; +using XClaim.Web.Server.Helpers; namespace XClaim.Web.Server.Modules.ClaimModule; public sealed class ClaimService : GenericService, IClaimService { - public ClaimService(ServerContext ctx, IMapper mapper, ILogger logger) : base(ctx, mapper, logger) { } + private readonly IdentityHelper _identity; + public ClaimService(ServerContext ctx, IMapper mapper, ILogger logger, IdentityHelper identity) : base(ctx, mapper, logger) { + _identity = identity; + } - new public async Task>> GetAllAsync(PaginationFilterBase responseFilter) { - var result = new PagedResponse>(); - var query = _ctx.Claims.Where(x => x.DeletedAt == null) + private async Task> ClaimPersonalQuery(IQueryable queryable) { + var userId = ((await _identity.GetUser())!).Id; + return queryable.Where(x => x.DeletedAt == null) + .Where(x => x.OwnerId == userId) .Include(x => x.Owner) .Include(x => x.Category); + } + + new public async Task>> GetAllAsync(PaginationFilterBase responseFilter) { + var result = new PagedResponse>(); + var query = await ClaimPersonalQuery(_ctx.Claims); try { var count = await query.CountAsync(); var data = await query.ApplyFilter(responseFilter).ToListAsync(); @@ -29,8 +40,7 @@ public ClaimService(ServerContext ctx, IMapper mapper, ILogger log result = new PagedResponse>(response, count, filter) { Succeeded = true }; - } - catch (Exception e) { + } catch (Exception e) { result.Errors = new[] { e.ToString() }; _logger.LogError(e.ToString()); } @@ -41,15 +51,12 @@ public ClaimService(ServerContext ctx, IMapper mapper, ILogger log new public async Task> GetByIdAsync(Guid id) { var response = new Response(); try { - var item = await _ctx.Claims.Where(x => x.Id == id) - .Include(x => x.Owner) - .Include(x => x.Category) - .FirstOrDefaultAsync(); + var item = await (await ClaimPersonalQuery(_ctx.Claims)) + .Where(x => x.Id == id).FirstOrDefaultAsync(); var data = _mapper.Map(item); response.Data = data; response.Succeeded = data != null; - } - catch (Exception e) { + } catch (Exception e) { response.Errors = new[] { e.ToString() }; _logger.LogError(e.ToString()); } From 0a3abc7365bd14457ab1785206eb9659d84772aa Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Sat, 28 Jan 2023 12:44:56 +0100 Subject: [PATCH 048/185] fix getById error --- src/Web/Server/Modules/ClaimModule/ClaimService.cs | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/Web/Server/Modules/ClaimModule/ClaimService.cs b/src/Web/Server/Modules/ClaimModule/ClaimService.cs index c1491120..0e241777 100644 --- a/src/Web/Server/Modules/ClaimModule/ClaimService.cs +++ b/src/Web/Server/Modules/ClaimModule/ClaimService.cs @@ -18,17 +18,16 @@ public ClaimService(ServerContext ctx, IMapper mapper, ILogger log _identity = identity; } - private async Task> ClaimPersonalQuery(IQueryable queryable) { - var userId = ((await _identity.GetUser())!).Id; - return queryable.Where(x => x.DeletedAt == null) - .Where(x => x.OwnerId == userId) + private static Task> ClaimPersonalQuery(IQueryable queryable) { + return Task.FromResult(queryable.Where(x => x.DeletedAt == null) .Include(x => x.Owner) - .Include(x => x.Category); + .Include(x => x.Category)); } new public async Task>> GetAllAsync(PaginationFilterBase responseFilter) { + var userId = ((await _identity.GetUser())!).Id; var result = new PagedResponse>(); - var query = await ClaimPersonalQuery(_ctx.Claims); + var query = (await ClaimPersonalQuery(_ctx.Claims)).Where(x => x.OwnerId == userId); try { var count = await query.CountAsync(); var data = await query.ApplyFilter(responseFilter).ToListAsync(); From 1583aea566b775e6cd3c23560d5faec5e5754b3f Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Tue, 31 Jan 2023 13:58:23 +0100 Subject: [PATCH 049/185] Discard redundant package from common --- src/Common/XClaim.Common.csproj | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Common/XClaim.Common.csproj b/src/Common/XClaim.Common.csproj index 32999600..60f11f07 100644 --- a/src/Common/XClaim.Common.csproj +++ b/src/Common/XClaim.Common.csproj @@ -7,7 +7,6 @@ - From eb5fac236f75bd79501d33de77d21e2ef5503806 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Tue, 31 Jan 2023 14:08:48 +0100 Subject: [PATCH 050/185] Updated payment type and implemented gatAll and getById endpoints --- src/Common/Dtos/PaymentResponse.cs | 16 +++-- src/Web/Components/Pages/Payments/Index.razor | 4 +- src/Web/Server/Entities/PaymentEntity.cs | 12 ++-- .../Modules/PaymentModule/PaymentModule.cs | 2 +- .../Modules/PaymentModule/PaymentService.cs | 63 ++++++++++++++++++- 5 files changed, 79 insertions(+), 18 deletions(-) diff --git a/src/Common/Dtos/PaymentResponse.cs b/src/Common/Dtos/PaymentResponse.cs index 3b593d6c..447a73b7 100644 --- a/src/Common/Dtos/PaymentResponse.cs +++ b/src/Common/Dtos/PaymentResponse.cs @@ -4,20 +4,18 @@ namespace XClaim.Common.Dtos; public class PaymentResponse : BaseResponse { public string Description { get; set; } = string.Empty; - public decimal Amount { get; set; } + public string Notes { get; set; } = string.Empty; public UserResponse? Owner { get; set; } public Guid? OwnerId { get; set; } - public DateTime? CompletedAt { get; set; } - - public UserResponse? CompletedBy { get; set; } - - public bool Completed { + public DateTime? ConfirmedAt { get; set; } + public UserResponse? ConfirmedBy { get; set; } + public Guid? ConfirmedById { get; set; } + public bool Confirmed { get { - return CompletedAt != null; + return ConfirmedAt != null; } } - - public string Notes { get; set; } = string.Empty; + public int Count { get; set; } public ICollection Claims { get; set; } = default!; } \ No newline at end of file diff --git a/src/Web/Components/Pages/Payments/Index.razor b/src/Web/Components/Pages/Payments/Index.razor index 99fa9e45..7388b255 100644 --- a/src/Web/Components/Pages/Payments/Index.razor +++ b/src/Web/Components/Pages/Payments/Index.razor @@ -55,8 +55,8 @@ - - + + 1 diff --git a/src/Web/Server/Entities/PaymentEntity.cs b/src/Web/Server/Entities/PaymentEntity.cs index 49db6422..8dc89f3f 100644 --- a/src/Web/Server/Entities/PaymentEntity.cs +++ b/src/Web/Server/Entities/PaymentEntity.cs @@ -12,14 +12,16 @@ public sealed class PaymentEntity : BaseEntity { [Required] public UserEntity? Owner { get; set; } public Guid? OwnerId { get; set; } - public DateTime? CompletedAt { get; set; } - public UserEntity? CompletedBy { get; set; } - public bool Completed { + public DateTime? ConfirmedAt { get; set; } + public UserEntity? ConfirmedBy { get; set; } + public Guid? ConfirmedById { get; set; } + public bool Confirmed { get { - return CompletedAt != null; + return ConfirmedAt != null; } } - public Guid? CompletedById { get; set; } + public int Count { get; set; } + public ICollection Claims { get; set; } = default!; public ICollection Files { get; set; } = default!; public ICollection Comments { get; set; } = default!; } \ No newline at end of file diff --git a/src/Web/Server/Modules/PaymentModule/PaymentModule.cs b/src/Web/Server/Modules/PaymentModule/PaymentModule.cs index f3e31b38..ef04bfd6 100644 --- a/src/Web/Server/Modules/PaymentModule/PaymentModule.cs +++ b/src/Web/Server/Modules/PaymentModule/PaymentModule.cs @@ -26,7 +26,7 @@ await sv.GetAllAsync(filter)) }).WithName($"Get{name}ById").WithOpenApi(); group.MapPost("/confirmation", async (PaymentResponse value, PaymentService sv) => { - value.CompletedAt = DateTime.Now; + value.ConfirmedAt = DateTime.Now; var result = await sv.UpdateAsync(value); return !result.Succeeded ? Results.NotFound(result) : TypedResults.Ok(result); }).WithName($"Confirm{name}").WithOpenApi(); diff --git a/src/Web/Server/Modules/PaymentModule/PaymentService.cs b/src/Web/Server/Modules/PaymentModule/PaymentService.cs index 6a0a4fe1..a1142180 100644 --- a/src/Web/Server/Modules/PaymentModule/PaymentService.cs +++ b/src/Web/Server/Modules/PaymentModule/PaymentService.cs @@ -1,10 +1,71 @@ +using AutoFilterer.Extensions; +using AutoFilterer.Types; using AutoMapper; +using Microsoft.EntityFrameworkCore; using XClaim.Common.Dtos; +using XClaim.Common.Helpers; +using XClaim.Common.Wrappers; using XClaim.Web.Server.Data; using XClaim.Web.Server.Entities; +using XClaim.Web.Server.Helpers; namespace XClaim.Web.Server.Modules.PaymentModule; public sealed class PaymentService : GenericService { - public PaymentService(ServerContext ctx, IMapper mapper, ILogger logger) : base(ctx, mapper, logger) { } + + private readonly IdentityHelper _identity; + + public PaymentService(ServerContext ctx, IMapper mapper, ILogger logger, IdentityHelper identity) : base(ctx, mapper, logger) { + _identity = identity; + } + + new public async Task>> GetAllAsync(PaginationFilterBase responseFilter) { + var id = ((await _identity.GetUser())!).Id; + var result = new PagedResponse>(); + var query = _ctx.Payments + .Where(x => x.DeletedAt == null) + .Where(x => x.OwnerId == id) + .Include(x => x.ConfirmedBy); + try { + var count = await query.CountAsync(); + var data = await query.ApplyFilter(responseFilter).ToListAsync(); + var response = _mapper.Map>(data); + var filter = new PaginationFilter { + Page = responseFilter.Page, + PerPage = responseFilter.PerPage + }; + result = new PagedResponse>(response, count, filter) { + Succeeded = true + }; + } catch (Exception e) { + result.Errors = new[] { e.ToString() }; + _logger.LogError(e.ToString()); + } + + return result; + } + + new public async Task> GetByIdAsync(Guid id) { + var response = new Response(); + try { + var item = await _ctx.Payments.Where(x => x.Id == id) + .Include(x => x.ConfirmedBy) + .Include(x => x.Files) + .Include(x => x.Claims) + .FirstOrDefaultAsync(); + var data = _mapper.Map(item); + response.Data = data; + response.Succeeded = data != null; + } + catch (Exception e) { + response.Errors = new[] { e.ToString() }; + _logger.LogError(e.ToString()); + } + + return response; + } + + public async Task>> GetPaymentsAsync(PaginationFilterBase responseFilter) => default!; + + public async Task> CompleteAsync(Guid id) => default!; } \ No newline at end of file From d4630d150117c94e36b57470b88f56370c1e8991 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Tue, 31 Jan 2023 14:11:02 +0100 Subject: [PATCH 051/185] MInor improvements to claims service --- src/Web/Server/Modules/ClaimModule/ClaimService.cs | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/Web/Server/Modules/ClaimModule/ClaimService.cs b/src/Web/Server/Modules/ClaimModule/ClaimService.cs index 0e241777..3a41c0f4 100644 --- a/src/Web/Server/Modules/ClaimModule/ClaimService.cs +++ b/src/Web/Server/Modules/ClaimModule/ClaimService.cs @@ -25,9 +25,10 @@ public ClaimService(ServerContext ctx, IMapper mapper, ILogger log } new public async Task>> GetAllAsync(PaginationFilterBase responseFilter) { - var userId = ((await _identity.GetUser())!).Id; + var id = ((await _identity.GetUser())!).Id; var result = new PagedResponse>(); - var query = (await ClaimPersonalQuery(_ctx.Claims)).Where(x => x.OwnerId == userId); + var query = (await ClaimPersonalQuery(_ctx.Claims)) + .Where(x => x.OwnerId == id); try { var count = await query.CountAsync(); var data = await query.ApplyFilter(responseFilter).ToListAsync(); @@ -51,7 +52,10 @@ public ClaimService(ServerContext ctx, IMapper mapper, ILogger log var response = new Response(); try { var item = await (await ClaimPersonalQuery(_ctx.Claims)) - .Where(x => x.Id == id).FirstOrDefaultAsync(); + .Where(x => x.Id == id) + .Include(x => x.Payment) + .Include(x => x.Files) + .FirstOrDefaultAsync(); var data = _mapper.Map(item); response.Data = data; response.Succeeded = data != null; @@ -62,4 +66,8 @@ public ClaimService(ServerContext ctx, IMapper mapper, ILogger log return response; } + + public async Task>> GetReviewsAsync(PaginationFilterBase responseFilter) => default!; + + public async Task> ReviewAsync(Guid id) => default!; } \ No newline at end of file From a34a77a61da3c5ef91a1908b648b1edbb3439d52 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Wed, 1 Feb 2023 05:07:22 +0100 Subject: [PATCH 052/185] extended balzor navigation and added back nav --- .../Extensions/ComponentServiceExtensions.cs | 1 + src/Web/Components/Navigation.cs | 56 +++++++++++++++++++ .../Components/Pages/User/BankAccount.razor | 4 +- src/Web/Components/Pages/User/Profile.razor | 4 +- 4 files changed, 61 insertions(+), 4 deletions(-) create mode 100644 src/Web/Components/Navigation.cs diff --git a/src/Web/Components/Extensions/ComponentServiceExtensions.cs b/src/Web/Components/Extensions/ComponentServiceExtensions.cs index dfc947ca..30748e4d 100644 --- a/src/Web/Components/Extensions/ComponentServiceExtensions.cs +++ b/src/Web/Components/Extensions/ComponentServiceExtensions.cs @@ -4,6 +4,7 @@ namespace XClaim.Web.Components.Extensions; public static class ComponentServiceExtensions { public static IServiceCollection UseComponentsExtensions(this IServiceCollection services) { + services.AddSingleton(); return services; } diff --git a/src/Web/Components/Navigation.cs b/src/Web/Components/Navigation.cs new file mode 100644 index 00000000..24ccd3df --- /dev/null +++ b/src/Web/Components/Navigation.cs @@ -0,0 +1,56 @@ +using Microsoft.AspNetCore.Components; +using Microsoft.AspNetCore.Components.Routing; + +namespace XClaim.Web.Components; + +public class Navigation : IDisposable { + private const int MinHistorySize = 256; + private const int AdditionalHistorySize = 64; + private readonly NavigationManager _navigationManager; + private readonly List _history; + + public Navigation(NavigationManager navigationManager) { + _navigationManager = navigationManager; + _history = new List(MinHistorySize + AdditionalHistorySize) { + _navigationManager.Uri + }; + _navigationManager.LocationChanged += OnLocationChanged!; + } + + /// + /// Navigates to the specified url. + /// + /// The destination url (relative or absolute). + public void NavigateTo(string url) { + _navigationManager.NavigateTo(url); + } + + /// + /// Returns true if it is possible to navigate to the previous url. + /// + public bool CanNavigateBack => _history.Count >= 2; + + /// + /// Navigates to the previous url if possible or does nothing if it is not. + /// + public void NavigateBack() { + if (!CanNavigateBack) return; + var backPageUrl = _history[^2]; + _history.RemoveRange(_history.Count - 2, 2); + _navigationManager.NavigateTo(backPageUrl); + } + + private void OnLocationChanged(object sender, LocationChangedEventArgs e) { + EnsureSize(); + _history.Add(e.Location); + } + + private void EnsureSize() { + if (_history.Count < MinHistorySize + AdditionalHistorySize) return; + _history.RemoveRange(0, _history.Count - MinHistorySize); + } + + public void Dispose() { + _navigationManager.LocationChanged -= OnLocationChanged!; + } +} diff --git a/src/Web/Components/Pages/User/BankAccount.razor b/src/Web/Components/Pages/User/BankAccount.razor index 161cfaf9..3b4e674b 100644 --- a/src/Web/Components/Pages/User/BankAccount.razor +++ b/src/Web/Components/Pages/User/BankAccount.razor @@ -1,4 +1,4 @@ -@inject NavigationManager Nav +@inject Navigation Nav @page "/app/user/bank-account" @attribute [Authorize] @@ -26,7 +26,7 @@ - Back Save diff --git a/src/Web/Components/Pages/User/Profile.razor b/src/Web/Components/Pages/User/Profile.razor index 5e2d9ca8..c9820830 100644 --- a/src/Web/Components/Pages/User/Profile.razor +++ b/src/Web/Components/Pages/User/Profile.razor @@ -3,7 +3,7 @@ @using XClaim.Common.Helpers @inject IUserService Http @inject ICurrencyService CurrencyService -@inject NavigationManager Nav +@inject Navigation Nav @inject ISnackbar Snackbar @attribute [Authorize] @@ -69,7 +69,7 @@ - Back Save From c207a439bb304ea477edc6b1c21f642937f14ffa Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Wed, 1 Feb 2023 05:08:37 +0100 Subject: [PATCH 053/185] remove blazor extensions --- src/Common/Extensions/StringExtensions.cs | 8 ++++++++ src/Common/XClaim.Common.csproj | 1 + src/Web/Components/_Imports.razor | 2 -- 3 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 src/Common/Extensions/StringExtensions.cs diff --git a/src/Common/Extensions/StringExtensions.cs b/src/Common/Extensions/StringExtensions.cs new file mode 100644 index 00000000..3f59bcb9 --- /dev/null +++ b/src/Common/Extensions/StringExtensions.cs @@ -0,0 +1,8 @@ +namespace XClaim.Common.Extensions; + +public static class StringExtensions { + public static string Truncate(this string? value, int length = 15) { + if (value == null) return string.Empty; + return value.Length <= length ? value : value[..length] + "..."; + } +} \ No newline at end of file diff --git a/src/Common/XClaim.Common.csproj b/src/Common/XClaim.Common.csproj index 60f11f07..184e87c2 100644 --- a/src/Common/XClaim.Common.csproj +++ b/src/Common/XClaim.Common.csproj @@ -8,6 +8,7 @@ + diff --git a/src/Web/Components/_Imports.razor b/src/Web/Components/_Imports.razor index 1f1a5b8f..94057958 100644 --- a/src/Web/Components/_Imports.razor +++ b/src/Web/Components/_Imports.razor @@ -10,8 +10,6 @@ @using Microsoft.AspNetCore.Components.Authorization @using MudBlazor @using MudBlazor.Extensions -@using MudBlazor.Extensions.Components -@using MudBlazor.Extensions.Components.ObjectEdit @using XClaim.Web.Shared @using XClaim.Web.Shared.States @using XClaim.Web.Components.Layouts From d1023c391ab53e59eec5dd58443c457ff38f3ced Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Wed, 1 Feb 2023 05:09:01 +0100 Subject: [PATCH 054/185] Enable new registration by default --- src/Web/Server/Modules/UserModule/UserService.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Web/Server/Modules/UserModule/UserService.cs b/src/Web/Server/Modules/UserModule/UserService.cs index 6232f473..07b8c618 100644 --- a/src/Web/Server/Modules/UserModule/UserService.cs +++ b/src/Web/Server/Modules/UserModule/UserService.cs @@ -102,6 +102,7 @@ public async Task>> GetAllAsync(UserFilter resp try { var item = _mapper.Map(value); item.Identifier = _identity!.NameIdentifier!; + item.Active = true; var isAdmin = (await _ctx.Users.CountAsync(x => x.Permission == UserPermission.System)) < 1; if (isAdmin) item.Permission = UserPermission.System; await _ctx.Users.AddAsync(item); From 965455ab1dc15d9ed14d3d324d26ed5477004dd3 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Wed, 1 Feb 2023 05:09:31 +0100 Subject: [PATCH 055/185] mudblazor extensions removal --- src/Web/Shared/XClaim.Web.Shared.csproj | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Web/Shared/XClaim.Web.Shared.csproj b/src/Web/Shared/XClaim.Web.Shared.csproj index f9417ddd..01d5d4db 100644 --- a/src/Web/Shared/XClaim.Web.Shared.csproj +++ b/src/Web/Shared/XClaim.Web.Shared.csproj @@ -18,7 +18,6 @@ - - + From e2d61c7ee61ef6c3938112bcd46011fd250730eb Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Wed, 1 Feb 2023 05:09:40 +0100 Subject: [PATCH 056/185] Update DbInitializer.cs --- src/Web/Server/Data/DbInitializer.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Web/Server/Data/DbInitializer.cs b/src/Web/Server/Data/DbInitializer.cs index 7ed09b60..ce3fb89b 100644 --- a/src/Web/Server/Data/DbInitializer.cs +++ b/src/Web/Server/Data/DbInitializer.cs @@ -64,8 +64,8 @@ public void Seed() { }; var users = new List { - new UserEntity { Id = Guid.NewGuid(), Identifier = (Guid.NewGuid()).ToLowerShorterString(), CreatedAt = time, FirstName = "John", LastName = "Doe", Email = "john.doe@tolaram.com", Phone = "+234012345567", TeamId = teams[0].Id, CompanyId = companies[0].Id }, - new UserEntity { Id = Guid.NewGuid(), Identifier = (Guid.NewGuid()).ToLowerShorterString(), CreatedAt = time, FirstName = "Jane", LastName = "Doe", Email = "jane.doe@tolaram.com", Phone = "+234022424553", TeamId = teams[1].Id, CompanyId = companies[1].Id } + new UserEntity { Id = Guid.NewGuid(), Identifier = Guid.NewGuid().ToLowerShorterString(), CreatedAt = time, FirstName = "John", LastName = "Doe", Email = "john.doe@tolaram.com", Phone = "+234012345567", TeamId = teams[0].Id, CompanyId = companies[0].Id }, + new UserEntity { Id = Guid.NewGuid(), Identifier = Guid.NewGuid().ToLowerShorterString(), CreatedAt = time, FirstName = "Jane", LastName = "Doe", Email = "jane.doe@tolaram.com", Phone = "+234022424553", TeamId = teams[1].Id, CompanyId = companies[1].Id } }; _modelBuilder.Entity().HasData(banks); From 9d21e7b40fd847bee862456055a63e178a50454c Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Wed, 1 Feb 2023 05:10:20 +0100 Subject: [PATCH 057/185] Updated mainlayout components --- src/Web/Components/Shared/AppBar.razor | 18 ------ src/Web/Components/Shared/NavMenu.razor | 84 +++++++++++++++++-------- 2 files changed, 59 insertions(+), 43 deletions(-) diff --git a/src/Web/Components/Shared/AppBar.razor b/src/Web/Components/Shared/AppBar.razor index 131158c4..78962188 100644 --- a/src/Web/Components/Shared/AppBar.razor +++ b/src/Web/Components/Shared/AppBar.razor @@ -1,7 +1,6 @@ @implements IDisposable @inject AppState AppState @inject ThemeState ThemeState -@inject AuthState AuthState @code { protected override void OnInitialized() { @@ -14,8 +13,6 @@ AppState.OnChange -= StateHasChanged; ThemeState.OnChange -= StateHasChanged; } - - async Task SignOut() => await AuthState.TriggerSignOut(); } @@ -27,19 +24,4 @@ } else { } - - - -
- - SA - -
- - - Profile - Bank Act - Sign Out - - \ No newline at end of file diff --git a/src/Web/Components/Shared/NavMenu.razor b/src/Web/Components/Shared/NavMenu.razor index d0c25461..11e24078 100644 --- a/src/Web/Components/Shared/NavMenu.razor +++ b/src/Web/Components/Shared/NavMenu.razor @@ -1,7 +1,13 @@ -@code { +@using XClaim.Common.Dtos +@using XClaim.Common.Extensions +@inject AuthState AuthState + +@code { [Parameter] public bool SideBarOpen { get; set; } = true; + private UserResponse? _profile; + record MenuLink(string Title, string Icon, string Path, List? Child = null); private List _links = new() { @@ -12,7 +18,8 @@ new MenuLink("Transactions", Icons.Material.Filled.SendTimeExtension, "/app/transactions") }; - private List _secondaryLinks = new() { + private List _secondaryLinks = new List { + new MenuLink("Users", Icons.Material.Filled.People, "/app/users"), new MenuLink("Settings", Icons.Material.Filled.Settings, "/app/settings/", new () { new MenuLink("Teams", Icons.Material.Filled.Groups, "/app/settings/teams"), @@ -22,26 +29,58 @@ new MenuLink("Domains", Icons.Material.Filled.Computer, "/app/settings/domains"), new MenuLink("Currency", Icons.Material.Filled.CurrencyExchange, "/app/settings/currency"), new MenuLink("Server", Icons.Material.Filled.SettingsApplications, "/app/settings/server") - }), - new MenuLink("Users", Icons.Material.Filled.People, "/app/users"), - new MenuLink("Help", Icons.Material.Filled.Help, "/app/help") + }) }; + + async Task SignOut() => await AuthState.TriggerSignOut(); + + protected override async Task OnInitializedAsync() { + await base.OnInitializedAsync(); + if(await AuthState.IsAuth()) + _profile = ((await AuthState.GetSession())!).Data; + } + + private string GetInitialsText(string?[] value) { + if (value.Length < 2) return "FL"; + var firstName = value[0]?.ToUpper(); + var lastName = value[^1]?.ToUpper(); + + if (firstName == null && lastName == null) return "FL"; + return firstName![..1] + lastName![..1]; + } } - - X - X-Claim - - - - @foreach (var link in _links) { - @link.Title - } - - -
- + @if (_profile != null) { + + + + + @GetInitialsText(new[] {_profile?.FirstName, _profile?.LastName}) + + @_profile?.FirstName.Truncate(12) + @_profile?.Email.Truncate(18) + + + + + + Profile + Bank Act + Help + Sign Out + + + } + +
+ + + @foreach (var link in _links) { + @link.Title + } + + @foreach (var link in _secondaryLinks) { @if (link.Child is not null) { @@ -50,13 +89,13 @@ @subLink.Title } - } else { + } + else { @link.Title } }
- \ No newline at end of file From 9cbb4e856618007207ba1b8d570594de26052d4f Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Wed, 1 Feb 2023 05:11:16 +0100 Subject: [PATCH 058/185] Limit company modification to system users only --- .../Settings/Category/MutateCategory.razor | 16 +++-- .../Pages/Settings/Teams/MutateTeam.razor | 18 ++++-- .../Components/Pages/User/MutateUser.razor | 62 ++++++++++++------- 3 files changed, 63 insertions(+), 33 deletions(-) diff --git a/src/Web/Components/Pages/Settings/Category/MutateCategory.razor b/src/Web/Components/Pages/Settings/Category/MutateCategory.razor index 21c38f29..e927fc24 100644 --- a/src/Web/Components/Pages/Settings/Category/MutateCategory.razor +++ b/src/Web/Components/Pages/Settings/Category/MutateCategory.razor @@ -73,6 +73,7 @@ + @@ -82,17 +83,22 @@ - - - + + + + + + + + diff --git a/src/Web/Components/Pages/Settings/Teams/MutateTeam.razor b/src/Web/Components/Pages/Settings/Teams/MutateTeam.razor index 4a467e87..985cfa33 100644 --- a/src/Web/Components/Pages/Settings/Teams/MutateTeam.razor +++ b/src/Web/Components/Pages/Settings/Teams/MutateTeam.razor @@ -84,6 +84,7 @@ + @@ -93,13 +94,17 @@ - - - + Clearable="true" ToStringFunc="@(e => e == null ? null : $"{e.FullName} - {e.Permission}")"/> + + + + + + + @@ -109,6 +114,7 @@ + diff --git a/src/Web/Components/Pages/User/MutateUser.razor b/src/Web/Components/Pages/User/MutateUser.razor index e0d97bc8..846f7e19 100644 --- a/src/Web/Components/Pages/User/MutateUser.razor +++ b/src/Web/Components/Pages/User/MutateUser.razor @@ -1,5 +1,7 @@ @using XClaim.Common.Dtos +@using XClaim.Common.Enums @using XClaim.Common.Helpers +@using Nextended.Core.Extensions @inject IUserService Http @inject ICompanyService CompanyService @inject ITeamService TeamService @@ -39,20 +41,21 @@ private UserResponse Item { get; set; } = new UserResponse(); protected override async Task OnInitializedAsync() { - await base.OnInitializedAsync(); + if (Id != null) { Loading = true; - var response = (await Http.GetByIdAsync(Id.Value)).Data; - if (response != null) { - Company = response.Company; - Team = response.Team; - response.Company = null; - response.Team = null; - - Item = response; + var res = await Http.GetByIdAsync(Id.Value); + if (res.Succeeded) { + var result = res.Data; + Company = result!.Company; + Team = result!.Team; + result.Company = null; + result.Team = null; + Item = result; } Loading = false; } + await base.OnInitializedAsync(); } async Task Submit() { @@ -85,10 +88,11 @@ + - + SA @@ -96,36 +100,50 @@ - + - - - - + - + - + + + + + + @foreach (var p in Enum.GetValues()) { + @p.ToDescriptionString().Capitalize() + } + + + + + + + - - + + - @ActionText + Cancel + @ActionText \ No newline at end of file From 206f63d217d79934c089fa0d59101e38429b0987 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Wed, 1 Feb 2023 05:11:36 +0100 Subject: [PATCH 059/185] Added descriptions to enums --- src/Common/Enums/ClaimPriority.cs | 3 +++ src/Common/Enums/UserPermission.cs | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/Common/Enums/ClaimPriority.cs b/src/Common/Enums/ClaimPriority.cs index 81998ce2..839fe4da 100644 --- a/src/Common/Enums/ClaimPriority.cs +++ b/src/Common/Enums/ClaimPriority.cs @@ -1,7 +1,10 @@ +using System.ComponentModel; + namespace XClaim.Common.Enums; public enum ClaimPriority { Normal, Urgent, + [Description("Show Stopper")] ShowStopper } \ No newline at end of file diff --git a/src/Common/Enums/UserPermission.cs b/src/Common/Enums/UserPermission.cs index 7d7314fa..98d035b9 100644 --- a/src/Common/Enums/UserPermission.cs +++ b/src/Common/Enums/UserPermission.cs @@ -1,10 +1,14 @@ -namespace XClaim.Common.Enums; +using System.ComponentModel; + +namespace XClaim.Common.Enums; public enum UserPermission { System, Administrator, + [Description("Finance Manager")] Finance, Cashier, + [Description("Department Head")] Lead, Standard } \ No newline at end of file From 23c1e636440c740e4fc1b6850853361714a8ae83 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Wed, 1 Feb 2023 05:12:46 +0100 Subject: [PATCH 060/185] Fix claims priority enum selection --- src/Web/Components/Pages/Claims/MutateClaim.razor | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Web/Components/Pages/Claims/MutateClaim.razor b/src/Web/Components/Pages/Claims/MutateClaim.razor index fac62156..c882f33c 100644 --- a/src/Web/Components/Pages/Claims/MutateClaim.razor +++ b/src/Web/Components/Pages/Claims/MutateClaim.razor @@ -1,6 +1,7 @@ @using XClaim.Common.Dtos @using XClaim.Common.Enums @using XClaim.Common.Helpers +@using Nextended.Core.Extensions @inject IClaimService Http @inject ICategoryService CategoryService @inject ISnackbar Snackbar @@ -105,9 +106,10 @@ - - @foreach (ClaimPriority priority in Enum.GetValues(typeof(ClaimPriority))) { - + + @foreach (var priority in Enum.GetValues()) { + @priority.ToDescriptionString().Capitalize() } From 5878ca686e34d56eb346b6efe21d27b9a4d60e8b Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Wed, 1 Feb 2023 05:12:52 +0100 Subject: [PATCH 061/185] Update UserService.cs --- src/Common/HTTP/UserService.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Common/HTTP/UserService.cs b/src/Common/HTTP/UserService.cs index 041798dc..51f85522 100644 --- a/src/Common/HTTP/UserService.cs +++ b/src/Common/HTTP/UserService.cs @@ -21,11 +21,11 @@ public async Task>> GetManagersAsync(object? qu public async Task> GetByIdAsync(Guid id) { return await _http.Get>($"{RootApi}/{id}"); } - public async Task> RegistrationAsync(UserResponse bank) { - return await _http.Post>(RootApi, bank); + public async Task> RegistrationAsync(UserResponse user) { + return await _http.Post>(RootApi, user); } - public async Task> UpdateAsync(UserResponse bank) { - return await _http.Put>(RootApi, bank); + public async Task> UpdateAsync(UserResponse user) { + return await _http.Put>(RootApi, user); } public async Task> ArchiveAsync(Guid id) { return await _http.Delete>($"{RootApi}/{id}"); From 7ee03cfadec4701d59943afac796f836ae991c47 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Wed, 1 Feb 2023 14:55:05 +0100 Subject: [PATCH 062/185] Update PaymentView.cs --- src/Mobile/Views/Payment/PaymentView.cs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Mobile/Views/Payment/PaymentView.cs b/src/Mobile/Views/Payment/PaymentView.cs index 3d02d33f..4a5ba53e 100644 --- a/src/Mobile/Views/Payment/PaymentView.cs +++ b/src/Mobile/Views/Payment/PaymentView.cs @@ -1,4 +1,3 @@ -using XClaim.Common.Dtos; using XClaim.Mobile.Views.Payment.Component; namespace XClaim.Mobile.Views.Payment; @@ -90,7 +89,7 @@ protected override void Build() { new Label { TextColor = Colors.LightGreen } .Font(size: 18) .Bind(Label.TextProperty, nameof(PaymentResponse.Amount), - convert: (decimal value) => AppConst.Naira + string.Format("{0:N0}", value)) + convert: (decimal value) => AppConst.Naira + $"{value:N0}") .MinWidth(95) .Row(SectionLevel.First) .Column(SectionLevel.Third) @@ -98,7 +97,7 @@ protected override void Build() { .CenterHorizontal(), new Label() .Font(size: 11) - .Bind(Label.TextProperty, nameof(PaymentResponse.Completed)) + .Bind(Label.TextProperty, nameof(PaymentResponse.Confirmed)) .Row(SectionLevel.Second) .Column(SectionLevel.Third), new BoxView() From b5ffa35b5a62574e26c41e0ba7ba4e08f0ff0dd2 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Wed, 1 Feb 2023 16:05:28 +0100 Subject: [PATCH 063/185] Added validation to registration form --- .../Pages/Startup/Registration.razor | 94 +++++++++++-------- 1 file changed, 55 insertions(+), 39 deletions(-) diff --git a/src/Web/Components/Pages/Startup/Registration.razor b/src/Web/Components/Pages/Startup/Registration.razor index 810cb2bc..d4043160 100644 --- a/src/Web/Components/Pages/Startup/Registration.razor +++ b/src/Web/Components/Pages/Startup/Registration.razor @@ -2,6 +2,7 @@ @using XClaim.Common.Dtos @using XClaim.Common.Helpers @using Nextended.Core.Extensions +@using System.ComponentModel.DataAnnotations @inject IUserService Http @inject ICompanyService CompanyService @inject ICurrencyService CurrencyService @@ -11,6 +12,9 @@ @attribute [Authorize] @code { + bool _success; + string[] _errors = { }; + MudForm? _form; private CompanyResponse? Company { get; set; } private CurrencyResponse? Currency { get; set; } @@ -44,6 +48,9 @@ } async Task Verify() { + await _form!.Validate(); + if (!_success) return; + Item.CompanyId = Company?.Id; Item.CurrencyId = Currency?.Id; var result = await Http.RegistrationAsync(Item); @@ -62,45 +69,54 @@ Verify Account - - - - - - - SA - - - - + + + + + + + + SA + + + + + + + + + + + + + + - + + + + + + + + + + Continue - - - - - - - - - - - - - - - - - - Continue - - - - + + + + From 93e810c485d01d088b5ff63cf08740cb96ea2f23 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Wed, 1 Feb 2023 16:10:37 +0100 Subject: [PATCH 064/185] mobile app compilation fix --- src/Mobile/Services/HttpService.cs | 3 +-- src/Mobile/XClaim.Mobile.csproj | 7 ++++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Mobile/Services/HttpService.cs b/src/Mobile/Services/HttpService.cs index 2c56aa41..cfd2f397 100644 --- a/src/Mobile/Services/HttpService.cs +++ b/src/Mobile/Services/HttpService.cs @@ -1,11 +1,10 @@ -using JetBrains.Annotations; using XClaim.Common.Service; namespace XClaim.Mobile.Services; public class HttpService : AbstractHttpService { - public HttpService([NotNull] HttpClient http) : base(http) { } + public HttpService(HttpClient http) : base(http) { } protected override Task AddJwtHeader(HttpRequestMessage request) { throw new NotImplementedException(); } diff --git a/src/Mobile/XClaim.Mobile.csproj b/src/Mobile/XClaim.Mobile.csproj index 1fad3166..f2cf0541 100644 --- a/src/Mobile/XClaim.Mobile.csproj +++ b/src/Mobile/XClaim.Mobile.csproj @@ -39,14 +39,15 @@ + - + - - + + From 8394dc1ee3d9e3a7fb55858267b608c10cadba33 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Wed, 1 Feb 2023 17:04:22 +0100 Subject: [PATCH 065/185] Added user settings page --- src/Web/Components/Pages/User/Settings.razor | 7 +++ src/Web/Components/Shared/NavMenu.razor | 57 +++++++++++--------- 2 files changed, 38 insertions(+), 26 deletions(-) create mode 100644 src/Web/Components/Pages/User/Settings.razor diff --git a/src/Web/Components/Pages/User/Settings.razor b/src/Web/Components/Pages/User/Settings.razor new file mode 100644 index 00000000..7a5359ce --- /dev/null +++ b/src/Web/Components/Pages/User/Settings.razor @@ -0,0 +1,7 @@ +@page "/app/user/settings" + +

Settings

+ +@code { + +} \ No newline at end of file diff --git a/src/Web/Components/Shared/NavMenu.razor b/src/Web/Components/Shared/NavMenu.razor index 11e24078..fa820adc 100644 --- a/src/Web/Components/Shared/NavMenu.razor +++ b/src/Web/Components/Shared/NavMenu.razor @@ -20,8 +20,8 @@ private List _secondaryLinks = new List { new MenuLink("Users", Icons.Material.Filled.People, "/app/users"), - new MenuLink("Settings", Icons.Material.Filled.Settings, "/app/settings/", - new () { + new MenuLink("Manage", Icons.Material.Filled.ManageAccounts, "/app/settings/", + new List { new MenuLink("Teams", Icons.Material.Filled.Groups, "/app/settings/teams"), new MenuLink("Category", Icons.Material.Filled.Category, "/app/settings/category"), new MenuLink("Companies", Icons.Material.Filled.PendingActions, "/app/settings/companies"), @@ -51,36 +51,41 @@ } - @if (_profile != null) { - - - - - @GetInitialsText(new[] {_profile?.FirstName, _profile?.LastName}) - - @_profile?.FirstName.Truncate(12) - @_profile?.Email.Truncate(18) +
+ @if (_profile != null) { + + + + + @GetInitialsText(new[] { + _profile?.FirstName, _profile?.LastName + }) + + @_profile?.FirstName.Truncate(12) + @_profile?.Email.Truncate(18) + - - - - - Profile - Bank Act - Help - Sign Out - - - } - -
- + + + + Profile + Settings + Bank Act + Help + Sign Out + + + } + + @foreach (var link in _links) { @link.Title } - +
+
+ @foreach (var link in _secondaryLinks) { @if (link.Child is not null) { From 78c8c3134a01ae604829331c846cd08c1df8df33 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Wed, 1 Feb 2023 20:17:19 +0100 Subject: [PATCH 066/185] Added user notification setting types --- src/Common/Dtos/NotificationResponse.cs | 11 +++++++++++ src/Web/Server/Entities/NotificationEntity.cs | 12 ++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 src/Common/Dtos/NotificationResponse.cs create mode 100644 src/Web/Server/Entities/NotificationEntity.cs diff --git a/src/Common/Dtos/NotificationResponse.cs b/src/Common/Dtos/NotificationResponse.cs new file mode 100644 index 00000000..beaf33b1 --- /dev/null +++ b/src/Common/Dtos/NotificationResponse.cs @@ -0,0 +1,11 @@ +using XClaim.Common.Enums; + +namespace XClaim.Common.Dtos; + +public class NotificationResponse { + public UserResponse? Owner { get; set; } + public Guid OwnerId { get; set; } + public bool Disabled { get; set; } + public ICollection Channels { get; set; } = default!; + public ICollection Types { get; set; } = default!; +} \ No newline at end of file diff --git a/src/Web/Server/Entities/NotificationEntity.cs b/src/Web/Server/Entities/NotificationEntity.cs new file mode 100644 index 00000000..93557b92 --- /dev/null +++ b/src/Web/Server/Entities/NotificationEntity.cs @@ -0,0 +1,12 @@ +using XClaim.Common.Base; +using XClaim.Common.Enums; + +namespace XClaim.Web.Server.Entities; + +public class NotificationEntity : BaseEntity { + public UserEntity? Owner { get; set; } + public Guid OwnerId { get; set; } + public bool Disabled { get; set; } + public ICollection Channels { get; set; } = default!; + public ICollection Types { get; set; } = default!; +} \ No newline at end of file From 475adc8452666e47677462f203ccadbe7f2628dc Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Wed, 1 Feb 2023 20:17:48 +0100 Subject: [PATCH 067/185] Update enums --- src/Common/Enums/AppLanguage.cs | 7 +++++++ src/Common/Enums/EventType.cs | 10 ++++++++-- src/Common/Enums/NotificationChannels.cs | 14 ++++++++++++++ 3 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 src/Common/Enums/AppLanguage.cs create mode 100644 src/Common/Enums/NotificationChannels.cs diff --git a/src/Common/Enums/AppLanguage.cs b/src/Common/Enums/AppLanguage.cs new file mode 100644 index 00000000..a4a70c84 --- /dev/null +++ b/src/Common/Enums/AppLanguage.cs @@ -0,0 +1,7 @@ +namespace XClaim.Common.Enums { + public enum AppLanguage { + English, + French, + Spanish + } +} \ No newline at end of file diff --git a/src/Common/Enums/EventType.cs b/src/Common/Enums/EventType.cs index 52f304b6..de26ab2f 100644 --- a/src/Common/Enums/EventType.cs +++ b/src/Common/Enums/EventType.cs @@ -1,8 +1,14 @@ -namespace XClaim.Common.Enums; +using System.ComponentModel; + +namespace XClaim.Common.Enums; public enum EventType { Claim, Payment, Review, - Comment + Comment, + Reminder, + Announcement, + [Description("Weekly Status")] + WeeklyStatus } \ No newline at end of file diff --git a/src/Common/Enums/NotificationChannels.cs b/src/Common/Enums/NotificationChannels.cs new file mode 100644 index 00000000..9e4ca92c --- /dev/null +++ b/src/Common/Enums/NotificationChannels.cs @@ -0,0 +1,14 @@ +using System.ComponentModel; + +namespace XClaim.Common.Enums { + public enum NotificationChannels { + [Description("Email NOtifications")] + Email, + [Description("Push NOtifications")] + Push, + [Description("SMS NOtifications")] + Sms, + [Description("MS Teams NOtifications")] + Teams + } +} \ No newline at end of file From e02bb8f9c8a92f2cbf5fb146774afa944a1f52b2 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Wed, 1 Feb 2023 20:18:07 +0100 Subject: [PATCH 068/185] Added user setting types --- src/Common/Dtos/SettingResponse.cs | 10 ++++++++++ src/Web/Server/Entities/SettingEntity.cs | 11 +++++++++++ 2 files changed, 21 insertions(+) create mode 100644 src/Common/Dtos/SettingResponse.cs create mode 100644 src/Web/Server/Entities/SettingEntity.cs diff --git a/src/Common/Dtos/SettingResponse.cs b/src/Common/Dtos/SettingResponse.cs new file mode 100644 index 00000000..61e1bd63 --- /dev/null +++ b/src/Common/Dtos/SettingResponse.cs @@ -0,0 +1,10 @@ +using XClaim.Common.Enums; + +namespace XClaim.Common.Dtos; + +public class SettingResponse { + public UserResponse? Owner { get; set; } + public Guid OwnerId { get; set; } + public bool DarkMode { get; set; } + public AppLanguage Language { get; set; } = AppLanguage.English; +} \ No newline at end of file diff --git a/src/Web/Server/Entities/SettingEntity.cs b/src/Web/Server/Entities/SettingEntity.cs new file mode 100644 index 00000000..5066b8e0 --- /dev/null +++ b/src/Web/Server/Entities/SettingEntity.cs @@ -0,0 +1,11 @@ +using XClaim.Common.Base; +using XClaim.Common.Enums; + +namespace XClaim.Web.Server.Entities; + +public class SettingEntity : BaseEntity { + public UserEntity? Owner { get; set; } + public Guid OwnerId { get; set; } + public bool DarkMode { get; set; } + public AppLanguage Language { get; set; } = AppLanguage.English; +} \ No newline at end of file From 52444609943cf30bc21286ba96ee0882dd8fb121 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Wed, 1 Feb 2023 20:18:26 +0100 Subject: [PATCH 069/185] Added server setting types --- src/Common/Dtos/ServerResponse.cs | 12 ++++++++++++ src/Web/Server/Entities/ServerEntity.cs | 12 ++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 src/Common/Dtos/ServerResponse.cs create mode 100644 src/Web/Server/Entities/ServerEntity.cs diff --git a/src/Common/Dtos/ServerResponse.cs b/src/Common/Dtos/ServerResponse.cs new file mode 100644 index 00000000..c6c5cda7 --- /dev/null +++ b/src/Common/Dtos/ServerResponse.cs @@ -0,0 +1,12 @@ +using XClaim.Common.Base; + +namespace XClaim.Common.Dtos; + +public class ServerResponse : BaseResponse { + public string ServiceName { get; set; } = string.Empty; + public string AdminEmail { get; set; } = string.Empty; + public bool MaintenanceMode { get; set; } + public string MaintenanceText { get; set; } = string.Empty; + public CurrencyResponse? Currency { get; set; } + public Guid? CurrencyId { get; set; } +} \ No newline at end of file diff --git a/src/Web/Server/Entities/ServerEntity.cs b/src/Web/Server/Entities/ServerEntity.cs new file mode 100644 index 00000000..b8a43970 --- /dev/null +++ b/src/Web/Server/Entities/ServerEntity.cs @@ -0,0 +1,12 @@ +using XClaim.Common.Base; + +namespace XClaim.Web.Server.Entities; + +public class ServerEntity : BaseEntity { + public string ServiceName { get; set; } = string.Empty; + public string AdminEmail { get; set; } = string.Empty; + public bool MaintenanceMode { get; set; } + public string MaintenanceText { get; set; } = string.Empty; + public CurrencyEntity? Currency { get; set; } + public Guid? CurrencyId { get; set; } +} \ No newline at end of file From da2c8731b95501193368cbf5225b662738542365 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Wed, 1 Feb 2023 20:22:00 +0100 Subject: [PATCH 070/185] Added user dependent entities --- src/Common/Dtos/UserResponse.cs | 9 +++++---- src/Web/Server/Entities/UserEntity.cs | 3 ++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/Common/Dtos/UserResponse.cs b/src/Common/Dtos/UserResponse.cs index 34a66436..6810a1ac 100644 --- a/src/Common/Dtos/UserResponse.cs +++ b/src/Common/Dtos/UserResponse.cs @@ -9,9 +9,7 @@ public class UserResponse : BaseResponse { public string Phone { get; set; } = String.Empty; public string FirstName { get; set; } = String.Empty; public string LastName { get; set; } = String.Empty; - public string FullName { - get { return $"{FirstName} {LastName}"; } - } + public string FullName => $"{FirstName} {LastName}"; public decimal Balance { get; set; } public UserPermission Permission { get; set; } = UserPermission.Standard; public CompanyResponse? Company { get; set; } @@ -20,9 +18,12 @@ public string FullName { public TeamResponse? Team { get; set; } public Guid? TeamId { get; set; } public TeamResponse? TeamManaged { get; set; } - public BankAccountResponse? BankAccount { get; set; } public CurrencyResponse? Currency { get; set; } public Guid? CurrencyId { get; set; } + public BankAccountResponse? BankAccount { get; set; } + public NotificationResponse? Notification { get; set; } + public SettingResponse? Setting { get; set; } + public bool Active { get; set; } public string Token { get; set; } = String.Empty; public string? Image { get; set; } diff --git a/src/Web/Server/Entities/UserEntity.cs b/src/Web/Server/Entities/UserEntity.cs index 62fda342..f4e27e14 100644 --- a/src/Web/Server/Entities/UserEntity.cs +++ b/src/Web/Server/Entities/UserEntity.cs @@ -29,7 +29,8 @@ public sealed class UserEntity : BaseEntity { public TeamEntity? TeamManaged { get; set; } public Guid? TeamManagedId { get; set; } public BankAccountEntity? BankAccount { get; set; } - public Guid? BankAccountId { get; set; } + public NotificationEntity? Notification { get; set; } + public SettingEntity? Setting { get; set; } public CurrencyEntity? Currency { get; set; } public Guid? CurrencyId { get; set; } public bool Active { get; set; } From e02e5bc059536871ef822e76bda3d8f26b310940 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Wed, 1 Feb 2023 20:22:28 +0100 Subject: [PATCH 071/185] Updated model builder and seed --- src/Web/Server/Data/DbInitializer.cs | 6 ++++++ src/Web/Server/Data/ServerContext.cs | 24 ++++++++++++++++-------- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/src/Web/Server/Data/DbInitializer.cs b/src/Web/Server/Data/DbInitializer.cs index ce3fb89b..03058069 100644 --- a/src/Web/Server/Data/DbInitializer.cs +++ b/src/Web/Server/Data/DbInitializer.cs @@ -1,5 +1,6 @@ using Microsoft.EntityFrameworkCore; using SourceExpress.ShorterGuid; +using XClaim.Common; using XClaim.Common.Enums; using XClaim.Web.Server.Entities; @@ -68,6 +69,10 @@ public void Seed() { new UserEntity { Id = Guid.NewGuid(), Identifier = Guid.NewGuid().ToLowerShorterString(), CreatedAt = time, FirstName = "Jane", LastName = "Doe", Email = "jane.doe@tolaram.com", Phone = "+234022424553", TeamId = teams[1].Id, CompanyId = companies[1].Id } }; + var server = new List { + new ServerEntity { Id = Guid.NewGuid(), AdminEmail = "admin@x-claim.dev", CurrencyId = currencies[0].Id, MaintenanceText = "In-Progress", ServiceName = SharedConst.ServiceName } + }; + _modelBuilder.Entity().HasData(banks); _modelBuilder.Entity().HasData(domains); _modelBuilder.Entity().HasData(currencies); @@ -75,5 +80,6 @@ public void Seed() { _modelBuilder.Entity().HasData(categories); _modelBuilder.Entity().HasData(users); _modelBuilder.Entity().HasData(teams); + _modelBuilder.Entity().HasData(server); } } \ No newline at end of file diff --git a/src/Web/Server/Data/ServerContext.cs b/src/Web/Server/Data/ServerContext.cs index d43a8cbd..30139652 100644 --- a/src/Web/Server/Data/ServerContext.cs +++ b/src/Web/Server/Data/ServerContext.cs @@ -1,6 +1,8 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.ChangeTracking; using XClaim.Common.Base; +using XClaim.Common.Enums; +using XClaim.Web.Server.Converters; using XClaim.Web.Server.Entities; namespace XClaim.Web.Server.Data; @@ -29,23 +31,29 @@ protected override void OnModelCreating(ModelBuilder mx) { .WithOne(u => u.TeamManaged) .HasForeignKey(t => t.ManagerId) .OnDelete(DeleteBehavior.SetNull); - - // User - BankAccount One to One - mx.Entity() - .HasOne(u => u.Owner) - .WithOne(ba => ba.BankAccount) - .HasForeignKey(u => u.OwnerId) - .OnDelete(DeleteBehavior.SetNull); + + mx.Entity() + .Property(e => e.Channels) + .HasConversion(new EnumCollectionJsonValueConverter()) + .Metadata.SetValueComparer(new CollectionValueComparer()); + + mx.Entity() + .Property(e => e.Types) + .HasConversion(new EnumCollectionJsonValueConverter()) + .Metadata.SetValueComparer(new CollectionValueComparer()); // Initialize database seeding new DbInitializer(mx).Seed(); } + public DbSet Server { get; set; } = default!; public DbSet Users { get; set; } = default!; + public DbSet UserNotification { get; set; } = default!; + public DbSet UserSetting { get; set; } = default!; + public DbSet UserBankAccount { get; set; } = default!; public DbSet Teams { get; set; } = default!; public DbSet Banks { get; set; } = default!; public DbSet Companies { get; set; } = default!; - public DbSet BankAccounts { get; set; } = default!; public DbSet Categories { get; set; } = default!; public DbSet Comments { get; set; } = default!; public DbSet Events { get; set; } = default!; From 7d4858190307e422578708a501f8a5f9465c425a Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Wed, 1 Feb 2023 20:23:02 +0100 Subject: [PATCH 072/185] Updated mapper profile --- src/Web/Server/MapperProfile.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Web/Server/MapperProfile.cs b/src/Web/Server/MapperProfile.cs index d5ad37e6..1fdea0e8 100644 --- a/src/Web/Server/MapperProfile.cs +++ b/src/Web/Server/MapperProfile.cs @@ -9,7 +9,6 @@ namespace XClaim.Web.Server; public class MapperProfile : AutoMapperProfile { public MapperProfile() { CreateMap().ReverseMap(); - CreateMap().ReverseMap(); CreateMap().ReverseMap(); CreateMap().ReverseMap(); CreateMap().ReverseMap(); @@ -21,6 +20,10 @@ public MapperProfile() { CreateMap().ReverseMap(); CreateMap().ReverseMap(); CreateMap().ReverseMap(); + CreateMap().ReverseMap(); + CreateMap().ReverseMap(); + CreateMap().ReverseMap(); + CreateMap().ReverseMap(); CreateMap().ReverseMap(); } } \ No newline at end of file From 4ed51e46adf00ee77f8b5506612299c2ca83984b Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Wed, 1 Feb 2023 20:23:38 +0100 Subject: [PATCH 073/185] Added collection enum convertion helpers --- .../Server/Converters/CollectionValueComparer.cs | 10 ++++++++++ .../Converters/EnumCollectionJsonValueConverter.cs | 13 +++++++++++++ src/Web/Server/Converters/JsonValueConverter.cs | 9 +++++++++ 3 files changed, 32 insertions(+) create mode 100644 src/Web/Server/Converters/CollectionValueComparer.cs create mode 100644 src/Web/Server/Converters/EnumCollectionJsonValueConverter.cs create mode 100644 src/Web/Server/Converters/JsonValueConverter.cs diff --git a/src/Web/Server/Converters/CollectionValueComparer.cs b/src/Web/Server/Converters/CollectionValueComparer.cs new file mode 100644 index 00000000..a7b4bd6e --- /dev/null +++ b/src/Web/Server/Converters/CollectionValueComparer.cs @@ -0,0 +1,10 @@ +using Microsoft.EntityFrameworkCore.ChangeTracking; + +namespace XClaim.Web.Server.Converters; + +public class CollectionValueComparer : ValueComparer> { + public CollectionValueComparer() : base((c1, c2) => c1!.SequenceEqual(c2!), + c => c.Aggregate(0, (a, v) => HashCode.Combine(a, v!.GetHashCode())), c => (ICollection) c.ToHashSet()) + { + } +} \ No newline at end of file diff --git a/src/Web/Server/Converters/EnumCollectionJsonValueConverter.cs b/src/Web/Server/Converters/EnumCollectionJsonValueConverter.cs new file mode 100644 index 00000000..634fbb4a --- /dev/null +++ b/src/Web/Server/Converters/EnumCollectionJsonValueConverter.cs @@ -0,0 +1,13 @@ +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using Newtonsoft.Json; + +namespace XClaim.Web.Server.Converters; + +public class EnumCollectionJsonValueConverter : ValueConverter, string> where T : Enum { + public EnumCollectionJsonValueConverter() : base( + v => JsonConvert + .SerializeObject(v.Select(e => e.ToString()).ToList()), + v => JsonConvert + .DeserializeObject>(v)! + .Select(e => (T) Enum.Parse(typeof(T), e)).ToList()) { } +} \ No newline at end of file diff --git a/src/Web/Server/Converters/JsonValueConverter.cs b/src/Web/Server/Converters/JsonValueConverter.cs new file mode 100644 index 00000000..42ce749d --- /dev/null +++ b/src/Web/Server/Converters/JsonValueConverter.cs @@ -0,0 +1,9 @@ +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using Newtonsoft.Json; + +namespace XClaim.Web.Server.Converters; + +public class JsonValueConverter : ValueConverter { + public JsonValueConverter() : base(v => JsonConvert.SerializeObject(v), + v => JsonConvert.DeserializeObject(v) ?? (T) new object()) { } +} \ No newline at end of file From f91e20163e2b52f7e24224f8379a7ebdaeba1cc0 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Wed, 1 Feb 2023 20:23:42 +0100 Subject: [PATCH 074/185] Update SharedConst.cs --- src/Common/SharedConst.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Common/SharedConst.cs b/src/Common/SharedConst.cs index 32a81b6e..2e5abff1 100644 --- a/src/Common/SharedConst.cs +++ b/src/Common/SharedConst.cs @@ -1,6 +1,7 @@ namespace XClaim.Common; -public class SharedConst { +public static class SharedConst { + public const string ServiceName = "X-Claim"; public static int RowsPerPage = 25; public static readonly DateTime StartDate = DateTime.Now.AddDays(-7); public static readonly DateTime EndDate = DateTime.Now.Date; From e06bc7dd55a034b3a9e19f2744bcb3b8e0a0dc05 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Wed, 1 Feb 2023 20:24:02 +0100 Subject: [PATCH 075/185] Payment type update --- src/Common/Dtos/PaymentResponse.cs | 6 +----- src/Web/Server/Entities/PaymentEntity.cs | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/Common/Dtos/PaymentResponse.cs b/src/Common/Dtos/PaymentResponse.cs index 447a73b7..ad6c542a 100644 --- a/src/Common/Dtos/PaymentResponse.cs +++ b/src/Common/Dtos/PaymentResponse.cs @@ -11,11 +11,7 @@ public class PaymentResponse : BaseResponse { public DateTime? ConfirmedAt { get; set; } public UserResponse? ConfirmedBy { get; set; } public Guid? ConfirmedById { get; set; } - public bool Confirmed { - get { - return ConfirmedAt != null; - } - } + public bool Confirmed => ConfirmedAt != null; public int Count { get; set; } public ICollection Claims { get; set; } = default!; } \ No newline at end of file diff --git a/src/Web/Server/Entities/PaymentEntity.cs b/src/Web/Server/Entities/PaymentEntity.cs index 8dc89f3f..7f179abc 100644 --- a/src/Web/Server/Entities/PaymentEntity.cs +++ b/src/Web/Server/Entities/PaymentEntity.cs @@ -15,11 +15,7 @@ public sealed class PaymentEntity : BaseEntity { public DateTime? ConfirmedAt { get; set; } public UserEntity? ConfirmedBy { get; set; } public Guid? ConfirmedById { get; set; } - public bool Confirmed { - get { - return ConfirmedAt != null; - } - } + public bool Confirmed => ConfirmedAt != null; public int Count { get; set; } public ICollection Claims { get; set; } = default!; public ICollection Files { get; set; } = default!; From 452ab41ac5b7909e8187cff23de6be2b093671ed Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Thu, 2 Feb 2023 02:25:51 +0100 Subject: [PATCH 076/185] tweak config helper --- src/Web/Server/Helpers/ConfigHelper.cs | 5 ++--- src/Web/Server/config.Development.ini | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/Web/Server/Helpers/ConfigHelper.cs b/src/Web/Server/Helpers/ConfigHelper.cs index aedd48f3..6235a760 100644 --- a/src/Web/Server/Helpers/ConfigHelper.cs +++ b/src/Web/Server/Helpers/ConfigHelper.cs @@ -7,9 +7,8 @@ public static class ConfigHelper { public static void ApplyDefaultAppConfiguration(HostBuilderContext hostingContext, IConfigurationBuilder appConfigBuilder, string[]? args) { IHostEnvironment env = hostingContext.HostingEnvironment; bool reloadOnChange = GetReloadConfigOnChangeValue(hostingContext); - - appConfigBuilder.AddIniFile("config.ini", optional: true, reloadOnChange: reloadOnChange) - .AddIniFile($"config{env.EnvironmentName}.ini", optional: true, reloadOnChange: reloadOnChange); + var configFile = env.IsDevelopment() ? $"config.Development.ini" : "config.ini"; + appConfigBuilder.AddIniFile(configFile, optional: true, reloadOnChange: reloadOnChange); if (env.IsDevelopment() && env.ApplicationName is { Length: > 0 }) { var appAssembly = Assembly.Load(new AssemblyName(env.ApplicationName)); diff --git a/src/Web/Server/config.Development.ini b/src/Web/Server/config.Development.ini index 7bff08da..451caa27 100644 --- a/src/Web/Server/config.Development.ini +++ b/src/Web/Server/config.Development.ini @@ -2,8 +2,8 @@ AllowedHosts=* Database=sqlite [Logging.LogLevel] -Default=Information -Microsoft.AspNetCore=Warning +Default=Debug +Microsoft.AspNetCore=Debug [ConnectionStrings] Default="Data Source=app-data.sqlite3" From dbb7d709573fed71e83a851f25eb675519587923 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Thu, 2 Feb 2023 02:26:18 +0100 Subject: [PATCH 077/185] Correct type erros --- src/Common/Dtos/BankAccountResponse.cs | 1 + src/Common/Dtos/NotificationResponse.cs | 5 +++-- src/Common/Dtos/SettingResponse.cs | 5 +++-- src/Web/Server/Entities/NotificationEntity.cs | 2 +- src/Web/Server/Entities/SettingEntity.cs | 2 +- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/Common/Dtos/BankAccountResponse.cs b/src/Common/Dtos/BankAccountResponse.cs index ccdf0819..5dcfe191 100644 --- a/src/Common/Dtos/BankAccountResponse.cs +++ b/src/Common/Dtos/BankAccountResponse.cs @@ -6,6 +6,7 @@ public class BankAccountResponse : BaseResponse { public string FullName { get; set; } = string.Empty; public BankResponse? Bank { get; set; } public UserResponse? Owner { get; set; } + public Guid? OwnerId { get; set; } public string Number { get; set; } = string.Empty; public string Description { get; set; } = string.Empty; } \ No newline at end of file diff --git a/src/Common/Dtos/NotificationResponse.cs b/src/Common/Dtos/NotificationResponse.cs index beaf33b1..e9c5a051 100644 --- a/src/Common/Dtos/NotificationResponse.cs +++ b/src/Common/Dtos/NotificationResponse.cs @@ -1,10 +1,11 @@ +using XClaim.Common.Base; using XClaim.Common.Enums; namespace XClaim.Common.Dtos; -public class NotificationResponse { +public class NotificationResponse : BaseResponse { public UserResponse? Owner { get; set; } - public Guid OwnerId { get; set; } + public Guid? OwnerId { get; set; } public bool Disabled { get; set; } public ICollection Channels { get; set; } = default!; public ICollection Types { get; set; } = default!; diff --git a/src/Common/Dtos/SettingResponse.cs b/src/Common/Dtos/SettingResponse.cs index 61e1bd63..cd60ba2d 100644 --- a/src/Common/Dtos/SettingResponse.cs +++ b/src/Common/Dtos/SettingResponse.cs @@ -1,10 +1,11 @@ +using XClaim.Common.Base; using XClaim.Common.Enums; namespace XClaim.Common.Dtos; -public class SettingResponse { +public class SettingResponse : BaseResponse { public UserResponse? Owner { get; set; } - public Guid OwnerId { get; set; } + public Guid? OwnerId { get; set; } public bool DarkMode { get; set; } public AppLanguage Language { get; set; } = AppLanguage.English; } \ No newline at end of file diff --git a/src/Web/Server/Entities/NotificationEntity.cs b/src/Web/Server/Entities/NotificationEntity.cs index 93557b92..0347436f 100644 --- a/src/Web/Server/Entities/NotificationEntity.cs +++ b/src/Web/Server/Entities/NotificationEntity.cs @@ -5,7 +5,7 @@ namespace XClaim.Web.Server.Entities; public class NotificationEntity : BaseEntity { public UserEntity? Owner { get; set; } - public Guid OwnerId { get; set; } + public Guid? OwnerId { get; set; } public bool Disabled { get; set; } public ICollection Channels { get; set; } = default!; public ICollection Types { get; set; } = default!; diff --git a/src/Web/Server/Entities/SettingEntity.cs b/src/Web/Server/Entities/SettingEntity.cs index 5066b8e0..cac0cd82 100644 --- a/src/Web/Server/Entities/SettingEntity.cs +++ b/src/Web/Server/Entities/SettingEntity.cs @@ -5,7 +5,7 @@ namespace XClaim.Web.Server.Entities; public class SettingEntity : BaseEntity { public UserEntity? Owner { get; set; } - public Guid OwnerId { get; set; } + public Guid? OwnerId { get; set; } public bool DarkMode { get; set; } public AppLanguage Language { get; set; } = AppLanguage.English; } \ No newline at end of file From 0709d2042337bbe5b0dd0a93ec14bcf8c9a93e9d Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Thu, 2 Feb 2023 02:26:40 +0100 Subject: [PATCH 078/185] Update event service --- src/Web/Server/Modules/EventModule/EventService.cs | 13 ++++++++++++- src/Web/Server/Modules/EventModule/IEventService.cs | 8 +++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/Web/Server/Modules/EventModule/EventService.cs b/src/Web/Server/Modules/EventModule/EventService.cs index ae0cb6e4..0e3d7a33 100644 --- a/src/Web/Server/Modules/EventModule/EventService.cs +++ b/src/Web/Server/Modules/EventModule/EventService.cs @@ -1,5 +1,6 @@ using AutoMapper; using XClaim.Common.Dtos; +using XClaim.Common.Wrappers; using XClaim.Web.Server.Data; using XClaim.Web.Server.Entities; @@ -7,7 +8,17 @@ namespace XClaim.Web.Server.Modules.EventModule; public sealed class EventService : GenericService, IEventService { public EventService(ServerContext ctx, IMapper mapper, ILogger logger) : base(ctx, mapper, logger) { } - public Task ClearOld() { + + public async Task>> GetRecentAsync() { + throw new NotImplementedException(); + } + public async Task>> GetHistoryAsync(EventFilter filter) { + throw new NotImplementedException(); + } + public async Task>> GetAccountAuditAsync() { + throw new NotImplementedException(); + } + public async Task> ClearOld() { throw new NotImplementedException(); } } \ No newline at end of file diff --git a/src/Web/Server/Modules/EventModule/IEventService.cs b/src/Web/Server/Modules/EventModule/IEventService.cs index a6d9838d..f170ecf2 100644 --- a/src/Web/Server/Modules/EventModule/IEventService.cs +++ b/src/Web/Server/Modules/EventModule/IEventService.cs @@ -1,5 +1,11 @@ +using XClaim.Common.Dtos; +using XClaim.Common.Wrappers; + namespace XClaim.Web.Server.Modules.EventModule; public interface IEventService { - Task ClearOld(); + Task>> GetRecentAsync(); + Task>> GetHistoryAsync(EventFilter filter); + Task>> GetAccountAuditAsync(); + Task> ClearOld(); } \ No newline at end of file From 599bbaec58cfebe9cf984a78446909ee23b2af9e Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Thu, 2 Feb 2023 02:27:35 +0100 Subject: [PATCH 079/185] Added child types to profile module --- .../Modules/ProfileModule/IProfileService.cs | 14 +- .../Modules/ProfileModule/ProfileModule.cs | 30 ++- .../Modules/ProfileModule/ProfileService.cs | 173 +++++++++++++++++- 3 files changed, 203 insertions(+), 14 deletions(-) diff --git a/src/Web/Server/Modules/ProfileModule/IProfileService.cs b/src/Web/Server/Modules/ProfileModule/IProfileService.cs index ba08a3ca..1698ac53 100644 --- a/src/Web/Server/Modules/ProfileModule/IProfileService.cs +++ b/src/Web/Server/Modules/ProfileModule/IProfileService.cs @@ -1,9 +1,15 @@ -using XClaim.Web.Server.Entities; +using XClaim.Common.Dtos; +using XClaim.Common.Wrappers; namespace XClaim.Web.Server.Modules.ProfileModule; public interface IProfileService { - Task GetBankAccount(Guid userId); - Task GetAccountHistory(Guid userId); - Task GetRecentNotifications(Guid userId); + Task> GetBankAccountAsync(); + Task> UpdateBankAccountAsync(BankAccountResponse account); + + Task> GetSettingAsync(); + Task> UpdateSettingAsync(SettingResponse setting); + + Task> GetNotificationAsync(); + Task> UpdateNotificationAsync(NotificationResponse notification); } \ No newline at end of file diff --git a/src/Web/Server/Modules/ProfileModule/ProfileModule.cs b/src/Web/Server/Modules/ProfileModule/ProfileModule.cs index 85a2ec13..cf80c8b6 100644 --- a/src/Web/Server/Modules/ProfileModule/ProfileModule.cs +++ b/src/Web/Server/Modules/ProfileModule/ProfileModule.cs @@ -1,6 +1,3 @@ -using System.Security.Claims; -using IdentityModel; -using Microsoft.AspNetCore.Authentication; using XClaim.Common.Dtos; using XClaim.Common.Enums; using XClaim.Common.Wrappers; @@ -11,6 +8,7 @@ namespace XClaim.Web.Server.Modules.ProfileModule; public class ProfileModule : IModule { public IServiceCollection RegisterApiModule(IServiceCollection services) { + services.AddScoped(); return services; } @@ -33,7 +31,31 @@ public IEndpointRouteBuilder MapEndpoints(IEndpointRouteBuilder endpoints) { authProfile.Role = role; return Results.Ok(new Response(authProfile) { Succeeded = authProfile.ExpiresIn > 0 }); - }).WithName("AccountProfile").WithOpenApi(); + }).WithName("GetAccountAuth").WithOpenApi(); + + group.MapGet("/bank-account", async (IProfileService sv) + => await sv.GetBankAccountAsync()).WithName("GetBankAccountSetting").WithOpenApi(); + + group.MapPut("/bank-account", async (BankAccountResponse value, IProfileService sv) => { + var result = await sv.UpdateBankAccountAsync(value); + return !result.Succeeded ? Results.BadRequest(result) : TypedResults.Ok(result); + }).WithName($"UpdateBankAccountSetting").WithOpenApi(); + + group.MapGet("/setting", async (IProfileService sv) + => await sv.GetSettingAsync()).WithName("GetUserSetting").WithOpenApi(); + + group.MapPut("/setting", async (SettingResponse value, IProfileService sv) => { + var result = await sv.UpdateSettingAsync(value); + return !result.Succeeded ? Results.BadRequest(result) : TypedResults.Ok(result); + }).WithName($"UpdateUserSetting").WithOpenApi(); + + group.MapGet("/notification", async (IProfileService sv) + => await sv.GetNotificationAsync()).WithName("GetNotificationSetting").WithOpenApi(); + + group.MapPut("/notification", async (NotificationResponse value, IProfileService sv) => { + var result = await sv.UpdateNotificationAsync(value); + return !result.Succeeded ? Results.BadRequest(result) : TypedResults.Ok(result); + }).WithName($"UpdateNotificationSetting").WithOpenApi(); return group; } diff --git a/src/Web/Server/Modules/ProfileModule/ProfileService.cs b/src/Web/Server/Modules/ProfileModule/ProfileService.cs index 8d1d2e98..fb3f6d81 100644 --- a/src/Web/Server/Modules/ProfileModule/ProfileService.cs +++ b/src/Web/Server/Modules/ProfileModule/ProfileService.cs @@ -1,17 +1,178 @@ +using AutoMapper; +using Microsoft.EntityFrameworkCore; +using XClaim.Common.Dtos; +using XClaim.Common.Wrappers; +using XClaim.Web.Server.Data; using XClaim.Web.Server.Entities; +using XClaim.Web.Server.Helpers; namespace XClaim.Web.Server.Modules.ProfileModule; public class ProfileService : IProfileService { - public Task GetBankAccount(Guid userId) { - throw new NotImplementedException(); + + private readonly ServerContext _ctx; + private readonly IMapper _mapper; + private readonly ILogger _logger; + private readonly IdentityHelper _identity; + + public ProfileService(ServerContext ctx, IMapper mapper, ILogger logger, IdentityHelper identity) { + _ctx = ctx; + _mapper = mapper; + _logger = logger; + _identity = identity; } - public Task GetAccountHistory(Guid userId) { - throw new NotImplementedException(); + private async Task GetId() { + var profile = await _identity.GetUser(); + return profile!.Id; } - public Task GetRecentNotifications(Guid userId) { - throw new NotImplementedException(); + private async Task GetBankAccount() { + var id = await this.GetId(); + return await _ctx.UserBankAccount.FirstOrDefaultAsync(x => x.OwnerId == id); + } + + public async Task> GetBankAccountAsync() { + var response = new Response(); + var id = await this.GetId(); + if (id == null ) return response; + try { + var data = _mapper.Map(await this.GetBankAccount()); + response.Data = data; + response.Succeeded = true; + } catch (Exception e) { + response.Errors = new[] { e.ToString() }; + _logger.LogError(e.ToString()); + } + + return response; + } + + public async Task> UpdateBankAccountAsync(BankAccountResponse account) { + var response = new Response(); + var id = await this.GetId(); + if (id == null ) return response; + + try { + var userBankAccount = await this.GetBankAccount(); + BankAccountEntity item; + if (userBankAccount == null) { + item = _mapper.Map(account); + item.OwnerId = id; + await _ctx.UserBankAccount.AddAsync(item); + await _ctx.SaveChangesAsync(); + } else { + item = _mapper.Map(account); + _ctx.UserBankAccount.Update(item); + await _ctx.SaveChangesAsync(); + } + var data = _mapper.Map(item); + response.Data = data; + response.Succeeded = data != null; + } catch (Exception e) { + response.Errors = new[] { e.ToString() }; + _logger.LogError(e.ToString()); + } + + return response; + } + + private async Task GetSetting() { + var id = await this.GetId(); + return await _ctx.UserSetting.FirstOrDefaultAsync(x => x.OwnerId == id); + } + + public async Task> GetSettingAsync() { + var response = new Response(); + var id = await this.GetId(); + if (id == null ) return response; + try { + var data = _mapper.Map(await this.GetSetting()); + response.Data = data; + response.Succeeded = true; + } catch (Exception e) { + response.Errors = new[] { e.ToString() }; + _logger.LogError(e.ToString()); + } + + return response; + } + public async Task> UpdateSettingAsync(SettingResponse setting) { + var response = new Response(); + var id = await this.GetId(); + if (id == null ) return response; + + try { + var userSetting = await this.GetSetting(); + SettingEntity item; + if (userSetting == null) { + item = _mapper.Map(setting); + item.OwnerId = id; + await _ctx.UserSetting.AddAsync(item); + await _ctx.SaveChangesAsync(); + } else { + item = _mapper.Map(setting); + _ctx.UserSetting.Update(item); + await _ctx.SaveChangesAsync(); + } + var data = _mapper.Map(item); + response.Data = data; + response.Succeeded = data != null; + } catch (Exception e) { + response.Errors = new[] { e.ToString() }; + _logger.LogError(e.ToString()); + } + + return response; + } + + private async Task GetNotification() { + var id = await this.GetId(); + + return await _ctx.UserNotification.FirstOrDefaultAsync(x => x.OwnerId == id); + } + + public async Task> GetNotificationAsync() { + var response = new Response(); + var id = await this.GetId(); + if (id == null ) return response; + try { + var data = _mapper.Map(await this.GetNotification()); + response.Data = data; + response.Succeeded = true; + } catch (Exception e) { + response.Errors = new[] { e.ToString() }; + _logger.LogError(e.ToString()); + } + + return response; + } + public async Task> UpdateNotificationAsync(NotificationResponse notification) { + var response = new Response(); + var id = await this.GetId(); + if (id == null ) return response; + + try { + var userNotification = await this.GetNotification(); + NotificationEntity item; + if (userNotification == null) { + item = _mapper.Map(notification); + item.OwnerId = id; + await _ctx.UserNotification.AddAsync(item); + await _ctx.SaveChangesAsync(); + } else { + item = _mapper.Map(notification); + _ctx.UserNotification.Update(item); + await _ctx.SaveChangesAsync(); + } + var data = _mapper.Map(item); + response.Data = data; + response.Succeeded = data != null; + } catch (Exception e) { + response.Errors = new[] { e.ToString() }; + _logger.LogError(e.ToString()); + } + + return response; } } \ No newline at end of file From 899c13e47f50438146a3fd2adc52ae61b79d9da8 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Thu, 2 Feb 2023 12:37:49 +0100 Subject: [PATCH 080/185] Implemented server state API --- src/Common/Dtos/ServerStateResponse.cs | 5 ++ src/Web/Server/MapperProfile.cs | 1 + .../Modules/ServerModule/IServerService.cs | 9 ++ .../Modules/ServerModule/ServerModule.cs | 27 ++++++ .../Modules/ServerModule/ServerService.cs | 82 +++++++++++++++++++ src/Web/Server/config.Development.ini | 1 + src/Web/Server/config.ini | 1 + 7 files changed, 126 insertions(+) create mode 100644 src/Common/Dtos/ServerStateResponse.cs create mode 100644 src/Web/Server/Modules/ServerModule/IServerService.cs create mode 100644 src/Web/Server/Modules/ServerModule/ServerModule.cs create mode 100644 src/Web/Server/Modules/ServerModule/ServerService.cs diff --git a/src/Common/Dtos/ServerStateResponse.cs b/src/Common/Dtos/ServerStateResponse.cs new file mode 100644 index 00000000..eddba9e0 --- /dev/null +++ b/src/Common/Dtos/ServerStateResponse.cs @@ -0,0 +1,5 @@ +namespace XClaim.Common.Dtos; + +public sealed class ServerStateResponse : ServerResponse { + public bool Online { get; set; } +} \ No newline at end of file diff --git a/src/Web/Server/MapperProfile.cs b/src/Web/Server/MapperProfile.cs index 1fdea0e8..2790bde2 100644 --- a/src/Web/Server/MapperProfile.cs +++ b/src/Web/Server/MapperProfile.cs @@ -24,6 +24,7 @@ public MapperProfile() { CreateMap().ReverseMap(); CreateMap().ReverseMap(); CreateMap().ReverseMap(); + CreateMap().ReverseMap(); CreateMap().ReverseMap(); } } \ No newline at end of file diff --git a/src/Web/Server/Modules/ServerModule/IServerService.cs b/src/Web/Server/Modules/ServerModule/IServerService.cs new file mode 100644 index 00000000..d0f30a1c --- /dev/null +++ b/src/Web/Server/Modules/ServerModule/IServerService.cs @@ -0,0 +1,9 @@ +using XClaim.Common.Dtos; +using XClaim.Common.Wrappers; + +namespace XClaim.Web.Server.Modules.ServerModule; + +public interface IServerService { + Task> GetAsync(); + Task> UpdateAsync(ServerResponse server); +} \ No newline at end of file diff --git a/src/Web/Server/Modules/ServerModule/ServerModule.cs b/src/Web/Server/Modules/ServerModule/ServerModule.cs new file mode 100644 index 00000000..17c83ef2 --- /dev/null +++ b/src/Web/Server/Modules/ServerModule/ServerModule.cs @@ -0,0 +1,27 @@ +using XClaim.Common.Dtos; + +namespace XClaim.Web.Server.Modules.ServerModule; + +public class ServerModule : IModule { + + public IServiceCollection RegisterApiModule(IServiceCollection services) { + services.AddScoped(); + + return services; + } + public IEndpointRouteBuilder MapEndpoints(IEndpointRouteBuilder endpoints) { + const string name = "Server"; + var url = $"{Constants.RootApi}/{name.ToLower()}"; + var group = endpoints.MapGroup(url).WithTags(name); + + group.MapGet("/", async (IServerService sv) + => await sv.GetAsync()).WithName($"Get{name}").WithOpenApi(); + + group.MapPut("/", async (ServerResponse value, IServerService sv) => { + var result = await sv.UpdateAsync(value); + return TypedResults.Ok(result); + }).WithName($"Update{name}").WithOpenApi(); + + return group; + } +} \ No newline at end of file diff --git a/src/Web/Server/Modules/ServerModule/ServerService.cs b/src/Web/Server/Modules/ServerModule/ServerService.cs new file mode 100644 index 00000000..79e75e67 --- /dev/null +++ b/src/Web/Server/Modules/ServerModule/ServerService.cs @@ -0,0 +1,82 @@ +using AutoMapper; +using Microsoft.EntityFrameworkCore; +using XClaim.Common; +using XClaim.Common.Dtos; +using XClaim.Common.Wrappers; +using XClaim.Web.Server.Data; +using XClaim.Web.Server.Entities; + +namespace XClaim.Web.Server.Modules.ServerModule; + +public class ServerService : IServerService { + + private readonly ServerContext _ctx; + private readonly IMapper _mapper; + private readonly ILogger _logger; + private readonly IConfiguration _configuration; + + private record ServerState(bool Online, ServerEntity Server); + + public ServerService(ServerContext ctx, IMapper mapper, ILogger logger, IConfiguration configuration) { + _ctx = ctx; + _mapper = mapper; + _logger = logger; + _configuration = configuration; + } + + private async Task Get() { + var name =_configuration.GetValue("ServiceName") ?? SharedConst.ServiceName; + var defaults = new ServerEntity() { ServiceName = name }; + var online = await _ctx.Server.AnyAsync(); + if (!online) return new ServerState(false, defaults); + var result = (await _ctx.Server.Include(x => x.Currency) + .FirstOrDefaultAsync())!; + + return new ServerState(true, result); + } + + public async Task> GetAsync() { + var response = new Response { + Succeeded = true + }; + try { + var value = await this.Get(); + var db = _mapper.Map(value.Server); + var data = new ServerStateResponse { + Online = value.Online + }; + _mapper.Map(db, data); + response.Data = data; + } catch (Exception e) { + response.Errors = new[] { e.ToString() }; + _logger.LogError(e.ToString()); + } + + return response; + } + + public async Task> UpdateAsync(ServerResponse server) { + var response = new Response { + Succeeded = true + }; + try { + var value = await this.Get(); + if (!value.Online) return response; + var item = value.Server; + _mapper.Map(server, item); + _ctx.Update(item); + await _ctx.SaveChangesAsync(); + var db = _mapper.Map(item); + var data = new ServerStateResponse { + Online = value.Online + }; + _mapper.Map(db, data); + response.Data = data; + } + catch (Exception e) { + response.Errors = new[] { e.ToString() }; + _logger.LogError(e.ToString()); + } + return response; + } +} \ No newline at end of file diff --git a/src/Web/Server/config.Development.ini b/src/Web/Server/config.Development.ini index 451caa27..d6bd212d 100644 --- a/src/Web/Server/config.Development.ini +++ b/src/Web/Server/config.Development.ini @@ -1,3 +1,4 @@ +ServiceName=X-Claim AllowedHosts=* Database=sqlite diff --git a/src/Web/Server/config.ini b/src/Web/Server/config.ini index 7bff08da..3671c0ec 100644 --- a/src/Web/Server/config.ini +++ b/src/Web/Server/config.ini @@ -1,3 +1,4 @@ +ServiceName=X-Claim AllowedHosts=* Database=sqlite From cfac8f4f5194d1c6c0d50528ea71d9356b494340 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Thu, 2 Feb 2023 13:16:56 +0100 Subject: [PATCH 081/185] Added user admin limitations --- src/Common/Enums/UserPermission.cs | 2 +- src/Web/Server/Data/DbInitializer.cs | 3 ++- src/Web/Server/Modules/UserModule/UserService.cs | 9 ++++++++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/Common/Enums/UserPermission.cs b/src/Common/Enums/UserPermission.cs index 98d035b9..ad5b8bf5 100644 --- a/src/Common/Enums/UserPermission.cs +++ b/src/Common/Enums/UserPermission.cs @@ -7,8 +7,8 @@ public enum UserPermission { Administrator, [Description("Finance Manager")] Finance, + Lead, Cashier, [Description("Department Head")] - Lead, Standard } \ No newline at end of file diff --git a/src/Web/Server/Data/DbInitializer.cs b/src/Web/Server/Data/DbInitializer.cs index 03058069..ca7cfd8c 100644 --- a/src/Web/Server/Data/DbInitializer.cs +++ b/src/Web/Server/Data/DbInitializer.cs @@ -48,7 +48,8 @@ public void Seed() { var companies = new List { new CompanyEntity() { Id = Guid.NewGuid(), CreatedAt = time, ShortName = "BHN Logistics", FullName = "MCPL LTD - BHN Division" }, new CompanyEntity() { Id = Guid.NewGuid(), CreatedAt = time, ShortName = "MCPL LTD", FullName = "Multi Consumer Product LTD" }, - new CompanyEntity() { Id = Guid.NewGuid(), CreatedAt = time, ShortName = "Dufil Prima", FullName = "Dufil Prima Foods Plc" } + new CompanyEntity() { Id = Guid.NewGuid(), CreatedAt = time, ShortName = "Dufil Prima", FullName = "Dufil Prima Foods Plc" }, + new CompanyEntity() { Id = Guid.NewGuid(), CreatedAt = time, ShortName = "X-Claim", FullName = "X-Claim Instance Management" } }; var categories = new List { diff --git a/src/Web/Server/Modules/UserModule/UserService.cs b/src/Web/Server/Modules/UserModule/UserService.cs index 07b8c618..a6afacad 100644 --- a/src/Web/Server/Modules/UserModule/UserService.cs +++ b/src/Web/Server/Modules/UserModule/UserService.cs @@ -49,11 +49,18 @@ public UserService(ServerContext ctx, IMapper mapper, ILogger logge } public async Task>> GetAllAsync(UserFilter responseFilter) { + var current = await _identity.GetUser(); var result = new PagedResponse>(); + + // INFO: Return an error to normal users + if (current!.Permission > UserPermission.Administrator) return result; + var isAdmin = current!.Permission == UserPermission.Administrator; var query = _ctx.Users - .Where(x => x.DeletedAt == null) + // INFO: Limits admins to their company and haide system mangers. + .Where(x => !isAdmin || x.CompanyId == current!.CompanyId && x.Permission != UserPermission.System ) .Include(x => x.Company) .Include(x => x.Team); + try { var count = await query.CountAsync(); var data = await query.ApplyFilter(responseFilter).ToListAsync(); From dea08584103482dcfd0efc874f5410543700bec1 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Thu, 2 Feb 2023 13:56:52 +0100 Subject: [PATCH 082/185] Limit category and team API listing --- .../Modules/CategoryModule/CategoryService.cs | 16 ++++++++++++-- .../Server/Modules/TeamModule/TeamService.cs | 20 +++++++++++++----- .../Server/Modules/UserModule/UserService.cs | 21 +++++++++---------- 3 files changed, 39 insertions(+), 18 deletions(-) diff --git a/src/Web/Server/Modules/CategoryModule/CategoryService.cs b/src/Web/Server/Modules/CategoryModule/CategoryService.cs index cf6f7090..4b89f623 100644 --- a/src/Web/Server/Modules/CategoryModule/CategoryService.cs +++ b/src/Web/Server/Modules/CategoryModule/CategoryService.cs @@ -3,20 +3,32 @@ using AutoMapper; using Microsoft.EntityFrameworkCore; using XClaim.Common.Dtos; +using XClaim.Common.Enums; using XClaim.Common.Helpers; using XClaim.Common.Wrappers; using XClaim.Web.Server.Data; using XClaim.Web.Server.Entities; +using XClaim.Web.Server.Helpers; namespace XClaim.Web.Server.Modules.CategoryModule; public sealed class CategoryService : GenericService { - public CategoryService(ServerContext ctx, IMapper mapper, ILogger logger) : base(ctx, mapper, logger) { } + + private readonly IdentityHelper _identity; + + public CategoryService(ServerContext ctx, IMapper mapper, ILogger logger, IdentityHelper identity) : base(ctx, mapper, logger) { + _identity = identity; + } new public async Task>> GetAllAsync(PaginationFilterBase responseFilter) { var result = new PagedResponse>(); - var query = _ctx.Categories.Include(x => x.Company); try { + var current = await _identity.GetUser(); + var isSystemUser = current!.Permission == UserPermission.System; + var query = _ctx.Categories + .Where(e => isSystemUser || e.CompanyId == current.CompanyId) + .Include(x => x.Company); + var count = await query.CountAsync(); var data = await query.ApplyFilter(responseFilter).ToListAsync(); var response = _mapper.Map>(data); diff --git a/src/Web/Server/Modules/TeamModule/TeamService.cs b/src/Web/Server/Modules/TeamModule/TeamService.cs index 228ba2d1..971d1e5a 100644 --- a/src/Web/Server/Modules/TeamModule/TeamService.cs +++ b/src/Web/Server/Modules/TeamModule/TeamService.cs @@ -3,23 +3,33 @@ using AutoMapper; using Microsoft.EntityFrameworkCore; using XClaim.Common.Dtos; +using XClaim.Common.Enums; using XClaim.Common.Helpers; using XClaim.Common.Wrappers; using XClaim.Web.Server.Data; using XClaim.Web.Server.Entities; +using XClaim.Web.Server.Helpers; namespace XClaim.Web.Server.Modules.TeamModule; public sealed class TeamService : GenericService { - public TeamService(ServerContext ctx, IMapper mapper, ILogger logger) : base(ctx, mapper, logger) { } + private readonly IdentityHelper _identity; + + public TeamService(ServerContext ctx, IMapper mapper, ILogger logger, IdentityHelper identity) : base(ctx, mapper, logger) { + _identity = identity; + } new public async Task>> GetAllAsync(PaginationFilterBase responseFilter) { var result = new PagedResponse>(); - var query = _ctx.Teams - .Include(e => e.Company) - .Include(e => e.Manager) - .Where(x => x.DeletedAt == null); try { + var current = await _identity.GetUser(); + var isSystemUser = current!.Permission == UserPermission.System; + var query = _ctx.Teams + .Where(e => isSystemUser || e.CompanyId == current.CompanyId) + .Include(e => e.Company) + .Include(e => e.Manager) + .Where(x => x.DeletedAt == null); + var count = await query.CountAsync(); var data = await query.ApplyFilter(responseFilter).ToListAsync(); var response = _mapper.Map>(data); diff --git a/src/Web/Server/Modules/UserModule/UserService.cs b/src/Web/Server/Modules/UserModule/UserService.cs index a6afacad..1a98b6bd 100644 --- a/src/Web/Server/Modules/UserModule/UserService.cs +++ b/src/Web/Server/Modules/UserModule/UserService.cs @@ -49,19 +49,18 @@ public UserService(ServerContext ctx, IMapper mapper, ILogger logge } public async Task>> GetAllAsync(UserFilter responseFilter) { - var current = await _identity.GetUser(); var result = new PagedResponse>(); - - // INFO: Return an error to normal users - if (current!.Permission > UserPermission.Administrator) return result; - var isAdmin = current!.Permission == UserPermission.Administrator; - var query = _ctx.Users - // INFO: Limits admins to their company and haide system mangers. - .Where(x => !isAdmin || x.CompanyId == current!.CompanyId && x.Permission != UserPermission.System ) - .Include(x => x.Company) - .Include(x => x.Team); - try { + var current = await _identity.GetUser(); + // INFO: Return an error to normal users + if (current!.Permission > UserPermission.Administrator) return result; + var isAdmin = current!.Permission == UserPermission.Administrator; + var query = _ctx.Users + // INFO: Limits admins to their company and haide system mangers. + .Where(x => !isAdmin || x.CompanyId == current!.CompanyId && x.Permission != UserPermission.System ) + .Include(x => x.Company) + .Include(x => x.Team); + var count = await query.CountAsync(); var data = await query.ApplyFilter(responseFilter).ToListAsync(); var response = _mapper.Map>(data); From 82d88b01824f3081d00301c8dd63521fd2d5389e Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Thu, 2 Feb 2023 14:26:09 +0100 Subject: [PATCH 083/185] Added auto company binding for category and team form --- src/Common/Enums/UserPermission.cs | 3 ++- .../Pages/Settings/Category/MutateCategory.razor | 9 ++++++++- src/Web/Components/Pages/Settings/Teams/MutateTeam.razor | 9 ++++++++- src/Web/Shared/States/AuthState.cs | 4 ++++ 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/src/Common/Enums/UserPermission.cs b/src/Common/Enums/UserPermission.cs index ad5b8bf5..7c6fddbb 100644 --- a/src/Common/Enums/UserPermission.cs +++ b/src/Common/Enums/UserPermission.cs @@ -10,5 +10,6 @@ public enum UserPermission { Lead, Cashier, [Description("Department Head")] - Standard + Standard, + Anonymous } \ No newline at end of file diff --git a/src/Web/Components/Pages/Settings/Category/MutateCategory.razor b/src/Web/Components/Pages/Settings/Category/MutateCategory.razor index e927fc24..e73fc514 100644 --- a/src/Web/Components/Pages/Settings/Category/MutateCategory.razor +++ b/src/Web/Components/Pages/Settings/Category/MutateCategory.razor @@ -1,8 +1,10 @@ @using XClaim.Common.Dtos +@using XClaim.Common.Enums @using XClaim.Common.Helpers @inject ICategoryService Http @inject ICompanyService CompanyService @inject ISnackbar Snackbar +@inject AuthState AuthState @code { [CascadingParameter] @@ -45,7 +47,12 @@ } async Task Submit() { - Item.CompanyId = Company?.Id; + if (await AuthState.GetPermission() != UserPermission.System) { + Item.CompanyId = (await AuthState.GetAccount())!.CompanyId; + Company = (await AuthState.GetAccount())!.Company; + } else { + Item.CompanyId = Company?.Id; + } var result = Id == null ? (await Http.CreateAsync(Item)) : (await Http.UpdateAsync(Item)); MudDialog.Close(DialogResult.Ok(result.Succeeded)); } diff --git a/src/Web/Components/Pages/Settings/Teams/MutateTeam.razor b/src/Web/Components/Pages/Settings/Teams/MutateTeam.razor index 985cfa33..537d19c7 100644 --- a/src/Web/Components/Pages/Settings/Teams/MutateTeam.razor +++ b/src/Web/Components/Pages/Settings/Teams/MutateTeam.razor @@ -1,9 +1,11 @@ @using XClaim.Common.Dtos +@using XClaim.Common.Enums @using XClaim.Common.Helpers @inject ITeamService Http @inject IUserService UserService @inject ICompanyService CompanyService @inject ISnackbar Snackbar +@inject AuthState AuthState @code { [CascadingParameter] @@ -55,8 +57,13 @@ } async Task Submit() { + if (await AuthState.GetPermission() != UserPermission.System) { + Item.CompanyId = (await AuthState.GetAccount())!.CompanyId; + Company = (await AuthState.GetAccount())!.Company; + } else { + Item.CompanyId = Company?.Id; + } Item.ManagerId = Manager?.Id; - Item.CompanyId = Company?.Id; var result = Id == null ? (await Http.CreateAsync(Item)) : (await Http.UpdateAsync(Item)); MudDialog.Close(DialogResult.Ok(result.Succeeded)); } diff --git a/src/Web/Shared/States/AuthState.cs b/src/Web/Shared/States/AuthState.cs index fa5761a6..b0601871 100644 --- a/src/Web/Shared/States/AuthState.cs +++ b/src/Web/Shared/States/AuthState.cs @@ -3,6 +3,7 @@ using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components.Authorization; using XClaim.Common.Dtos; +using XClaim.Common.Enums; using XClaim.Common.HTTP; namespace XClaim.Web.Shared.States; @@ -31,6 +32,9 @@ private AuthProvider Profile { get { private async Task GetUser() => (await GetState()).User; + public async Task GetPermission() => (await this.GetSession())!.Data?.Permission ?? UserPermission.Anonymous; + public async Task GetAccount() => (await this.GetSession())!.Data; + public async Task IsAuth() => (await GetUser()).Identity!.IsAuthenticated; public async Task TriggerAuthentication() { From dca4472c302c219654af092c8c97c9c6d995655c Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Thu, 2 Feb 2023 15:28:15 +0100 Subject: [PATCH 084/185] Move default company assignment to API --- .../Settings/Category/MutateCategory.razor | 8 +----- .../Pages/Settings/Teams/MutateTeam.razor | 8 +----- .../Modules/CategoryModule/CategoryService.cs | 25 +++++++++++++++++++ .../Server/Modules/TeamModule/TeamService.cs | 25 +++++++++++++++++++ 4 files changed, 52 insertions(+), 14 deletions(-) diff --git a/src/Web/Components/Pages/Settings/Category/MutateCategory.razor b/src/Web/Components/Pages/Settings/Category/MutateCategory.razor index e73fc514..cb64dc4e 100644 --- a/src/Web/Components/Pages/Settings/Category/MutateCategory.razor +++ b/src/Web/Components/Pages/Settings/Category/MutateCategory.razor @@ -4,7 +4,6 @@ @inject ICategoryService Http @inject ICompanyService CompanyService @inject ISnackbar Snackbar -@inject AuthState AuthState @code { [CascadingParameter] @@ -47,12 +46,7 @@ } async Task Submit() { - if (await AuthState.GetPermission() != UserPermission.System) { - Item.CompanyId = (await AuthState.GetAccount())!.CompanyId; - Company = (await AuthState.GetAccount())!.Company; - } else { - Item.CompanyId = Company?.Id; - } + Item.CompanyId = Company?.Id; var result = Id == null ? (await Http.CreateAsync(Item)) : (await Http.UpdateAsync(Item)); MudDialog.Close(DialogResult.Ok(result.Succeeded)); } diff --git a/src/Web/Components/Pages/Settings/Teams/MutateTeam.razor b/src/Web/Components/Pages/Settings/Teams/MutateTeam.razor index 537d19c7..cd2025cb 100644 --- a/src/Web/Components/Pages/Settings/Teams/MutateTeam.razor +++ b/src/Web/Components/Pages/Settings/Teams/MutateTeam.razor @@ -5,7 +5,6 @@ @inject IUserService UserService @inject ICompanyService CompanyService @inject ISnackbar Snackbar -@inject AuthState AuthState @code { [CascadingParameter] @@ -57,12 +56,7 @@ } async Task Submit() { - if (await AuthState.GetPermission() != UserPermission.System) { - Item.CompanyId = (await AuthState.GetAccount())!.CompanyId; - Company = (await AuthState.GetAccount())!.Company; - } else { - Item.CompanyId = Company?.Id; - } + Item.CompanyId = Company?.Id; Item.ManagerId = Manager?.Id; var result = Id == null ? (await Http.CreateAsync(Item)) : (await Http.UpdateAsync(Item)); MudDialog.Close(DialogResult.Ok(result.Succeeded)); diff --git a/src/Web/Server/Modules/CategoryModule/CategoryService.cs b/src/Web/Server/Modules/CategoryModule/CategoryService.cs index 4b89f623..95a1e116 100644 --- a/src/Web/Server/Modules/CategoryModule/CategoryService.cs +++ b/src/Web/Server/Modules/CategoryModule/CategoryService.cs @@ -53,10 +53,13 @@ public CategoryService(ServerContext ctx, IMapper mapper, ILogger> GetByIdAsync(Guid id) { var result = new Response(); try { + var user = await _identity.GetUser(); var item = await _ctx.Categories .Include(e => e.Company) .FirstOrDefaultAsync(e => e.Id == id); var data = _mapper.Map(item); + if (user!.Permission != UserPermission.System && data.CompanyId == null) + data.CompanyId = user.CompanyId; result.Succeeded = data != null; result.Data = data; } @@ -68,4 +71,26 @@ public CategoryService(ServerContext ctx, IMapper mapper, ILogger> CreateAsync(CategoryResponse value) { + var response = new Response(); + try { + var user = await _identity.GetUser(); + if (user!.Permission != UserPermission.System && value.CompanyId == null) + value.CompanyId = user.CompanyId; + var item = _mapper.Map(value); + await _ctx.Categories.AddAsync(item); + await _ctx.SaveChangesAsync(); + var data = _mapper.Map(item); + response = new Response(data!) { + Succeeded = data != null + }; + } + catch (Exception e) { + response.Errors = new[] { e.ToString() }; + _logger.LogError(e.ToString()); + } + + return response; + } } \ No newline at end of file diff --git a/src/Web/Server/Modules/TeamModule/TeamService.cs b/src/Web/Server/Modules/TeamModule/TeamService.cs index 971d1e5a..59719b2d 100644 --- a/src/Web/Server/Modules/TeamModule/TeamService.cs +++ b/src/Web/Server/Modules/TeamModule/TeamService.cs @@ -54,11 +54,14 @@ public TeamService(ServerContext ctx, IMapper mapper, ILogger logge new public async Task> GetByIdAsync(Guid id) { var result = new Response(); try { + var user = await _identity.GetUser(); var item = await _ctx.Teams .Include(e => e.Company) .Include(e => e.Manager) .FirstOrDefaultAsync(e => e.Id == id); var data = _mapper.Map(item); + if (user!.Permission != UserPermission.System && data.CompanyId == null) + data.CompanyId = user.CompanyId; result.Succeeded = data != null; result.Data = data; } @@ -70,4 +73,26 @@ public TeamService(ServerContext ctx, IMapper mapper, ILogger logge return result; } + + new public async Task> CreateAsync(TeamResponse value) { + var response = new Response(); + try { + var user = await _identity.GetUser(); + if (user!.Permission != UserPermission.System && value.CompanyId == null) + value.CompanyId = user.CompanyId; + var item = _mapper.Map(value); + await _ctx.Teams.AddAsync(item); + await _ctx.SaveChangesAsync(); + var data = _mapper.Map(item); + response = new Response(data!) { + Succeeded = data != null + }; + } + catch (Exception e) { + response.Errors = new[] { e.ToString() }; + _logger.LogError(e.ToString()); + } + + return response; + } } \ No newline at end of file From d1c4100041999495061e64291ecb5a330f1f30e7 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Thu, 2 Feb 2023 16:05:15 +0100 Subject: [PATCH 085/185] Implemented server and profile HTTP service --- src/Common/HTTP/IProfileService.cs | 10 +++++++- .../HTTP}/IServerService.cs | 2 +- src/Common/HTTP/ProfileService.cs | 20 +++++++++++++++- src/Common/HTTP/ServerService.cs | 20 ++++++++++++++++ .../Modules/ProfileModule/IProfileService.cs | 1 + .../Modules/ProfileModule/ProfileModule.cs | 16 +++---------- .../Modules/ProfileModule/ProfileService.cs | 23 ++++++++++++++++++- .../Modules/ServerModule/ServerModule.cs | 1 + .../Modules/ServerModule/ServerService.cs | 1 + src/Web/Shared/States/AuthState.cs | 2 +- 10 files changed, 78 insertions(+), 18 deletions(-) rename src/{Web/Server/Modules/ServerModule => Common/HTTP}/IServerService.cs (81%) create mode 100644 src/Common/HTTP/ServerService.cs diff --git a/src/Common/HTTP/IProfileService.cs b/src/Common/HTTP/IProfileService.cs index c02668bb..27d3083a 100644 --- a/src/Common/HTTP/IProfileService.cs +++ b/src/Common/HTTP/IProfileService.cs @@ -4,6 +4,14 @@ namespace XClaim.Common.HTTP; public interface IProfileService { - Task> GetAsync(); + Task> GetAccountAsync(); + Task> GetBankAccountAsync(); + Task> UpdateBankAccountAsync(BankAccountResponse account); + + Task> GetSettingAsync(); + Task> UpdateSettingAsync(SettingResponse setting); + + Task> GetNotificationAsync(); + Task> UpdateNotificationAsync(NotificationResponse notification); Task SignOutAsync(); } \ No newline at end of file diff --git a/src/Web/Server/Modules/ServerModule/IServerService.cs b/src/Common/HTTP/IServerService.cs similarity index 81% rename from src/Web/Server/Modules/ServerModule/IServerService.cs rename to src/Common/HTTP/IServerService.cs index d0f30a1c..ec3a659c 100644 --- a/src/Web/Server/Modules/ServerModule/IServerService.cs +++ b/src/Common/HTTP/IServerService.cs @@ -1,7 +1,7 @@ using XClaim.Common.Dtos; using XClaim.Common.Wrappers; -namespace XClaim.Web.Server.Modules.ServerModule; +namespace XClaim.Common.HTTP; public interface IServerService { Task> GetAsync(); diff --git a/src/Common/HTTP/ProfileService.cs b/src/Common/HTTP/ProfileService.cs index 2c396da8..99a37669 100644 --- a/src/Common/HTTP/ProfileService.cs +++ b/src/Common/HTTP/ProfileService.cs @@ -12,9 +12,27 @@ public ProfileService(IHttpService http) { _http = http; } - public async Task> GetAsync() { + public async Task> GetAccountAsync() { return await _http.Get>($"{RootApi}/account"); } + public async Task> GetBankAccountAsync() { + return await _http.Get>($"{RootApi}/bank-account"); + } + public async Task> UpdateBankAccountAsync(BankAccountResponse account) { + return await _http.Put>($"{RootApi}/bank-account", account); + } + public async Task> GetSettingAsync() { + return await _http.Get>($"{RootApi}/setting"); + } + public async Task> UpdateSettingAsync(SettingResponse setting) { + return await _http.Put>($"{RootApi}/setting", setting); + } + public async Task> GetNotificationAsync() { + return await _http.Get>($"{RootApi}/notification"); + } + public async Task> UpdateNotificationAsync(NotificationResponse notification) { + return await _http.Put>($"{RootApi}/notification", notification); + } public async Task SignOutAsync() { return await _http.Post("/auth/sign-out", null); diff --git a/src/Common/HTTP/ServerService.cs b/src/Common/HTTP/ServerService.cs new file mode 100644 index 00000000..6d6ceeeb --- /dev/null +++ b/src/Common/HTTP/ServerService.cs @@ -0,0 +1,20 @@ +using XClaim.Common.Dtos; +using XClaim.Common.Service; +using XClaim.Common.Wrappers; + +namespace XClaim.Common.HTTP; + +public class ServerService : IServerService { + private const string RootApi = "api/v1/server"; + private readonly IHttpService _http; + public ServerService(IHttpService http) { + _http = http; + } + + public async Task> GetAsync() { + return await _http.Get>(RootApi); + } + public async Task> UpdateAsync(ServerResponse server) { + return await _http.Put>(RootApi, server); + } +} \ No newline at end of file diff --git a/src/Web/Server/Modules/ProfileModule/IProfileService.cs b/src/Web/Server/Modules/ProfileModule/IProfileService.cs index 1698ac53..0db0bb12 100644 --- a/src/Web/Server/Modules/ProfileModule/IProfileService.cs +++ b/src/Web/Server/Modules/ProfileModule/IProfileService.cs @@ -4,6 +4,7 @@ namespace XClaim.Web.Server.Modules.ProfileModule; public interface IProfileService { + Task> GetAccountAsync(); Task> GetBankAccountAsync(); Task> UpdateBankAccountAsync(BankAccountResponse account); diff --git a/src/Web/Server/Modules/ProfileModule/ProfileModule.cs b/src/Web/Server/Modules/ProfileModule/ProfileModule.cs index cf80c8b6..43132fab 100644 --- a/src/Web/Server/Modules/ProfileModule/ProfileModule.cs +++ b/src/Web/Server/Modules/ProfileModule/ProfileModule.cs @@ -18,19 +18,9 @@ public IEndpointRouteBuilder MapEndpoints(IEndpointRouteBuilder endpoints) { var url = $"{Constants.RootApi}/{name.ToLower()}"; var group = endpoints.MapGroup(url).WithTags(name); - group.MapGet("/account", async (IdentityHelper identity, UserService user) => { - var authProfile = await identity.GetAuthProfile(); - if (!identity.IsAuthenticated) return TypedResults.Unauthorized(); - - var account = (await user.GetByIdentifierAsync(authProfile!.Data!.Identifier)).Data; - if (account != null) { - authProfile!.Data = account; - authProfile.Confirmed = true; - } - var role = account?.Permission != null ? Enum.GetName(account.Permission)! : Enum.GetName(UserPermission.Standard)!; - authProfile.Role = role; - - return Results.Ok(new Response(authProfile) { Succeeded = authProfile.ExpiresIn > 0 }); + group.MapGet("/account", async (IProfileService sv) => { + var result = await sv.GetAccountAsync(); + return !result.Succeeded ? Results.Unauthorized() : TypedResults.Ok(result); }).WithName("GetAccountAuth").WithOpenApi(); group.MapGet("/bank-account", async (IProfileService sv) diff --git a/src/Web/Server/Modules/ProfileModule/ProfileService.cs b/src/Web/Server/Modules/ProfileModule/ProfileService.cs index fb3f6d81..039ac13d 100644 --- a/src/Web/Server/Modules/ProfileModule/ProfileService.cs +++ b/src/Web/Server/Modules/ProfileModule/ProfileService.cs @@ -1,10 +1,12 @@ using AutoMapper; using Microsoft.EntityFrameworkCore; using XClaim.Common.Dtos; +using XClaim.Common.Enums; using XClaim.Common.Wrappers; using XClaim.Web.Server.Data; using XClaim.Web.Server.Entities; using XClaim.Web.Server.Helpers; +using XClaim.Web.Server.Modules.UserModule; namespace XClaim.Web.Server.Modules.ProfileModule; @@ -14,19 +16,38 @@ public class ProfileService : IProfileService { private readonly IMapper _mapper; private readonly ILogger _logger; private readonly IdentityHelper _identity; + private readonly UserService _user; - public ProfileService(ServerContext ctx, IMapper mapper, ILogger logger, IdentityHelper identity) { + public ProfileService(ServerContext ctx, IMapper mapper, ILogger logger, IdentityHelper identity, UserService user) { _ctx = ctx; _mapper = mapper; _logger = logger; _identity = identity; + _user = user; } private async Task GetId() { var profile = await _identity.GetUser(); return profile!.Id; } + + public async Task> GetAccountAsync() { + var response = new Response(); + var profile = await _identity.GetAuthProfile(); + if (!_identity.IsAuthenticated) return response; + var account = (await _user.GetByIdentifierAsync(profile!.Data!.Identifier)).Data; + if (account != null) { + profile.Data = account; + profile.Confirmed = true; + } + var role = account?.Permission != null ? Enum.GetName(account.Permission)! : Enum.GetName(UserPermission.Anonymous)!; + profile.Role = role; + return new Response(profile) { + Succeeded = profile.ExpiresIn > 0 + }; + } + private async Task GetBankAccount() { var id = await this.GetId(); return await _ctx.UserBankAccount.FirstOrDefaultAsync(x => x.OwnerId == id); diff --git a/src/Web/Server/Modules/ServerModule/ServerModule.cs b/src/Web/Server/Modules/ServerModule/ServerModule.cs index 17c83ef2..20d19ad0 100644 --- a/src/Web/Server/Modules/ServerModule/ServerModule.cs +++ b/src/Web/Server/Modules/ServerModule/ServerModule.cs @@ -1,4 +1,5 @@ using XClaim.Common.Dtos; +using XClaim.Common.HTTP; namespace XClaim.Web.Server.Modules.ServerModule; diff --git a/src/Web/Server/Modules/ServerModule/ServerService.cs b/src/Web/Server/Modules/ServerModule/ServerService.cs index 79e75e67..b5754ea0 100644 --- a/src/Web/Server/Modules/ServerModule/ServerService.cs +++ b/src/Web/Server/Modules/ServerModule/ServerService.cs @@ -2,6 +2,7 @@ using Microsoft.EntityFrameworkCore; using XClaim.Common; using XClaim.Common.Dtos; +using XClaim.Common.HTTP; using XClaim.Common.Wrappers; using XClaim.Web.Server.Data; using XClaim.Web.Server.Entities; diff --git a/src/Web/Shared/States/AuthState.cs b/src/Web/Shared/States/AuthState.cs index b0601871..e10c636b 100644 --- a/src/Web/Shared/States/AuthState.cs +++ b/src/Web/Shared/States/AuthState.cs @@ -38,7 +38,7 @@ private AuthProvider Profile { get { public async Task IsAuth() => (await GetUser()).Identity!.IsAuthenticated; public async Task TriggerAuthentication() { - var response = await _profileService.GetAsync(); + var response = await _profileService.GetAccountAsync(); if (response is { Data: { }, Succeeded: true }) await Profile.UpdateAuthenticationState(response.Data); else From f7d05db18662c015ad465619825b8b4a3fe5aae4 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Thu, 2 Feb 2023 20:39:57 +0100 Subject: [PATCH 086/185] Added profile and server HTTP service to HTTPExtension --- src/Common/HTTP/HttpServiceExtensions.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Common/HTTP/HttpServiceExtensions.cs b/src/Common/HTTP/HttpServiceExtensions.cs index a1d79d69..0e416afb 100644 --- a/src/Common/HTTP/HttpServiceExtensions.cs +++ b/src/Common/HTTP/HttpServiceExtensions.cs @@ -17,6 +17,8 @@ public static IServiceCollection UseHttpServices(this IServiceCollection service services.AddScoped(); services.AddScoped(); services.AddScoped(); + services.AddScoped(); + services.AddScoped(); return services; } From 1b9a2c3c11de3fd28b1ee9f67ffdef24ab1cab08 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Thu, 2 Feb 2023 20:40:43 +0100 Subject: [PATCH 087/185] Added server service details to web UI --- src/Web/Client/App.razor | 15 +++-- .../Components/Pages/Settings/Server.razor | 60 +++++++++++++++---- src/Web/Components/Shared/Title.razor | 5 +- src/Web/Shared/States/AppState.cs | 19 +++++- 4 files changed, 79 insertions(+), 20 deletions(-) diff --git a/src/Web/Client/App.razor b/src/Web/Client/App.razor index a9cd5f20..7b4a27bb 100644 --- a/src/Web/Client/App.razor +++ b/src/Web/Client/App.razor @@ -1,21 +1,28 @@ -@inject NavigationManager Nav +@using XClaim.Common.HTTP +@inject NavigationManager Nav +@inject AppState AppState @inject AuthState AuthState +@inject IServerService ServerService @code { private async Task OnNavigateAsync(NavigationContext args) { var isRootPath = args.Path.Equals(string.Empty); var isAuthPath = args.Path.Equals(WebConst.AppAuth); + var isRegistrationPath = args.Path.Equals(WebConst.AppRegister); var session = await AuthState.GetSession(); var isAuth = await AuthState.IsAuth(); + var result = await ServerService.GetAsync(); + await AppState.LoadServerState(result.Data!); + switch (isAuth) { - case true when !session!.Confirmed && !args.Path.Equals(WebConst.AppRegister): + case true when !session!.Confirmed && !isRegistrationPath: Nav.NavigateTo(WebConst.AppRegister, true); break; case false when isAuthPath: break; - case true when isAuthPath || isRootPath: - Nav.NavigateTo(WebConst.AppHome, true); + case true when isAuthPath || isRootPath || isRegistrationPath: + Nav.NavigateTo(WebConst.AppHome); break; case false when isRootPath: await AuthState.TriggerAuthentication(); diff --git a/src/Web/Components/Pages/Settings/Server.razor b/src/Web/Components/Pages/Settings/Server.razor index 05f1b4ef..612caf8d 100644 --- a/src/Web/Components/Pages/Settings/Server.razor +++ b/src/Web/Components/Pages/Settings/Server.razor @@ -1,8 +1,39 @@ -@inject NavigationManager Nav +@using XClaim.Common.Dtos +@using XClaim.Common.Helpers +@using Nextended.Core.Extensions @page "/app/settings/server" +@inject Navigation Nav +@inject ISnackbar Snackbar +@inject ICurrencyService CurrencyService +@inject IServerService ServerService +@inject AppState AppState @attribute [Authorize(Roles = "System")] -@code { } +@code { + private CurrencyResponse? Currency { get; set; } + + private ServerResponse Item { get; set; } = new ServerResponse(); + + private async Task> SearchCurrency(string value) { + var response = await CurrencyService.GetAllAsync(new SearchFilter { Search = value }); + return (response.Succeeded ? response.Data : new List {})!; + } + + protected override async Task OnInitializedAsync() { + await base.OnInitializedAsync(); + var current = AppState.ServerState; + Item = await current.MapToAsync(); + Currency = Item.Currency; + } + + private async Task Submit() { + var result = await ServerService.UpdateAsync(Item); + if (result.Succeeded) + await AppState.LoadServerState(result.Data!); + Snackbar.Add(result.Succeeded ? "Deleted successfully" : "Archiving failed", result.Succeeded ? Severity.Success : Severity.Error); + + } +} Server options @@ -10,26 +41,29 @@ - + - + + + + - + - - - - Naira - Dolar - + + - Back - Save + Update diff --git a/src/Web/Components/Shared/Title.razor b/src/Web/Components/Shared/Title.razor index e9f1a3b3..506529a0 100644 --- a/src/Web/Components/Shared/Title.razor +++ b/src/Web/Components/Shared/Title.razor @@ -10,15 +10,16 @@ public RenderFragment? Content { get; set; } [Parameter] - public string AppTitle { get; set; } = "X-Claim"; + public string? AppTitle { get; set; } protected override void OnParametersSet() { base.OnParametersSet(); AppState.SetLayoutTitle(Content = ChildContent ?? Content); + if(AppTitle != null) AppState.SetAppTitle(AppTitle); AppState.OnChange += StateHasChanged; } public void Dispose() => AppState.OnChange -= StateHasChanged; } -@AppState.LayoutTitle :: @AppTitle \ No newline at end of file +@AppState.LayoutTitle :: @AppState.AppTitle \ No newline at end of file diff --git a/src/Web/Shared/States/AppState.cs b/src/Web/Shared/States/AppState.cs index 78915e99..16b8da96 100644 --- a/src/Web/Shared/States/AppState.cs +++ b/src/Web/Shared/States/AppState.cs @@ -1,9 +1,15 @@ using Microsoft.AspNetCore.Components; +using XClaim.Common; +using XClaim.Common.Dtos; namespace XClaim.Web.Shared.States; public class AppState : RootState { - public RenderFragment? LayoutTitle { get; private set; } = default!; + public RenderFragment? LayoutTitle { get; private set; } + + public string? AppTitle { get; private set; } = SharedConst.ServiceName; + + public ServerStateResponse ServerState { get; private set; } = default!; public bool IsSidebarOpen { get; private set; } = true; @@ -11,9 +17,20 @@ public void SetLayoutTitle(RenderFragment? value) { LayoutTitle = value; NotifyStateChanged(); } + + public void SetAppTitle(string? value) { + AppTitle = value; + NotifyStateChanged(); + } public void ToggleSidebar() { IsSidebarOpen = !IsSidebarOpen; NotifyStateChanged(); } + + public async Task LoadServerState(ServerStateResponse server) { + ServerState = server; + AppTitle = server.ServiceName; + NotifyStateChanged(); + } } \ No newline at end of file From 69918e306817cc8e76d2fdace8e07136abfaf49a Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Thu, 2 Feb 2023 23:51:00 +0100 Subject: [PATCH 088/185] Create StringHelpers.cs --- src/Common/Helpers/StringHelpers.cs | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 src/Common/Helpers/StringHelpers.cs diff --git a/src/Common/Helpers/StringHelpers.cs b/src/Common/Helpers/StringHelpers.cs new file mode 100644 index 00000000..b3770503 --- /dev/null +++ b/src/Common/Helpers/StringHelpers.cs @@ -0,0 +1,18 @@ +using System; + +namespace XClaim.Common.Helpers; + +public static class StringHelpers { + public static string GetInitialsText(string?[] value) { + if (value.Length < 2) return "FL"; + var f = value[0]?.ToUpper(); + var l = value[^1]?.ToUpper(); + if (f == null || l == null) return "FL"; + try { + return string.Concat(f[0], l[0]); + } catch (Exception e) { + // ignore + } + return string.Empty; + } +} \ No newline at end of file From a51cf64b45b025088a0c93f069e14bda4239a9c9 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Thu, 2 Feb 2023 23:51:15 +0100 Subject: [PATCH 089/185] Update routing logic --- src/Web/Client/App.razor | 2 +- .../20230202213843_Initial.Designer.cs | 1669 +++++++++++++++++ .../Migrations/20230202213843_Initial.cs | 934 +++++++++ .../Migrations/ServerContextModelSnapshot.cs | 1666 ++++++++++++++++ 4 files changed, 4270 insertions(+), 1 deletion(-) create mode 100644 src/Web/Server/Migrations/20230202213843_Initial.Designer.cs create mode 100644 src/Web/Server/Migrations/20230202213843_Initial.cs create mode 100644 src/Web/Server/Migrations/ServerContextModelSnapshot.cs diff --git a/src/Web/Client/App.razor b/src/Web/Client/App.razor index 7b4a27bb..bf6a78c1 100644 --- a/src/Web/Client/App.razor +++ b/src/Web/Client/App.razor @@ -21,7 +21,7 @@ break; case false when isAuthPath: break; - case true when isAuthPath || isRootPath || isRegistrationPath: + case true when isAuthPath || isRootPath || (isRegistrationPath && session.Confirmed): Nav.NavigateTo(WebConst.AppHome); break; case false when isRootPath: diff --git a/src/Web/Server/Migrations/20230202213843_Initial.Designer.cs b/src/Web/Server/Migrations/20230202213843_Initial.Designer.cs new file mode 100644 index 00000000..8990fab4 --- /dev/null +++ b/src/Web/Server/Migrations/20230202213843_Initial.Designer.cs @@ -0,0 +1,1669 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using XClaim.Web.Server.Data; + +#nullable disable + +namespace XClaim.Web.Server.Migrations +{ + [DbContext(typeof(ServerContext))] + [Migration("20230202213843_Initial")] + partial class Initial + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder.HasAnnotation("ProductVersion", "7.0.2"); + + modelBuilder.Entity("XClaim.Web.Server.Entities.BankAccountEntity", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasColumnName("id"); + + b.Property("BankId") + .HasColumnType("TEXT") + .HasColumnName("bank_id"); + + b.Property("CreatedAt") + .HasColumnType("TEXT") + .HasColumnName("created_at"); + + b.Property("DeletedAt") + .HasColumnType("TEXT") + .HasColumnName("deleted_at"); + + b.Property("Description") + .HasMaxLength(1024) + .HasColumnType("TEXT") + .HasColumnName("description"); + + b.Property("FullName") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("full_name"); + + b.Property("ModifiedAt") + .HasColumnType("TEXT") + .HasColumnName("modified_at"); + + b.Property("Number") + .IsRequired() + .HasMaxLength(20) + .HasColumnType("TEXT") + .HasColumnName("number"); + + b.Property("OwnerId") + .HasColumnType("TEXT") + .HasColumnName("owner_id"); + + b.HasKey("Id") + .HasName("pk_user_bank_account"); + + b.HasIndex("BankId") + .HasDatabaseName("ix_user_bank_account_bank_id"); + + b.HasIndex("DeletedAt") + .HasDatabaseName("ix_user_bank_account_deleted_at"); + + b.HasIndex("OwnerId") + .IsUnique() + .HasDatabaseName("ix_user_bank_account_owner_id"); + + b.ToTable("user_bank_account", (string)null); + }); + + modelBuilder.Entity("XClaim.Web.Server.Entities.BankEntity", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasColumnName("id"); + + b.Property("Active") + .HasColumnType("INTEGER") + .HasColumnName("active"); + + b.Property("CreatedAt") + .HasColumnType("TEXT") + .HasColumnName("created_at"); + + b.Property("DeletedAt") + .HasColumnType("TEXT") + .HasColumnName("deleted_at"); + + b.Property("Description") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("description"); + + b.Property("ModifiedAt") + .HasColumnType("TEXT") + .HasColumnName("modified_at"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(128) + .HasColumnType("TEXT") + .HasColumnName("name"); + + b.Property("SwiftCode") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("swift_code"); + + b.HasKey("Id") + .HasName("pk_banks"); + + b.HasIndex("DeletedAt") + .HasDatabaseName("ix_banks_deleted_at"); + + b.HasIndex("Name") + .IsUnique() + .HasDatabaseName("ix_banks_name"); + + b.ToTable("banks", (string)null); + + b.HasData( + new + { + Id = new Guid("dcb125d2-1d42-4b01-bc2c-a7863e708a47"), + Active = false, + CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), + Description = "", + Name = "GT Bank", + SwiftCode = "" + }, + new + { + Id = new Guid("1771e448-891d-43c4-a0aa-3784803e9af1"), + Active = false, + CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), + Description = "", + Name = "Zenith Bank", + SwiftCode = "" + }, + new + { + Id = new Guid("dbb5aa84-e727-4b03-b18f-80315d2a18b4"), + Active = false, + CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), + Description = "", + Name = "First Bank", + SwiftCode = "" + }, + new + { + Id = new Guid("3ce65741-39ef-4ca8-bc85-4afee4800a07"), + Active = false, + CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), + Description = "", + Name = "Access Bank", + SwiftCode = "" + }, + new + { + Id = new Guid("4a12f06b-352d-4786-899f-52ea979cc65c"), + Active = false, + CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), + Description = "", + Name = "Fidelity Bank", + SwiftCode = "" + }, + new + { + Id = new Guid("195fc39b-4791-41b7-9d9e-d9c31dcbe884"), + Active = false, + CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), + Description = "", + Name = "First City Monument Bank", + SwiftCode = "" + }, + new + { + Id = new Guid("de625d37-6628-47d3-8656-6d457ca1b151"), + Active = false, + CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), + Description = "", + Name = "Union Bank of Nigeria", + SwiftCode = "" + }, + new + { + Id = new Guid("8b98faad-c950-4adc-ac13-4577c3e7d616"), + Active = false, + CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), + Description = "", + Name = "United Bank for Africa", + SwiftCode = "" + }, + new + { + Id = new Guid("ac444cc9-93c2-4b90-b7a4-cb759fe9bb1a"), + Active = false, + CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), + Description = "", + Name = "Sterling Bank", + SwiftCode = "" + }, + new + { + Id = new Guid("8f2fdbbc-c992-4f57-86bf-167633c491fb"), + Active = false, + CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), + Description = "", + Name = "Wema Bank", + SwiftCode = "" + }, + new + { + Id = new Guid("bcb4a992-7936-4126-9bba-602b0f0f979f"), + Active = false, + CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), + Description = "", + Name = "Stanbic IBTC Bank", + SwiftCode = "" + }, + new + { + Id = new Guid("01cb6bc8-b3a7-4a9f-8c25-37885fbd1ada"), + Active = false, + CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), + Description = "", + Name = "Polaris Bank Limited", + SwiftCode = "" + }, + new + { + Id = new Guid("2e6fa8fd-49ca-450d-a85d-54df1055816e"), + Active = false, + CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), + Description = "", + Name = "Keystone Bank Limited", + SwiftCode = "" + }); + }); + + modelBuilder.Entity("XClaim.Web.Server.Entities.CategoryEntity", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasColumnName("id"); + + b.Property("Active") + .HasColumnType("INTEGER") + .HasColumnName("active"); + + b.Property("CompanyId") + .HasColumnType("TEXT") + .HasColumnName("company_id"); + + b.Property("CreatedAt") + .HasColumnType("TEXT") + .HasColumnName("created_at"); + + b.Property("DeletedAt") + .HasColumnType("TEXT") + .HasColumnName("deleted_at"); + + b.Property("Description") + .HasMaxLength(1024) + .HasColumnType("TEXT") + .HasColumnName("description"); + + b.Property("Icon") + .HasMaxLength(64) + .HasColumnType("TEXT") + .HasColumnName("icon"); + + b.Property("ModifiedAt") + .HasColumnType("TEXT") + .HasColumnName("modified_at"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(128) + .HasColumnType("TEXT") + .HasColumnName("name"); + + b.HasKey("Id") + .HasName("pk_categories"); + + b.HasIndex("CompanyId") + .HasDatabaseName("ix_categories_company_id"); + + b.HasIndex("DeletedAt") + .HasDatabaseName("ix_categories_deleted_at"); + + b.ToTable("categories", (string)null); + + b.HasData( + new + { + Id = new Guid("8db67707-4665-43b0-b26f-cfca391aa4b0"), + Active = false, + CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), + Description = "", + Icon = "", + Name = "General Fuelling" + }, + new + { + Id = new Guid("8286de04-35da-48fa-9fd3-9a90910c54aa"), + Active = false, + CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), + Description = "", + Icon = "", + Name = "Internet Service" + }, + new + { + Id = new Guid("4197d752-02d5-450a-9d3c-6fa44489d97d"), + Active = false, + CompanyId = new Guid("3de60ed7-4c83-43d9-ac34-21c18e849b8f"), + CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), + Description = "", + Icon = "", + Name = "BHN - Weekly meeting expense" + }, + new + { + Id = new Guid("64c7b903-12e5-4168-96fd-026a1a67f73f"), + Active = false, + CompanyId = new Guid("15539941-c7e7-45d4-b86e-05b5991f6215"), + CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), + Description = "", + Icon = "", + Name = "MCPL - Monthly training expense" + }); + }); + + modelBuilder.Entity("XClaim.Web.Server.Entities.ClaimEntity", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasColumnName("id"); + + b.Property("Amount") + .HasColumnType("TEXT") + .HasColumnName("amount"); + + b.Property("ApprovedAt") + .HasColumnType("TEXT") + .HasColumnName("approved_at"); + + b.Property("ApprovedById") + .HasColumnType("TEXT") + .HasColumnName("approved_by_id"); + + b.Property("CategoryId") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("category_id"); + + b.Property("CompanyId") + .HasColumnType("TEXT") + .HasColumnName("company_id"); + + b.Property("ConfirmedAt") + .HasColumnType("TEXT") + .HasColumnName("confirmed_at"); + + b.Property("ConfirmedById") + .HasColumnType("TEXT") + .HasColumnName("confirmed_by_id"); + + b.Property("CreatedAt") + .HasColumnType("TEXT") + .HasColumnName("created_at"); + + b.Property("DeletedAt") + .HasColumnType("TEXT") + .HasColumnName("deleted_at"); + + b.Property("Description") + .IsRequired() + .HasMaxLength(256) + .HasColumnType("TEXT") + .HasColumnName("description"); + + b.Property("ModifiedAt") + .HasColumnType("TEXT") + .HasColumnName("modified_at"); + + b.Property("Notes") + .HasMaxLength(1024) + .HasColumnType("TEXT") + .HasColumnName("notes"); + + b.Property("OwnerId") + .HasColumnType("TEXT") + .HasColumnName("owner_id"); + + b.Property("PaymentId") + .HasColumnType("TEXT") + .HasColumnName("payment_id"); + + b.Property("Priority") + .HasColumnType("INTEGER") + .HasColumnName("priority"); + + b.Property("ReviewedAt") + .HasColumnType("TEXT") + .HasColumnName("reviewed_at"); + + b.Property("ReviewedById") + .HasColumnType("TEXT") + .HasColumnName("reviewed_by_id"); + + b.Property("Status") + .HasColumnType("INTEGER") + .HasColumnName("status"); + + b.HasKey("Id") + .HasName("pk_claims"); + + b.HasIndex("ApprovedById") + .HasDatabaseName("ix_claims_approved_by_id"); + + b.HasIndex("CategoryId") + .HasDatabaseName("ix_claims_category_id"); + + b.HasIndex("CompanyId") + .HasDatabaseName("ix_claims_company_id"); + + b.HasIndex("ConfirmedById") + .HasDatabaseName("ix_claims_confirmed_by_id"); + + b.HasIndex("DeletedAt") + .HasDatabaseName("ix_claims_deleted_at"); + + b.HasIndex("OwnerId") + .HasDatabaseName("ix_claims_owner_id"); + + b.HasIndex("PaymentId") + .HasDatabaseName("ix_claims_payment_id"); + + b.HasIndex("ReviewedById") + .HasDatabaseName("ix_claims_reviewed_by_id"); + + b.ToTable("claims", (string)null); + }); + + modelBuilder.Entity("XClaim.Web.Server.Entities.CommentEntity", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasColumnName("id"); + + b.Property("ClaimId") + .HasColumnType("TEXT") + .HasColumnName("claim_id"); + + b.Property("Content") + .IsRequired() + .HasMaxLength(1024) + .HasColumnType("TEXT") + .HasColumnName("content"); + + b.Property("CreatedAt") + .HasColumnType("TEXT") + .HasColumnName("created_at"); + + b.Property("DeletedAt") + .HasColumnType("TEXT") + .HasColumnName("deleted_at"); + + b.Property("ModifiedAt") + .HasColumnType("TEXT") + .HasColumnName("modified_at"); + + b.Property("OwnerId") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("owner_id"); + + b.Property("PaymentId") + .HasColumnType("TEXT") + .HasColumnName("payment_id"); + + b.HasKey("Id") + .HasName("pk_comments"); + + b.HasIndex("ClaimId") + .HasDatabaseName("ix_comments_claim_id"); + + b.HasIndex("DeletedAt") + .HasDatabaseName("ix_comments_deleted_at"); + + b.HasIndex("OwnerId") + .HasDatabaseName("ix_comments_owner_id"); + + b.HasIndex("PaymentId") + .HasDatabaseName("ix_comments_payment_id"); + + b.ToTable("comments", (string)null); + }); + + modelBuilder.Entity("XClaim.Web.Server.Entities.CompanyEntity", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasColumnName("id"); + + b.Property("Active") + .HasColumnType("INTEGER") + .HasColumnName("active"); + + b.Property("AdminEmail") + .IsRequired() + .HasMaxLength(256) + .HasColumnType("TEXT") + .HasColumnName("admin_email"); + + b.Property("CreatedAt") + .HasColumnType("TEXT") + .HasColumnName("created_at"); + + b.Property("DeletedAt") + .HasColumnType("TEXT") + .HasColumnName("deleted_at"); + + b.Property("FullName") + .IsRequired() + .HasMaxLength(128) + .HasColumnType("TEXT") + .HasColumnName("full_name"); + + b.Property("ManagerId") + .HasColumnType("TEXT") + .HasColumnName("manager_id"); + + b.Property("ModifiedAt") + .HasColumnType("TEXT") + .HasColumnName("modified_at"); + + b.Property("ShortName") + .IsRequired() + .HasMaxLength(64) + .HasColumnType("TEXT") + .HasColumnName("short_name"); + + b.HasKey("Id") + .HasName("pk_companies"); + + b.HasIndex("DeletedAt") + .HasDatabaseName("ix_companies_deleted_at"); + + b.HasIndex("ManagerId") + .IsUnique() + .HasDatabaseName("ix_companies_manager_id"); + + b.ToTable("companies", (string)null); + + b.HasData( + new + { + Id = new Guid("3de60ed7-4c83-43d9-ac34-21c18e849b8f"), + Active = false, + AdminEmail = "", + CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), + FullName = "MCPL LTD - BHN Division", + ShortName = "BHN Logistics" + }, + new + { + Id = new Guid("15539941-c7e7-45d4-b86e-05b5991f6215"), + Active = false, + AdminEmail = "", + CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), + FullName = "Multi Consumer Product LTD", + ShortName = "MCPL LTD" + }, + new + { + Id = new Guid("9f4598fe-bd5d-4e3b-8588-d293df693ba9"), + Active = false, + AdminEmail = "", + CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), + FullName = "Dufil Prima Foods Plc", + ShortName = "Dufil Prima" + }, + new + { + Id = new Guid("84cccd2f-2369-4337-bb89-7495146d8411"), + Active = false, + AdminEmail = "", + CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), + FullName = "X-Claim Instance Management", + ShortName = "X-Claim" + }); + }); + + modelBuilder.Entity("XClaim.Web.Server.Entities.CurrencyEntity", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasColumnName("id"); + + b.Property("Active") + .HasColumnType("INTEGER") + .HasColumnName("active"); + + b.Property("Code") + .IsRequired() + .HasMaxLength(3) + .HasColumnType("TEXT") + .HasColumnName("code"); + + b.Property("CreatedAt") + .HasColumnType("TEXT") + .HasColumnName("created_at"); + + b.Property("DeletedAt") + .HasColumnType("TEXT") + .HasColumnName("deleted_at"); + + b.Property("Description") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("description"); + + b.Property("ModifiedAt") + .HasColumnType("TEXT") + .HasColumnName("modified_at"); + + b.Property("Name") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("name"); + + b.Property("Rate") + .HasColumnType("TEXT") + .HasColumnName("rate"); + + b.Property("Symbol") + .IsRequired() + .HasMaxLength(1) + .HasColumnType("TEXT") + .HasColumnName("symbol"); + + b.HasKey("Id") + .HasName("pk_currency_entity"); + + b.HasIndex("Code") + .IsUnique() + .HasDatabaseName("ix_currency_entity_code"); + + b.HasIndex("DeletedAt") + .HasDatabaseName("ix_currency_entity_deleted_at"); + + b.HasIndex("Name") + .IsUnique() + .HasDatabaseName("ix_currency_entity_name"); + + b.ToTable("currency_entity", (string)null); + + b.HasData( + new + { + Id = new Guid("62184e4d-9397-459c-9623-1bb02a44419b"), + Active = false, + Code = "NGN", + CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), + Description = "", + Name = "Naira", + Rate = 0m, + Symbol = "₦" + }, + new + { + Id = new Guid("4b2bb3b9-2e37-4942-a499-2c852e5db1c7"), + Active = false, + Code = "USD", + CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), + Description = "", + Name = "US Dollar", + Rate = 0m, + Symbol = "$" + }, + new + { + Id = new Guid("88dddfe8-d318-4868-9bf5-8f267376e3a9"), + Active = false, + Code = "EUR", + CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), + Description = "", + Name = "Euro", + Rate = 0m, + Symbol = "€" + }, + new + { + Id = new Guid("a9161b94-6223-4929-b4ef-bbcd82ba6719"), + Active = false, + Code = "GBP", + CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), + Description = "", + Name = "British Pounds", + Rate = 0m, + Symbol = "£" + }, + new + { + Id = new Guid("85ad4afd-5c60-44ae-b809-170fdaac6b09"), + Active = false, + Code = "INR", + CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), + Description = "", + Name = "Rupee", + Rate = 0m, + Symbol = "₹" + }); + }); + + modelBuilder.Entity("XClaim.Web.Server.Entities.DomainEntity", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasColumnName("id"); + + b.Property("Active") + .HasColumnType("INTEGER") + .HasColumnName("active"); + + b.Property("Address") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("address"); + + b.Property("CreatedAt") + .HasColumnType("TEXT") + .HasColumnName("created_at"); + + b.Property("DeletedAt") + .HasColumnType("TEXT") + .HasColumnName("deleted_at"); + + b.Property("Description") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("description"); + + b.Property("ModifiedAt") + .HasColumnType("TEXT") + .HasColumnName("modified_at"); + + b.HasKey("Id") + .HasName("pk_domain_entity"); + + b.ToTable("domain_entity", (string)null); + + b.HasData( + new + { + Id = new Guid("e3bfd149-0a86-43f4-9021-81a3d6fea9a2"), + Active = false, + Address = "tolaram.com", + CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), + Description = "" + }, + new + { + Id = new Guid("320655ca-4002-4539-8eab-3ee2dcac1804"), + Active = false, + Address = "dufil.com", + CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), + Description = "" + }, + new + { + Id = new Guid("989e690e-7895-4dbf-93c6-fbb2cca3e632"), + Active = false, + Address = "outlook.com", + CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), + Description = "" + }); + }); + + modelBuilder.Entity("XClaim.Web.Server.Entities.EventEntity", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasColumnName("id"); + + b.Property("ClaimId") + .HasColumnType("TEXT") + .HasColumnName("claim_id"); + + b.Property("CreatedAt") + .HasColumnType("TEXT") + .HasColumnName("created_at"); + + b.Property("DeletedAt") + .HasColumnType("TEXT") + .HasColumnName("deleted_at"); + + b.Property("Description") + .IsRequired() + .HasMaxLength(512) + .HasColumnType("TEXT") + .HasColumnName("description"); + + b.Property("ModifiedAt") + .HasColumnType("TEXT") + .HasColumnName("modified_at"); + + b.Property("PaymentId") + .HasColumnType("TEXT") + .HasColumnName("payment_id"); + + b.Property("Type") + .HasColumnType("INTEGER") + .HasColumnName("type"); + + b.HasKey("Id") + .HasName("pk_events"); + + b.HasIndex("ClaimId") + .HasDatabaseName("ix_events_claim_id"); + + b.HasIndex("DeletedAt") + .HasDatabaseName("ix_events_deleted_at"); + + b.HasIndex("PaymentId") + .HasDatabaseName("ix_events_payment_id"); + + b.ToTable("events", (string)null); + }); + + modelBuilder.Entity("XClaim.Web.Server.Entities.FileEntity", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasColumnName("id"); + + b.Property("ClaimEntityId") + .HasColumnType("TEXT") + .HasColumnName("claim_entity_id"); + + b.Property("CreatedAt") + .HasColumnType("TEXT") + .HasColumnName("created_at"); + + b.Property("DeletedAt") + .HasColumnType("TEXT") + .HasColumnName("deleted_at"); + + b.Property("Extension") + .HasMaxLength(8) + .HasColumnType("TEXT") + .HasColumnName("extension"); + + b.Property("ModifiedAt") + .HasColumnType("TEXT") + .HasColumnName("modified_at"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(256) + .HasColumnType("TEXT") + .HasColumnName("name"); + + b.Property("OwnerId") + .HasColumnType("TEXT") + .HasColumnName("owner_id"); + + b.Property("Path") + .IsRequired() + .HasMaxLength(1024) + .HasColumnType("TEXT") + .HasColumnName("path"); + + b.Property("PaymentEntityId") + .HasColumnType("TEXT") + .HasColumnName("payment_entity_id"); + + b.HasKey("Id") + .HasName("pk_files"); + + b.HasIndex("ClaimEntityId") + .HasDatabaseName("ix_files_claim_entity_id"); + + b.HasIndex("DeletedAt") + .HasDatabaseName("ix_files_deleted_at"); + + b.HasIndex("OwnerId") + .HasDatabaseName("ix_files_owner_id"); + + b.HasIndex("PaymentEntityId") + .HasDatabaseName("ix_files_payment_entity_id"); + + b.ToTable("files", (string)null); + }); + + modelBuilder.Entity("XClaim.Web.Server.Entities.NotificationEntity", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasColumnName("id"); + + b.Property("Channels") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("channels"); + + b.Property("CreatedAt") + .HasColumnType("TEXT") + .HasColumnName("created_at"); + + b.Property("DeletedAt") + .HasColumnType("TEXT") + .HasColumnName("deleted_at"); + + b.Property("Disabled") + .HasColumnType("INTEGER") + .HasColumnName("disabled"); + + b.Property("ModifiedAt") + .HasColumnType("TEXT") + .HasColumnName("modified_at"); + + b.Property("OwnerId") + .HasColumnType("TEXT") + .HasColumnName("owner_id"); + + b.Property("Types") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("types"); + + b.HasKey("Id") + .HasName("pk_user_notification"); + + b.HasIndex("DeletedAt") + .HasDatabaseName("ix_user_notification_deleted_at"); + + b.HasIndex("OwnerId") + .IsUnique() + .HasDatabaseName("ix_user_notification_owner_id"); + + b.ToTable("user_notification", (string)null); + }); + + modelBuilder.Entity("XClaim.Web.Server.Entities.PaymentEntity", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasColumnName("id"); + + b.Property("Amount") + .HasColumnType("TEXT") + .HasColumnName("amount"); + + b.Property("ConfirmedAt") + .HasColumnType("TEXT") + .HasColumnName("confirmed_at"); + + b.Property("ConfirmedById") + .HasColumnType("TEXT") + .HasColumnName("confirmed_by_id"); + + b.Property("Count") + .HasColumnType("INTEGER") + .HasColumnName("count"); + + b.Property("CreatedAt") + .HasColumnType("TEXT") + .HasColumnName("created_at"); + + b.Property("DeletedAt") + .HasColumnType("TEXT") + .HasColumnName("deleted_at"); + + b.Property("Description") + .HasMaxLength(256) + .HasColumnType("TEXT") + .HasColumnName("description"); + + b.Property("ModifiedAt") + .HasColumnType("TEXT") + .HasColumnName("modified_at"); + + b.Property("Notes") + .HasMaxLength(1024) + .HasColumnType("TEXT") + .HasColumnName("notes"); + + b.Property("OwnerId") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("owner_id"); + + b.HasKey("Id") + .HasName("pk_payments"); + + b.HasIndex("ConfirmedById") + .HasDatabaseName("ix_payments_confirmed_by_id"); + + b.HasIndex("DeletedAt") + .HasDatabaseName("ix_payments_deleted_at"); + + b.HasIndex("OwnerId") + .HasDatabaseName("ix_payments_owner_id"); + + b.ToTable("payments", (string)null); + }); + + modelBuilder.Entity("XClaim.Web.Server.Entities.ServerEntity", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasColumnName("id"); + + b.Property("AdminEmail") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("admin_email"); + + b.Property("CreatedAt") + .HasColumnType("TEXT") + .HasColumnName("created_at"); + + b.Property("CurrencyId") + .HasColumnType("TEXT") + .HasColumnName("currency_id"); + + b.Property("DeletedAt") + .HasColumnType("TEXT") + .HasColumnName("deleted_at"); + + b.Property("MaintenanceMode") + .HasColumnType("INTEGER") + .HasColumnName("maintenance_mode"); + + b.Property("MaintenanceText") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("maintenance_text"); + + b.Property("ModifiedAt") + .HasColumnType("TEXT") + .HasColumnName("modified_at"); + + b.Property("ServiceName") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("service_name"); + + b.HasKey("Id") + .HasName("pk_server"); + + b.HasIndex("CurrencyId") + .HasDatabaseName("ix_server_currency_id"); + + b.HasIndex("DeletedAt") + .HasDatabaseName("ix_server_deleted_at"); + + b.ToTable("server", (string)null); + + b.HasData( + new + { + Id = new Guid("ca00807b-625a-48e4-9269-3cbbd890226d"), + AdminEmail = "admin@x-claim.dev", + CreatedAt = new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified), + CurrencyId = new Guid("62184e4d-9397-459c-9623-1bb02a44419b"), + MaintenanceMode = false, + MaintenanceText = "In-Progress", + ServiceName = "X-Claim" + }); + }); + + modelBuilder.Entity("XClaim.Web.Server.Entities.SettingEntity", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasColumnName("id"); + + b.Property("CreatedAt") + .HasColumnType("TEXT") + .HasColumnName("created_at"); + + b.Property("DarkMode") + .HasColumnType("INTEGER") + .HasColumnName("dark_mode"); + + b.Property("DeletedAt") + .HasColumnType("TEXT") + .HasColumnName("deleted_at"); + + b.Property("Language") + .HasColumnType("INTEGER") + .HasColumnName("language"); + + b.Property("ModifiedAt") + .HasColumnType("TEXT") + .HasColumnName("modified_at"); + + b.Property("OwnerId") + .HasColumnType("TEXT") + .HasColumnName("owner_id"); + + b.HasKey("Id") + .HasName("pk_user_setting"); + + b.HasIndex("DeletedAt") + .HasDatabaseName("ix_user_setting_deleted_at"); + + b.HasIndex("OwnerId") + .IsUnique() + .HasDatabaseName("ix_user_setting_owner_id"); + + b.ToTable("user_setting", (string)null); + }); + + modelBuilder.Entity("XClaim.Web.Server.Entities.TeamEntity", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasColumnName("id"); + + b.Property("Active") + .HasColumnType("INTEGER") + .HasColumnName("active"); + + b.Property("CompanyId") + .HasColumnType("TEXT") + .HasColumnName("company_id"); + + b.Property("CreatedAt") + .HasColumnType("TEXT") + .HasColumnName("created_at"); + + b.Property("DeletedAt") + .HasColumnType("TEXT") + .HasColumnName("deleted_at"); + + b.Property("Description") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("description"); + + b.Property("ManagerId") + .HasColumnType("TEXT") + .HasColumnName("manager_id"); + + b.Property("ModifiedAt") + .HasColumnType("TEXT") + .HasColumnName("modified_at"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(128) + .HasColumnType("TEXT") + .HasColumnName("name"); + + b.HasKey("Id") + .HasName("pk_teams"); + + b.HasIndex("CompanyId") + .HasDatabaseName("ix_teams_company_id"); + + b.HasIndex("DeletedAt") + .HasDatabaseName("ix_teams_deleted_at"); + + b.HasIndex("ManagerId") + .IsUnique() + .HasDatabaseName("ix_teams_manager_id"); + + b.ToTable("teams", (string)null); + + b.HasData( + new + { + Id = new Guid("0a063653-f0f0-468f-aec8-85bdcfd22c21"), + Active = false, + CompanyId = new Guid("3de60ed7-4c83-43d9-ac34-21c18e849b8f"), + CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), + Description = "", + Name = "Account Dept" + }, + new + { + Id = new Guid("47720f67-9f3d-4cce-b34c-8dc6aa26ddc6"), + Active = false, + CompanyId = new Guid("15539941-c7e7-45d4-b86e-05b5991f6215"), + CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), + Description = "", + Name = "Logistics Dept" + }, + new + { + Id = new Guid("8f08bd2f-148b-410a-8a15-1c826c5a7ede"), + Active = false, + CompanyId = new Guid("9f4598fe-bd5d-4e3b-8588-d293df693ba9"), + CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), + Description = "", + Name = "Packaging Dept" + }); + }); + + modelBuilder.Entity("XClaim.Web.Server.Entities.UserEntity", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasColumnName("id"); + + b.Property("Active") + .HasColumnType("INTEGER") + .HasColumnName("active"); + + b.Property("Balance") + .HasColumnType("TEXT") + .HasColumnName("balance"); + + b.Property("CompanyId") + .HasColumnType("TEXT") + .HasColumnName("company_id"); + + b.Property("CompanyManagedId") + .HasColumnType("TEXT") + .HasColumnName("company_managed_id"); + + b.Property("CreatedAt") + .HasColumnType("TEXT") + .HasColumnName("created_at"); + + b.Property("CurrencyId") + .HasColumnType("TEXT") + .HasColumnName("currency_id"); + + b.Property("DeletedAt") + .HasColumnType("TEXT") + .HasColumnName("deleted_at"); + + b.Property("Email") + .IsRequired() + .HasMaxLength(256) + .HasColumnType("TEXT") + .HasColumnName("email"); + + b.Property("FirstName") + .IsRequired() + .HasMaxLength(128) + .HasColumnType("TEXT") + .HasColumnName("first_name"); + + b.Property("Identifier") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("identifier"); + + b.Property("Image") + .HasColumnType("TEXT") + .HasColumnName("image"); + + b.Property("LastName") + .IsRequired() + .HasMaxLength(128) + .HasColumnType("TEXT") + .HasColumnName("last_name"); + + b.Property("ModifiedAt") + .HasColumnType("TEXT") + .HasColumnName("modified_at"); + + b.Property("Permission") + .HasColumnType("INTEGER") + .HasColumnName("permission"); + + b.Property("Phone") + .IsRequired() + .HasMaxLength(64) + .HasColumnType("TEXT") + .HasColumnName("phone"); + + b.Property("ProfileImage") + .HasColumnType("TEXT") + .HasColumnName("profile_image"); + + b.Property("TeamId") + .HasColumnType("TEXT") + .HasColumnName("team_id"); + + b.Property("TeamManagedId") + .HasColumnType("TEXT") + .HasColumnName("team_managed_id"); + + b.Property("Token") + .HasMaxLength(128) + .HasColumnType("TEXT") + .HasColumnName("token"); + + b.HasKey("Id") + .HasName("pk_users"); + + b.HasIndex("CompanyId") + .HasDatabaseName("ix_users_company_id"); + + b.HasIndex("CurrencyId") + .HasDatabaseName("ix_users_currency_id"); + + b.HasIndex("DeletedAt") + .HasDatabaseName("ix_users_deleted_at"); + + b.HasIndex("Email") + .IsUnique() + .HasDatabaseName("ix_users_email"); + + b.HasIndex("Identifier") + .IsUnique() + .HasDatabaseName("ix_users_identifier"); + + b.HasIndex("TeamId") + .HasDatabaseName("ix_users_team_id"); + + b.ToTable("users", (string)null); + + b.HasData( + new + { + Id = new Guid("88e90686-fc3e-4063-819c-1cd585dd49a3"), + Active = false, + Balance = 0m, + CompanyId = new Guid("3de60ed7-4c83-43d9-ac34-21c18e849b8f"), + CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), + Email = "john.doe@tolaram.com", + FirstName = "John", + Identifier = "rtebe6r6mhpubcu7iitygg7woa", + LastName = "Doe", + Permission = 5, + Phone = "+234012345567", + TeamId = new Guid("0a063653-f0f0-468f-aec8-85bdcfd22c21") + }, + new + { + Id = new Guid("cc8e58ef-9920-4090-a972-a027ed3f48e2"), + Active = false, + Balance = 0m, + CompanyId = new Guid("15539941-c7e7-45d4-b86e-05b5991f6215"), + CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), + Email = "jane.doe@tolaram.com", + FirstName = "Jane", + Identifier = "syrbh5p7fuxuljf66irs5bhahi", + LastName = "Doe", + Permission = 5, + Phone = "+234022424553", + TeamId = new Guid("47720f67-9f3d-4cce-b34c-8dc6aa26ddc6") + }); + }); + + modelBuilder.Entity("XClaim.Web.Server.Entities.BankAccountEntity", b => + { + b.HasOne("XClaim.Web.Server.Entities.BankEntity", "Bank") + .WithMany() + .HasForeignKey("BankId") + .HasConstraintName("fk_user_bank_account_banks_bank_id"); + + b.HasOne("XClaim.Web.Server.Entities.UserEntity", "Owner") + .WithOne("BankAccount") + .HasForeignKey("XClaim.Web.Server.Entities.BankAccountEntity", "OwnerId") + .HasConstraintName("fk_user_bank_account_users_owner_id"); + + b.Navigation("Bank"); + + b.Navigation("Owner"); + }); + + modelBuilder.Entity("XClaim.Web.Server.Entities.CategoryEntity", b => + { + b.HasOne("XClaim.Web.Server.Entities.CompanyEntity", "Company") + .WithMany() + .HasForeignKey("CompanyId") + .HasConstraintName("fk_categories_companies_company_id"); + + b.Navigation("Company"); + }); + + modelBuilder.Entity("XClaim.Web.Server.Entities.ClaimEntity", b => + { + b.HasOne("XClaim.Web.Server.Entities.UserEntity", "ApprovedBy") + .WithMany() + .HasForeignKey("ApprovedById") + .HasConstraintName("fk_claims_users_approved_by_id"); + + b.HasOne("XClaim.Web.Server.Entities.CategoryEntity", "Category") + .WithMany() + .HasForeignKey("CategoryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("fk_claims_categories_category_id"); + + b.HasOne("XClaim.Web.Server.Entities.CompanyEntity", "Company") + .WithMany() + .HasForeignKey("CompanyId") + .HasConstraintName("fk_claims_companies_company_id"); + + b.HasOne("XClaim.Web.Server.Entities.UserEntity", "ConfirmedBy") + .WithMany() + .HasForeignKey("ConfirmedById") + .HasConstraintName("fk_claims_users_confirmed_by_id"); + + b.HasOne("XClaim.Web.Server.Entities.UserEntity", "Owner") + .WithMany() + .HasForeignKey("OwnerId") + .HasConstraintName("fk_claims_users_owner_id"); + + b.HasOne("XClaim.Web.Server.Entities.PaymentEntity", "Payment") + .WithMany("Claims") + .HasForeignKey("PaymentId") + .HasConstraintName("fk_claims_payments_payment_id"); + + b.HasOne("XClaim.Web.Server.Entities.UserEntity", "ReviewedBy") + .WithMany() + .HasForeignKey("ReviewedById") + .HasConstraintName("fk_claims_users_reviewed_by_id"); + + b.Navigation("ApprovedBy"); + + b.Navigation("Category"); + + b.Navigation("Company"); + + b.Navigation("ConfirmedBy"); + + b.Navigation("Owner"); + + b.Navigation("Payment"); + + b.Navigation("ReviewedBy"); + }); + + modelBuilder.Entity("XClaim.Web.Server.Entities.CommentEntity", b => + { + b.HasOne("XClaim.Web.Server.Entities.ClaimEntity", "Claim") + .WithMany("Comments") + .HasForeignKey("ClaimId") + .HasConstraintName("fk_comments_claims_claim_id"); + + b.HasOne("XClaim.Web.Server.Entities.UserEntity", "Owner") + .WithMany() + .HasForeignKey("OwnerId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("fk_comments_users_owner_id"); + + b.HasOne("XClaim.Web.Server.Entities.PaymentEntity", "Payment") + .WithMany("Comments") + .HasForeignKey("PaymentId") + .HasConstraintName("fk_comments_payments_payment_id"); + + b.Navigation("Claim"); + + b.Navigation("Owner"); + + b.Navigation("Payment"); + }); + + modelBuilder.Entity("XClaim.Web.Server.Entities.CompanyEntity", b => + { + b.HasOne("XClaim.Web.Server.Entities.UserEntity", "Manager") + .WithOne("CompanyManaged") + .HasForeignKey("XClaim.Web.Server.Entities.CompanyEntity", "ManagerId") + .OnDelete(DeleteBehavior.SetNull) + .HasConstraintName("fk_companies_users_manager_id"); + + b.Navigation("Manager"); + }); + + modelBuilder.Entity("XClaim.Web.Server.Entities.EventEntity", b => + { + b.HasOne("XClaim.Web.Server.Entities.ClaimEntity", "Claim") + .WithMany() + .HasForeignKey("ClaimId") + .HasConstraintName("fk_events_claims_claim_id"); + + b.HasOne("XClaim.Web.Server.Entities.PaymentEntity", "Payment") + .WithMany() + .HasForeignKey("PaymentId") + .HasConstraintName("fk_events_payments_payment_id"); + + b.Navigation("Claim"); + + b.Navigation("Payment"); + }); + + modelBuilder.Entity("XClaim.Web.Server.Entities.FileEntity", b => + { + b.HasOne("XClaim.Web.Server.Entities.ClaimEntity", null) + .WithMany("Files") + .HasForeignKey("ClaimEntityId") + .HasConstraintName("fk_files_claims_claim_entity_id"); + + b.HasOne("XClaim.Web.Server.Entities.UserEntity", "Owner") + .WithMany() + .HasForeignKey("OwnerId") + .HasConstraintName("fk_files_users_owner_id"); + + b.HasOne("XClaim.Web.Server.Entities.PaymentEntity", null) + .WithMany("Files") + .HasForeignKey("PaymentEntityId") + .HasConstraintName("fk_files_payments_payment_entity_id"); + + b.Navigation("Owner"); + }); + + modelBuilder.Entity("XClaim.Web.Server.Entities.NotificationEntity", b => + { + b.HasOne("XClaim.Web.Server.Entities.UserEntity", "Owner") + .WithOne("Notification") + .HasForeignKey("XClaim.Web.Server.Entities.NotificationEntity", "OwnerId") + .HasConstraintName("fk_user_notification_users_owner_id"); + + b.Navigation("Owner"); + }); + + modelBuilder.Entity("XClaim.Web.Server.Entities.PaymentEntity", b => + { + b.HasOne("XClaim.Web.Server.Entities.UserEntity", "ConfirmedBy") + .WithMany() + .HasForeignKey("ConfirmedById") + .HasConstraintName("fk_payments_users_confirmed_by_id"); + + b.HasOne("XClaim.Web.Server.Entities.UserEntity", "Owner") + .WithMany() + .HasForeignKey("OwnerId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("fk_payments_users_owner_id"); + + b.Navigation("ConfirmedBy"); + + b.Navigation("Owner"); + }); + + modelBuilder.Entity("XClaim.Web.Server.Entities.ServerEntity", b => + { + b.HasOne("XClaim.Web.Server.Entities.CurrencyEntity", "Currency") + .WithMany() + .HasForeignKey("CurrencyId") + .HasConstraintName("fk_server_currency_entity_currency_id"); + + b.Navigation("Currency"); + }); + + modelBuilder.Entity("XClaim.Web.Server.Entities.SettingEntity", b => + { + b.HasOne("XClaim.Web.Server.Entities.UserEntity", "Owner") + .WithOne("Setting") + .HasForeignKey("XClaim.Web.Server.Entities.SettingEntity", "OwnerId") + .HasConstraintName("fk_user_setting_users_owner_id"); + + b.Navigation("Owner"); + }); + + modelBuilder.Entity("XClaim.Web.Server.Entities.TeamEntity", b => + { + b.HasOne("XClaim.Web.Server.Entities.CompanyEntity", "Company") + .WithMany() + .HasForeignKey("CompanyId") + .HasConstraintName("fk_teams_companies_company_id"); + + b.HasOne("XClaim.Web.Server.Entities.UserEntity", "Manager") + .WithOne("TeamManaged") + .HasForeignKey("XClaim.Web.Server.Entities.TeamEntity", "ManagerId") + .OnDelete(DeleteBehavior.SetNull) + .HasConstraintName("fk_teams_users_manager_id"); + + b.Navigation("Company"); + + b.Navigation("Manager"); + }); + + modelBuilder.Entity("XClaim.Web.Server.Entities.UserEntity", b => + { + b.HasOne("XClaim.Web.Server.Entities.CompanyEntity", "Company") + .WithMany("Members") + .HasForeignKey("CompanyId") + .HasConstraintName("fk_users_companies_company_id"); + + b.HasOne("XClaim.Web.Server.Entities.CurrencyEntity", "Currency") + .WithMany() + .HasForeignKey("CurrencyId") + .HasConstraintName("fk_users_currency_entity_currency_id"); + + b.HasOne("XClaim.Web.Server.Entities.TeamEntity", "Team") + .WithMany("Members") + .HasForeignKey("TeamId") + .HasConstraintName("fk_users_teams_team_id"); + + b.Navigation("Company"); + + b.Navigation("Currency"); + + b.Navigation("Team"); + }); + + modelBuilder.Entity("XClaim.Web.Server.Entities.ClaimEntity", b => + { + b.Navigation("Comments"); + + b.Navigation("Files"); + }); + + modelBuilder.Entity("XClaim.Web.Server.Entities.CompanyEntity", b => + { + b.Navigation("Members"); + }); + + modelBuilder.Entity("XClaim.Web.Server.Entities.PaymentEntity", b => + { + b.Navigation("Claims"); + + b.Navigation("Comments"); + + b.Navigation("Files"); + }); + + modelBuilder.Entity("XClaim.Web.Server.Entities.TeamEntity", b => + { + b.Navigation("Members"); + }); + + modelBuilder.Entity("XClaim.Web.Server.Entities.UserEntity", b => + { + b.Navigation("BankAccount"); + + b.Navigation("CompanyManaged"); + + b.Navigation("Notification"); + + b.Navigation("Setting"); + + b.Navigation("TeamManaged"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/src/Web/Server/Migrations/20230202213843_Initial.cs b/src/Web/Server/Migrations/20230202213843_Initial.cs new file mode 100644 index 00000000..1f60fe2e --- /dev/null +++ b/src/Web/Server/Migrations/20230202213843_Initial.cs @@ -0,0 +1,934 @@ +using System; +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +#pragma warning disable CA1814 // Prefer jagged arrays over multidimensional + +namespace XClaim.Web.Server.Migrations +{ + /// + public partial class Initial : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.CreateTable( + name: "banks", + columns: table => new + { + id = table.Column(type: "TEXT", nullable: false), + name = table.Column(type: "TEXT", maxLength: 128, nullable: false), + description = table.Column(type: "TEXT", nullable: false), + swiftcode = table.Column(name: "swift_code", type: "TEXT", nullable: false), + active = table.Column(type: "INTEGER", nullable: false), + createdat = table.Column(name: "created_at", type: "TEXT", nullable: false), + modifiedat = table.Column(name: "modified_at", type: "TEXT", nullable: true), + deletedat = table.Column(name: "deleted_at", type: "TEXT", nullable: true) + }, + constraints: table => + { + table.PrimaryKey("pk_banks", x => x.id); + }); + + migrationBuilder.CreateTable( + name: "currency_entity", + columns: table => new + { + id = table.Column(type: "TEXT", nullable: false), + name = table.Column(type: "TEXT", nullable: false), + symbol = table.Column(type: "TEXT", maxLength: 1, nullable: false), + code = table.Column(type: "TEXT", maxLength: 3, nullable: false), + rate = table.Column(type: "TEXT", nullable: false), + description = table.Column(type: "TEXT", nullable: false), + active = table.Column(type: "INTEGER", nullable: false), + createdat = table.Column(name: "created_at", type: "TEXT", nullable: false), + modifiedat = table.Column(name: "modified_at", type: "TEXT", nullable: true), + deletedat = table.Column(name: "deleted_at", type: "TEXT", nullable: true) + }, + constraints: table => + { + table.PrimaryKey("pk_currency_entity", x => x.id); + }); + + migrationBuilder.CreateTable( + name: "domain_entity", + columns: table => new + { + id = table.Column(type: "TEXT", nullable: false), + address = table.Column(type: "TEXT", nullable: false), + active = table.Column(type: "INTEGER", nullable: false), + description = table.Column(type: "TEXT", nullable: false), + createdat = table.Column(name: "created_at", type: "TEXT", nullable: false), + modifiedat = table.Column(name: "modified_at", type: "TEXT", nullable: true), + deletedat = table.Column(name: "deleted_at", type: "TEXT", nullable: true) + }, + constraints: table => + { + table.PrimaryKey("pk_domain_entity", x => x.id); + }); + + migrationBuilder.CreateTable( + name: "server", + columns: table => new + { + id = table.Column(type: "TEXT", nullable: false), + servicename = table.Column(name: "service_name", type: "TEXT", nullable: false), + adminemail = table.Column(name: "admin_email", type: "TEXT", nullable: false), + maintenancemode = table.Column(name: "maintenance_mode", type: "INTEGER", nullable: false), + maintenancetext = table.Column(name: "maintenance_text", type: "TEXT", nullable: false), + currencyid = table.Column(name: "currency_id", type: "TEXT", nullable: true), + createdat = table.Column(name: "created_at", type: "TEXT", nullable: false), + modifiedat = table.Column(name: "modified_at", type: "TEXT", nullable: true), + deletedat = table.Column(name: "deleted_at", type: "TEXT", nullable: true) + }, + constraints: table => + { + table.PrimaryKey("pk_server", x => x.id); + table.ForeignKey( + name: "fk_server_currency_entity_currency_id", + column: x => x.currencyid, + principalTable: "currency_entity", + principalColumn: "id"); + }); + + migrationBuilder.CreateTable( + name: "categories", + columns: table => new + { + id = table.Column(type: "TEXT", nullable: false), + name = table.Column(type: "TEXT", maxLength: 128, nullable: false), + companyid = table.Column(name: "company_id", type: "TEXT", nullable: true), + description = table.Column(type: "TEXT", maxLength: 1024, nullable: true), + active = table.Column(type: "INTEGER", nullable: false), + icon = table.Column(type: "TEXT", maxLength: 64, nullable: true), + createdat = table.Column(name: "created_at", type: "TEXT", nullable: false), + modifiedat = table.Column(name: "modified_at", type: "TEXT", nullable: true), + deletedat = table.Column(name: "deleted_at", type: "TEXT", nullable: true) + }, + constraints: table => + { + table.PrimaryKey("pk_categories", x => x.id); + }); + + migrationBuilder.CreateTable( + name: "claims", + columns: table => new + { + id = table.Column(type: "TEXT", nullable: false), + description = table.Column(type: "TEXT", maxLength: 256, nullable: false), + notes = table.Column(type: "TEXT", maxLength: 1024, nullable: true), + amount = table.Column(type: "TEXT", nullable: false), + priority = table.Column(type: "INTEGER", nullable: false), + paymentid = table.Column(name: "payment_id", type: "TEXT", nullable: true), + categoryid = table.Column(name: "category_id", type: "TEXT", nullable: false), + companyid = table.Column(name: "company_id", type: "TEXT", nullable: true), + status = table.Column(type: "INTEGER", nullable: false), + ownerid = table.Column(name: "owner_id", type: "TEXT", nullable: true), + reviewedbyid = table.Column(name: "reviewed_by_id", type: "TEXT", nullable: true), + reviewedat = table.Column(name: "reviewed_at", type: "TEXT", nullable: true), + confirmedbyid = table.Column(name: "confirmed_by_id", type: "TEXT", nullable: true), + confirmedat = table.Column(name: "confirmed_at", type: "TEXT", nullable: true), + approvedbyid = table.Column(name: "approved_by_id", type: "TEXT", nullable: true), + approvedat = table.Column(name: "approved_at", type: "TEXT", nullable: true), + createdat = table.Column(name: "created_at", type: "TEXT", nullable: false), + modifiedat = table.Column(name: "modified_at", type: "TEXT", nullable: true), + deletedat = table.Column(name: "deleted_at", type: "TEXT", nullable: true) + }, + constraints: table => + { + table.PrimaryKey("pk_claims", x => x.id); + table.ForeignKey( + name: "fk_claims_categories_category_id", + column: x => x.categoryid, + principalTable: "categories", + principalColumn: "id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateTable( + name: "comments", + columns: table => new + { + id = table.Column(type: "TEXT", nullable: false), + claimid = table.Column(name: "claim_id", type: "TEXT", nullable: true), + paymentid = table.Column(name: "payment_id", type: "TEXT", nullable: true), + ownerid = table.Column(name: "owner_id", type: "TEXT", nullable: false), + content = table.Column(type: "TEXT", maxLength: 1024, nullable: false), + createdat = table.Column(name: "created_at", type: "TEXT", nullable: false), + modifiedat = table.Column(name: "modified_at", type: "TEXT", nullable: true), + deletedat = table.Column(name: "deleted_at", type: "TEXT", nullable: true) + }, + constraints: table => + { + table.PrimaryKey("pk_comments", x => x.id); + table.ForeignKey( + name: "fk_comments_claims_claim_id", + column: x => x.claimid, + principalTable: "claims", + principalColumn: "id"); + }); + + migrationBuilder.CreateTable( + name: "companies", + columns: table => new + { + id = table.Column(type: "TEXT", nullable: false), + active = table.Column(type: "INTEGER", nullable: false), + shortname = table.Column(name: "short_name", type: "TEXT", maxLength: 64, nullable: false), + fullname = table.Column(name: "full_name", type: "TEXT", maxLength: 128, nullable: false), + adminemail = table.Column(name: "admin_email", type: "TEXT", maxLength: 256, nullable: false), + managerid = table.Column(name: "manager_id", type: "TEXT", nullable: true), + createdat = table.Column(name: "created_at", type: "TEXT", nullable: false), + modifiedat = table.Column(name: "modified_at", type: "TEXT", nullable: true), + deletedat = table.Column(name: "deleted_at", type: "TEXT", nullable: true) + }, + constraints: table => + { + table.PrimaryKey("pk_companies", x => x.id); + }); + + migrationBuilder.CreateTable( + name: "events", + columns: table => new + { + id = table.Column(type: "TEXT", nullable: false), + type = table.Column(type: "INTEGER", nullable: false), + claimid = table.Column(name: "claim_id", type: "TEXT", nullable: true), + paymentid = table.Column(name: "payment_id", type: "TEXT", nullable: true), + description = table.Column(type: "TEXT", maxLength: 512, nullable: false), + createdat = table.Column(name: "created_at", type: "TEXT", nullable: false), + modifiedat = table.Column(name: "modified_at", type: "TEXT", nullable: true), + deletedat = table.Column(name: "deleted_at", type: "TEXT", nullable: true) + }, + constraints: table => + { + table.PrimaryKey("pk_events", x => x.id); + table.ForeignKey( + name: "fk_events_claims_claim_id", + column: x => x.claimid, + principalTable: "claims", + principalColumn: "id"); + }); + + migrationBuilder.CreateTable( + name: "files", + columns: table => new + { + id = table.Column(type: "TEXT", nullable: false), + name = table.Column(type: "TEXT", maxLength: 256, nullable: false), + path = table.Column(type: "TEXT", maxLength: 1024, nullable: false), + extension = table.Column(type: "TEXT", maxLength: 8, nullable: true), + ownerid = table.Column(name: "owner_id", type: "TEXT", nullable: true), + claimentityid = table.Column(name: "claim_entity_id", type: "TEXT", nullable: true), + paymententityid = table.Column(name: "payment_entity_id", type: "TEXT", nullable: true), + createdat = table.Column(name: "created_at", type: "TEXT", nullable: false), + modifiedat = table.Column(name: "modified_at", type: "TEXT", nullable: true), + deletedat = table.Column(name: "deleted_at", type: "TEXT", nullable: true) + }, + constraints: table => + { + table.PrimaryKey("pk_files", x => x.id); + table.ForeignKey( + name: "fk_files_claims_claim_entity_id", + column: x => x.claimentityid, + principalTable: "claims", + principalColumn: "id"); + }); + + migrationBuilder.CreateTable( + name: "payments", + columns: table => new + { + id = table.Column(type: "TEXT", nullable: false), + description = table.Column(type: "TEXT", maxLength: 256, nullable: true), + notes = table.Column(type: "TEXT", maxLength: 1024, nullable: true), + amount = table.Column(type: "TEXT", nullable: false), + ownerid = table.Column(name: "owner_id", type: "TEXT", nullable: false), + confirmedat = table.Column(name: "confirmed_at", type: "TEXT", nullable: true), + confirmedbyid = table.Column(name: "confirmed_by_id", type: "TEXT", nullable: true), + count = table.Column(type: "INTEGER", nullable: false), + createdat = table.Column(name: "created_at", type: "TEXT", nullable: false), + modifiedat = table.Column(name: "modified_at", type: "TEXT", nullable: true), + deletedat = table.Column(name: "deleted_at", type: "TEXT", nullable: true) + }, + constraints: table => + { + table.PrimaryKey("pk_payments", x => x.id); + }); + + migrationBuilder.CreateTable( + name: "teams", + columns: table => new + { + id = table.Column(type: "TEXT", nullable: false), + name = table.Column(type: "TEXT", maxLength: 128, nullable: false), + active = table.Column(type: "INTEGER", nullable: false), + description = table.Column(type: "TEXT", nullable: false), + companyid = table.Column(name: "company_id", type: "TEXT", nullable: true), + managerid = table.Column(name: "manager_id", type: "TEXT", nullable: true), + createdat = table.Column(name: "created_at", type: "TEXT", nullable: false), + modifiedat = table.Column(name: "modified_at", type: "TEXT", nullable: true), + deletedat = table.Column(name: "deleted_at", type: "TEXT", nullable: true) + }, + constraints: table => + { + table.PrimaryKey("pk_teams", x => x.id); + table.ForeignKey( + name: "fk_teams_companies_company_id", + column: x => x.companyid, + principalTable: "companies", + principalColumn: "id"); + }); + + migrationBuilder.CreateTable( + name: "users", + columns: table => new + { + id = table.Column(type: "TEXT", nullable: false), + identifier = table.Column(type: "TEXT", nullable: false), + email = table.Column(type: "TEXT", maxLength: 256, nullable: false), + profileimage = table.Column(name: "profile_image", type: "TEXT", nullable: true), + phone = table.Column(type: "TEXT", maxLength: 64, nullable: false), + firstname = table.Column(name: "first_name", type: "TEXT", maxLength: 128, nullable: false), + lastname = table.Column(name: "last_name", type: "TEXT", maxLength: 128, nullable: false), + balance = table.Column(type: "TEXT", nullable: false), + permission = table.Column(type: "INTEGER", nullable: false), + companyid = table.Column(name: "company_id", type: "TEXT", nullable: true), + companymanagedid = table.Column(name: "company_managed_id", type: "TEXT", nullable: true), + teamid = table.Column(name: "team_id", type: "TEXT", nullable: true), + teammanagedid = table.Column(name: "team_managed_id", type: "TEXT", nullable: true), + currencyid = table.Column(name: "currency_id", type: "TEXT", nullable: true), + active = table.Column(type: "INTEGER", nullable: false), + token = table.Column(type: "TEXT", maxLength: 128, nullable: true), + image = table.Column(type: "TEXT", nullable: true), + createdat = table.Column(name: "created_at", type: "TEXT", nullable: false), + modifiedat = table.Column(name: "modified_at", type: "TEXT", nullable: true), + deletedat = table.Column(name: "deleted_at", type: "TEXT", nullable: true) + }, + constraints: table => + { + table.PrimaryKey("pk_users", x => x.id); + table.ForeignKey( + name: "fk_users_companies_company_id", + column: x => x.companyid, + principalTable: "companies", + principalColumn: "id"); + table.ForeignKey( + name: "fk_users_currency_entity_currency_id", + column: x => x.currencyid, + principalTable: "currency_entity", + principalColumn: "id"); + table.ForeignKey( + name: "fk_users_teams_team_id", + column: x => x.teamid, + principalTable: "teams", + principalColumn: "id"); + }); + + migrationBuilder.CreateTable( + name: "user_bank_account", + columns: table => new + { + id = table.Column(type: "TEXT", nullable: false), + fullname = table.Column(name: "full_name", type: "TEXT", nullable: false), + bankid = table.Column(name: "bank_id", type: "TEXT", nullable: true), + ownerid = table.Column(name: "owner_id", type: "TEXT", nullable: true), + number = table.Column(type: "TEXT", maxLength: 20, nullable: false), + description = table.Column(type: "TEXT", maxLength: 1024, nullable: true), + createdat = table.Column(name: "created_at", type: "TEXT", nullable: false), + modifiedat = table.Column(name: "modified_at", type: "TEXT", nullable: true), + deletedat = table.Column(name: "deleted_at", type: "TEXT", nullable: true) + }, + constraints: table => + { + table.PrimaryKey("pk_user_bank_account", x => x.id); + table.ForeignKey( + name: "fk_user_bank_account_banks_bank_id", + column: x => x.bankid, + principalTable: "banks", + principalColumn: "id"); + table.ForeignKey( + name: "fk_user_bank_account_users_owner_id", + column: x => x.ownerid, + principalTable: "users", + principalColumn: "id"); + }); + + migrationBuilder.CreateTable( + name: "user_notification", + columns: table => new + { + id = table.Column(type: "TEXT", nullable: false), + ownerid = table.Column(name: "owner_id", type: "TEXT", nullable: true), + disabled = table.Column(type: "INTEGER", nullable: false), + channels = table.Column(type: "TEXT", nullable: false), + types = table.Column(type: "TEXT", nullable: false), + createdat = table.Column(name: "created_at", type: "TEXT", nullable: false), + modifiedat = table.Column(name: "modified_at", type: "TEXT", nullable: true), + deletedat = table.Column(name: "deleted_at", type: "TEXT", nullable: true) + }, + constraints: table => + { + table.PrimaryKey("pk_user_notification", x => x.id); + table.ForeignKey( + name: "fk_user_notification_users_owner_id", + column: x => x.ownerid, + principalTable: "users", + principalColumn: "id"); + }); + + migrationBuilder.CreateTable( + name: "user_setting", + columns: table => new + { + id = table.Column(type: "TEXT", nullable: false), + ownerid = table.Column(name: "owner_id", type: "TEXT", nullable: true), + darkmode = table.Column(name: "dark_mode", type: "INTEGER", nullable: false), + language = table.Column(type: "INTEGER", nullable: false), + createdat = table.Column(name: "created_at", type: "TEXT", nullable: false), + modifiedat = table.Column(name: "modified_at", type: "TEXT", nullable: true), + deletedat = table.Column(name: "deleted_at", type: "TEXT", nullable: true) + }, + constraints: table => + { + table.PrimaryKey("pk_user_setting", x => x.id); + table.ForeignKey( + name: "fk_user_setting_users_owner_id", + column: x => x.ownerid, + principalTable: "users", + principalColumn: "id"); + }); + + migrationBuilder.InsertData( + table: "banks", + columns: new[] { "id", "active", "created_at", "deleted_at", "description", "modified_at", "name", "swift_code" }, + values: new object[,] + { + { new Guid("01cb6bc8-b3a7-4a9f-8c25-37885fbd1ada"), false, new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), null, "", null, "Polaris Bank Limited", "" }, + { new Guid("1771e448-891d-43c4-a0aa-3784803e9af1"), false, new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), null, "", null, "Zenith Bank", "" }, + { new Guid("195fc39b-4791-41b7-9d9e-d9c31dcbe884"), false, new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), null, "", null, "First City Monument Bank", "" }, + { new Guid("2e6fa8fd-49ca-450d-a85d-54df1055816e"), false, new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), null, "", null, "Keystone Bank Limited", "" }, + { new Guid("3ce65741-39ef-4ca8-bc85-4afee4800a07"), false, new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), null, "", null, "Access Bank", "" }, + { new Guid("4a12f06b-352d-4786-899f-52ea979cc65c"), false, new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), null, "", null, "Fidelity Bank", "" }, + { new Guid("8b98faad-c950-4adc-ac13-4577c3e7d616"), false, new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), null, "", null, "United Bank for Africa", "" }, + { new Guid("8f2fdbbc-c992-4f57-86bf-167633c491fb"), false, new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), null, "", null, "Wema Bank", "" }, + { new Guid("ac444cc9-93c2-4b90-b7a4-cb759fe9bb1a"), false, new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), null, "", null, "Sterling Bank", "" }, + { new Guid("bcb4a992-7936-4126-9bba-602b0f0f979f"), false, new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), null, "", null, "Stanbic IBTC Bank", "" }, + { new Guid("dbb5aa84-e727-4b03-b18f-80315d2a18b4"), false, new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), null, "", null, "First Bank", "" }, + { new Guid("dcb125d2-1d42-4b01-bc2c-a7863e708a47"), false, new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), null, "", null, "GT Bank", "" }, + { new Guid("de625d37-6628-47d3-8656-6d457ca1b151"), false, new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), null, "", null, "Union Bank of Nigeria", "" } + }); + + migrationBuilder.InsertData( + table: "categories", + columns: new[] { "id", "active", "company_id", "created_at", "deleted_at", "description", "icon", "modified_at", "name" }, + values: new object[,] + { + { new Guid("8286de04-35da-48fa-9fd3-9a90910c54aa"), false, null, new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), null, "", "", null, "Internet Service" }, + { new Guid("8db67707-4665-43b0-b26f-cfca391aa4b0"), false, null, new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), null, "", "", null, "General Fuelling" } + }); + + migrationBuilder.InsertData( + table: "companies", + columns: new[] { "id", "active", "admin_email", "created_at", "deleted_at", "full_name", "manager_id", "modified_at", "short_name" }, + values: new object[,] + { + { new Guid("15539941-c7e7-45d4-b86e-05b5991f6215"), false, "", new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), null, "Multi Consumer Product LTD", null, null, "MCPL LTD" }, + { new Guid("3de60ed7-4c83-43d9-ac34-21c18e849b8f"), false, "", new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), null, "MCPL LTD - BHN Division", null, null, "BHN Logistics" }, + { new Guid("84cccd2f-2369-4337-bb89-7495146d8411"), false, "", new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), null, "X-Claim Instance Management", null, null, "X-Claim" }, + { new Guid("9f4598fe-bd5d-4e3b-8588-d293df693ba9"), false, "", new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), null, "Dufil Prima Foods Plc", null, null, "Dufil Prima" } + }); + + migrationBuilder.InsertData( + table: "currency_entity", + columns: new[] { "id", "active", "code", "created_at", "deleted_at", "description", "modified_at", "name", "rate", "symbol" }, + values: new object[,] + { + { new Guid("4b2bb3b9-2e37-4942-a499-2c852e5db1c7"), false, "USD", new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), null, "", null, "US Dollar", 0m, "$" }, + { new Guid("62184e4d-9397-459c-9623-1bb02a44419b"), false, "NGN", new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), null, "", null, "Naira", 0m, "₦" }, + { new Guid("85ad4afd-5c60-44ae-b809-170fdaac6b09"), false, "INR", new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), null, "", null, "Rupee", 0m, "₹" }, + { new Guid("88dddfe8-d318-4868-9bf5-8f267376e3a9"), false, "EUR", new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), null, "", null, "Euro", 0m, "€" }, + { new Guid("a9161b94-6223-4929-b4ef-bbcd82ba6719"), false, "GBP", new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), null, "", null, "British Pounds", 0m, "£" } + }); + + migrationBuilder.InsertData( + table: "domain_entity", + columns: new[] { "id", "active", "address", "created_at", "deleted_at", "description", "modified_at" }, + values: new object[,] + { + { new Guid("320655ca-4002-4539-8eab-3ee2dcac1804"), false, "dufil.com", new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), null, "", null }, + { new Guid("989e690e-7895-4dbf-93c6-fbb2cca3e632"), false, "outlook.com", new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), null, "", null }, + { new Guid("e3bfd149-0a86-43f4-9021-81a3d6fea9a2"), false, "tolaram.com", new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), null, "", null } + }); + + migrationBuilder.InsertData( + table: "categories", + columns: new[] { "id", "active", "company_id", "created_at", "deleted_at", "description", "icon", "modified_at", "name" }, + values: new object[,] + { + { new Guid("4197d752-02d5-450a-9d3c-6fa44489d97d"), false, new Guid("3de60ed7-4c83-43d9-ac34-21c18e849b8f"), new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), null, "", "", null, "BHN - Weekly meeting expense" }, + { new Guid("64c7b903-12e5-4168-96fd-026a1a67f73f"), false, new Guid("15539941-c7e7-45d4-b86e-05b5991f6215"), new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), null, "", "", null, "MCPL - Monthly training expense" } + }); + + migrationBuilder.InsertData( + table: "server", + columns: new[] { "id", "admin_email", "created_at", "currency_id", "deleted_at", "maintenance_mode", "maintenance_text", "modified_at", "service_name" }, + values: new object[] { new Guid("ca00807b-625a-48e4-9269-3cbbd890226d"), "admin@x-claim.dev", new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified), new Guid("62184e4d-9397-459c-9623-1bb02a44419b"), null, false, "In-Progress", null, "X-Claim" }); + + migrationBuilder.InsertData( + table: "teams", + columns: new[] { "id", "active", "company_id", "created_at", "deleted_at", "description", "manager_id", "modified_at", "name" }, + values: new object[,] + { + { new Guid("0a063653-f0f0-468f-aec8-85bdcfd22c21"), false, new Guid("3de60ed7-4c83-43d9-ac34-21c18e849b8f"), new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), null, "", null, null, "Account Dept" }, + { new Guid("47720f67-9f3d-4cce-b34c-8dc6aa26ddc6"), false, new Guid("15539941-c7e7-45d4-b86e-05b5991f6215"), new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), null, "", null, null, "Logistics Dept" }, + { new Guid("8f08bd2f-148b-410a-8a15-1c826c5a7ede"), false, new Guid("9f4598fe-bd5d-4e3b-8588-d293df693ba9"), new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), null, "", null, null, "Packaging Dept" } + }); + + migrationBuilder.InsertData( + table: "users", + columns: new[] { "id", "active", "balance", "company_id", "company_managed_id", "created_at", "currency_id", "deleted_at", "email", "first_name", "identifier", "image", "last_name", "modified_at", "permission", "phone", "profile_image", "team_id", "team_managed_id", "token" }, + values: new object[,] + { + { new Guid("88e90686-fc3e-4063-819c-1cd585dd49a3"), false, 0m, new Guid("3de60ed7-4c83-43d9-ac34-21c18e849b8f"), null, new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), null, null, "john.doe@tolaram.com", "John", "rtebe6r6mhpubcu7iitygg7woa", null, "Doe", null, 5, "+234012345567", null, new Guid("0a063653-f0f0-468f-aec8-85bdcfd22c21"), null, null }, + { new Guid("cc8e58ef-9920-4090-a972-a027ed3f48e2"), false, 0m, new Guid("15539941-c7e7-45d4-b86e-05b5991f6215"), null, new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), null, null, "jane.doe@tolaram.com", "Jane", "syrbh5p7fuxuljf66irs5bhahi", null, "Doe", null, 5, "+234022424553", null, new Guid("47720f67-9f3d-4cce-b34c-8dc6aa26ddc6"), null, null } + }); + + migrationBuilder.CreateIndex( + name: "ix_banks_deleted_at", + table: "banks", + column: "deleted_at"); + + migrationBuilder.CreateIndex( + name: "ix_banks_name", + table: "banks", + column: "name", + unique: true); + + migrationBuilder.CreateIndex( + name: "ix_categories_company_id", + table: "categories", + column: "company_id"); + + migrationBuilder.CreateIndex( + name: "ix_categories_deleted_at", + table: "categories", + column: "deleted_at"); + + migrationBuilder.CreateIndex( + name: "ix_claims_approved_by_id", + table: "claims", + column: "approved_by_id"); + + migrationBuilder.CreateIndex( + name: "ix_claims_category_id", + table: "claims", + column: "category_id"); + + migrationBuilder.CreateIndex( + name: "ix_claims_company_id", + table: "claims", + column: "company_id"); + + migrationBuilder.CreateIndex( + name: "ix_claims_confirmed_by_id", + table: "claims", + column: "confirmed_by_id"); + + migrationBuilder.CreateIndex( + name: "ix_claims_deleted_at", + table: "claims", + column: "deleted_at"); + + migrationBuilder.CreateIndex( + name: "ix_claims_owner_id", + table: "claims", + column: "owner_id"); + + migrationBuilder.CreateIndex( + name: "ix_claims_payment_id", + table: "claims", + column: "payment_id"); + + migrationBuilder.CreateIndex( + name: "ix_claims_reviewed_by_id", + table: "claims", + column: "reviewed_by_id"); + + migrationBuilder.CreateIndex( + name: "ix_comments_claim_id", + table: "comments", + column: "claim_id"); + + migrationBuilder.CreateIndex( + name: "ix_comments_deleted_at", + table: "comments", + column: "deleted_at"); + + migrationBuilder.CreateIndex( + name: "ix_comments_owner_id", + table: "comments", + column: "owner_id"); + + migrationBuilder.CreateIndex( + name: "ix_comments_payment_id", + table: "comments", + column: "payment_id"); + + migrationBuilder.CreateIndex( + name: "ix_companies_deleted_at", + table: "companies", + column: "deleted_at"); + + migrationBuilder.CreateIndex( + name: "ix_companies_manager_id", + table: "companies", + column: "manager_id", + unique: true); + + migrationBuilder.CreateIndex( + name: "ix_currency_entity_code", + table: "currency_entity", + column: "code", + unique: true); + + migrationBuilder.CreateIndex( + name: "ix_currency_entity_deleted_at", + table: "currency_entity", + column: "deleted_at"); + + migrationBuilder.CreateIndex( + name: "ix_currency_entity_name", + table: "currency_entity", + column: "name", + unique: true); + + migrationBuilder.CreateIndex( + name: "ix_events_claim_id", + table: "events", + column: "claim_id"); + + migrationBuilder.CreateIndex( + name: "ix_events_deleted_at", + table: "events", + column: "deleted_at"); + + migrationBuilder.CreateIndex( + name: "ix_events_payment_id", + table: "events", + column: "payment_id"); + + migrationBuilder.CreateIndex( + name: "ix_files_claim_entity_id", + table: "files", + column: "claim_entity_id"); + + migrationBuilder.CreateIndex( + name: "ix_files_deleted_at", + table: "files", + column: "deleted_at"); + + migrationBuilder.CreateIndex( + name: "ix_files_owner_id", + table: "files", + column: "owner_id"); + + migrationBuilder.CreateIndex( + name: "ix_files_payment_entity_id", + table: "files", + column: "payment_entity_id"); + + migrationBuilder.CreateIndex( + name: "ix_payments_confirmed_by_id", + table: "payments", + column: "confirmed_by_id"); + + migrationBuilder.CreateIndex( + name: "ix_payments_deleted_at", + table: "payments", + column: "deleted_at"); + + migrationBuilder.CreateIndex( + name: "ix_payments_owner_id", + table: "payments", + column: "owner_id"); + + migrationBuilder.CreateIndex( + name: "ix_server_currency_id", + table: "server", + column: "currency_id"); + + migrationBuilder.CreateIndex( + name: "ix_server_deleted_at", + table: "server", + column: "deleted_at"); + + migrationBuilder.CreateIndex( + name: "ix_teams_company_id", + table: "teams", + column: "company_id"); + + migrationBuilder.CreateIndex( + name: "ix_teams_deleted_at", + table: "teams", + column: "deleted_at"); + + migrationBuilder.CreateIndex( + name: "ix_teams_manager_id", + table: "teams", + column: "manager_id", + unique: true); + + migrationBuilder.CreateIndex( + name: "ix_user_bank_account_bank_id", + table: "user_bank_account", + column: "bank_id"); + + migrationBuilder.CreateIndex( + name: "ix_user_bank_account_deleted_at", + table: "user_bank_account", + column: "deleted_at"); + + migrationBuilder.CreateIndex( + name: "ix_user_bank_account_owner_id", + table: "user_bank_account", + column: "owner_id", + unique: true); + + migrationBuilder.CreateIndex( + name: "ix_user_notification_deleted_at", + table: "user_notification", + column: "deleted_at"); + + migrationBuilder.CreateIndex( + name: "ix_user_notification_owner_id", + table: "user_notification", + column: "owner_id", + unique: true); + + migrationBuilder.CreateIndex( + name: "ix_user_setting_deleted_at", + table: "user_setting", + column: "deleted_at"); + + migrationBuilder.CreateIndex( + name: "ix_user_setting_owner_id", + table: "user_setting", + column: "owner_id", + unique: true); + + migrationBuilder.CreateIndex( + name: "ix_users_company_id", + table: "users", + column: "company_id"); + + migrationBuilder.CreateIndex( + name: "ix_users_currency_id", + table: "users", + column: "currency_id"); + + migrationBuilder.CreateIndex( + name: "ix_users_deleted_at", + table: "users", + column: "deleted_at"); + + migrationBuilder.CreateIndex( + name: "ix_users_email", + table: "users", + column: "email", + unique: true); + + migrationBuilder.CreateIndex( + name: "ix_users_identifier", + table: "users", + column: "identifier", + unique: true); + + migrationBuilder.CreateIndex( + name: "ix_users_team_id", + table: "users", + column: "team_id"); + + migrationBuilder.AddForeignKey( + name: "fk_categories_companies_company_id", + table: "categories", + column: "company_id", + principalTable: "companies", + principalColumn: "id"); + + migrationBuilder.AddForeignKey( + name: "fk_claims_companies_company_id", + table: "claims", + column: "company_id", + principalTable: "companies", + principalColumn: "id"); + + migrationBuilder.AddForeignKey( + name: "fk_claims_payments_payment_id", + table: "claims", + column: "payment_id", + principalTable: "payments", + principalColumn: "id"); + + migrationBuilder.AddForeignKey( + name: "fk_claims_users_approved_by_id", + table: "claims", + column: "approved_by_id", + principalTable: "users", + principalColumn: "id"); + + migrationBuilder.AddForeignKey( + name: "fk_claims_users_confirmed_by_id", + table: "claims", + column: "confirmed_by_id", + principalTable: "users", + principalColumn: "id"); + + migrationBuilder.AddForeignKey( + name: "fk_claims_users_owner_id", + table: "claims", + column: "owner_id", + principalTable: "users", + principalColumn: "id"); + + migrationBuilder.AddForeignKey( + name: "fk_claims_users_reviewed_by_id", + table: "claims", + column: "reviewed_by_id", + principalTable: "users", + principalColumn: "id"); + + migrationBuilder.AddForeignKey( + name: "fk_comments_payments_payment_id", + table: "comments", + column: "payment_id", + principalTable: "payments", + principalColumn: "id"); + + migrationBuilder.AddForeignKey( + name: "fk_comments_users_owner_id", + table: "comments", + column: "owner_id", + principalTable: "users", + principalColumn: "id", + onDelete: ReferentialAction.Cascade); + + migrationBuilder.AddForeignKey( + name: "fk_companies_users_manager_id", + table: "companies", + column: "manager_id", + principalTable: "users", + principalColumn: "id", + onDelete: ReferentialAction.SetNull); + + migrationBuilder.AddForeignKey( + name: "fk_events_payments_payment_id", + table: "events", + column: "payment_id", + principalTable: "payments", + principalColumn: "id"); + + migrationBuilder.AddForeignKey( + name: "fk_files_payments_payment_entity_id", + table: "files", + column: "payment_entity_id", + principalTable: "payments", + principalColumn: "id"); + + migrationBuilder.AddForeignKey( + name: "fk_files_users_owner_id", + table: "files", + column: "owner_id", + principalTable: "users", + principalColumn: "id"); + + migrationBuilder.AddForeignKey( + name: "fk_payments_users_confirmed_by_id", + table: "payments", + column: "confirmed_by_id", + principalTable: "users", + principalColumn: "id"); + + migrationBuilder.AddForeignKey( + name: "fk_payments_users_owner_id", + table: "payments", + column: "owner_id", + principalTable: "users", + principalColumn: "id", + onDelete: ReferentialAction.Cascade); + + migrationBuilder.AddForeignKey( + name: "fk_teams_users_manager_id", + table: "teams", + column: "manager_id", + principalTable: "users", + principalColumn: "id", + onDelete: ReferentialAction.SetNull); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropForeignKey( + name: "fk_teams_companies_company_id", + table: "teams"); + + migrationBuilder.DropForeignKey( + name: "fk_users_companies_company_id", + table: "users"); + + migrationBuilder.DropForeignKey( + name: "fk_teams_users_manager_id", + table: "teams"); + + migrationBuilder.DropTable( + name: "comments"); + + migrationBuilder.DropTable( + name: "domain_entity"); + + migrationBuilder.DropTable( + name: "events"); + + migrationBuilder.DropTable( + name: "files"); + + migrationBuilder.DropTable( + name: "server"); + + migrationBuilder.DropTable( + name: "user_bank_account"); + + migrationBuilder.DropTable( + name: "user_notification"); + + migrationBuilder.DropTable( + name: "user_setting"); + + migrationBuilder.DropTable( + name: "claims"); + + migrationBuilder.DropTable( + name: "banks"); + + migrationBuilder.DropTable( + name: "categories"); + + migrationBuilder.DropTable( + name: "payments"); + + migrationBuilder.DropTable( + name: "companies"); + + migrationBuilder.DropTable( + name: "users"); + + migrationBuilder.DropTable( + name: "currency_entity"); + + migrationBuilder.DropTable( + name: "teams"); + } + } +} diff --git a/src/Web/Server/Migrations/ServerContextModelSnapshot.cs b/src/Web/Server/Migrations/ServerContextModelSnapshot.cs new file mode 100644 index 00000000..b651662c --- /dev/null +++ b/src/Web/Server/Migrations/ServerContextModelSnapshot.cs @@ -0,0 +1,1666 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using XClaim.Web.Server.Data; + +#nullable disable + +namespace XClaim.Web.Server.Migrations +{ + [DbContext(typeof(ServerContext))] + partial class ServerContextModelSnapshot : ModelSnapshot + { + protected override void BuildModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder.HasAnnotation("ProductVersion", "7.0.2"); + + modelBuilder.Entity("XClaim.Web.Server.Entities.BankAccountEntity", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasColumnName("id"); + + b.Property("BankId") + .HasColumnType("TEXT") + .HasColumnName("bank_id"); + + b.Property("CreatedAt") + .HasColumnType("TEXT") + .HasColumnName("created_at"); + + b.Property("DeletedAt") + .HasColumnType("TEXT") + .HasColumnName("deleted_at"); + + b.Property("Description") + .HasMaxLength(1024) + .HasColumnType("TEXT") + .HasColumnName("description"); + + b.Property("FullName") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("full_name"); + + b.Property("ModifiedAt") + .HasColumnType("TEXT") + .HasColumnName("modified_at"); + + b.Property("Number") + .IsRequired() + .HasMaxLength(20) + .HasColumnType("TEXT") + .HasColumnName("number"); + + b.Property("OwnerId") + .HasColumnType("TEXT") + .HasColumnName("owner_id"); + + b.HasKey("Id") + .HasName("pk_user_bank_account"); + + b.HasIndex("BankId") + .HasDatabaseName("ix_user_bank_account_bank_id"); + + b.HasIndex("DeletedAt") + .HasDatabaseName("ix_user_bank_account_deleted_at"); + + b.HasIndex("OwnerId") + .IsUnique() + .HasDatabaseName("ix_user_bank_account_owner_id"); + + b.ToTable("user_bank_account", (string)null); + }); + + modelBuilder.Entity("XClaim.Web.Server.Entities.BankEntity", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasColumnName("id"); + + b.Property("Active") + .HasColumnType("INTEGER") + .HasColumnName("active"); + + b.Property("CreatedAt") + .HasColumnType("TEXT") + .HasColumnName("created_at"); + + b.Property("DeletedAt") + .HasColumnType("TEXT") + .HasColumnName("deleted_at"); + + b.Property("Description") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("description"); + + b.Property("ModifiedAt") + .HasColumnType("TEXT") + .HasColumnName("modified_at"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(128) + .HasColumnType("TEXT") + .HasColumnName("name"); + + b.Property("SwiftCode") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("swift_code"); + + b.HasKey("Id") + .HasName("pk_banks"); + + b.HasIndex("DeletedAt") + .HasDatabaseName("ix_banks_deleted_at"); + + b.HasIndex("Name") + .IsUnique() + .HasDatabaseName("ix_banks_name"); + + b.ToTable("banks", (string)null); + + b.HasData( + new + { + Id = new Guid("dcb125d2-1d42-4b01-bc2c-a7863e708a47"), + Active = false, + CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), + Description = "", + Name = "GT Bank", + SwiftCode = "" + }, + new + { + Id = new Guid("1771e448-891d-43c4-a0aa-3784803e9af1"), + Active = false, + CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), + Description = "", + Name = "Zenith Bank", + SwiftCode = "" + }, + new + { + Id = new Guid("dbb5aa84-e727-4b03-b18f-80315d2a18b4"), + Active = false, + CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), + Description = "", + Name = "First Bank", + SwiftCode = "" + }, + new + { + Id = new Guid("3ce65741-39ef-4ca8-bc85-4afee4800a07"), + Active = false, + CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), + Description = "", + Name = "Access Bank", + SwiftCode = "" + }, + new + { + Id = new Guid("4a12f06b-352d-4786-899f-52ea979cc65c"), + Active = false, + CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), + Description = "", + Name = "Fidelity Bank", + SwiftCode = "" + }, + new + { + Id = new Guid("195fc39b-4791-41b7-9d9e-d9c31dcbe884"), + Active = false, + CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), + Description = "", + Name = "First City Monument Bank", + SwiftCode = "" + }, + new + { + Id = new Guid("de625d37-6628-47d3-8656-6d457ca1b151"), + Active = false, + CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), + Description = "", + Name = "Union Bank of Nigeria", + SwiftCode = "" + }, + new + { + Id = new Guid("8b98faad-c950-4adc-ac13-4577c3e7d616"), + Active = false, + CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), + Description = "", + Name = "United Bank for Africa", + SwiftCode = "" + }, + new + { + Id = new Guid("ac444cc9-93c2-4b90-b7a4-cb759fe9bb1a"), + Active = false, + CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), + Description = "", + Name = "Sterling Bank", + SwiftCode = "" + }, + new + { + Id = new Guid("8f2fdbbc-c992-4f57-86bf-167633c491fb"), + Active = false, + CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), + Description = "", + Name = "Wema Bank", + SwiftCode = "" + }, + new + { + Id = new Guid("bcb4a992-7936-4126-9bba-602b0f0f979f"), + Active = false, + CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), + Description = "", + Name = "Stanbic IBTC Bank", + SwiftCode = "" + }, + new + { + Id = new Guid("01cb6bc8-b3a7-4a9f-8c25-37885fbd1ada"), + Active = false, + CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), + Description = "", + Name = "Polaris Bank Limited", + SwiftCode = "" + }, + new + { + Id = new Guid("2e6fa8fd-49ca-450d-a85d-54df1055816e"), + Active = false, + CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), + Description = "", + Name = "Keystone Bank Limited", + SwiftCode = "" + }); + }); + + modelBuilder.Entity("XClaim.Web.Server.Entities.CategoryEntity", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasColumnName("id"); + + b.Property("Active") + .HasColumnType("INTEGER") + .HasColumnName("active"); + + b.Property("CompanyId") + .HasColumnType("TEXT") + .HasColumnName("company_id"); + + b.Property("CreatedAt") + .HasColumnType("TEXT") + .HasColumnName("created_at"); + + b.Property("DeletedAt") + .HasColumnType("TEXT") + .HasColumnName("deleted_at"); + + b.Property("Description") + .HasMaxLength(1024) + .HasColumnType("TEXT") + .HasColumnName("description"); + + b.Property("Icon") + .HasMaxLength(64) + .HasColumnType("TEXT") + .HasColumnName("icon"); + + b.Property("ModifiedAt") + .HasColumnType("TEXT") + .HasColumnName("modified_at"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(128) + .HasColumnType("TEXT") + .HasColumnName("name"); + + b.HasKey("Id") + .HasName("pk_categories"); + + b.HasIndex("CompanyId") + .HasDatabaseName("ix_categories_company_id"); + + b.HasIndex("DeletedAt") + .HasDatabaseName("ix_categories_deleted_at"); + + b.ToTable("categories", (string)null); + + b.HasData( + new + { + Id = new Guid("8db67707-4665-43b0-b26f-cfca391aa4b0"), + Active = false, + CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), + Description = "", + Icon = "", + Name = "General Fuelling" + }, + new + { + Id = new Guid("8286de04-35da-48fa-9fd3-9a90910c54aa"), + Active = false, + CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), + Description = "", + Icon = "", + Name = "Internet Service" + }, + new + { + Id = new Guid("4197d752-02d5-450a-9d3c-6fa44489d97d"), + Active = false, + CompanyId = new Guid("3de60ed7-4c83-43d9-ac34-21c18e849b8f"), + CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), + Description = "", + Icon = "", + Name = "BHN - Weekly meeting expense" + }, + new + { + Id = new Guid("64c7b903-12e5-4168-96fd-026a1a67f73f"), + Active = false, + CompanyId = new Guid("15539941-c7e7-45d4-b86e-05b5991f6215"), + CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), + Description = "", + Icon = "", + Name = "MCPL - Monthly training expense" + }); + }); + + modelBuilder.Entity("XClaim.Web.Server.Entities.ClaimEntity", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasColumnName("id"); + + b.Property("Amount") + .HasColumnType("TEXT") + .HasColumnName("amount"); + + b.Property("ApprovedAt") + .HasColumnType("TEXT") + .HasColumnName("approved_at"); + + b.Property("ApprovedById") + .HasColumnType("TEXT") + .HasColumnName("approved_by_id"); + + b.Property("CategoryId") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("category_id"); + + b.Property("CompanyId") + .HasColumnType("TEXT") + .HasColumnName("company_id"); + + b.Property("ConfirmedAt") + .HasColumnType("TEXT") + .HasColumnName("confirmed_at"); + + b.Property("ConfirmedById") + .HasColumnType("TEXT") + .HasColumnName("confirmed_by_id"); + + b.Property("CreatedAt") + .HasColumnType("TEXT") + .HasColumnName("created_at"); + + b.Property("DeletedAt") + .HasColumnType("TEXT") + .HasColumnName("deleted_at"); + + b.Property("Description") + .IsRequired() + .HasMaxLength(256) + .HasColumnType("TEXT") + .HasColumnName("description"); + + b.Property("ModifiedAt") + .HasColumnType("TEXT") + .HasColumnName("modified_at"); + + b.Property("Notes") + .HasMaxLength(1024) + .HasColumnType("TEXT") + .HasColumnName("notes"); + + b.Property("OwnerId") + .HasColumnType("TEXT") + .HasColumnName("owner_id"); + + b.Property("PaymentId") + .HasColumnType("TEXT") + .HasColumnName("payment_id"); + + b.Property("Priority") + .HasColumnType("INTEGER") + .HasColumnName("priority"); + + b.Property("ReviewedAt") + .HasColumnType("TEXT") + .HasColumnName("reviewed_at"); + + b.Property("ReviewedById") + .HasColumnType("TEXT") + .HasColumnName("reviewed_by_id"); + + b.Property("Status") + .HasColumnType("INTEGER") + .HasColumnName("status"); + + b.HasKey("Id") + .HasName("pk_claims"); + + b.HasIndex("ApprovedById") + .HasDatabaseName("ix_claims_approved_by_id"); + + b.HasIndex("CategoryId") + .HasDatabaseName("ix_claims_category_id"); + + b.HasIndex("CompanyId") + .HasDatabaseName("ix_claims_company_id"); + + b.HasIndex("ConfirmedById") + .HasDatabaseName("ix_claims_confirmed_by_id"); + + b.HasIndex("DeletedAt") + .HasDatabaseName("ix_claims_deleted_at"); + + b.HasIndex("OwnerId") + .HasDatabaseName("ix_claims_owner_id"); + + b.HasIndex("PaymentId") + .HasDatabaseName("ix_claims_payment_id"); + + b.HasIndex("ReviewedById") + .HasDatabaseName("ix_claims_reviewed_by_id"); + + b.ToTable("claims", (string)null); + }); + + modelBuilder.Entity("XClaim.Web.Server.Entities.CommentEntity", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasColumnName("id"); + + b.Property("ClaimId") + .HasColumnType("TEXT") + .HasColumnName("claim_id"); + + b.Property("Content") + .IsRequired() + .HasMaxLength(1024) + .HasColumnType("TEXT") + .HasColumnName("content"); + + b.Property("CreatedAt") + .HasColumnType("TEXT") + .HasColumnName("created_at"); + + b.Property("DeletedAt") + .HasColumnType("TEXT") + .HasColumnName("deleted_at"); + + b.Property("ModifiedAt") + .HasColumnType("TEXT") + .HasColumnName("modified_at"); + + b.Property("OwnerId") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("owner_id"); + + b.Property("PaymentId") + .HasColumnType("TEXT") + .HasColumnName("payment_id"); + + b.HasKey("Id") + .HasName("pk_comments"); + + b.HasIndex("ClaimId") + .HasDatabaseName("ix_comments_claim_id"); + + b.HasIndex("DeletedAt") + .HasDatabaseName("ix_comments_deleted_at"); + + b.HasIndex("OwnerId") + .HasDatabaseName("ix_comments_owner_id"); + + b.HasIndex("PaymentId") + .HasDatabaseName("ix_comments_payment_id"); + + b.ToTable("comments", (string)null); + }); + + modelBuilder.Entity("XClaim.Web.Server.Entities.CompanyEntity", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasColumnName("id"); + + b.Property("Active") + .HasColumnType("INTEGER") + .HasColumnName("active"); + + b.Property("AdminEmail") + .IsRequired() + .HasMaxLength(256) + .HasColumnType("TEXT") + .HasColumnName("admin_email"); + + b.Property("CreatedAt") + .HasColumnType("TEXT") + .HasColumnName("created_at"); + + b.Property("DeletedAt") + .HasColumnType("TEXT") + .HasColumnName("deleted_at"); + + b.Property("FullName") + .IsRequired() + .HasMaxLength(128) + .HasColumnType("TEXT") + .HasColumnName("full_name"); + + b.Property("ManagerId") + .HasColumnType("TEXT") + .HasColumnName("manager_id"); + + b.Property("ModifiedAt") + .HasColumnType("TEXT") + .HasColumnName("modified_at"); + + b.Property("ShortName") + .IsRequired() + .HasMaxLength(64) + .HasColumnType("TEXT") + .HasColumnName("short_name"); + + b.HasKey("Id") + .HasName("pk_companies"); + + b.HasIndex("DeletedAt") + .HasDatabaseName("ix_companies_deleted_at"); + + b.HasIndex("ManagerId") + .IsUnique() + .HasDatabaseName("ix_companies_manager_id"); + + b.ToTable("companies", (string)null); + + b.HasData( + new + { + Id = new Guid("3de60ed7-4c83-43d9-ac34-21c18e849b8f"), + Active = false, + AdminEmail = "", + CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), + FullName = "MCPL LTD - BHN Division", + ShortName = "BHN Logistics" + }, + new + { + Id = new Guid("15539941-c7e7-45d4-b86e-05b5991f6215"), + Active = false, + AdminEmail = "", + CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), + FullName = "Multi Consumer Product LTD", + ShortName = "MCPL LTD" + }, + new + { + Id = new Guid("9f4598fe-bd5d-4e3b-8588-d293df693ba9"), + Active = false, + AdminEmail = "", + CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), + FullName = "Dufil Prima Foods Plc", + ShortName = "Dufil Prima" + }, + new + { + Id = new Guid("84cccd2f-2369-4337-bb89-7495146d8411"), + Active = false, + AdminEmail = "", + CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), + FullName = "X-Claim Instance Management", + ShortName = "X-Claim" + }); + }); + + modelBuilder.Entity("XClaim.Web.Server.Entities.CurrencyEntity", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasColumnName("id"); + + b.Property("Active") + .HasColumnType("INTEGER") + .HasColumnName("active"); + + b.Property("Code") + .IsRequired() + .HasMaxLength(3) + .HasColumnType("TEXT") + .HasColumnName("code"); + + b.Property("CreatedAt") + .HasColumnType("TEXT") + .HasColumnName("created_at"); + + b.Property("DeletedAt") + .HasColumnType("TEXT") + .HasColumnName("deleted_at"); + + b.Property("Description") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("description"); + + b.Property("ModifiedAt") + .HasColumnType("TEXT") + .HasColumnName("modified_at"); + + b.Property("Name") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("name"); + + b.Property("Rate") + .HasColumnType("TEXT") + .HasColumnName("rate"); + + b.Property("Symbol") + .IsRequired() + .HasMaxLength(1) + .HasColumnType("TEXT") + .HasColumnName("symbol"); + + b.HasKey("Id") + .HasName("pk_currency_entity"); + + b.HasIndex("Code") + .IsUnique() + .HasDatabaseName("ix_currency_entity_code"); + + b.HasIndex("DeletedAt") + .HasDatabaseName("ix_currency_entity_deleted_at"); + + b.HasIndex("Name") + .IsUnique() + .HasDatabaseName("ix_currency_entity_name"); + + b.ToTable("currency_entity", (string)null); + + b.HasData( + new + { + Id = new Guid("62184e4d-9397-459c-9623-1bb02a44419b"), + Active = false, + Code = "NGN", + CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), + Description = "", + Name = "Naira", + Rate = 0m, + Symbol = "₦" + }, + new + { + Id = new Guid("4b2bb3b9-2e37-4942-a499-2c852e5db1c7"), + Active = false, + Code = "USD", + CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), + Description = "", + Name = "US Dollar", + Rate = 0m, + Symbol = "$" + }, + new + { + Id = new Guid("88dddfe8-d318-4868-9bf5-8f267376e3a9"), + Active = false, + Code = "EUR", + CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), + Description = "", + Name = "Euro", + Rate = 0m, + Symbol = "€" + }, + new + { + Id = new Guid("a9161b94-6223-4929-b4ef-bbcd82ba6719"), + Active = false, + Code = "GBP", + CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), + Description = "", + Name = "British Pounds", + Rate = 0m, + Symbol = "£" + }, + new + { + Id = new Guid("85ad4afd-5c60-44ae-b809-170fdaac6b09"), + Active = false, + Code = "INR", + CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), + Description = "", + Name = "Rupee", + Rate = 0m, + Symbol = "₹" + }); + }); + + modelBuilder.Entity("XClaim.Web.Server.Entities.DomainEntity", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasColumnName("id"); + + b.Property("Active") + .HasColumnType("INTEGER") + .HasColumnName("active"); + + b.Property("Address") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("address"); + + b.Property("CreatedAt") + .HasColumnType("TEXT") + .HasColumnName("created_at"); + + b.Property("DeletedAt") + .HasColumnType("TEXT") + .HasColumnName("deleted_at"); + + b.Property("Description") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("description"); + + b.Property("ModifiedAt") + .HasColumnType("TEXT") + .HasColumnName("modified_at"); + + b.HasKey("Id") + .HasName("pk_domain_entity"); + + b.ToTable("domain_entity", (string)null); + + b.HasData( + new + { + Id = new Guid("e3bfd149-0a86-43f4-9021-81a3d6fea9a2"), + Active = false, + Address = "tolaram.com", + CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), + Description = "" + }, + new + { + Id = new Guid("320655ca-4002-4539-8eab-3ee2dcac1804"), + Active = false, + Address = "dufil.com", + CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), + Description = "" + }, + new + { + Id = new Guid("989e690e-7895-4dbf-93c6-fbb2cca3e632"), + Active = false, + Address = "outlook.com", + CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), + Description = "" + }); + }); + + modelBuilder.Entity("XClaim.Web.Server.Entities.EventEntity", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasColumnName("id"); + + b.Property("ClaimId") + .HasColumnType("TEXT") + .HasColumnName("claim_id"); + + b.Property("CreatedAt") + .HasColumnType("TEXT") + .HasColumnName("created_at"); + + b.Property("DeletedAt") + .HasColumnType("TEXT") + .HasColumnName("deleted_at"); + + b.Property("Description") + .IsRequired() + .HasMaxLength(512) + .HasColumnType("TEXT") + .HasColumnName("description"); + + b.Property("ModifiedAt") + .HasColumnType("TEXT") + .HasColumnName("modified_at"); + + b.Property("PaymentId") + .HasColumnType("TEXT") + .HasColumnName("payment_id"); + + b.Property("Type") + .HasColumnType("INTEGER") + .HasColumnName("type"); + + b.HasKey("Id") + .HasName("pk_events"); + + b.HasIndex("ClaimId") + .HasDatabaseName("ix_events_claim_id"); + + b.HasIndex("DeletedAt") + .HasDatabaseName("ix_events_deleted_at"); + + b.HasIndex("PaymentId") + .HasDatabaseName("ix_events_payment_id"); + + b.ToTable("events", (string)null); + }); + + modelBuilder.Entity("XClaim.Web.Server.Entities.FileEntity", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasColumnName("id"); + + b.Property("ClaimEntityId") + .HasColumnType("TEXT") + .HasColumnName("claim_entity_id"); + + b.Property("CreatedAt") + .HasColumnType("TEXT") + .HasColumnName("created_at"); + + b.Property("DeletedAt") + .HasColumnType("TEXT") + .HasColumnName("deleted_at"); + + b.Property("Extension") + .HasMaxLength(8) + .HasColumnType("TEXT") + .HasColumnName("extension"); + + b.Property("ModifiedAt") + .HasColumnType("TEXT") + .HasColumnName("modified_at"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(256) + .HasColumnType("TEXT") + .HasColumnName("name"); + + b.Property("OwnerId") + .HasColumnType("TEXT") + .HasColumnName("owner_id"); + + b.Property("Path") + .IsRequired() + .HasMaxLength(1024) + .HasColumnType("TEXT") + .HasColumnName("path"); + + b.Property("PaymentEntityId") + .HasColumnType("TEXT") + .HasColumnName("payment_entity_id"); + + b.HasKey("Id") + .HasName("pk_files"); + + b.HasIndex("ClaimEntityId") + .HasDatabaseName("ix_files_claim_entity_id"); + + b.HasIndex("DeletedAt") + .HasDatabaseName("ix_files_deleted_at"); + + b.HasIndex("OwnerId") + .HasDatabaseName("ix_files_owner_id"); + + b.HasIndex("PaymentEntityId") + .HasDatabaseName("ix_files_payment_entity_id"); + + b.ToTable("files", (string)null); + }); + + modelBuilder.Entity("XClaim.Web.Server.Entities.NotificationEntity", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasColumnName("id"); + + b.Property("Channels") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("channels"); + + b.Property("CreatedAt") + .HasColumnType("TEXT") + .HasColumnName("created_at"); + + b.Property("DeletedAt") + .HasColumnType("TEXT") + .HasColumnName("deleted_at"); + + b.Property("Disabled") + .HasColumnType("INTEGER") + .HasColumnName("disabled"); + + b.Property("ModifiedAt") + .HasColumnType("TEXT") + .HasColumnName("modified_at"); + + b.Property("OwnerId") + .HasColumnType("TEXT") + .HasColumnName("owner_id"); + + b.Property("Types") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("types"); + + b.HasKey("Id") + .HasName("pk_user_notification"); + + b.HasIndex("DeletedAt") + .HasDatabaseName("ix_user_notification_deleted_at"); + + b.HasIndex("OwnerId") + .IsUnique() + .HasDatabaseName("ix_user_notification_owner_id"); + + b.ToTable("user_notification", (string)null); + }); + + modelBuilder.Entity("XClaim.Web.Server.Entities.PaymentEntity", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasColumnName("id"); + + b.Property("Amount") + .HasColumnType("TEXT") + .HasColumnName("amount"); + + b.Property("ConfirmedAt") + .HasColumnType("TEXT") + .HasColumnName("confirmed_at"); + + b.Property("ConfirmedById") + .HasColumnType("TEXT") + .HasColumnName("confirmed_by_id"); + + b.Property("Count") + .HasColumnType("INTEGER") + .HasColumnName("count"); + + b.Property("CreatedAt") + .HasColumnType("TEXT") + .HasColumnName("created_at"); + + b.Property("DeletedAt") + .HasColumnType("TEXT") + .HasColumnName("deleted_at"); + + b.Property("Description") + .HasMaxLength(256) + .HasColumnType("TEXT") + .HasColumnName("description"); + + b.Property("ModifiedAt") + .HasColumnType("TEXT") + .HasColumnName("modified_at"); + + b.Property("Notes") + .HasMaxLength(1024) + .HasColumnType("TEXT") + .HasColumnName("notes"); + + b.Property("OwnerId") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("owner_id"); + + b.HasKey("Id") + .HasName("pk_payments"); + + b.HasIndex("ConfirmedById") + .HasDatabaseName("ix_payments_confirmed_by_id"); + + b.HasIndex("DeletedAt") + .HasDatabaseName("ix_payments_deleted_at"); + + b.HasIndex("OwnerId") + .HasDatabaseName("ix_payments_owner_id"); + + b.ToTable("payments", (string)null); + }); + + modelBuilder.Entity("XClaim.Web.Server.Entities.ServerEntity", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasColumnName("id"); + + b.Property("AdminEmail") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("admin_email"); + + b.Property("CreatedAt") + .HasColumnType("TEXT") + .HasColumnName("created_at"); + + b.Property("CurrencyId") + .HasColumnType("TEXT") + .HasColumnName("currency_id"); + + b.Property("DeletedAt") + .HasColumnType("TEXT") + .HasColumnName("deleted_at"); + + b.Property("MaintenanceMode") + .HasColumnType("INTEGER") + .HasColumnName("maintenance_mode"); + + b.Property("MaintenanceText") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("maintenance_text"); + + b.Property("ModifiedAt") + .HasColumnType("TEXT") + .HasColumnName("modified_at"); + + b.Property("ServiceName") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("service_name"); + + b.HasKey("Id") + .HasName("pk_server"); + + b.HasIndex("CurrencyId") + .HasDatabaseName("ix_server_currency_id"); + + b.HasIndex("DeletedAt") + .HasDatabaseName("ix_server_deleted_at"); + + b.ToTable("server", (string)null); + + b.HasData( + new + { + Id = new Guid("ca00807b-625a-48e4-9269-3cbbd890226d"), + AdminEmail = "admin@x-claim.dev", + CreatedAt = new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified), + CurrencyId = new Guid("62184e4d-9397-459c-9623-1bb02a44419b"), + MaintenanceMode = false, + MaintenanceText = "In-Progress", + ServiceName = "X-Claim" + }); + }); + + modelBuilder.Entity("XClaim.Web.Server.Entities.SettingEntity", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasColumnName("id"); + + b.Property("CreatedAt") + .HasColumnType("TEXT") + .HasColumnName("created_at"); + + b.Property("DarkMode") + .HasColumnType("INTEGER") + .HasColumnName("dark_mode"); + + b.Property("DeletedAt") + .HasColumnType("TEXT") + .HasColumnName("deleted_at"); + + b.Property("Language") + .HasColumnType("INTEGER") + .HasColumnName("language"); + + b.Property("ModifiedAt") + .HasColumnType("TEXT") + .HasColumnName("modified_at"); + + b.Property("OwnerId") + .HasColumnType("TEXT") + .HasColumnName("owner_id"); + + b.HasKey("Id") + .HasName("pk_user_setting"); + + b.HasIndex("DeletedAt") + .HasDatabaseName("ix_user_setting_deleted_at"); + + b.HasIndex("OwnerId") + .IsUnique() + .HasDatabaseName("ix_user_setting_owner_id"); + + b.ToTable("user_setting", (string)null); + }); + + modelBuilder.Entity("XClaim.Web.Server.Entities.TeamEntity", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasColumnName("id"); + + b.Property("Active") + .HasColumnType("INTEGER") + .HasColumnName("active"); + + b.Property("CompanyId") + .HasColumnType("TEXT") + .HasColumnName("company_id"); + + b.Property("CreatedAt") + .HasColumnType("TEXT") + .HasColumnName("created_at"); + + b.Property("DeletedAt") + .HasColumnType("TEXT") + .HasColumnName("deleted_at"); + + b.Property("Description") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("description"); + + b.Property("ManagerId") + .HasColumnType("TEXT") + .HasColumnName("manager_id"); + + b.Property("ModifiedAt") + .HasColumnType("TEXT") + .HasColumnName("modified_at"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(128) + .HasColumnType("TEXT") + .HasColumnName("name"); + + b.HasKey("Id") + .HasName("pk_teams"); + + b.HasIndex("CompanyId") + .HasDatabaseName("ix_teams_company_id"); + + b.HasIndex("DeletedAt") + .HasDatabaseName("ix_teams_deleted_at"); + + b.HasIndex("ManagerId") + .IsUnique() + .HasDatabaseName("ix_teams_manager_id"); + + b.ToTable("teams", (string)null); + + b.HasData( + new + { + Id = new Guid("0a063653-f0f0-468f-aec8-85bdcfd22c21"), + Active = false, + CompanyId = new Guid("3de60ed7-4c83-43d9-ac34-21c18e849b8f"), + CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), + Description = "", + Name = "Account Dept" + }, + new + { + Id = new Guid("47720f67-9f3d-4cce-b34c-8dc6aa26ddc6"), + Active = false, + CompanyId = new Guid("15539941-c7e7-45d4-b86e-05b5991f6215"), + CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), + Description = "", + Name = "Logistics Dept" + }, + new + { + Id = new Guid("8f08bd2f-148b-410a-8a15-1c826c5a7ede"), + Active = false, + CompanyId = new Guid("9f4598fe-bd5d-4e3b-8588-d293df693ba9"), + CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), + Description = "", + Name = "Packaging Dept" + }); + }); + + modelBuilder.Entity("XClaim.Web.Server.Entities.UserEntity", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasColumnName("id"); + + b.Property("Active") + .HasColumnType("INTEGER") + .HasColumnName("active"); + + b.Property("Balance") + .HasColumnType("TEXT") + .HasColumnName("balance"); + + b.Property("CompanyId") + .HasColumnType("TEXT") + .HasColumnName("company_id"); + + b.Property("CompanyManagedId") + .HasColumnType("TEXT") + .HasColumnName("company_managed_id"); + + b.Property("CreatedAt") + .HasColumnType("TEXT") + .HasColumnName("created_at"); + + b.Property("CurrencyId") + .HasColumnType("TEXT") + .HasColumnName("currency_id"); + + b.Property("DeletedAt") + .HasColumnType("TEXT") + .HasColumnName("deleted_at"); + + b.Property("Email") + .IsRequired() + .HasMaxLength(256) + .HasColumnType("TEXT") + .HasColumnName("email"); + + b.Property("FirstName") + .IsRequired() + .HasMaxLength(128) + .HasColumnType("TEXT") + .HasColumnName("first_name"); + + b.Property("Identifier") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("identifier"); + + b.Property("Image") + .HasColumnType("TEXT") + .HasColumnName("image"); + + b.Property("LastName") + .IsRequired() + .HasMaxLength(128) + .HasColumnType("TEXT") + .HasColumnName("last_name"); + + b.Property("ModifiedAt") + .HasColumnType("TEXT") + .HasColumnName("modified_at"); + + b.Property("Permission") + .HasColumnType("INTEGER") + .HasColumnName("permission"); + + b.Property("Phone") + .IsRequired() + .HasMaxLength(64) + .HasColumnType("TEXT") + .HasColumnName("phone"); + + b.Property("ProfileImage") + .HasColumnType("TEXT") + .HasColumnName("profile_image"); + + b.Property("TeamId") + .HasColumnType("TEXT") + .HasColumnName("team_id"); + + b.Property("TeamManagedId") + .HasColumnType("TEXT") + .HasColumnName("team_managed_id"); + + b.Property("Token") + .HasMaxLength(128) + .HasColumnType("TEXT") + .HasColumnName("token"); + + b.HasKey("Id") + .HasName("pk_users"); + + b.HasIndex("CompanyId") + .HasDatabaseName("ix_users_company_id"); + + b.HasIndex("CurrencyId") + .HasDatabaseName("ix_users_currency_id"); + + b.HasIndex("DeletedAt") + .HasDatabaseName("ix_users_deleted_at"); + + b.HasIndex("Email") + .IsUnique() + .HasDatabaseName("ix_users_email"); + + b.HasIndex("Identifier") + .IsUnique() + .HasDatabaseName("ix_users_identifier"); + + b.HasIndex("TeamId") + .HasDatabaseName("ix_users_team_id"); + + b.ToTable("users", (string)null); + + b.HasData( + new + { + Id = new Guid("88e90686-fc3e-4063-819c-1cd585dd49a3"), + Active = false, + Balance = 0m, + CompanyId = new Guid("3de60ed7-4c83-43d9-ac34-21c18e849b8f"), + CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), + Email = "john.doe@tolaram.com", + FirstName = "John", + Identifier = "rtebe6r6mhpubcu7iitygg7woa", + LastName = "Doe", + Permission = 5, + Phone = "+234012345567", + TeamId = new Guid("0a063653-f0f0-468f-aec8-85bdcfd22c21") + }, + new + { + Id = new Guid("cc8e58ef-9920-4090-a972-a027ed3f48e2"), + Active = false, + Balance = 0m, + CompanyId = new Guid("15539941-c7e7-45d4-b86e-05b5991f6215"), + CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), + Email = "jane.doe@tolaram.com", + FirstName = "Jane", + Identifier = "syrbh5p7fuxuljf66irs5bhahi", + LastName = "Doe", + Permission = 5, + Phone = "+234022424553", + TeamId = new Guid("47720f67-9f3d-4cce-b34c-8dc6aa26ddc6") + }); + }); + + modelBuilder.Entity("XClaim.Web.Server.Entities.BankAccountEntity", b => + { + b.HasOne("XClaim.Web.Server.Entities.BankEntity", "Bank") + .WithMany() + .HasForeignKey("BankId") + .HasConstraintName("fk_user_bank_account_banks_bank_id"); + + b.HasOne("XClaim.Web.Server.Entities.UserEntity", "Owner") + .WithOne("BankAccount") + .HasForeignKey("XClaim.Web.Server.Entities.BankAccountEntity", "OwnerId") + .HasConstraintName("fk_user_bank_account_users_owner_id"); + + b.Navigation("Bank"); + + b.Navigation("Owner"); + }); + + modelBuilder.Entity("XClaim.Web.Server.Entities.CategoryEntity", b => + { + b.HasOne("XClaim.Web.Server.Entities.CompanyEntity", "Company") + .WithMany() + .HasForeignKey("CompanyId") + .HasConstraintName("fk_categories_companies_company_id"); + + b.Navigation("Company"); + }); + + modelBuilder.Entity("XClaim.Web.Server.Entities.ClaimEntity", b => + { + b.HasOne("XClaim.Web.Server.Entities.UserEntity", "ApprovedBy") + .WithMany() + .HasForeignKey("ApprovedById") + .HasConstraintName("fk_claims_users_approved_by_id"); + + b.HasOne("XClaim.Web.Server.Entities.CategoryEntity", "Category") + .WithMany() + .HasForeignKey("CategoryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("fk_claims_categories_category_id"); + + b.HasOne("XClaim.Web.Server.Entities.CompanyEntity", "Company") + .WithMany() + .HasForeignKey("CompanyId") + .HasConstraintName("fk_claims_companies_company_id"); + + b.HasOne("XClaim.Web.Server.Entities.UserEntity", "ConfirmedBy") + .WithMany() + .HasForeignKey("ConfirmedById") + .HasConstraintName("fk_claims_users_confirmed_by_id"); + + b.HasOne("XClaim.Web.Server.Entities.UserEntity", "Owner") + .WithMany() + .HasForeignKey("OwnerId") + .HasConstraintName("fk_claims_users_owner_id"); + + b.HasOne("XClaim.Web.Server.Entities.PaymentEntity", "Payment") + .WithMany("Claims") + .HasForeignKey("PaymentId") + .HasConstraintName("fk_claims_payments_payment_id"); + + b.HasOne("XClaim.Web.Server.Entities.UserEntity", "ReviewedBy") + .WithMany() + .HasForeignKey("ReviewedById") + .HasConstraintName("fk_claims_users_reviewed_by_id"); + + b.Navigation("ApprovedBy"); + + b.Navigation("Category"); + + b.Navigation("Company"); + + b.Navigation("ConfirmedBy"); + + b.Navigation("Owner"); + + b.Navigation("Payment"); + + b.Navigation("ReviewedBy"); + }); + + modelBuilder.Entity("XClaim.Web.Server.Entities.CommentEntity", b => + { + b.HasOne("XClaim.Web.Server.Entities.ClaimEntity", "Claim") + .WithMany("Comments") + .HasForeignKey("ClaimId") + .HasConstraintName("fk_comments_claims_claim_id"); + + b.HasOne("XClaim.Web.Server.Entities.UserEntity", "Owner") + .WithMany() + .HasForeignKey("OwnerId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("fk_comments_users_owner_id"); + + b.HasOne("XClaim.Web.Server.Entities.PaymentEntity", "Payment") + .WithMany("Comments") + .HasForeignKey("PaymentId") + .HasConstraintName("fk_comments_payments_payment_id"); + + b.Navigation("Claim"); + + b.Navigation("Owner"); + + b.Navigation("Payment"); + }); + + modelBuilder.Entity("XClaim.Web.Server.Entities.CompanyEntity", b => + { + b.HasOne("XClaim.Web.Server.Entities.UserEntity", "Manager") + .WithOne("CompanyManaged") + .HasForeignKey("XClaim.Web.Server.Entities.CompanyEntity", "ManagerId") + .OnDelete(DeleteBehavior.SetNull) + .HasConstraintName("fk_companies_users_manager_id"); + + b.Navigation("Manager"); + }); + + modelBuilder.Entity("XClaim.Web.Server.Entities.EventEntity", b => + { + b.HasOne("XClaim.Web.Server.Entities.ClaimEntity", "Claim") + .WithMany() + .HasForeignKey("ClaimId") + .HasConstraintName("fk_events_claims_claim_id"); + + b.HasOne("XClaim.Web.Server.Entities.PaymentEntity", "Payment") + .WithMany() + .HasForeignKey("PaymentId") + .HasConstraintName("fk_events_payments_payment_id"); + + b.Navigation("Claim"); + + b.Navigation("Payment"); + }); + + modelBuilder.Entity("XClaim.Web.Server.Entities.FileEntity", b => + { + b.HasOne("XClaim.Web.Server.Entities.ClaimEntity", null) + .WithMany("Files") + .HasForeignKey("ClaimEntityId") + .HasConstraintName("fk_files_claims_claim_entity_id"); + + b.HasOne("XClaim.Web.Server.Entities.UserEntity", "Owner") + .WithMany() + .HasForeignKey("OwnerId") + .HasConstraintName("fk_files_users_owner_id"); + + b.HasOne("XClaim.Web.Server.Entities.PaymentEntity", null) + .WithMany("Files") + .HasForeignKey("PaymentEntityId") + .HasConstraintName("fk_files_payments_payment_entity_id"); + + b.Navigation("Owner"); + }); + + modelBuilder.Entity("XClaim.Web.Server.Entities.NotificationEntity", b => + { + b.HasOne("XClaim.Web.Server.Entities.UserEntity", "Owner") + .WithOne("Notification") + .HasForeignKey("XClaim.Web.Server.Entities.NotificationEntity", "OwnerId") + .HasConstraintName("fk_user_notification_users_owner_id"); + + b.Navigation("Owner"); + }); + + modelBuilder.Entity("XClaim.Web.Server.Entities.PaymentEntity", b => + { + b.HasOne("XClaim.Web.Server.Entities.UserEntity", "ConfirmedBy") + .WithMany() + .HasForeignKey("ConfirmedById") + .HasConstraintName("fk_payments_users_confirmed_by_id"); + + b.HasOne("XClaim.Web.Server.Entities.UserEntity", "Owner") + .WithMany() + .HasForeignKey("OwnerId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("fk_payments_users_owner_id"); + + b.Navigation("ConfirmedBy"); + + b.Navigation("Owner"); + }); + + modelBuilder.Entity("XClaim.Web.Server.Entities.ServerEntity", b => + { + b.HasOne("XClaim.Web.Server.Entities.CurrencyEntity", "Currency") + .WithMany() + .HasForeignKey("CurrencyId") + .HasConstraintName("fk_server_currency_entity_currency_id"); + + b.Navigation("Currency"); + }); + + modelBuilder.Entity("XClaim.Web.Server.Entities.SettingEntity", b => + { + b.HasOne("XClaim.Web.Server.Entities.UserEntity", "Owner") + .WithOne("Setting") + .HasForeignKey("XClaim.Web.Server.Entities.SettingEntity", "OwnerId") + .HasConstraintName("fk_user_setting_users_owner_id"); + + b.Navigation("Owner"); + }); + + modelBuilder.Entity("XClaim.Web.Server.Entities.TeamEntity", b => + { + b.HasOne("XClaim.Web.Server.Entities.CompanyEntity", "Company") + .WithMany() + .HasForeignKey("CompanyId") + .HasConstraintName("fk_teams_companies_company_id"); + + b.HasOne("XClaim.Web.Server.Entities.UserEntity", "Manager") + .WithOne("TeamManaged") + .HasForeignKey("XClaim.Web.Server.Entities.TeamEntity", "ManagerId") + .OnDelete(DeleteBehavior.SetNull) + .HasConstraintName("fk_teams_users_manager_id"); + + b.Navigation("Company"); + + b.Navigation("Manager"); + }); + + modelBuilder.Entity("XClaim.Web.Server.Entities.UserEntity", b => + { + b.HasOne("XClaim.Web.Server.Entities.CompanyEntity", "Company") + .WithMany("Members") + .HasForeignKey("CompanyId") + .HasConstraintName("fk_users_companies_company_id"); + + b.HasOne("XClaim.Web.Server.Entities.CurrencyEntity", "Currency") + .WithMany() + .HasForeignKey("CurrencyId") + .HasConstraintName("fk_users_currency_entity_currency_id"); + + b.HasOne("XClaim.Web.Server.Entities.TeamEntity", "Team") + .WithMany("Members") + .HasForeignKey("TeamId") + .HasConstraintName("fk_users_teams_team_id"); + + b.Navigation("Company"); + + b.Navigation("Currency"); + + b.Navigation("Team"); + }); + + modelBuilder.Entity("XClaim.Web.Server.Entities.ClaimEntity", b => + { + b.Navigation("Comments"); + + b.Navigation("Files"); + }); + + modelBuilder.Entity("XClaim.Web.Server.Entities.CompanyEntity", b => + { + b.Navigation("Members"); + }); + + modelBuilder.Entity("XClaim.Web.Server.Entities.PaymentEntity", b => + { + b.Navigation("Claims"); + + b.Navigation("Comments"); + + b.Navigation("Files"); + }); + + modelBuilder.Entity("XClaim.Web.Server.Entities.TeamEntity", b => + { + b.Navigation("Members"); + }); + + modelBuilder.Entity("XClaim.Web.Server.Entities.UserEntity", b => + { + b.Navigation("BankAccount"); + + b.Navigation("CompanyManaged"); + + b.Navigation("Notification"); + + b.Navigation("Setting"); + + b.Navigation("TeamManaged"); + }); +#pragma warning restore 612, 618 + } + } +} From ff5076e22bc215b5e6d6a5998d6acc3291aa65ee Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Thu, 2 Feb 2023 23:51:48 +0100 Subject: [PATCH 090/185] Added profile bank form --- src/Common/Dtos/BankAccountResponse.cs | 1 + .../Components/Pages/User/BankAccount.razor | 107 +++++++++++++----- src/Web/Server/Entities/BankAccountEntity.cs | 1 - 3 files changed, 81 insertions(+), 28 deletions(-) diff --git a/src/Common/Dtos/BankAccountResponse.cs b/src/Common/Dtos/BankAccountResponse.cs index 5dcfe191..8c5d8f29 100644 --- a/src/Common/Dtos/BankAccountResponse.cs +++ b/src/Common/Dtos/BankAccountResponse.cs @@ -5,6 +5,7 @@ namespace XClaim.Common.Dtos; public class BankAccountResponse : BaseResponse { public string FullName { get; set; } = string.Empty; public BankResponse? Bank { get; set; } + public Guid? BankId { get; set; } public UserResponse? Owner { get; set; } public Guid? OwnerId { get; set; } public string Number { get; set; } = string.Empty; diff --git a/src/Web/Components/Pages/User/BankAccount.razor b/src/Web/Components/Pages/User/BankAccount.razor index 3b4e674b..26f66724 100644 --- a/src/Web/Components/Pages/User/BankAccount.razor +++ b/src/Web/Components/Pages/User/BankAccount.razor @@ -1,36 +1,89 @@ @inject Navigation Nav +@inject IBankService BankService +@inject IProfileService ProfileService +@inject ISnackbar Snackbar @page "/app/user/bank-account" +@using XClaim.Common.Dtos +@using XClaim.Common.Helpers @attribute [Authorize] -@code { } +@code { + private bool Loading { get; set; } + bool _success; + string[] _errors = { }; + MudForm? _form; + + private BankResponse? Bank { get; set; } + + private BankAccountResponse? Item { get; set; } = new BankAccountResponse(); + + private async Task> SearchBank(string value) { + var response = await BankService.GetAllAsync(new SearchFilter { Search = value }); + return (response.Succeeded ? response.Data : new List {})!; + } + + protected override async Task OnInitializedAsync() { + await base.OnInitializedAsync(); + Loading = true; + var result = await ProfileService.GetBankAccountAsync(); + if (result is { Succeeded: true, Data: { } }) { + Bank = result.Data.Bank; + Item = result.Data; + } + Loading = false; + } + + private async Task Submit() { + await _form!.Validate(); + if (!_success) return; + + if (Item != null) { + Item.BankId = Bank?.Id; + var result = await ProfileService.UpdateBankAccountAsync(Item); + Snackbar.Clear(); + await Task.Delay(500); + Snackbar.Add(result.Succeeded ? "Updated successfully.." : "Update failed..", result.Succeeded ? Severity.Success : Severity.Error); + if (result.Succeeded) { + Nav.NavigateBack(); + } + } + } +} Bank Account - - - - - - - - - - - - Foo - Bar - - - - - - - - Back - Save - + + + + + + + + + + + + + + + + + + + + Back + Save + + + - - \ No newline at end of file + + \ No newline at end of file diff --git a/src/Web/Server/Entities/BankAccountEntity.cs b/src/Web/Server/Entities/BankAccountEntity.cs index 032bf0d7..e1479648 100644 --- a/src/Web/Server/Entities/BankAccountEntity.cs +++ b/src/Web/Server/Entities/BankAccountEntity.cs @@ -6,7 +6,6 @@ namespace XClaim.Web.Server.Entities; [GenerateAutoFilter("XClaim.Web.Server.Filters")] public sealed class BankAccountEntity : BaseEntity { public string FullName { get; set; } = string.Empty; - [Required] public BankEntity? Bank { get; set; } public Guid? BankId { get; set; } public UserEntity? Owner { get; set; } From a31ce16d398e99ee5f22d37f4ccd77fec29c226d Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Thu, 2 Feb 2023 23:52:33 +0100 Subject: [PATCH 091/185] Update NavMenu.razor --- src/Web/Components/Shared/NavMenu.razor | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/src/Web/Components/Shared/NavMenu.razor b/src/Web/Components/Shared/NavMenu.razor index fa820adc..341a127a 100644 --- a/src/Web/Components/Shared/NavMenu.razor +++ b/src/Web/Components/Shared/NavMenu.razor @@ -1,5 +1,6 @@ @using XClaim.Common.Dtos @using XClaim.Common.Extensions +@using XClaim.Common.Helpers @inject AuthState AuthState @code { @@ -27,8 +28,7 @@ new MenuLink("Companies", Icons.Material.Filled.PendingActions, "/app/settings/companies"), new MenuLink("Banks", Icons.Material.Filled.Money, "/app/settings/banks"), new MenuLink("Domains", Icons.Material.Filled.Computer, "/app/settings/domains"), - new MenuLink("Currency", Icons.Material.Filled.CurrencyExchange, "/app/settings/currency"), - new MenuLink("Server", Icons.Material.Filled.SettingsApplications, "/app/settings/server") + new MenuLink("Currency", Icons.Material.Filled.CurrencyExchange, "/app/settings/currency") }) }; @@ -40,14 +40,9 @@ _profile = ((await AuthState.GetSession())!).Data; } - private string GetInitialsText(string?[] value) { - if (value.Length < 2) return "FL"; - var firstName = value[0]?.ToUpper(); - var lastName = value[^1]?.ToUpper(); - - if (firstName == null && lastName == null) return "FL"; - return firstName![..1] + lastName![..1]; - } + private string ProfileInitials => StringHelpers.GetInitialsText(new[] { + _profile?.FirstName, _profile?.LastName + }); } @@ -57,9 +52,7 @@ - @GetInitialsText(new[] { - _profile?.FirstName, _profile?.LastName - }) + @ProfileInitials @_profile?.FirstName.Truncate(12) @_profile?.Email.Truncate(18) @@ -71,6 +64,7 @@ Profile Settings Bank Act + Server Options Help Sign Out From 4055f944758b030899ea48828b5383466d7d3b20 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Thu, 2 Feb 2023 23:52:57 +0100 Subject: [PATCH 092/185] Update Registration.razor --- src/Web/Components/Pages/Startup/Registration.razor | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Web/Components/Pages/Startup/Registration.razor b/src/Web/Components/Pages/Startup/Registration.razor index d4043160..d005516f 100644 --- a/src/Web/Components/Pages/Startup/Registration.razor +++ b/src/Web/Components/Pages/Startup/Registration.razor @@ -30,6 +30,10 @@ } private UserResponse Item { get; set; } = new UserResponse(); + + private string ProfileInitials => StringHelpers.GetInitialsText(new[] { + Item.FirstName, Item.LastName + }); protected override async Task OnInitializedAsync() { await base.OnInitializedAsync(); @@ -76,7 +80,7 @@ - SA + @ProfileInitials From f7cc02b5a5ebe45f13f3c9a2fe2ac1a34559542e Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Thu, 2 Feb 2023 23:53:37 +0100 Subject: [PATCH 093/185] Added validation to server and profile form --- .../Components/Pages/Settings/Server.razor | 70 ++++++----- src/Web/Components/Pages/User/Profile.razor | 118 +++++++++++------- 2 files changed, 115 insertions(+), 73 deletions(-) diff --git a/src/Web/Components/Pages/Settings/Server.razor b/src/Web/Components/Pages/Settings/Server.razor index 612caf8d..9af320fe 100644 --- a/src/Web/Components/Pages/Settings/Server.razor +++ b/src/Web/Components/Pages/Settings/Server.razor @@ -10,6 +10,9 @@ @attribute [Authorize(Roles = "System")] @code { + bool _success; + string[] _errors = { }; + MudForm? _form; private CurrencyResponse? Currency { get; set; } private ServerResponse Item { get; set; } = new ServerResponse(); @@ -27,6 +30,9 @@ } private async Task Submit() { + await _form!.Validate(); + if (!_success) return; + var result = await ServerService.UpdateAsync(Item); if (result.Succeeded) await AppState.LoadServerState(result.Data!); @@ -37,35 +43,39 @@ Server options - - - - - - - - - - - - - - - - - - - - - Back - Update - + + + + + + + + + + + + + + + + + + + + + + + Back + Update + + + - - \ No newline at end of file + + \ No newline at end of file diff --git a/src/Web/Components/Pages/User/Profile.razor b/src/Web/Components/Pages/User/Profile.razor index c9820830..d06825a1 100644 --- a/src/Web/Components/Pages/User/Profile.razor +++ b/src/Web/Components/Pages/User/Profile.razor @@ -1,15 +1,19 @@ @page "/app/user/profile" @using XClaim.Common.Dtos @using XClaim.Common.Helpers +@using System.ComponentModel.DataAnnotations @inject IUserService Http @inject ICurrencyService CurrencyService @inject Navigation Nav +@inject AuthState AuthState @inject ISnackbar Snackbar @attribute [Authorize] @code { - [Parameter] - public Guid? Id { get; set; } + private bool Loading { get; set; } + bool _success; + string[] _errors = { }; + MudForm? _form; private CurrencyResponse? Currency { get; set; } @@ -22,58 +26,86 @@ protected override async Task OnInitializedAsync() { await base.OnInitializedAsync(); + var user = await AuthState.GetAccount(); + if (user!.Id != null) { + var id = (Guid) user!.Id!; + Loading = true; + var res = await Http.GetByIdAsync(id); + if (res.Succeeded) { + var result = res.Data!; + Currency = result.Currency; + Item = result; + } + Loading = false; + } } async Task Submit() { + await _form!.Validate(); + if (!_success) return; Item.CurrencyId = Currency?.Id; var result = await Http.UpdateAsync(Item); + Snackbar.Clear(); + await Task.Delay(1500); + Snackbar.Add(result.Succeeded ? "Updated successfully.." : "Update failed..", result.Succeeded ? Severity.Success : Severity.Error); if (result.Succeeded) { - Snackbar.Add("Verification successful..", Severity.Success); - await Task.Delay(1500); - Nav.NavigateTo(WebConst.AppHome); - } else { - Snackbar.Add("Verification failed..", Severity.Error); + // await AuthState.TriggerAuthentication(); + Nav.NavigateBack(); } } + + private string ProfileInitials => StringHelpers.GetInitialsText(new[] { + Item.FirstName, Item.LastName + }); } -Profile options +Account profile - - - - - - - SA - - - - - - - - - - - - - - - - - - - - - Back - Save - + + + + + + + + + @ProfileInitials + + + + + + + + + + + + + + + + + + + + + Back + Update + + + - - \ No newline at end of file + + \ No newline at end of file From 00610a4334b3d00e5048209ff2170bd6f785464d Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Thu, 2 Feb 2023 23:54:22 +0100 Subject: [PATCH 094/185] Additional entity to bank account profile --- .../Server/Modules/ProfileModule/ProfileService.cs | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/Web/Server/Modules/ProfileModule/ProfileService.cs b/src/Web/Server/Modules/ProfileModule/ProfileService.cs index 039ac13d..bf8b72c0 100644 --- a/src/Web/Server/Modules/ProfileModule/ProfileService.cs +++ b/src/Web/Server/Modules/ProfileModule/ProfileService.cs @@ -50,17 +50,16 @@ public ProfileService(ServerContext ctx, IMapper mapper, ILogger private async Task GetBankAccount() { var id = await this.GetId(); - return await _ctx.UserBankAccount.FirstOrDefaultAsync(x => x.OwnerId == id); + return await _ctx.UserBankAccount.Where(x => x.OwnerId == id) + .Include(x => x.Bank).FirstOrDefaultAsync(); } public async Task> GetBankAccountAsync() { var response = new Response(); - var id = await this.GetId(); - if (id == null ) return response; try { var data = _mapper.Map(await this.GetBankAccount()); response.Data = data; - response.Succeeded = true; + response.Succeeded = data != null; } catch (Exception e) { response.Errors = new[] { e.ToString() }; _logger.LogError(e.ToString()); @@ -76,14 +75,12 @@ public ProfileService(ServerContext ctx, IMapper mapper, ILogger try { var userBankAccount = await this.GetBankAccount(); - BankAccountEntity item; + var item = _mapper.Map(account); if (userBankAccount == null) { - item = _mapper.Map(account); item.OwnerId = id; await _ctx.UserBankAccount.AddAsync(item); await _ctx.SaveChangesAsync(); } else { - item = _mapper.Map(account); _ctx.UserBankAccount.Update(item); await _ctx.SaveChangesAsync(); } From 3827dc353b873b83cfd1a014f9057304e309805c Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Fri, 3 Feb 2023 14:51:18 +0100 Subject: [PATCH 095/185] Fix enum typo --- src/Common/Enums/NotificationChannels.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Common/Enums/NotificationChannels.cs b/src/Common/Enums/NotificationChannels.cs index 9e4ca92c..02e12e0d 100644 --- a/src/Common/Enums/NotificationChannels.cs +++ b/src/Common/Enums/NotificationChannels.cs @@ -2,13 +2,13 @@ namespace XClaim.Common.Enums { public enum NotificationChannels { - [Description("Email NOtifications")] + [Description("Email Notifications")] Email, - [Description("Push NOtifications")] + [Description("Push Notifications")] Push, - [Description("SMS NOtifications")] + [Description("SMS Notifications")] Sms, - [Description("MS Teams NOtifications")] + [Description("MS Teams Notifications")] Teams } } \ No newline at end of file From 807dc903aeb93f6973e0e3249502d3f1369f1a78 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Fri, 3 Feb 2023 14:52:17 +0100 Subject: [PATCH 096/185] Improved Theme State --- src/Web/Shared/States/ThemeState.cs | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/Web/Shared/States/ThemeState.cs b/src/Web/Shared/States/ThemeState.cs index 20e70860..b5cd087f 100644 --- a/src/Web/Shared/States/ThemeState.cs +++ b/src/Web/Shared/States/ThemeState.cs @@ -5,16 +5,21 @@ namespace XClaim.Web.Shared.States; public class ThemeState : RootState { public bool IsLightMode { get; private set; } = true; - public MudTheme CurrentTheme { get; private set; } = new(); + public MudTheme CurrentTheme { get; private set; } = new MudTheme(); public void ToggleTheme() { IsLightMode = !IsLightMode; - CurrentTheme = !IsLightMode ? GenerateDarkTheme() : new MudTheme(); + CurrentTheme = IsLightMode ? new MudTheme() : GenerateDarkTheme(); NotifyStateChanged(); } - private static MudTheme GenerateDarkTheme() => - new() { + public void SetLightMode(bool value) { + IsLightMode = value; + CurrentTheme = IsLightMode ? new MudTheme() : GenerateDarkTheme(); + NotifyStateChanged(); + } + + private static MudTheme GenerateDarkTheme() => new MudTheme { Palette = new Palette { Black = "#27272f", Background = "#32333d", From 4b1cffbe4903682b92342fd1f3da3c5b55022a96 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Fri, 3 Feb 2023 14:52:38 +0100 Subject: [PATCH 097/185] Added AuthenticationState refresh method --- src/Web/Shared/AuthProvider.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Web/Shared/AuthProvider.cs b/src/Web/Shared/AuthProvider.cs index cf2bc9bb..7cc392cd 100644 --- a/src/Web/Shared/AuthProvider.cs +++ b/src/Web/Shared/AuthProvider.cs @@ -50,6 +50,10 @@ public async Task UpdateAuthenticationState(AuthResponse? userSession) { NotifyAuthenticationStateChanged(Task.FromResult(new AuthenticationState(claimsPrincipal))); } + public async Task RefreshAuthenticationState(AuthResponse userSession) { + await _sessionStorage.SaveAsync(WebConst.SessionKey, userSession); + } + public async Task ClearAuthInfo() => await this.UpdateAuthenticationState(null); public async Task GetToken() { From 404bca482c96b5c2b558ca3d3a7ee170c014c2db Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Fri, 3 Feb 2023 14:53:18 +0100 Subject: [PATCH 098/185] Added method for state refresh from back-end --- src/Web/Shared/States/AuthState.cs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/Web/Shared/States/AuthState.cs b/src/Web/Shared/States/AuthState.cs index e10c636b..302107c7 100644 --- a/src/Web/Shared/States/AuthState.cs +++ b/src/Web/Shared/States/AuthState.cs @@ -32,6 +32,13 @@ private AuthProvider Profile { get { private async Task GetUser() => (await GetState()).User; + public async Task Refresh() { + var auth = (await _profileService.GetAccountAsync()).Data; + if (auth != null) { + await Profile.RefreshAuthenticationState(auth); + } + } + public async Task GetPermission() => (await this.GetSession())!.Data?.Permission ?? UserPermission.Anonymous; public async Task GetAccount() => (await this.GetSession())!.Data; From 7cffb960aee094c986e49814d9ef03bc4db989db Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Fri, 3 Feb 2023 14:53:27 +0100 Subject: [PATCH 099/185] Update UserService.cs --- src/Web/Server/Modules/UserModule/UserService.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Web/Server/Modules/UserModule/UserService.cs b/src/Web/Server/Modules/UserModule/UserService.cs index 1a98b6bd..5aa4705d 100644 --- a/src/Web/Server/Modules/UserModule/UserService.cs +++ b/src/Web/Server/Modules/UserModule/UserService.cs @@ -23,6 +23,7 @@ public UserService(ServerContext ctx, IMapper mapper, ILogger logge .Include(x => x.Company) .Include(x => x.Team) .Include(x => x.Currency) + .Include(x => x.Setting) .FirstOrDefaultAsync(); var data = _mapper.Map(item); @@ -39,6 +40,7 @@ public UserService(ServerContext ctx, IMapper mapper, ILogger logge .Include(x => x.Company) .Include(x => x.Team) .Include(x => x.Currency) + .Include(x => x.Setting) .FirstOrDefaultAsync(); var data = _mapper.Map(item); From 0bfe3788c5746803f97958b62293d6b6a7aa3fdc Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Fri, 3 Feb 2023 14:53:58 +0100 Subject: [PATCH 100/185] fix for user settings update error --- .../Modules/ProfileModule/ProfileService.cs | 29 +++++++++---------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/src/Web/Server/Modules/ProfileModule/ProfileService.cs b/src/Web/Server/Modules/ProfileModule/ProfileService.cs index bf8b72c0..ecaba586 100644 --- a/src/Web/Server/Modules/ProfileModule/ProfileService.cs +++ b/src/Web/Server/Modules/ProfileModule/ProfileService.cs @@ -1,5 +1,6 @@ using AutoMapper; using Microsoft.EntityFrameworkCore; +using Nextended.Core.Extensions; using XClaim.Common.Dtos; using XClaim.Common.Enums; using XClaim.Common.Wrappers; @@ -97,13 +98,14 @@ public ProfileService(ServerContext ctx, IMapper mapper, ILogger private async Task GetSetting() { var id = await this.GetId(); - return await _ctx.UserSetting.FirstOrDefaultAsync(x => x.OwnerId == id); + return await _ctx.UserSetting.Where(x => x.OwnerId == id) + .Include(x => x.Owner) + .AsNoTracking() + .FirstOrDefaultAsync(); } public async Task> GetSettingAsync() { var response = new Response(); - var id = await this.GetId(); - if (id == null ) return response; try { var data = _mapper.Map(await this.GetSetting()); response.Data = data; @@ -118,18 +120,16 @@ public ProfileService(ServerContext ctx, IMapper mapper, ILogger public async Task> UpdateSettingAsync(SettingResponse setting) { var response = new Response(); var id = await this.GetId(); - if (id == null ) return response; try { var userSetting = await this.GetSetting(); - SettingEntity item; + var item = setting.MapTo(); if (userSetting == null) { - item = _mapper.Map(setting); item.OwnerId = id; await _ctx.UserSetting.AddAsync(item); await _ctx.SaveChangesAsync(); } else { - item = _mapper.Map(setting); + _mapper.Map(userSetting, item); _ctx.UserSetting.Update(item); await _ctx.SaveChangesAsync(); } @@ -147,13 +147,14 @@ public ProfileService(ServerContext ctx, IMapper mapper, ILogger private async Task GetNotification() { var id = await this.GetId(); - return await _ctx.UserNotification.FirstOrDefaultAsync(x => x.OwnerId == id); + return await _ctx.UserNotification.Where(x => x.OwnerId == id) + .Include(x => x.Owner) + .AsNoTracking() + .FirstOrDefaultAsync(); } public async Task> GetNotificationAsync() { var response = new Response(); - var id = await this.GetId(); - if (id == null ) return response; try { var data = _mapper.Map(await this.GetNotification()); response.Data = data; @@ -167,19 +168,17 @@ public ProfileService(ServerContext ctx, IMapper mapper, ILogger } public async Task> UpdateNotificationAsync(NotificationResponse notification) { var response = new Response(); - var id = await this.GetId(); - if (id == null ) return response; try { var userNotification = await this.GetNotification(); - NotificationEntity item; + var id = await this.GetId(); + var item = _mapper.Map(notification); if (userNotification == null) { - item = _mapper.Map(notification); item.OwnerId = id; await _ctx.UserNotification.AddAsync(item); await _ctx.SaveChangesAsync(); } else { - item = _mapper.Map(notification); + _mapper.Map(userNotification, item); _ctx.UserNotification.Update(item); await _ctx.SaveChangesAsync(); } From 3efa6e9942d251fb18eb6bbafe44c969f68a2265 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Fri, 3 Feb 2023 14:55:02 +0100 Subject: [PATCH 101/185] Complete user account setting MVP implementation --- .../Pages/{User => Account}/BankAccount.razor | 4 +- src/Web/Components/Pages/Account/Index.razor | 9 ++ src/Web/Components/Pages/Account/Layout.razor | 37 ++++++ .../Pages/Account/Notification.razor | 115 ++++++++++++++++++ .../Pages/{User => Account}/Profile.razor | 8 +- .../Components/Pages/Account/Settings.razor | 75 ++++++++++++ .../Components/Pages/Account/_Imports.razor | 1 + .../Components/Pages/User/MutateUser.razor | 3 + src/Web/Components/Pages/User/Settings.razor | 7 -- src/Web/Components/Shared/NavMenu.razor | 4 +- 10 files changed, 246 insertions(+), 17 deletions(-) rename src/Web/Components/Pages/{User => Account}/BankAccount.razor (97%) create mode 100644 src/Web/Components/Pages/Account/Index.razor create mode 100644 src/Web/Components/Pages/Account/Layout.razor create mode 100644 src/Web/Components/Pages/Account/Notification.razor rename src/Web/Components/Pages/{User => Account}/Profile.razor (97%) create mode 100644 src/Web/Components/Pages/Account/Settings.razor create mode 100644 src/Web/Components/Pages/Account/_Imports.razor delete mode 100644 src/Web/Components/Pages/User/Settings.razor diff --git a/src/Web/Components/Pages/User/BankAccount.razor b/src/Web/Components/Pages/Account/BankAccount.razor similarity index 97% rename from src/Web/Components/Pages/User/BankAccount.razor rename to src/Web/Components/Pages/Account/BankAccount.razor index 26f66724..cfe85586 100644 --- a/src/Web/Components/Pages/User/BankAccount.razor +++ b/src/Web/Components/Pages/Account/BankAccount.razor @@ -2,7 +2,7 @@ @inject IBankService BankService @inject IProfileService ProfileService @inject ISnackbar Snackbar -@page "/app/user/bank-account" +@page "/app/account/bank-account" @using XClaim.Common.Dtos @using XClaim.Common.Helpers @attribute [Authorize] @@ -79,7 +79,7 @@ Back Save + Class="mt-8 px-12 py-3">Update diff --git a/src/Web/Components/Pages/Account/Index.razor b/src/Web/Components/Pages/Account/Index.razor new file mode 100644 index 00000000..2a143b42 --- /dev/null +++ b/src/Web/Components/Pages/Account/Index.razor @@ -0,0 +1,9 @@ +@page "/app/account" +@inject Navigation Nav + +@code { + protected override void OnInitialized() { + base.OnInitialized(); + Nav.NavigateTo("/app/account/profile"); + } +} \ No newline at end of file diff --git a/src/Web/Components/Pages/Account/Layout.razor b/src/Web/Components/Pages/Account/Layout.razor new file mode 100644 index 00000000..eecec31f --- /dev/null +++ b/src/Web/Components/Pages/Account/Layout.razor @@ -0,0 +1,37 @@ +@inherits LayoutComponentBase +@layout MainLayout +@inject NavigationManager Nav + +@code { + private int TabState { get; set; } + + private record AccountPage(string Title, string Path, string Icon = Icons.Material.Filled.Settings); + + private readonly List _pages = new List() { + new AccountPage("Profile", "app/account/profile", Icons.Material.Filled.Person), + new AccountPage("Bank Account", "app/account/bank-account", Icons.Material.Filled.CreditCard), + new AccountPage("Notification", "app/account/notification", Icons.Material.Filled.Notifications), + new AccountPage("Settings", "app/account/settings"), + }; + + private void TriggerNavigation(AccountPage page) { + TabState = _pages.IndexOf(page); + Nav.NavigateTo(page.Path); + } + + protected override void OnInitialized() { + base.OnInitialized(); + var page = _pages.Find(x => Nav.ToAbsoluteUri(x.Path).ToString() == Nav.Uri); + if (page == null) return; + TabState = _pages.IndexOf(page); + } +} + + + + @foreach (var tab in _pages) { + + } + + @Body + \ No newline at end of file diff --git a/src/Web/Components/Pages/Account/Notification.razor b/src/Web/Components/Pages/Account/Notification.razor new file mode 100644 index 00000000..915cd054 --- /dev/null +++ b/src/Web/Components/Pages/Account/Notification.razor @@ -0,0 +1,115 @@ +@inject Navigation Nav +@inject IProfileService ProfileService +@inject ISnackbar Snackbar +@page "/app/account/notification" +@using XClaim.Common.Dtos +@using XClaim.Common.Enums +@using Nextended.Core.Extensions + +@code { + bool _success; + string[] _errors = { }; + MudForm? _form; + + private class EventObject { + public string Key { get; set; } + public string Name { get; set; } + public EventType Value { get; set; } + public bool Active { get; set; } + } + + private readonly ICollection _eventList = new List { }; + private NotificationChannels ChannelValue { get; set; } + private IEnumerable Channels { get; set; } = new List { }; + private IEnumerable Events { get; set; } = new List { }; + + private NotificationResponse Item { get; set; } = new NotificationResponse(); + + private void LoadEventList() { + foreach (var eventItem in Enum.GetValues()) { + var name = Enum.Parse(eventItem.ToString()); + _eventList.Add(new EventObject { Key = name.ToString(), Name = name.ToDescriptionString().Capitalize(), Value = eventItem, Active = false }); + } + } + + protected override async Task OnInitializedAsync() { + await base.OnInitializedAsync(); + this.LoadEventList(); + + var result = await ProfileService.GetNotificationAsync(); + if (result is { Succeeded: true, Data: { } }) { + Item = result.Data; + Channels = Item.Channels; + Events = Item.Types; + + foreach (var eventType in Events) { + _eventList.First(x => x.Value == eventType).Active = true; + } + } + } + + private async Task Submit() { + await _form!.Validate(); + if (!_success) return; + Item.Channels = Channels.ToList(); + Item.Types = _eventList.Where(x => x.Active).Select(x => x.Value).ToList(); + var result = await ProfileService.UpdateNotificationAsync(Item); + Snackbar.Clear(); + await Task.Delay(500); + Snackbar.Add(result.Succeeded ? "Updated successfully.." : "Update failed..", result.Succeeded ? Severity.Success : Severity.Error); + } +} + +Notification Settings + + + + + + + + + @foreach (var lang in Enum.GetValues()) { + @lang.ToDescriptionString().Capitalize() + } + + + + + + + Notification types + + + + + + + + @foreach (var eventValue in _eventList) { + + + @eventValue.Name + + + + } + + + + + + + Back + Update + + + + + + + \ No newline at end of file diff --git a/src/Web/Components/Pages/User/Profile.razor b/src/Web/Components/Pages/Account/Profile.razor similarity index 97% rename from src/Web/Components/Pages/User/Profile.razor rename to src/Web/Components/Pages/Account/Profile.razor index d06825a1..4ce3957d 100644 --- a/src/Web/Components/Pages/User/Profile.razor +++ b/src/Web/Components/Pages/Account/Profile.razor @@ -1,4 +1,4 @@ -@page "/app/user/profile" +@page "/app/account/profile" @using XClaim.Common.Dtos @using XClaim.Common.Helpers @using System.ComponentModel.DataAnnotations @@ -45,13 +45,11 @@ if (!_success) return; Item.CurrencyId = Currency?.Id; var result = await Http.UpdateAsync(Item); + if (result.Succeeded) + await AuthState.Refresh(); Snackbar.Clear(); await Task.Delay(1500); Snackbar.Add(result.Succeeded ? "Updated successfully.." : "Update failed..", result.Succeeded ? Severity.Success : Severity.Error); - if (result.Succeeded) { - // await AuthState.TriggerAuthentication(); - Nav.NavigateBack(); - } } private string ProfileInitials => StringHelpers.GetInitialsText(new[] { diff --git a/src/Web/Components/Pages/Account/Settings.razor b/src/Web/Components/Pages/Account/Settings.razor new file mode 100644 index 00000000..29c49663 --- /dev/null +++ b/src/Web/Components/Pages/Account/Settings.razor @@ -0,0 +1,75 @@ +@implements IDisposable +@inject Navigation Nav +@inject IProfileService ProfileService +@inject ISnackbar Snackbar +@inject ThemeState ThemeState +@inject AuthState AuthState +@page "/app/account/settings" +@using XClaim.Common.Enums +@using Nextended.Core.Extensions +@using XClaim.Common.Dtos +@attribute [Authorize] + +@code { + bool _success; + string[] _errors = { }; + MudForm? _form; + private SettingResponse Item { get; set; } = new SettingResponse(); + + protected override async Task OnInitializedAsync() { + await base.OnInitializedAsync(); + var result = await ProfileService.GetSettingAsync(); + if (result is { Succeeded: true, Data: { } }) { + Item = result.Data; + } + } + + private async Task Submit() { + await _form!.Validate(); + if (!_success) return; + var result = await ProfileService.UpdateSettingAsync(Item); + if (result.Data != null) { + await AuthState.Refresh(); + var lightMode = !(result.Data.DarkMode); + ThemeState.SetLightMode(lightMode); + ThemeState.OnChange += StateHasChanged; + } + Snackbar.Clear(); + await Task.Delay(500); + Snackbar.Add(result.Succeeded ? "Updated successfully.." : "Update failed..", result.Succeeded ? Severity.Success : Severity.Error); + } + + public void Dispose() => ThemeState.OnChange -= StateHasChanged; +} + +Account Settings + + + + + + + + + @foreach (var lang in Enum.GetValues()) { + @lang.ToDescriptionString().Capitalize() + } + + + + + + + + Back + Update + + + + + + + \ No newline at end of file diff --git a/src/Web/Components/Pages/Account/_Imports.razor b/src/Web/Components/Pages/Account/_Imports.razor new file mode 100644 index 00000000..cc2a445c --- /dev/null +++ b/src/Web/Components/Pages/Account/_Imports.razor @@ -0,0 +1 @@ +@layout Layout \ No newline at end of file diff --git a/src/Web/Components/Pages/User/MutateUser.razor b/src/Web/Components/Pages/User/MutateUser.razor index 846f7e19..4e6711a5 100644 --- a/src/Web/Components/Pages/User/MutateUser.razor +++ b/src/Web/Components/Pages/User/MutateUser.razor @@ -6,6 +6,7 @@ @inject ICompanyService CompanyService @inject ITeamService TeamService @inject ISnackbar Snackbar +@inject AuthState AuthState @code { [CascadingParameter] @@ -62,6 +63,8 @@ Item.CompanyId = Company?.Id; Item.TeamId = Team?.Id; var result = await Http.UpdateAsync(Item); + if (result.Succeeded) + await AuthState.Refresh(); MudDialog.Close(DialogResult.Ok(result.Succeeded)); } diff --git a/src/Web/Components/Pages/User/Settings.razor b/src/Web/Components/Pages/User/Settings.razor deleted file mode 100644 index 7a5359ce..00000000 --- a/src/Web/Components/Pages/User/Settings.razor +++ /dev/null @@ -1,7 +0,0 @@ -@page "/app/user/settings" - -

Settings

- -@code { - -} \ No newline at end of file diff --git a/src/Web/Components/Shared/NavMenu.razor b/src/Web/Components/Shared/NavMenu.razor index 341a127a..49d20f8a 100644 --- a/src/Web/Components/Shared/NavMenu.razor +++ b/src/Web/Components/Shared/NavMenu.razor @@ -61,9 +61,7 @@ - Profile - Settings - Bank Act + Account Options Server Options Help Sign Out From 7b35d9008a3632176491eb772411a6b9a7dfecca Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Fri, 3 Feb 2023 15:38:37 +0100 Subject: [PATCH 102/185] Added settings and server state --- src/Web/Client/App.razor | 18 +++++++++++++++--- src/Web/Shared/States/AppState.cs | 2 +- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/Web/Client/App.razor b/src/Web/Client/App.razor index bf6a78c1..07edfe0b 100644 --- a/src/Web/Client/App.razor +++ b/src/Web/Client/App.razor @@ -2,19 +2,31 @@ @inject NavigationManager Nav @inject AppState AppState @inject AuthState AuthState +@inject ThemeState ThemeState @inject IServerService ServerService @code { + private async Task OnNavigateAsync(NavigationContext args) { var isRootPath = args.Path.Equals(string.Empty); var isAuthPath = args.Path.Equals(WebConst.AppAuth); var isRegistrationPath = args.Path.Equals(WebConst.AppRegister); var session = await AuthState.GetSession(); var isAuth = await AuthState.IsAuth(); + + if (AppState.ServerState == null) { + var server = await ServerService.GetAsync(); + await AppState.LoadServerState(server.Data!); + } - var result = await ServerService.GetAsync(); - await AppState.LoadServerState(result.Data!); - + if (isAuth) { + var user = await AuthState.GetAccount(); + if (user != null) { + var lightMode = user.Setting?.DarkMode ?? false; + ThemeState.SetLightMode(!lightMode); + } + } + switch (isAuth) { case true when !session!.Confirmed && !isRegistrationPath: Nav.NavigateTo(WebConst.AppRegister, true); diff --git a/src/Web/Shared/States/AppState.cs b/src/Web/Shared/States/AppState.cs index 16b8da96..3c1d6720 100644 --- a/src/Web/Shared/States/AppState.cs +++ b/src/Web/Shared/States/AppState.cs @@ -9,7 +9,7 @@ public class AppState : RootState { public string? AppTitle { get; private set; } = SharedConst.ServiceName; - public ServerStateResponse ServerState { get; private set; } = default!; + public ServerStateResponse? ServerState { get; private set; } public bool IsSidebarOpen { get; private set; } = true; From 3a6c83ddb3872c79e231fff6542ab0704496f04d Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Fri, 3 Feb 2023 16:19:24 +0100 Subject: [PATCH 103/185] Adjust tables height --- src/Web/Shared/WebConst.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Web/Shared/WebConst.cs b/src/Web/Shared/WebConst.cs index a1e54b93..1f41f240 100644 --- a/src/Web/Shared/WebConst.cs +++ b/src/Web/Shared/WebConst.cs @@ -11,6 +11,6 @@ public static class WebConst { public const string AppRegister = "app/registration"; public const string SessionKey = "UserSession"; public static readonly DateRange AppDateRange = new DateRange(DateTime.Now.AddDays(-7), DateTime.Now); - public static readonly int[] AppPaged = new[] { 25, 100, 250, 2000 }; - public const string TableHeight = "calc(100vh - 256px)"; + public static readonly int[] AppPaged = { 25, 100, 250, 2000 }; + public const string TableHeight = "calc(100vh - 305px)"; } \ No newline at end of file From fc9dc03df561bf1179f29d82beb2838c46fefaf1 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Fri, 3 Feb 2023 16:20:14 +0100 Subject: [PATCH 104/185] Update management pages --- src/Web/Components/Pages/Account/Index.razor | 1 + .../{Settings => Manage}/Bank/Index.razor | 3 +- .../Bank/MutateBank.razor | 0 .../{Settings => Manage}/Category/Index.razor | 3 +- .../Category/MutateCategory.razor | 0 .../{Settings => Manage}/Company/Index.razor | 3 +- .../Company/MutateCompany.razor | 0 .../{Settings => Manage}/Currency/Index.razor | 3 +- .../Currency/MutateCurrency.razor | 0 .../{Settings => Manage}/Domains/Index.razor | 3 +- .../Domains/MutateDomain.razor | 0 src/Web/Components/Pages/Manage/Index.razor | 10 +++++ .../Pages/Manage/ManageLayout.razor | 39 +++++++++++++++++++ .../{Settings => Manage}/Teams/Index.razor | 3 +- .../Teams/MutateTeam.razor | 0 src/Web/Components/Shared/NavMenu.razor | 12 +----- 16 files changed, 64 insertions(+), 16 deletions(-) rename src/Web/Components/Pages/{Settings => Manage}/Bank/Index.razor (98%) rename src/Web/Components/Pages/{Settings => Manage}/Bank/MutateBank.razor (100%) rename src/Web/Components/Pages/{Settings => Manage}/Category/Index.razor (98%) rename src/Web/Components/Pages/{Settings => Manage}/Category/MutateCategory.razor (100%) rename src/Web/Components/Pages/{Settings => Manage}/Company/Index.razor (98%) rename src/Web/Components/Pages/{Settings => Manage}/Company/MutateCompany.razor (100%) rename src/Web/Components/Pages/{Settings => Manage}/Currency/Index.razor (98%) rename src/Web/Components/Pages/{Settings => Manage}/Currency/MutateCurrency.razor (100%) rename src/Web/Components/Pages/{Settings => Manage}/Domains/Index.razor (98%) rename src/Web/Components/Pages/{Settings => Manage}/Domains/MutateDomain.razor (100%) create mode 100644 src/Web/Components/Pages/Manage/Index.razor create mode 100644 src/Web/Components/Pages/Manage/ManageLayout.razor rename src/Web/Components/Pages/{Settings => Manage}/Teams/Index.razor (98%) rename src/Web/Components/Pages/{Settings => Manage}/Teams/MutateTeam.razor (100%) diff --git a/src/Web/Components/Pages/Account/Index.razor b/src/Web/Components/Pages/Account/Index.razor index 2a143b42..55ea50f8 100644 --- a/src/Web/Components/Pages/Account/Index.razor +++ b/src/Web/Components/Pages/Account/Index.razor @@ -1,5 +1,6 @@ @page "/app/account" @inject Navigation Nav +@layout Layout @code { protected override void OnInitialized() { diff --git a/src/Web/Components/Pages/Settings/Bank/Index.razor b/src/Web/Components/Pages/Manage/Bank/Index.razor similarity index 98% rename from src/Web/Components/Pages/Settings/Bank/Index.razor rename to src/Web/Components/Pages/Manage/Bank/Index.razor index 75dc8cac..08707bb4 100644 --- a/src/Web/Components/Pages/Settings/Bank/Index.razor +++ b/src/Web/Components/Pages/Manage/Bank/Index.razor @@ -1,7 +1,8 @@ @using XClaim.Common.Dtos @using XClaim.Common.Helpers +@layout ManageLayout @inject IBankService Http -@page "/app/settings/banks" +@page "/app/manage/banks" @attribute [Authorize(Roles = "System")] @code { diff --git a/src/Web/Components/Pages/Settings/Bank/MutateBank.razor b/src/Web/Components/Pages/Manage/Bank/MutateBank.razor similarity index 100% rename from src/Web/Components/Pages/Settings/Bank/MutateBank.razor rename to src/Web/Components/Pages/Manage/Bank/MutateBank.razor diff --git a/src/Web/Components/Pages/Settings/Category/Index.razor b/src/Web/Components/Pages/Manage/Category/Index.razor similarity index 98% rename from src/Web/Components/Pages/Settings/Category/Index.razor rename to src/Web/Components/Pages/Manage/Category/Index.razor index 23d3c7c2..5ed6c118 100644 --- a/src/Web/Components/Pages/Settings/Category/Index.razor +++ b/src/Web/Components/Pages/Manage/Category/Index.razor @@ -1,7 +1,8 @@ @using XClaim.Common.Dtos @using XClaim.Common.Helpers +@layout ManageLayout @inject ICategoryService Http -@page "/app/settings/category" +@page "/app/manage/category" @attribute [Authorize(Roles = "System, Administrator")] @code { diff --git a/src/Web/Components/Pages/Settings/Category/MutateCategory.razor b/src/Web/Components/Pages/Manage/Category/MutateCategory.razor similarity index 100% rename from src/Web/Components/Pages/Settings/Category/MutateCategory.razor rename to src/Web/Components/Pages/Manage/Category/MutateCategory.razor diff --git a/src/Web/Components/Pages/Settings/Company/Index.razor b/src/Web/Components/Pages/Manage/Company/Index.razor similarity index 98% rename from src/Web/Components/Pages/Settings/Company/Index.razor rename to src/Web/Components/Pages/Manage/Company/Index.razor index 3be40e84..06ef5c79 100644 --- a/src/Web/Components/Pages/Settings/Company/Index.razor +++ b/src/Web/Components/Pages/Manage/Company/Index.razor @@ -1,7 +1,8 @@ @using XClaim.Common.Dtos @using XClaim.Common.Helpers +@layout ManageLayout @inject ICompanyService Http -@page "/app/settings/companies" +@page "/app/manage/companies" @attribute [Authorize(Roles = "System")] @code { diff --git a/src/Web/Components/Pages/Settings/Company/MutateCompany.razor b/src/Web/Components/Pages/Manage/Company/MutateCompany.razor similarity index 100% rename from src/Web/Components/Pages/Settings/Company/MutateCompany.razor rename to src/Web/Components/Pages/Manage/Company/MutateCompany.razor diff --git a/src/Web/Components/Pages/Settings/Currency/Index.razor b/src/Web/Components/Pages/Manage/Currency/Index.razor similarity index 98% rename from src/Web/Components/Pages/Settings/Currency/Index.razor rename to src/Web/Components/Pages/Manage/Currency/Index.razor index f6b17619..6819c44f 100644 --- a/src/Web/Components/Pages/Settings/Currency/Index.razor +++ b/src/Web/Components/Pages/Manage/Currency/Index.razor @@ -1,7 +1,8 @@ @using XClaim.Common.Dtos @using XClaim.Common.Helpers +@layout ManageLayout @inject ICurrencyService Http -@page "/app/settings/currency" +@page "/app/manage/currency" @attribute [Authorize(Roles = "System")] @code { diff --git a/src/Web/Components/Pages/Settings/Currency/MutateCurrency.razor b/src/Web/Components/Pages/Manage/Currency/MutateCurrency.razor similarity index 100% rename from src/Web/Components/Pages/Settings/Currency/MutateCurrency.razor rename to src/Web/Components/Pages/Manage/Currency/MutateCurrency.razor diff --git a/src/Web/Components/Pages/Settings/Domains/Index.razor b/src/Web/Components/Pages/Manage/Domains/Index.razor similarity index 98% rename from src/Web/Components/Pages/Settings/Domains/Index.razor rename to src/Web/Components/Pages/Manage/Domains/Index.razor index ed51f1fe..132fdfdd 100644 --- a/src/Web/Components/Pages/Settings/Domains/Index.razor +++ b/src/Web/Components/Pages/Manage/Domains/Index.razor @@ -1,7 +1,8 @@ @using XClaim.Common.Dtos @using XClaim.Common.Helpers +@layout ManageLayout @inject IDomainService Http -@page "/app/settings/domains" +@page "/app/manage/domains" @attribute [Authorize(Roles = "System")] @code { diff --git a/src/Web/Components/Pages/Settings/Domains/MutateDomain.razor b/src/Web/Components/Pages/Manage/Domains/MutateDomain.razor similarity index 100% rename from src/Web/Components/Pages/Settings/Domains/MutateDomain.razor rename to src/Web/Components/Pages/Manage/Domains/MutateDomain.razor diff --git a/src/Web/Components/Pages/Manage/Index.razor b/src/Web/Components/Pages/Manage/Index.razor new file mode 100644 index 00000000..982f3e79 --- /dev/null +++ b/src/Web/Components/Pages/Manage/Index.razor @@ -0,0 +1,10 @@ +@page "/app/manage" +@inject Navigation Nav +@layout ManageLayout + +@code { + protected override void OnInitialized() { + base.OnInitialized(); + Nav.NavigateTo("/app/manage/teams"); + } +} \ No newline at end of file diff --git a/src/Web/Components/Pages/Manage/ManageLayout.razor b/src/Web/Components/Pages/Manage/ManageLayout.razor new file mode 100644 index 00000000..92675c53 --- /dev/null +++ b/src/Web/Components/Pages/Manage/ManageLayout.razor @@ -0,0 +1,39 @@ +@inherits LayoutComponentBase +@layout MainLayout +@inject NavigationManager Nav + +@code { + private int TabState { get; set; } + + private record ManagePage(string Title, string Path, string Icon = Icons.Material.Filled.Settings); + + private readonly List _pages = new List() { + new ManagePage("Teams", "app/manage/teams", Icons.Material.Filled.Groups), + new ManagePage("Category", "app/manage/category", Icons.Material.Filled.Category), + new ManagePage("Companies", "app/manage/companies", Icons.Material.Filled.PendingActions), + new ManagePage("Banks", "app/manage/banks", Icons.Material.Filled.Money), + new ManagePage("Domains", "app/manage/domains", Icons.Material.Filled.Computer), + new ManagePage("Currency", "app/manage/currency", Icons.Material.Filled.CurrencyExchange), + }; + + private void TriggerNavigation(ManagePage page) { + TabState = _pages.IndexOf(page); + Nav.NavigateTo(page.Path); + } + + protected override void OnInitialized() { + base.OnInitialized(); + var page = _pages.Find(x => Nav.ToAbsoluteUri(x.Path).ToString() == Nav.Uri); + if (page == null) return; + TabState = _pages.IndexOf(page); + } +} + + + @foreach (var tab in _pages) { + + } + + + @Body + diff --git a/src/Web/Components/Pages/Settings/Teams/Index.razor b/src/Web/Components/Pages/Manage/Teams/Index.razor similarity index 98% rename from src/Web/Components/Pages/Settings/Teams/Index.razor rename to src/Web/Components/Pages/Manage/Teams/Index.razor index db65bf47..aa9c2844 100644 --- a/src/Web/Components/Pages/Settings/Teams/Index.razor +++ b/src/Web/Components/Pages/Manage/Teams/Index.razor @@ -1,7 +1,8 @@ @using XClaim.Common.Dtos @using XClaim.Common.Helpers +@layout ManageLayout @inject ITeamService Http -@page "/app/settings/teams" +@page "/app/manage/teams" @attribute [Authorize(Roles = "System, Administrator")] @code { diff --git a/src/Web/Components/Pages/Settings/Teams/MutateTeam.razor b/src/Web/Components/Pages/Manage/Teams/MutateTeam.razor similarity index 100% rename from src/Web/Components/Pages/Settings/Teams/MutateTeam.razor rename to src/Web/Components/Pages/Manage/Teams/MutateTeam.razor diff --git a/src/Web/Components/Shared/NavMenu.razor b/src/Web/Components/Shared/NavMenu.razor index 49d20f8a..38e4929a 100644 --- a/src/Web/Components/Shared/NavMenu.razor +++ b/src/Web/Components/Shared/NavMenu.razor @@ -11,7 +11,7 @@ record MenuLink(string Title, string Icon, string Path, List? Child = null); - private List _links = new() { + private List _links = new List { new MenuLink("Overview", Icons.Material.Filled.Dashboard, "/app/overview"), new MenuLink("Claims", Icons.Material.Filled.Money, "/app/claims"), new MenuLink("Payments", Icons.Material.Filled.CreditCard, "/app/payments"), @@ -21,15 +21,7 @@ private List _secondaryLinks = new List { new MenuLink("Users", Icons.Material.Filled.People, "/app/users"), - new MenuLink("Manage", Icons.Material.Filled.ManageAccounts, "/app/settings/", - new List { - new MenuLink("Teams", Icons.Material.Filled.Groups, "/app/settings/teams"), - new MenuLink("Category", Icons.Material.Filled.Category, "/app/settings/category"), - new MenuLink("Companies", Icons.Material.Filled.PendingActions, "/app/settings/companies"), - new MenuLink("Banks", Icons.Material.Filled.Money, "/app/settings/banks"), - new MenuLink("Domains", Icons.Material.Filled.Computer, "/app/settings/domains"), - new MenuLink("Currency", Icons.Material.Filled.CurrencyExchange, "/app/settings/currency") - }) + new MenuLink("Manage", Icons.Material.Filled.SettingsApplications, "/app/manage") }; async Task SignOut() => await AuthState.TriggerSignOut(); From 96551531eb1ef745da41af19eea57050f7ffb060 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Fri, 3 Feb 2023 16:20:49 +0100 Subject: [PATCH 105/185] Improve un-authorized page --- src/Web/Client/App.razor | 1 + src/Web/Components/Shared/NotAuthorized.razor | 12 +++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/Web/Client/App.razor b/src/Web/Client/App.razor index 07edfe0b..f9126cc4 100644 --- a/src/Web/Client/App.razor +++ b/src/Web/Client/App.razor @@ -17,6 +17,7 @@ if (AppState.ServerState == null) { var server = await ServerService.GetAsync(); await AppState.LoadServerState(server.Data!); + await AuthState.Refresh(); } if (isAuth) { diff --git a/src/Web/Components/Shared/NotAuthorized.razor b/src/Web/Components/Shared/NotAuthorized.razor index 6c32e51d..49aaea3d 100644 --- a/src/Web/Components/Shared/NotAuthorized.razor +++ b/src/Web/Components/Shared/NotAuthorized.razor @@ -1,12 +1,18 @@ -@inject NavigationManager Nav +@inject Navigation Nav @code { - private void BackHome() => Nav.NavigateTo(WebConst.AppHome); + private void BackHome() { + if(Nav.CanNavigateBack) + Nav.NavigateBack(); + else + Nav.NavigateTo(WebConst.AppHome); + } } Role Not Authorized - Home + @( Nav.CanNavigateBack ? "Back" : "Home") \ No newline at end of file From 948c9f763ca997356ab141fba6fb11600b8f24cd Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Fri, 3 Feb 2023 16:26:02 +0100 Subject: [PATCH 106/185] Fix unecessary state reload state --- src/Web/Client/App.razor | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/Web/Client/App.razor b/src/Web/Client/App.razor index f9126cc4..9f4f6d1b 100644 --- a/src/Web/Client/App.razor +++ b/src/Web/Client/App.razor @@ -18,16 +18,15 @@ var server = await ServerService.GetAsync(); await AppState.LoadServerState(server.Data!); await AuthState.Refresh(); - } - - if (isAuth) { - var user = await AuthState.GetAccount(); - if (user != null) { - var lightMode = user.Setting?.DarkMode ?? false; - ThemeState.SetLightMode(!lightMode); + if (isAuth) { + var user = await AuthState.GetAccount(); + if (user != null) { + var lightMode = user.Setting?.DarkMode ?? false; + ThemeState.SetLightMode(!lightMode); + } } } - + switch (isAuth) { case true when !session!.Confirmed && !isRegistrationPath: Nav.NavigateTo(WebConst.AppRegister, true); From 17a96951a06bcdd3c9a543657000ee203a57c56d Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Fri, 3 Feb 2023 16:29:08 +0100 Subject: [PATCH 107/185] Update Index.razor --- src/Web/Components/Pages/Settings/Index.razor | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Web/Components/Pages/Settings/Index.razor b/src/Web/Components/Pages/Settings/Index.razor index d1bd141f..d8cc163e 100644 --- a/src/Web/Components/Pages/Settings/Index.razor +++ b/src/Web/Components/Pages/Settings/Index.razor @@ -1,14 +1,15 @@ -@inject NavigationManager Nav +@inject Navigation Nav @page "/app/settings" @attribute [Authorize] Settings @code { - protected override void OnInitialized() { base.OnInitialized(); - Nav.NavigateTo("/app/settings/teams"); + if(Nav.CanNavigateBack) + Nav.NavigateBack(); + else + Nav.NavigateTo(WebConst.AppHome); } - } \ No newline at end of file From 2399b0f7b61048739d00f818793408dc3bbee0d0 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Fri, 3 Feb 2023 19:45:41 +0100 Subject: [PATCH 108/185] Added user transfer request service --- src/Common/Dtos/TransferRequestResponse.cs | 8 ++ src/Web/Server/Data/DbInitializer.cs | 1 - src/Web/Server/Data/ServerContext.cs | 1 + .../Server/Entities/TransferRequestEntity.cs | 9 ++ src/Web/Server/MapperProfile.cs | 1 + .../Modules/ProfileModule/IProfileService.cs | 1 - .../Server/Modules/UserModule/IUserService.cs | 5 + .../UserModule/TransferRequestFilter.cs | 14 ++ .../Server/Modules/UserModule/UserModule.cs | 24 ++++ .../Server/Modules/UserModule/UserService.cs | 134 +++++++++++++++++- 10 files changed, 193 insertions(+), 5 deletions(-) create mode 100644 src/Common/Dtos/TransferRequestResponse.cs create mode 100644 src/Web/Server/Entities/TransferRequestEntity.cs create mode 100644 src/Web/Server/Modules/UserModule/TransferRequestFilter.cs diff --git a/src/Common/Dtos/TransferRequestResponse.cs b/src/Common/Dtos/TransferRequestResponse.cs new file mode 100644 index 00000000..e1f48e91 --- /dev/null +++ b/src/Common/Dtos/TransferRequestResponse.cs @@ -0,0 +1,8 @@ +using XClaim.Common.Base; + +namespace XClaim.Common.Dtos; + +public class TransferRequestResponse : BaseResponse { + public UserResponse? User { get; set; } + public Guid? UserId { get; set; } +} \ No newline at end of file diff --git a/src/Web/Server/Data/DbInitializer.cs b/src/Web/Server/Data/DbInitializer.cs index ca7cfd8c..3a906ce0 100644 --- a/src/Web/Server/Data/DbInitializer.cs +++ b/src/Web/Server/Data/DbInitializer.cs @@ -1,7 +1,6 @@ using Microsoft.EntityFrameworkCore; using SourceExpress.ShorterGuid; using XClaim.Common; -using XClaim.Common.Enums; using XClaim.Web.Server.Entities; namespace XClaim.Web.Server.Data; diff --git a/src/Web/Server/Data/ServerContext.cs b/src/Web/Server/Data/ServerContext.cs index 30139652..4d64c27e 100644 --- a/src/Web/Server/Data/ServerContext.cs +++ b/src/Web/Server/Data/ServerContext.cs @@ -60,4 +60,5 @@ protected override void OnModelCreating(ModelBuilder mx) { public DbSet Claims { get; set; } = default!; public DbSet Files { get; set; } = default!; public DbSet Payments { get; set; } = default!; + public DbSet TransferRequests { get; set; } = default!; } \ No newline at end of file diff --git a/src/Web/Server/Entities/TransferRequestEntity.cs b/src/Web/Server/Entities/TransferRequestEntity.cs new file mode 100644 index 00000000..23a1ea37 --- /dev/null +++ b/src/Web/Server/Entities/TransferRequestEntity.cs @@ -0,0 +1,9 @@ +using XClaim.Common.Base; + +namespace XClaim.Web.Server.Entities; + +public class TransferRequestEntity : BaseEntity { + public UserEntity? User { get; set; } + public Guid? UserId { get; set; } + public bool Completed { get; set; } +} \ No newline at end of file diff --git a/src/Web/Server/MapperProfile.cs b/src/Web/Server/MapperProfile.cs index 2790bde2..f48cd52f 100644 --- a/src/Web/Server/MapperProfile.cs +++ b/src/Web/Server/MapperProfile.cs @@ -25,6 +25,7 @@ public MapperProfile() { CreateMap().ReverseMap(); CreateMap().ReverseMap(); CreateMap().ReverseMap(); + CreateMap().ReverseMap(); CreateMap().ReverseMap(); } } \ No newline at end of file diff --git a/src/Web/Server/Modules/ProfileModule/IProfileService.cs b/src/Web/Server/Modules/ProfileModule/IProfileService.cs index 0db0bb12..ea58e5d7 100644 --- a/src/Web/Server/Modules/ProfileModule/IProfileService.cs +++ b/src/Web/Server/Modules/ProfileModule/IProfileService.cs @@ -7,7 +7,6 @@ public interface IProfileService { Task> GetAccountAsync(); Task> GetBankAccountAsync(); Task> UpdateBankAccountAsync(BankAccountResponse account); - Task> GetSettingAsync(); Task> UpdateSettingAsync(SettingResponse setting); diff --git a/src/Web/Server/Modules/UserModule/IUserService.cs b/src/Web/Server/Modules/UserModule/IUserService.cs index 35a847b6..bef684a5 100644 --- a/src/Web/Server/Modules/UserModule/IUserService.cs +++ b/src/Web/Server/Modules/UserModule/IUserService.cs @@ -6,4 +6,9 @@ namespace XClaim.Web.Server.Modules.UserModule; public interface IUserService { public Task> GetByEmailAsync(string email); public Task>> GetAllAsync(UserFilter responseFilter); + Task> GetTransferAsync(); + Task> CreateTransferAsync(); + Task>> GetAllTransferAsync(TransferRequestFilter filter); + Task> ApproveTransferAsync(TransferRequestResponse transfer); + Task> ArchiveTransferAsync(Guid id); } \ No newline at end of file diff --git a/src/Web/Server/Modules/UserModule/TransferRequestFilter.cs b/src/Web/Server/Modules/UserModule/TransferRequestFilter.cs new file mode 100644 index 00000000..44d024c0 --- /dev/null +++ b/src/Web/Server/Modules/UserModule/TransferRequestFilter.cs @@ -0,0 +1,14 @@ +using AutoFilterer.Attributes; +using AutoFilterer.Enums; +using XClaim.Web.Server.Entities; +using XClaim.Web.Server.Modules; + +public sealed class TransferRequestFilter : GenericFilter { + [CompareTo(nameof(TransferRequestEntity.CreatedAt))] + [OperatorComparison(OperatorType.GreaterThanOrEqual)] + public DateTime? StartDate { get; set; } + + [CompareTo(nameof(TransferRequestEntity.CreatedAt))] + [OperatorComparison(OperatorType.LessThanOrEqual)] + public DateTime? EndDate { get; set; } +} \ No newline at end of file diff --git a/src/Web/Server/Modules/UserModule/UserModule.cs b/src/Web/Server/Modules/UserModule/UserModule.cs index 1aa9a2c7..d6187e99 100644 --- a/src/Web/Server/Modules/UserModule/UserModule.cs +++ b/src/Web/Server/Modules/UserModule/UserModule.cs @@ -49,6 +49,30 @@ await sv.GetAllAsync(filter)) var items = await sv.DeleteRangeAsync(ids); return !items.Succeeded ? Results.NotFound(items) : TypedResults.Ok(items); }).WithName($"RangeArchive{name}").WithOpenApi(); + + group.MapGet("/transfer/profile", async (UserService sv) => { + var result = await sv.GetTransferAsync(); + return !result.Succeeded ? Results.NotFound(result) : TypedResults.Ok(result); + }).WithName($"Get{name}Transfer").WithOpenApi(); + + group.MapGet("/transfer", async (UserService sv, [AsParameters] TransferRequestFilter filter) => { + var result = await sv.GetAllTransferAsync(filter); + return !result.Succeeded ? Results.NotFound() : TypedResults.Ok(result); + }).WithName($"Get{name}TransferList").WithOpenApi(); + + group.MapPost("/transfer", async (UserService sv) => + await sv.CreateTransferAsync()) + .WithName($"Create{name}Transfer").WithOpenApi(); + + group.MapPut("/transfer", async (TransferRequestResponse value, UserService sv) => { + var result = await sv.ApproveTransferAsync(value); + return !result.Succeeded ? Results.NotFound() : TypedResults.Ok(result); + }).WithName($"Update{name}Transfer").WithOpenApi(); + + group.MapDelete("/transfer/{id:guid}", async (Guid id, UserService sv) => { + var item = await sv.ArchiveTransferAsync(id); + return !item.Succeeded ? Results.NotFound(item) : TypedResults.Ok(item); + }).WithName($"Archive{name}Transfer").WithOpenApi(); return group; } diff --git a/src/Web/Server/Modules/UserModule/UserService.cs b/src/Web/Server/Modules/UserModule/UserService.cs index 5aa4705d..689de47a 100644 --- a/src/Web/Server/Modules/UserModule/UserService.cs +++ b/src/Web/Server/Modules/UserModule/UserService.cs @@ -16,6 +16,12 @@ public sealed class UserService : GenericService logger, IdentityHelper identity) : base(ctx, mapper, logger) { _identity = identity; } + + private async Task GetId() { + var profile = await _identity.GetUser(); + return profile!.Id; + } + public async Task> GetByEmailAsync(string email) { var item = await _ctx.Users .Where(x => x.DeletedAt == null) @@ -56,10 +62,10 @@ public async Task>> GetAllAsync(UserFilter resp var current = await _identity.GetUser(); // INFO: Return an error to normal users if (current!.Permission > UserPermission.Administrator) return result; - var isAdmin = current!.Permission == UserPermission.Administrator; + var isAdmin = current.Permission == UserPermission.Administrator; var query = _ctx.Users // INFO: Limits admins to their company and haide system mangers. - .Where(x => !isAdmin || x.CompanyId == current!.CompanyId && x.Permission != UserPermission.System ) + .Where(x => !isAdmin || x.CompanyId == current.CompanyId && x.Permission != UserPermission.System ) .Include(x => x.Company) .Include(x => x.Team); @@ -109,7 +115,7 @@ public async Task>> GetAllAsync(UserFilter resp var response = new Response(); try { var item = _mapper.Map(value); - item.Identifier = _identity!.NameIdentifier!; + item.Identifier = _identity.NameIdentifier!; item.Active = true; var isAdmin = (await _ctx.Users.CountAsync(x => x.Permission == UserPermission.System)) < 1; if (isAdmin) item.Permission = UserPermission.System; @@ -127,4 +133,126 @@ public async Task>> GetAllAsync(UserFilter resp return response; } + + private async Task GetTransfer() { + try { + var id = await this.GetId(); + if (id == null) return null; + return await _ctx.TransferRequests.Where(x => x.UserId == id && x.Completed == false) + .Include(x => x.User) + .AsNoTracking() + .FirstOrDefaultAsync(); + } + catch (Exception) { + // ignore + } + + return null; + } + + public async Task> GetTransferAsync() { + var response = new Response(); + try { + var transfer = await this.GetTransfer(); + if (transfer != null) { + var data = _mapper.Map(transfer); + response.Data = data; + } + response.Succeeded = true; + } catch (Exception e) { + response.Errors = new[] { e.ToString() }; + _logger.LogError(e.ToString()); + } + + return response; + } + + public async Task> CreateTransferAsync() { + var response = new Response(); + try { + var id = await this.GetId(); + if (id != null) { + var item = new TransferRequestEntity { UserId = id, Completed = false }; + await _ctx.TransferRequests.AddAsync(item); + await _ctx.SaveChangesAsync(); + var data = _mapper.Map(item); + response = new Response(data!) { + Succeeded = data != null + }; + } + + } catch (Exception e) { + response.Errors = new[] { e.ToString() }; + _logger.LogError(e.ToString()); + } + + return response; + } + + + public async Task>> GetAllTransferAsync(TransferRequestFilter transferFilter) { + var result = new PagedResponse>(); + try { + var query = _ctx.TransferRequests + .Where(x => x.Completed == false) + .Include(x => x.User); + + var count = await query.CountAsync(); + var data = await query.ApplyFilter(transferFilter).ToListAsync(); + var response = _mapper.Map>(data); + var filter = new PaginationFilter { + Page = transferFilter.Page, + PerPage = transferFilter.PerPage + }; + result = new PagedResponse>(response, count, filter) { + Succeeded = true + }; + } + catch (Exception e) { + result.Errors = new[] { + e.ToString() + }; + _logger.LogError(e.ToString()); + } + + return result; + } + + public async Task> ApproveTransferAsync(TransferRequestResponse transfer) { + var response = new Response(); + try { + var item = await _ctx.TransferRequests.FindAsync(transfer.Id); + if (item is null) return response; + _mapper.Map(transfer, item); + _ctx.Update(item); + await _ctx.SaveChangesAsync(); + var data = _mapper.Map(item); + response.Data = data; + response.Succeeded = data != null; + } catch (Exception e) { + response.Errors = new[] { e.ToString() }; + _logger.LogError(e.ToString()); + } + + return response; + } + + public async Task> ArchiveTransferAsync(Guid id) { + var response = new Response(); + try { + var item = await _ctx.TransferRequests.FindAsync(id); + if (item == null) return response; + _ctx.Set().Remove(item); + await _ctx.SaveChangesAsync(); + var data = _mapper.Map(item); + response.Data = data; + response.Succeeded = data != null; + } + catch (Exception e) { + response.Errors = new[] { e.ToString() }; + _logger.LogError(e.ToString()); + } + + return response; + } } \ No newline at end of file From 46425d577f004d75325206a930167447d3a5129f Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Fri, 3 Feb 2023 19:45:59 +0100 Subject: [PATCH 109/185] Discard old migration --- .../20230202213843_Initial.Designer.cs | 1669 ----------------- .../Migrations/20230202213843_Initial.cs | 934 --------- 2 files changed, 2603 deletions(-) delete mode 100644 src/Web/Server/Migrations/20230202213843_Initial.Designer.cs delete mode 100644 src/Web/Server/Migrations/20230202213843_Initial.cs diff --git a/src/Web/Server/Migrations/20230202213843_Initial.Designer.cs b/src/Web/Server/Migrations/20230202213843_Initial.Designer.cs deleted file mode 100644 index 8990fab4..00000000 --- a/src/Web/Server/Migrations/20230202213843_Initial.Designer.cs +++ /dev/null @@ -1,1669 +0,0 @@ -// -using System; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using XClaim.Web.Server.Data; - -#nullable disable - -namespace XClaim.Web.Server.Migrations -{ - [DbContext(typeof(ServerContext))] - [Migration("20230202213843_Initial")] - partial class Initial - { - /// - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder.HasAnnotation("ProductVersion", "7.0.2"); - - modelBuilder.Entity("XClaim.Web.Server.Entities.BankAccountEntity", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("TEXT") - .HasColumnName("id"); - - b.Property("BankId") - .HasColumnType("TEXT") - .HasColumnName("bank_id"); - - b.Property("CreatedAt") - .HasColumnType("TEXT") - .HasColumnName("created_at"); - - b.Property("DeletedAt") - .HasColumnType("TEXT") - .HasColumnName("deleted_at"); - - b.Property("Description") - .HasMaxLength(1024) - .HasColumnType("TEXT") - .HasColumnName("description"); - - b.Property("FullName") - .IsRequired() - .HasColumnType("TEXT") - .HasColumnName("full_name"); - - b.Property("ModifiedAt") - .HasColumnType("TEXT") - .HasColumnName("modified_at"); - - b.Property("Number") - .IsRequired() - .HasMaxLength(20) - .HasColumnType("TEXT") - .HasColumnName("number"); - - b.Property("OwnerId") - .HasColumnType("TEXT") - .HasColumnName("owner_id"); - - b.HasKey("Id") - .HasName("pk_user_bank_account"); - - b.HasIndex("BankId") - .HasDatabaseName("ix_user_bank_account_bank_id"); - - b.HasIndex("DeletedAt") - .HasDatabaseName("ix_user_bank_account_deleted_at"); - - b.HasIndex("OwnerId") - .IsUnique() - .HasDatabaseName("ix_user_bank_account_owner_id"); - - b.ToTable("user_bank_account", (string)null); - }); - - modelBuilder.Entity("XClaim.Web.Server.Entities.BankEntity", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("TEXT") - .HasColumnName("id"); - - b.Property("Active") - .HasColumnType("INTEGER") - .HasColumnName("active"); - - b.Property("CreatedAt") - .HasColumnType("TEXT") - .HasColumnName("created_at"); - - b.Property("DeletedAt") - .HasColumnType("TEXT") - .HasColumnName("deleted_at"); - - b.Property("Description") - .IsRequired() - .HasColumnType("TEXT") - .HasColumnName("description"); - - b.Property("ModifiedAt") - .HasColumnType("TEXT") - .HasColumnName("modified_at"); - - b.Property("Name") - .IsRequired() - .HasMaxLength(128) - .HasColumnType("TEXT") - .HasColumnName("name"); - - b.Property("SwiftCode") - .IsRequired() - .HasColumnType("TEXT") - .HasColumnName("swift_code"); - - b.HasKey("Id") - .HasName("pk_banks"); - - b.HasIndex("DeletedAt") - .HasDatabaseName("ix_banks_deleted_at"); - - b.HasIndex("Name") - .IsUnique() - .HasDatabaseName("ix_banks_name"); - - b.ToTable("banks", (string)null); - - b.HasData( - new - { - Id = new Guid("dcb125d2-1d42-4b01-bc2c-a7863e708a47"), - Active = false, - CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), - Description = "", - Name = "GT Bank", - SwiftCode = "" - }, - new - { - Id = new Guid("1771e448-891d-43c4-a0aa-3784803e9af1"), - Active = false, - CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), - Description = "", - Name = "Zenith Bank", - SwiftCode = "" - }, - new - { - Id = new Guid("dbb5aa84-e727-4b03-b18f-80315d2a18b4"), - Active = false, - CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), - Description = "", - Name = "First Bank", - SwiftCode = "" - }, - new - { - Id = new Guid("3ce65741-39ef-4ca8-bc85-4afee4800a07"), - Active = false, - CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), - Description = "", - Name = "Access Bank", - SwiftCode = "" - }, - new - { - Id = new Guid("4a12f06b-352d-4786-899f-52ea979cc65c"), - Active = false, - CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), - Description = "", - Name = "Fidelity Bank", - SwiftCode = "" - }, - new - { - Id = new Guid("195fc39b-4791-41b7-9d9e-d9c31dcbe884"), - Active = false, - CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), - Description = "", - Name = "First City Monument Bank", - SwiftCode = "" - }, - new - { - Id = new Guid("de625d37-6628-47d3-8656-6d457ca1b151"), - Active = false, - CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), - Description = "", - Name = "Union Bank of Nigeria", - SwiftCode = "" - }, - new - { - Id = new Guid("8b98faad-c950-4adc-ac13-4577c3e7d616"), - Active = false, - CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), - Description = "", - Name = "United Bank for Africa", - SwiftCode = "" - }, - new - { - Id = new Guid("ac444cc9-93c2-4b90-b7a4-cb759fe9bb1a"), - Active = false, - CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), - Description = "", - Name = "Sterling Bank", - SwiftCode = "" - }, - new - { - Id = new Guid("8f2fdbbc-c992-4f57-86bf-167633c491fb"), - Active = false, - CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), - Description = "", - Name = "Wema Bank", - SwiftCode = "" - }, - new - { - Id = new Guid("bcb4a992-7936-4126-9bba-602b0f0f979f"), - Active = false, - CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), - Description = "", - Name = "Stanbic IBTC Bank", - SwiftCode = "" - }, - new - { - Id = new Guid("01cb6bc8-b3a7-4a9f-8c25-37885fbd1ada"), - Active = false, - CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), - Description = "", - Name = "Polaris Bank Limited", - SwiftCode = "" - }, - new - { - Id = new Guid("2e6fa8fd-49ca-450d-a85d-54df1055816e"), - Active = false, - CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), - Description = "", - Name = "Keystone Bank Limited", - SwiftCode = "" - }); - }); - - modelBuilder.Entity("XClaim.Web.Server.Entities.CategoryEntity", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("TEXT") - .HasColumnName("id"); - - b.Property("Active") - .HasColumnType("INTEGER") - .HasColumnName("active"); - - b.Property("CompanyId") - .HasColumnType("TEXT") - .HasColumnName("company_id"); - - b.Property("CreatedAt") - .HasColumnType("TEXT") - .HasColumnName("created_at"); - - b.Property("DeletedAt") - .HasColumnType("TEXT") - .HasColumnName("deleted_at"); - - b.Property("Description") - .HasMaxLength(1024) - .HasColumnType("TEXT") - .HasColumnName("description"); - - b.Property("Icon") - .HasMaxLength(64) - .HasColumnType("TEXT") - .HasColumnName("icon"); - - b.Property("ModifiedAt") - .HasColumnType("TEXT") - .HasColumnName("modified_at"); - - b.Property("Name") - .IsRequired() - .HasMaxLength(128) - .HasColumnType("TEXT") - .HasColumnName("name"); - - b.HasKey("Id") - .HasName("pk_categories"); - - b.HasIndex("CompanyId") - .HasDatabaseName("ix_categories_company_id"); - - b.HasIndex("DeletedAt") - .HasDatabaseName("ix_categories_deleted_at"); - - b.ToTable("categories", (string)null); - - b.HasData( - new - { - Id = new Guid("8db67707-4665-43b0-b26f-cfca391aa4b0"), - Active = false, - CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), - Description = "", - Icon = "", - Name = "General Fuelling" - }, - new - { - Id = new Guid("8286de04-35da-48fa-9fd3-9a90910c54aa"), - Active = false, - CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), - Description = "", - Icon = "", - Name = "Internet Service" - }, - new - { - Id = new Guid("4197d752-02d5-450a-9d3c-6fa44489d97d"), - Active = false, - CompanyId = new Guid("3de60ed7-4c83-43d9-ac34-21c18e849b8f"), - CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), - Description = "", - Icon = "", - Name = "BHN - Weekly meeting expense" - }, - new - { - Id = new Guid("64c7b903-12e5-4168-96fd-026a1a67f73f"), - Active = false, - CompanyId = new Guid("15539941-c7e7-45d4-b86e-05b5991f6215"), - CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), - Description = "", - Icon = "", - Name = "MCPL - Monthly training expense" - }); - }); - - modelBuilder.Entity("XClaim.Web.Server.Entities.ClaimEntity", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("TEXT") - .HasColumnName("id"); - - b.Property("Amount") - .HasColumnType("TEXT") - .HasColumnName("amount"); - - b.Property("ApprovedAt") - .HasColumnType("TEXT") - .HasColumnName("approved_at"); - - b.Property("ApprovedById") - .HasColumnType("TEXT") - .HasColumnName("approved_by_id"); - - b.Property("CategoryId") - .IsRequired() - .HasColumnType("TEXT") - .HasColumnName("category_id"); - - b.Property("CompanyId") - .HasColumnType("TEXT") - .HasColumnName("company_id"); - - b.Property("ConfirmedAt") - .HasColumnType("TEXT") - .HasColumnName("confirmed_at"); - - b.Property("ConfirmedById") - .HasColumnType("TEXT") - .HasColumnName("confirmed_by_id"); - - b.Property("CreatedAt") - .HasColumnType("TEXT") - .HasColumnName("created_at"); - - b.Property("DeletedAt") - .HasColumnType("TEXT") - .HasColumnName("deleted_at"); - - b.Property("Description") - .IsRequired() - .HasMaxLength(256) - .HasColumnType("TEXT") - .HasColumnName("description"); - - b.Property("ModifiedAt") - .HasColumnType("TEXT") - .HasColumnName("modified_at"); - - b.Property("Notes") - .HasMaxLength(1024) - .HasColumnType("TEXT") - .HasColumnName("notes"); - - b.Property("OwnerId") - .HasColumnType("TEXT") - .HasColumnName("owner_id"); - - b.Property("PaymentId") - .HasColumnType("TEXT") - .HasColumnName("payment_id"); - - b.Property("Priority") - .HasColumnType("INTEGER") - .HasColumnName("priority"); - - b.Property("ReviewedAt") - .HasColumnType("TEXT") - .HasColumnName("reviewed_at"); - - b.Property("ReviewedById") - .HasColumnType("TEXT") - .HasColumnName("reviewed_by_id"); - - b.Property("Status") - .HasColumnType("INTEGER") - .HasColumnName("status"); - - b.HasKey("Id") - .HasName("pk_claims"); - - b.HasIndex("ApprovedById") - .HasDatabaseName("ix_claims_approved_by_id"); - - b.HasIndex("CategoryId") - .HasDatabaseName("ix_claims_category_id"); - - b.HasIndex("CompanyId") - .HasDatabaseName("ix_claims_company_id"); - - b.HasIndex("ConfirmedById") - .HasDatabaseName("ix_claims_confirmed_by_id"); - - b.HasIndex("DeletedAt") - .HasDatabaseName("ix_claims_deleted_at"); - - b.HasIndex("OwnerId") - .HasDatabaseName("ix_claims_owner_id"); - - b.HasIndex("PaymentId") - .HasDatabaseName("ix_claims_payment_id"); - - b.HasIndex("ReviewedById") - .HasDatabaseName("ix_claims_reviewed_by_id"); - - b.ToTable("claims", (string)null); - }); - - modelBuilder.Entity("XClaim.Web.Server.Entities.CommentEntity", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("TEXT") - .HasColumnName("id"); - - b.Property("ClaimId") - .HasColumnType("TEXT") - .HasColumnName("claim_id"); - - b.Property("Content") - .IsRequired() - .HasMaxLength(1024) - .HasColumnType("TEXT") - .HasColumnName("content"); - - b.Property("CreatedAt") - .HasColumnType("TEXT") - .HasColumnName("created_at"); - - b.Property("DeletedAt") - .HasColumnType("TEXT") - .HasColumnName("deleted_at"); - - b.Property("ModifiedAt") - .HasColumnType("TEXT") - .HasColumnName("modified_at"); - - b.Property("OwnerId") - .IsRequired() - .HasColumnType("TEXT") - .HasColumnName("owner_id"); - - b.Property("PaymentId") - .HasColumnType("TEXT") - .HasColumnName("payment_id"); - - b.HasKey("Id") - .HasName("pk_comments"); - - b.HasIndex("ClaimId") - .HasDatabaseName("ix_comments_claim_id"); - - b.HasIndex("DeletedAt") - .HasDatabaseName("ix_comments_deleted_at"); - - b.HasIndex("OwnerId") - .HasDatabaseName("ix_comments_owner_id"); - - b.HasIndex("PaymentId") - .HasDatabaseName("ix_comments_payment_id"); - - b.ToTable("comments", (string)null); - }); - - modelBuilder.Entity("XClaim.Web.Server.Entities.CompanyEntity", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("TEXT") - .HasColumnName("id"); - - b.Property("Active") - .HasColumnType("INTEGER") - .HasColumnName("active"); - - b.Property("AdminEmail") - .IsRequired() - .HasMaxLength(256) - .HasColumnType("TEXT") - .HasColumnName("admin_email"); - - b.Property("CreatedAt") - .HasColumnType("TEXT") - .HasColumnName("created_at"); - - b.Property("DeletedAt") - .HasColumnType("TEXT") - .HasColumnName("deleted_at"); - - b.Property("FullName") - .IsRequired() - .HasMaxLength(128) - .HasColumnType("TEXT") - .HasColumnName("full_name"); - - b.Property("ManagerId") - .HasColumnType("TEXT") - .HasColumnName("manager_id"); - - b.Property("ModifiedAt") - .HasColumnType("TEXT") - .HasColumnName("modified_at"); - - b.Property("ShortName") - .IsRequired() - .HasMaxLength(64) - .HasColumnType("TEXT") - .HasColumnName("short_name"); - - b.HasKey("Id") - .HasName("pk_companies"); - - b.HasIndex("DeletedAt") - .HasDatabaseName("ix_companies_deleted_at"); - - b.HasIndex("ManagerId") - .IsUnique() - .HasDatabaseName("ix_companies_manager_id"); - - b.ToTable("companies", (string)null); - - b.HasData( - new - { - Id = new Guid("3de60ed7-4c83-43d9-ac34-21c18e849b8f"), - Active = false, - AdminEmail = "", - CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), - FullName = "MCPL LTD - BHN Division", - ShortName = "BHN Logistics" - }, - new - { - Id = new Guid("15539941-c7e7-45d4-b86e-05b5991f6215"), - Active = false, - AdminEmail = "", - CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), - FullName = "Multi Consumer Product LTD", - ShortName = "MCPL LTD" - }, - new - { - Id = new Guid("9f4598fe-bd5d-4e3b-8588-d293df693ba9"), - Active = false, - AdminEmail = "", - CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), - FullName = "Dufil Prima Foods Plc", - ShortName = "Dufil Prima" - }, - new - { - Id = new Guid("84cccd2f-2369-4337-bb89-7495146d8411"), - Active = false, - AdminEmail = "", - CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), - FullName = "X-Claim Instance Management", - ShortName = "X-Claim" - }); - }); - - modelBuilder.Entity("XClaim.Web.Server.Entities.CurrencyEntity", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("TEXT") - .HasColumnName("id"); - - b.Property("Active") - .HasColumnType("INTEGER") - .HasColumnName("active"); - - b.Property("Code") - .IsRequired() - .HasMaxLength(3) - .HasColumnType("TEXT") - .HasColumnName("code"); - - b.Property("CreatedAt") - .HasColumnType("TEXT") - .HasColumnName("created_at"); - - b.Property("DeletedAt") - .HasColumnType("TEXT") - .HasColumnName("deleted_at"); - - b.Property("Description") - .IsRequired() - .HasColumnType("TEXT") - .HasColumnName("description"); - - b.Property("ModifiedAt") - .HasColumnType("TEXT") - .HasColumnName("modified_at"); - - b.Property("Name") - .IsRequired() - .HasColumnType("TEXT") - .HasColumnName("name"); - - b.Property("Rate") - .HasColumnType("TEXT") - .HasColumnName("rate"); - - b.Property("Symbol") - .IsRequired() - .HasMaxLength(1) - .HasColumnType("TEXT") - .HasColumnName("symbol"); - - b.HasKey("Id") - .HasName("pk_currency_entity"); - - b.HasIndex("Code") - .IsUnique() - .HasDatabaseName("ix_currency_entity_code"); - - b.HasIndex("DeletedAt") - .HasDatabaseName("ix_currency_entity_deleted_at"); - - b.HasIndex("Name") - .IsUnique() - .HasDatabaseName("ix_currency_entity_name"); - - b.ToTable("currency_entity", (string)null); - - b.HasData( - new - { - Id = new Guid("62184e4d-9397-459c-9623-1bb02a44419b"), - Active = false, - Code = "NGN", - CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), - Description = "", - Name = "Naira", - Rate = 0m, - Symbol = "₦" - }, - new - { - Id = new Guid("4b2bb3b9-2e37-4942-a499-2c852e5db1c7"), - Active = false, - Code = "USD", - CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), - Description = "", - Name = "US Dollar", - Rate = 0m, - Symbol = "$" - }, - new - { - Id = new Guid("88dddfe8-d318-4868-9bf5-8f267376e3a9"), - Active = false, - Code = "EUR", - CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), - Description = "", - Name = "Euro", - Rate = 0m, - Symbol = "€" - }, - new - { - Id = new Guid("a9161b94-6223-4929-b4ef-bbcd82ba6719"), - Active = false, - Code = "GBP", - CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), - Description = "", - Name = "British Pounds", - Rate = 0m, - Symbol = "£" - }, - new - { - Id = new Guid("85ad4afd-5c60-44ae-b809-170fdaac6b09"), - Active = false, - Code = "INR", - CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), - Description = "", - Name = "Rupee", - Rate = 0m, - Symbol = "₹" - }); - }); - - modelBuilder.Entity("XClaim.Web.Server.Entities.DomainEntity", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("TEXT") - .HasColumnName("id"); - - b.Property("Active") - .HasColumnType("INTEGER") - .HasColumnName("active"); - - b.Property("Address") - .IsRequired() - .HasColumnType("TEXT") - .HasColumnName("address"); - - b.Property("CreatedAt") - .HasColumnType("TEXT") - .HasColumnName("created_at"); - - b.Property("DeletedAt") - .HasColumnType("TEXT") - .HasColumnName("deleted_at"); - - b.Property("Description") - .IsRequired() - .HasColumnType("TEXT") - .HasColumnName("description"); - - b.Property("ModifiedAt") - .HasColumnType("TEXT") - .HasColumnName("modified_at"); - - b.HasKey("Id") - .HasName("pk_domain_entity"); - - b.ToTable("domain_entity", (string)null); - - b.HasData( - new - { - Id = new Guid("e3bfd149-0a86-43f4-9021-81a3d6fea9a2"), - Active = false, - Address = "tolaram.com", - CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), - Description = "" - }, - new - { - Id = new Guid("320655ca-4002-4539-8eab-3ee2dcac1804"), - Active = false, - Address = "dufil.com", - CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), - Description = "" - }, - new - { - Id = new Guid("989e690e-7895-4dbf-93c6-fbb2cca3e632"), - Active = false, - Address = "outlook.com", - CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), - Description = "" - }); - }); - - modelBuilder.Entity("XClaim.Web.Server.Entities.EventEntity", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("TEXT") - .HasColumnName("id"); - - b.Property("ClaimId") - .HasColumnType("TEXT") - .HasColumnName("claim_id"); - - b.Property("CreatedAt") - .HasColumnType("TEXT") - .HasColumnName("created_at"); - - b.Property("DeletedAt") - .HasColumnType("TEXT") - .HasColumnName("deleted_at"); - - b.Property("Description") - .IsRequired() - .HasMaxLength(512) - .HasColumnType("TEXT") - .HasColumnName("description"); - - b.Property("ModifiedAt") - .HasColumnType("TEXT") - .HasColumnName("modified_at"); - - b.Property("PaymentId") - .HasColumnType("TEXT") - .HasColumnName("payment_id"); - - b.Property("Type") - .HasColumnType("INTEGER") - .HasColumnName("type"); - - b.HasKey("Id") - .HasName("pk_events"); - - b.HasIndex("ClaimId") - .HasDatabaseName("ix_events_claim_id"); - - b.HasIndex("DeletedAt") - .HasDatabaseName("ix_events_deleted_at"); - - b.HasIndex("PaymentId") - .HasDatabaseName("ix_events_payment_id"); - - b.ToTable("events", (string)null); - }); - - modelBuilder.Entity("XClaim.Web.Server.Entities.FileEntity", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("TEXT") - .HasColumnName("id"); - - b.Property("ClaimEntityId") - .HasColumnType("TEXT") - .HasColumnName("claim_entity_id"); - - b.Property("CreatedAt") - .HasColumnType("TEXT") - .HasColumnName("created_at"); - - b.Property("DeletedAt") - .HasColumnType("TEXT") - .HasColumnName("deleted_at"); - - b.Property("Extension") - .HasMaxLength(8) - .HasColumnType("TEXT") - .HasColumnName("extension"); - - b.Property("ModifiedAt") - .HasColumnType("TEXT") - .HasColumnName("modified_at"); - - b.Property("Name") - .IsRequired() - .HasMaxLength(256) - .HasColumnType("TEXT") - .HasColumnName("name"); - - b.Property("OwnerId") - .HasColumnType("TEXT") - .HasColumnName("owner_id"); - - b.Property("Path") - .IsRequired() - .HasMaxLength(1024) - .HasColumnType("TEXT") - .HasColumnName("path"); - - b.Property("PaymentEntityId") - .HasColumnType("TEXT") - .HasColumnName("payment_entity_id"); - - b.HasKey("Id") - .HasName("pk_files"); - - b.HasIndex("ClaimEntityId") - .HasDatabaseName("ix_files_claim_entity_id"); - - b.HasIndex("DeletedAt") - .HasDatabaseName("ix_files_deleted_at"); - - b.HasIndex("OwnerId") - .HasDatabaseName("ix_files_owner_id"); - - b.HasIndex("PaymentEntityId") - .HasDatabaseName("ix_files_payment_entity_id"); - - b.ToTable("files", (string)null); - }); - - modelBuilder.Entity("XClaim.Web.Server.Entities.NotificationEntity", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("TEXT") - .HasColumnName("id"); - - b.Property("Channels") - .IsRequired() - .HasColumnType("TEXT") - .HasColumnName("channels"); - - b.Property("CreatedAt") - .HasColumnType("TEXT") - .HasColumnName("created_at"); - - b.Property("DeletedAt") - .HasColumnType("TEXT") - .HasColumnName("deleted_at"); - - b.Property("Disabled") - .HasColumnType("INTEGER") - .HasColumnName("disabled"); - - b.Property("ModifiedAt") - .HasColumnType("TEXT") - .HasColumnName("modified_at"); - - b.Property("OwnerId") - .HasColumnType("TEXT") - .HasColumnName("owner_id"); - - b.Property("Types") - .IsRequired() - .HasColumnType("TEXT") - .HasColumnName("types"); - - b.HasKey("Id") - .HasName("pk_user_notification"); - - b.HasIndex("DeletedAt") - .HasDatabaseName("ix_user_notification_deleted_at"); - - b.HasIndex("OwnerId") - .IsUnique() - .HasDatabaseName("ix_user_notification_owner_id"); - - b.ToTable("user_notification", (string)null); - }); - - modelBuilder.Entity("XClaim.Web.Server.Entities.PaymentEntity", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("TEXT") - .HasColumnName("id"); - - b.Property("Amount") - .HasColumnType("TEXT") - .HasColumnName("amount"); - - b.Property("ConfirmedAt") - .HasColumnType("TEXT") - .HasColumnName("confirmed_at"); - - b.Property("ConfirmedById") - .HasColumnType("TEXT") - .HasColumnName("confirmed_by_id"); - - b.Property("Count") - .HasColumnType("INTEGER") - .HasColumnName("count"); - - b.Property("CreatedAt") - .HasColumnType("TEXT") - .HasColumnName("created_at"); - - b.Property("DeletedAt") - .HasColumnType("TEXT") - .HasColumnName("deleted_at"); - - b.Property("Description") - .HasMaxLength(256) - .HasColumnType("TEXT") - .HasColumnName("description"); - - b.Property("ModifiedAt") - .HasColumnType("TEXT") - .HasColumnName("modified_at"); - - b.Property("Notes") - .HasMaxLength(1024) - .HasColumnType("TEXT") - .HasColumnName("notes"); - - b.Property("OwnerId") - .IsRequired() - .HasColumnType("TEXT") - .HasColumnName("owner_id"); - - b.HasKey("Id") - .HasName("pk_payments"); - - b.HasIndex("ConfirmedById") - .HasDatabaseName("ix_payments_confirmed_by_id"); - - b.HasIndex("DeletedAt") - .HasDatabaseName("ix_payments_deleted_at"); - - b.HasIndex("OwnerId") - .HasDatabaseName("ix_payments_owner_id"); - - b.ToTable("payments", (string)null); - }); - - modelBuilder.Entity("XClaim.Web.Server.Entities.ServerEntity", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("TEXT") - .HasColumnName("id"); - - b.Property("AdminEmail") - .IsRequired() - .HasColumnType("TEXT") - .HasColumnName("admin_email"); - - b.Property("CreatedAt") - .HasColumnType("TEXT") - .HasColumnName("created_at"); - - b.Property("CurrencyId") - .HasColumnType("TEXT") - .HasColumnName("currency_id"); - - b.Property("DeletedAt") - .HasColumnType("TEXT") - .HasColumnName("deleted_at"); - - b.Property("MaintenanceMode") - .HasColumnType("INTEGER") - .HasColumnName("maintenance_mode"); - - b.Property("MaintenanceText") - .IsRequired() - .HasColumnType("TEXT") - .HasColumnName("maintenance_text"); - - b.Property("ModifiedAt") - .HasColumnType("TEXT") - .HasColumnName("modified_at"); - - b.Property("ServiceName") - .IsRequired() - .HasColumnType("TEXT") - .HasColumnName("service_name"); - - b.HasKey("Id") - .HasName("pk_server"); - - b.HasIndex("CurrencyId") - .HasDatabaseName("ix_server_currency_id"); - - b.HasIndex("DeletedAt") - .HasDatabaseName("ix_server_deleted_at"); - - b.ToTable("server", (string)null); - - b.HasData( - new - { - Id = new Guid("ca00807b-625a-48e4-9269-3cbbd890226d"), - AdminEmail = "admin@x-claim.dev", - CreatedAt = new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified), - CurrencyId = new Guid("62184e4d-9397-459c-9623-1bb02a44419b"), - MaintenanceMode = false, - MaintenanceText = "In-Progress", - ServiceName = "X-Claim" - }); - }); - - modelBuilder.Entity("XClaim.Web.Server.Entities.SettingEntity", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("TEXT") - .HasColumnName("id"); - - b.Property("CreatedAt") - .HasColumnType("TEXT") - .HasColumnName("created_at"); - - b.Property("DarkMode") - .HasColumnType("INTEGER") - .HasColumnName("dark_mode"); - - b.Property("DeletedAt") - .HasColumnType("TEXT") - .HasColumnName("deleted_at"); - - b.Property("Language") - .HasColumnType("INTEGER") - .HasColumnName("language"); - - b.Property("ModifiedAt") - .HasColumnType("TEXT") - .HasColumnName("modified_at"); - - b.Property("OwnerId") - .HasColumnType("TEXT") - .HasColumnName("owner_id"); - - b.HasKey("Id") - .HasName("pk_user_setting"); - - b.HasIndex("DeletedAt") - .HasDatabaseName("ix_user_setting_deleted_at"); - - b.HasIndex("OwnerId") - .IsUnique() - .HasDatabaseName("ix_user_setting_owner_id"); - - b.ToTable("user_setting", (string)null); - }); - - modelBuilder.Entity("XClaim.Web.Server.Entities.TeamEntity", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("TEXT") - .HasColumnName("id"); - - b.Property("Active") - .HasColumnType("INTEGER") - .HasColumnName("active"); - - b.Property("CompanyId") - .HasColumnType("TEXT") - .HasColumnName("company_id"); - - b.Property("CreatedAt") - .HasColumnType("TEXT") - .HasColumnName("created_at"); - - b.Property("DeletedAt") - .HasColumnType("TEXT") - .HasColumnName("deleted_at"); - - b.Property("Description") - .IsRequired() - .HasColumnType("TEXT") - .HasColumnName("description"); - - b.Property("ManagerId") - .HasColumnType("TEXT") - .HasColumnName("manager_id"); - - b.Property("ModifiedAt") - .HasColumnType("TEXT") - .HasColumnName("modified_at"); - - b.Property("Name") - .IsRequired() - .HasMaxLength(128) - .HasColumnType("TEXT") - .HasColumnName("name"); - - b.HasKey("Id") - .HasName("pk_teams"); - - b.HasIndex("CompanyId") - .HasDatabaseName("ix_teams_company_id"); - - b.HasIndex("DeletedAt") - .HasDatabaseName("ix_teams_deleted_at"); - - b.HasIndex("ManagerId") - .IsUnique() - .HasDatabaseName("ix_teams_manager_id"); - - b.ToTable("teams", (string)null); - - b.HasData( - new - { - Id = new Guid("0a063653-f0f0-468f-aec8-85bdcfd22c21"), - Active = false, - CompanyId = new Guid("3de60ed7-4c83-43d9-ac34-21c18e849b8f"), - CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), - Description = "", - Name = "Account Dept" - }, - new - { - Id = new Guid("47720f67-9f3d-4cce-b34c-8dc6aa26ddc6"), - Active = false, - CompanyId = new Guid("15539941-c7e7-45d4-b86e-05b5991f6215"), - CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), - Description = "", - Name = "Logistics Dept" - }, - new - { - Id = new Guid("8f08bd2f-148b-410a-8a15-1c826c5a7ede"), - Active = false, - CompanyId = new Guid("9f4598fe-bd5d-4e3b-8588-d293df693ba9"), - CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), - Description = "", - Name = "Packaging Dept" - }); - }); - - modelBuilder.Entity("XClaim.Web.Server.Entities.UserEntity", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("TEXT") - .HasColumnName("id"); - - b.Property("Active") - .HasColumnType("INTEGER") - .HasColumnName("active"); - - b.Property("Balance") - .HasColumnType("TEXT") - .HasColumnName("balance"); - - b.Property("CompanyId") - .HasColumnType("TEXT") - .HasColumnName("company_id"); - - b.Property("CompanyManagedId") - .HasColumnType("TEXT") - .HasColumnName("company_managed_id"); - - b.Property("CreatedAt") - .HasColumnType("TEXT") - .HasColumnName("created_at"); - - b.Property("CurrencyId") - .HasColumnType("TEXT") - .HasColumnName("currency_id"); - - b.Property("DeletedAt") - .HasColumnType("TEXT") - .HasColumnName("deleted_at"); - - b.Property("Email") - .IsRequired() - .HasMaxLength(256) - .HasColumnType("TEXT") - .HasColumnName("email"); - - b.Property("FirstName") - .IsRequired() - .HasMaxLength(128) - .HasColumnType("TEXT") - .HasColumnName("first_name"); - - b.Property("Identifier") - .IsRequired() - .HasColumnType("TEXT") - .HasColumnName("identifier"); - - b.Property("Image") - .HasColumnType("TEXT") - .HasColumnName("image"); - - b.Property("LastName") - .IsRequired() - .HasMaxLength(128) - .HasColumnType("TEXT") - .HasColumnName("last_name"); - - b.Property("ModifiedAt") - .HasColumnType("TEXT") - .HasColumnName("modified_at"); - - b.Property("Permission") - .HasColumnType("INTEGER") - .HasColumnName("permission"); - - b.Property("Phone") - .IsRequired() - .HasMaxLength(64) - .HasColumnType("TEXT") - .HasColumnName("phone"); - - b.Property("ProfileImage") - .HasColumnType("TEXT") - .HasColumnName("profile_image"); - - b.Property("TeamId") - .HasColumnType("TEXT") - .HasColumnName("team_id"); - - b.Property("TeamManagedId") - .HasColumnType("TEXT") - .HasColumnName("team_managed_id"); - - b.Property("Token") - .HasMaxLength(128) - .HasColumnType("TEXT") - .HasColumnName("token"); - - b.HasKey("Id") - .HasName("pk_users"); - - b.HasIndex("CompanyId") - .HasDatabaseName("ix_users_company_id"); - - b.HasIndex("CurrencyId") - .HasDatabaseName("ix_users_currency_id"); - - b.HasIndex("DeletedAt") - .HasDatabaseName("ix_users_deleted_at"); - - b.HasIndex("Email") - .IsUnique() - .HasDatabaseName("ix_users_email"); - - b.HasIndex("Identifier") - .IsUnique() - .HasDatabaseName("ix_users_identifier"); - - b.HasIndex("TeamId") - .HasDatabaseName("ix_users_team_id"); - - b.ToTable("users", (string)null); - - b.HasData( - new - { - Id = new Guid("88e90686-fc3e-4063-819c-1cd585dd49a3"), - Active = false, - Balance = 0m, - CompanyId = new Guid("3de60ed7-4c83-43d9-ac34-21c18e849b8f"), - CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), - Email = "john.doe@tolaram.com", - FirstName = "John", - Identifier = "rtebe6r6mhpubcu7iitygg7woa", - LastName = "Doe", - Permission = 5, - Phone = "+234012345567", - TeamId = new Guid("0a063653-f0f0-468f-aec8-85bdcfd22c21") - }, - new - { - Id = new Guid("cc8e58ef-9920-4090-a972-a027ed3f48e2"), - Active = false, - Balance = 0m, - CompanyId = new Guid("15539941-c7e7-45d4-b86e-05b5991f6215"), - CreatedAt = new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), - Email = "jane.doe@tolaram.com", - FirstName = "Jane", - Identifier = "syrbh5p7fuxuljf66irs5bhahi", - LastName = "Doe", - Permission = 5, - Phone = "+234022424553", - TeamId = new Guid("47720f67-9f3d-4cce-b34c-8dc6aa26ddc6") - }); - }); - - modelBuilder.Entity("XClaim.Web.Server.Entities.BankAccountEntity", b => - { - b.HasOne("XClaim.Web.Server.Entities.BankEntity", "Bank") - .WithMany() - .HasForeignKey("BankId") - .HasConstraintName("fk_user_bank_account_banks_bank_id"); - - b.HasOne("XClaim.Web.Server.Entities.UserEntity", "Owner") - .WithOne("BankAccount") - .HasForeignKey("XClaim.Web.Server.Entities.BankAccountEntity", "OwnerId") - .HasConstraintName("fk_user_bank_account_users_owner_id"); - - b.Navigation("Bank"); - - b.Navigation("Owner"); - }); - - modelBuilder.Entity("XClaim.Web.Server.Entities.CategoryEntity", b => - { - b.HasOne("XClaim.Web.Server.Entities.CompanyEntity", "Company") - .WithMany() - .HasForeignKey("CompanyId") - .HasConstraintName("fk_categories_companies_company_id"); - - b.Navigation("Company"); - }); - - modelBuilder.Entity("XClaim.Web.Server.Entities.ClaimEntity", b => - { - b.HasOne("XClaim.Web.Server.Entities.UserEntity", "ApprovedBy") - .WithMany() - .HasForeignKey("ApprovedById") - .HasConstraintName("fk_claims_users_approved_by_id"); - - b.HasOne("XClaim.Web.Server.Entities.CategoryEntity", "Category") - .WithMany() - .HasForeignKey("CategoryId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired() - .HasConstraintName("fk_claims_categories_category_id"); - - b.HasOne("XClaim.Web.Server.Entities.CompanyEntity", "Company") - .WithMany() - .HasForeignKey("CompanyId") - .HasConstraintName("fk_claims_companies_company_id"); - - b.HasOne("XClaim.Web.Server.Entities.UserEntity", "ConfirmedBy") - .WithMany() - .HasForeignKey("ConfirmedById") - .HasConstraintName("fk_claims_users_confirmed_by_id"); - - b.HasOne("XClaim.Web.Server.Entities.UserEntity", "Owner") - .WithMany() - .HasForeignKey("OwnerId") - .HasConstraintName("fk_claims_users_owner_id"); - - b.HasOne("XClaim.Web.Server.Entities.PaymentEntity", "Payment") - .WithMany("Claims") - .HasForeignKey("PaymentId") - .HasConstraintName("fk_claims_payments_payment_id"); - - b.HasOne("XClaim.Web.Server.Entities.UserEntity", "ReviewedBy") - .WithMany() - .HasForeignKey("ReviewedById") - .HasConstraintName("fk_claims_users_reviewed_by_id"); - - b.Navigation("ApprovedBy"); - - b.Navigation("Category"); - - b.Navigation("Company"); - - b.Navigation("ConfirmedBy"); - - b.Navigation("Owner"); - - b.Navigation("Payment"); - - b.Navigation("ReviewedBy"); - }); - - modelBuilder.Entity("XClaim.Web.Server.Entities.CommentEntity", b => - { - b.HasOne("XClaim.Web.Server.Entities.ClaimEntity", "Claim") - .WithMany("Comments") - .HasForeignKey("ClaimId") - .HasConstraintName("fk_comments_claims_claim_id"); - - b.HasOne("XClaim.Web.Server.Entities.UserEntity", "Owner") - .WithMany() - .HasForeignKey("OwnerId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired() - .HasConstraintName("fk_comments_users_owner_id"); - - b.HasOne("XClaim.Web.Server.Entities.PaymentEntity", "Payment") - .WithMany("Comments") - .HasForeignKey("PaymentId") - .HasConstraintName("fk_comments_payments_payment_id"); - - b.Navigation("Claim"); - - b.Navigation("Owner"); - - b.Navigation("Payment"); - }); - - modelBuilder.Entity("XClaim.Web.Server.Entities.CompanyEntity", b => - { - b.HasOne("XClaim.Web.Server.Entities.UserEntity", "Manager") - .WithOne("CompanyManaged") - .HasForeignKey("XClaim.Web.Server.Entities.CompanyEntity", "ManagerId") - .OnDelete(DeleteBehavior.SetNull) - .HasConstraintName("fk_companies_users_manager_id"); - - b.Navigation("Manager"); - }); - - modelBuilder.Entity("XClaim.Web.Server.Entities.EventEntity", b => - { - b.HasOne("XClaim.Web.Server.Entities.ClaimEntity", "Claim") - .WithMany() - .HasForeignKey("ClaimId") - .HasConstraintName("fk_events_claims_claim_id"); - - b.HasOne("XClaim.Web.Server.Entities.PaymentEntity", "Payment") - .WithMany() - .HasForeignKey("PaymentId") - .HasConstraintName("fk_events_payments_payment_id"); - - b.Navigation("Claim"); - - b.Navigation("Payment"); - }); - - modelBuilder.Entity("XClaim.Web.Server.Entities.FileEntity", b => - { - b.HasOne("XClaim.Web.Server.Entities.ClaimEntity", null) - .WithMany("Files") - .HasForeignKey("ClaimEntityId") - .HasConstraintName("fk_files_claims_claim_entity_id"); - - b.HasOne("XClaim.Web.Server.Entities.UserEntity", "Owner") - .WithMany() - .HasForeignKey("OwnerId") - .HasConstraintName("fk_files_users_owner_id"); - - b.HasOne("XClaim.Web.Server.Entities.PaymentEntity", null) - .WithMany("Files") - .HasForeignKey("PaymentEntityId") - .HasConstraintName("fk_files_payments_payment_entity_id"); - - b.Navigation("Owner"); - }); - - modelBuilder.Entity("XClaim.Web.Server.Entities.NotificationEntity", b => - { - b.HasOne("XClaim.Web.Server.Entities.UserEntity", "Owner") - .WithOne("Notification") - .HasForeignKey("XClaim.Web.Server.Entities.NotificationEntity", "OwnerId") - .HasConstraintName("fk_user_notification_users_owner_id"); - - b.Navigation("Owner"); - }); - - modelBuilder.Entity("XClaim.Web.Server.Entities.PaymentEntity", b => - { - b.HasOne("XClaim.Web.Server.Entities.UserEntity", "ConfirmedBy") - .WithMany() - .HasForeignKey("ConfirmedById") - .HasConstraintName("fk_payments_users_confirmed_by_id"); - - b.HasOne("XClaim.Web.Server.Entities.UserEntity", "Owner") - .WithMany() - .HasForeignKey("OwnerId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired() - .HasConstraintName("fk_payments_users_owner_id"); - - b.Navigation("ConfirmedBy"); - - b.Navigation("Owner"); - }); - - modelBuilder.Entity("XClaim.Web.Server.Entities.ServerEntity", b => - { - b.HasOne("XClaim.Web.Server.Entities.CurrencyEntity", "Currency") - .WithMany() - .HasForeignKey("CurrencyId") - .HasConstraintName("fk_server_currency_entity_currency_id"); - - b.Navigation("Currency"); - }); - - modelBuilder.Entity("XClaim.Web.Server.Entities.SettingEntity", b => - { - b.HasOne("XClaim.Web.Server.Entities.UserEntity", "Owner") - .WithOne("Setting") - .HasForeignKey("XClaim.Web.Server.Entities.SettingEntity", "OwnerId") - .HasConstraintName("fk_user_setting_users_owner_id"); - - b.Navigation("Owner"); - }); - - modelBuilder.Entity("XClaim.Web.Server.Entities.TeamEntity", b => - { - b.HasOne("XClaim.Web.Server.Entities.CompanyEntity", "Company") - .WithMany() - .HasForeignKey("CompanyId") - .HasConstraintName("fk_teams_companies_company_id"); - - b.HasOne("XClaim.Web.Server.Entities.UserEntity", "Manager") - .WithOne("TeamManaged") - .HasForeignKey("XClaim.Web.Server.Entities.TeamEntity", "ManagerId") - .OnDelete(DeleteBehavior.SetNull) - .HasConstraintName("fk_teams_users_manager_id"); - - b.Navigation("Company"); - - b.Navigation("Manager"); - }); - - modelBuilder.Entity("XClaim.Web.Server.Entities.UserEntity", b => - { - b.HasOne("XClaim.Web.Server.Entities.CompanyEntity", "Company") - .WithMany("Members") - .HasForeignKey("CompanyId") - .HasConstraintName("fk_users_companies_company_id"); - - b.HasOne("XClaim.Web.Server.Entities.CurrencyEntity", "Currency") - .WithMany() - .HasForeignKey("CurrencyId") - .HasConstraintName("fk_users_currency_entity_currency_id"); - - b.HasOne("XClaim.Web.Server.Entities.TeamEntity", "Team") - .WithMany("Members") - .HasForeignKey("TeamId") - .HasConstraintName("fk_users_teams_team_id"); - - b.Navigation("Company"); - - b.Navigation("Currency"); - - b.Navigation("Team"); - }); - - modelBuilder.Entity("XClaim.Web.Server.Entities.ClaimEntity", b => - { - b.Navigation("Comments"); - - b.Navigation("Files"); - }); - - modelBuilder.Entity("XClaim.Web.Server.Entities.CompanyEntity", b => - { - b.Navigation("Members"); - }); - - modelBuilder.Entity("XClaim.Web.Server.Entities.PaymentEntity", b => - { - b.Navigation("Claims"); - - b.Navigation("Comments"); - - b.Navigation("Files"); - }); - - modelBuilder.Entity("XClaim.Web.Server.Entities.TeamEntity", b => - { - b.Navigation("Members"); - }); - - modelBuilder.Entity("XClaim.Web.Server.Entities.UserEntity", b => - { - b.Navigation("BankAccount"); - - b.Navigation("CompanyManaged"); - - b.Navigation("Notification"); - - b.Navigation("Setting"); - - b.Navigation("TeamManaged"); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/src/Web/Server/Migrations/20230202213843_Initial.cs b/src/Web/Server/Migrations/20230202213843_Initial.cs deleted file mode 100644 index 1f60fe2e..00000000 --- a/src/Web/Server/Migrations/20230202213843_Initial.cs +++ /dev/null @@ -1,934 +0,0 @@ -using System; -using Microsoft.EntityFrameworkCore.Migrations; - -#nullable disable - -#pragma warning disable CA1814 // Prefer jagged arrays over multidimensional - -namespace XClaim.Web.Server.Migrations -{ - /// - public partial class Initial : Migration - { - /// - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.CreateTable( - name: "banks", - columns: table => new - { - id = table.Column(type: "TEXT", nullable: false), - name = table.Column(type: "TEXT", maxLength: 128, nullable: false), - description = table.Column(type: "TEXT", nullable: false), - swiftcode = table.Column(name: "swift_code", type: "TEXT", nullable: false), - active = table.Column(type: "INTEGER", nullable: false), - createdat = table.Column(name: "created_at", type: "TEXT", nullable: false), - modifiedat = table.Column(name: "modified_at", type: "TEXT", nullable: true), - deletedat = table.Column(name: "deleted_at", type: "TEXT", nullable: true) - }, - constraints: table => - { - table.PrimaryKey("pk_banks", x => x.id); - }); - - migrationBuilder.CreateTable( - name: "currency_entity", - columns: table => new - { - id = table.Column(type: "TEXT", nullable: false), - name = table.Column(type: "TEXT", nullable: false), - symbol = table.Column(type: "TEXT", maxLength: 1, nullable: false), - code = table.Column(type: "TEXT", maxLength: 3, nullable: false), - rate = table.Column(type: "TEXT", nullable: false), - description = table.Column(type: "TEXT", nullable: false), - active = table.Column(type: "INTEGER", nullable: false), - createdat = table.Column(name: "created_at", type: "TEXT", nullable: false), - modifiedat = table.Column(name: "modified_at", type: "TEXT", nullable: true), - deletedat = table.Column(name: "deleted_at", type: "TEXT", nullable: true) - }, - constraints: table => - { - table.PrimaryKey("pk_currency_entity", x => x.id); - }); - - migrationBuilder.CreateTable( - name: "domain_entity", - columns: table => new - { - id = table.Column(type: "TEXT", nullable: false), - address = table.Column(type: "TEXT", nullable: false), - active = table.Column(type: "INTEGER", nullable: false), - description = table.Column(type: "TEXT", nullable: false), - createdat = table.Column(name: "created_at", type: "TEXT", nullable: false), - modifiedat = table.Column(name: "modified_at", type: "TEXT", nullable: true), - deletedat = table.Column(name: "deleted_at", type: "TEXT", nullable: true) - }, - constraints: table => - { - table.PrimaryKey("pk_domain_entity", x => x.id); - }); - - migrationBuilder.CreateTable( - name: "server", - columns: table => new - { - id = table.Column(type: "TEXT", nullable: false), - servicename = table.Column(name: "service_name", type: "TEXT", nullable: false), - adminemail = table.Column(name: "admin_email", type: "TEXT", nullable: false), - maintenancemode = table.Column(name: "maintenance_mode", type: "INTEGER", nullable: false), - maintenancetext = table.Column(name: "maintenance_text", type: "TEXT", nullable: false), - currencyid = table.Column(name: "currency_id", type: "TEXT", nullable: true), - createdat = table.Column(name: "created_at", type: "TEXT", nullable: false), - modifiedat = table.Column(name: "modified_at", type: "TEXT", nullable: true), - deletedat = table.Column(name: "deleted_at", type: "TEXT", nullable: true) - }, - constraints: table => - { - table.PrimaryKey("pk_server", x => x.id); - table.ForeignKey( - name: "fk_server_currency_entity_currency_id", - column: x => x.currencyid, - principalTable: "currency_entity", - principalColumn: "id"); - }); - - migrationBuilder.CreateTable( - name: "categories", - columns: table => new - { - id = table.Column(type: "TEXT", nullable: false), - name = table.Column(type: "TEXT", maxLength: 128, nullable: false), - companyid = table.Column(name: "company_id", type: "TEXT", nullable: true), - description = table.Column(type: "TEXT", maxLength: 1024, nullable: true), - active = table.Column(type: "INTEGER", nullable: false), - icon = table.Column(type: "TEXT", maxLength: 64, nullable: true), - createdat = table.Column(name: "created_at", type: "TEXT", nullable: false), - modifiedat = table.Column(name: "modified_at", type: "TEXT", nullable: true), - deletedat = table.Column(name: "deleted_at", type: "TEXT", nullable: true) - }, - constraints: table => - { - table.PrimaryKey("pk_categories", x => x.id); - }); - - migrationBuilder.CreateTable( - name: "claims", - columns: table => new - { - id = table.Column(type: "TEXT", nullable: false), - description = table.Column(type: "TEXT", maxLength: 256, nullable: false), - notes = table.Column(type: "TEXT", maxLength: 1024, nullable: true), - amount = table.Column(type: "TEXT", nullable: false), - priority = table.Column(type: "INTEGER", nullable: false), - paymentid = table.Column(name: "payment_id", type: "TEXT", nullable: true), - categoryid = table.Column(name: "category_id", type: "TEXT", nullable: false), - companyid = table.Column(name: "company_id", type: "TEXT", nullable: true), - status = table.Column(type: "INTEGER", nullable: false), - ownerid = table.Column(name: "owner_id", type: "TEXT", nullable: true), - reviewedbyid = table.Column(name: "reviewed_by_id", type: "TEXT", nullable: true), - reviewedat = table.Column(name: "reviewed_at", type: "TEXT", nullable: true), - confirmedbyid = table.Column(name: "confirmed_by_id", type: "TEXT", nullable: true), - confirmedat = table.Column(name: "confirmed_at", type: "TEXT", nullable: true), - approvedbyid = table.Column(name: "approved_by_id", type: "TEXT", nullable: true), - approvedat = table.Column(name: "approved_at", type: "TEXT", nullable: true), - createdat = table.Column(name: "created_at", type: "TEXT", nullable: false), - modifiedat = table.Column(name: "modified_at", type: "TEXT", nullable: true), - deletedat = table.Column(name: "deleted_at", type: "TEXT", nullable: true) - }, - constraints: table => - { - table.PrimaryKey("pk_claims", x => x.id); - table.ForeignKey( - name: "fk_claims_categories_category_id", - column: x => x.categoryid, - principalTable: "categories", - principalColumn: "id", - onDelete: ReferentialAction.Cascade); - }); - - migrationBuilder.CreateTable( - name: "comments", - columns: table => new - { - id = table.Column(type: "TEXT", nullable: false), - claimid = table.Column(name: "claim_id", type: "TEXT", nullable: true), - paymentid = table.Column(name: "payment_id", type: "TEXT", nullable: true), - ownerid = table.Column(name: "owner_id", type: "TEXT", nullable: false), - content = table.Column(type: "TEXT", maxLength: 1024, nullable: false), - createdat = table.Column(name: "created_at", type: "TEXT", nullable: false), - modifiedat = table.Column(name: "modified_at", type: "TEXT", nullable: true), - deletedat = table.Column(name: "deleted_at", type: "TEXT", nullable: true) - }, - constraints: table => - { - table.PrimaryKey("pk_comments", x => x.id); - table.ForeignKey( - name: "fk_comments_claims_claim_id", - column: x => x.claimid, - principalTable: "claims", - principalColumn: "id"); - }); - - migrationBuilder.CreateTable( - name: "companies", - columns: table => new - { - id = table.Column(type: "TEXT", nullable: false), - active = table.Column(type: "INTEGER", nullable: false), - shortname = table.Column(name: "short_name", type: "TEXT", maxLength: 64, nullable: false), - fullname = table.Column(name: "full_name", type: "TEXT", maxLength: 128, nullable: false), - adminemail = table.Column(name: "admin_email", type: "TEXT", maxLength: 256, nullable: false), - managerid = table.Column(name: "manager_id", type: "TEXT", nullable: true), - createdat = table.Column(name: "created_at", type: "TEXT", nullable: false), - modifiedat = table.Column(name: "modified_at", type: "TEXT", nullable: true), - deletedat = table.Column(name: "deleted_at", type: "TEXT", nullable: true) - }, - constraints: table => - { - table.PrimaryKey("pk_companies", x => x.id); - }); - - migrationBuilder.CreateTable( - name: "events", - columns: table => new - { - id = table.Column(type: "TEXT", nullable: false), - type = table.Column(type: "INTEGER", nullable: false), - claimid = table.Column(name: "claim_id", type: "TEXT", nullable: true), - paymentid = table.Column(name: "payment_id", type: "TEXT", nullable: true), - description = table.Column(type: "TEXT", maxLength: 512, nullable: false), - createdat = table.Column(name: "created_at", type: "TEXT", nullable: false), - modifiedat = table.Column(name: "modified_at", type: "TEXT", nullable: true), - deletedat = table.Column(name: "deleted_at", type: "TEXT", nullable: true) - }, - constraints: table => - { - table.PrimaryKey("pk_events", x => x.id); - table.ForeignKey( - name: "fk_events_claims_claim_id", - column: x => x.claimid, - principalTable: "claims", - principalColumn: "id"); - }); - - migrationBuilder.CreateTable( - name: "files", - columns: table => new - { - id = table.Column(type: "TEXT", nullable: false), - name = table.Column(type: "TEXT", maxLength: 256, nullable: false), - path = table.Column(type: "TEXT", maxLength: 1024, nullable: false), - extension = table.Column(type: "TEXT", maxLength: 8, nullable: true), - ownerid = table.Column(name: "owner_id", type: "TEXT", nullable: true), - claimentityid = table.Column(name: "claim_entity_id", type: "TEXT", nullable: true), - paymententityid = table.Column(name: "payment_entity_id", type: "TEXT", nullable: true), - createdat = table.Column(name: "created_at", type: "TEXT", nullable: false), - modifiedat = table.Column(name: "modified_at", type: "TEXT", nullable: true), - deletedat = table.Column(name: "deleted_at", type: "TEXT", nullable: true) - }, - constraints: table => - { - table.PrimaryKey("pk_files", x => x.id); - table.ForeignKey( - name: "fk_files_claims_claim_entity_id", - column: x => x.claimentityid, - principalTable: "claims", - principalColumn: "id"); - }); - - migrationBuilder.CreateTable( - name: "payments", - columns: table => new - { - id = table.Column(type: "TEXT", nullable: false), - description = table.Column(type: "TEXT", maxLength: 256, nullable: true), - notes = table.Column(type: "TEXT", maxLength: 1024, nullable: true), - amount = table.Column(type: "TEXT", nullable: false), - ownerid = table.Column(name: "owner_id", type: "TEXT", nullable: false), - confirmedat = table.Column(name: "confirmed_at", type: "TEXT", nullable: true), - confirmedbyid = table.Column(name: "confirmed_by_id", type: "TEXT", nullable: true), - count = table.Column(type: "INTEGER", nullable: false), - createdat = table.Column(name: "created_at", type: "TEXT", nullable: false), - modifiedat = table.Column(name: "modified_at", type: "TEXT", nullable: true), - deletedat = table.Column(name: "deleted_at", type: "TEXT", nullable: true) - }, - constraints: table => - { - table.PrimaryKey("pk_payments", x => x.id); - }); - - migrationBuilder.CreateTable( - name: "teams", - columns: table => new - { - id = table.Column(type: "TEXT", nullable: false), - name = table.Column(type: "TEXT", maxLength: 128, nullable: false), - active = table.Column(type: "INTEGER", nullable: false), - description = table.Column(type: "TEXT", nullable: false), - companyid = table.Column(name: "company_id", type: "TEXT", nullable: true), - managerid = table.Column(name: "manager_id", type: "TEXT", nullable: true), - createdat = table.Column(name: "created_at", type: "TEXT", nullable: false), - modifiedat = table.Column(name: "modified_at", type: "TEXT", nullable: true), - deletedat = table.Column(name: "deleted_at", type: "TEXT", nullable: true) - }, - constraints: table => - { - table.PrimaryKey("pk_teams", x => x.id); - table.ForeignKey( - name: "fk_teams_companies_company_id", - column: x => x.companyid, - principalTable: "companies", - principalColumn: "id"); - }); - - migrationBuilder.CreateTable( - name: "users", - columns: table => new - { - id = table.Column(type: "TEXT", nullable: false), - identifier = table.Column(type: "TEXT", nullable: false), - email = table.Column(type: "TEXT", maxLength: 256, nullable: false), - profileimage = table.Column(name: "profile_image", type: "TEXT", nullable: true), - phone = table.Column(type: "TEXT", maxLength: 64, nullable: false), - firstname = table.Column(name: "first_name", type: "TEXT", maxLength: 128, nullable: false), - lastname = table.Column(name: "last_name", type: "TEXT", maxLength: 128, nullable: false), - balance = table.Column(type: "TEXT", nullable: false), - permission = table.Column(type: "INTEGER", nullable: false), - companyid = table.Column(name: "company_id", type: "TEXT", nullable: true), - companymanagedid = table.Column(name: "company_managed_id", type: "TEXT", nullable: true), - teamid = table.Column(name: "team_id", type: "TEXT", nullable: true), - teammanagedid = table.Column(name: "team_managed_id", type: "TEXT", nullable: true), - currencyid = table.Column(name: "currency_id", type: "TEXT", nullable: true), - active = table.Column(type: "INTEGER", nullable: false), - token = table.Column(type: "TEXT", maxLength: 128, nullable: true), - image = table.Column(type: "TEXT", nullable: true), - createdat = table.Column(name: "created_at", type: "TEXT", nullable: false), - modifiedat = table.Column(name: "modified_at", type: "TEXT", nullable: true), - deletedat = table.Column(name: "deleted_at", type: "TEXT", nullable: true) - }, - constraints: table => - { - table.PrimaryKey("pk_users", x => x.id); - table.ForeignKey( - name: "fk_users_companies_company_id", - column: x => x.companyid, - principalTable: "companies", - principalColumn: "id"); - table.ForeignKey( - name: "fk_users_currency_entity_currency_id", - column: x => x.currencyid, - principalTable: "currency_entity", - principalColumn: "id"); - table.ForeignKey( - name: "fk_users_teams_team_id", - column: x => x.teamid, - principalTable: "teams", - principalColumn: "id"); - }); - - migrationBuilder.CreateTable( - name: "user_bank_account", - columns: table => new - { - id = table.Column(type: "TEXT", nullable: false), - fullname = table.Column(name: "full_name", type: "TEXT", nullable: false), - bankid = table.Column(name: "bank_id", type: "TEXT", nullable: true), - ownerid = table.Column(name: "owner_id", type: "TEXT", nullable: true), - number = table.Column(type: "TEXT", maxLength: 20, nullable: false), - description = table.Column(type: "TEXT", maxLength: 1024, nullable: true), - createdat = table.Column(name: "created_at", type: "TEXT", nullable: false), - modifiedat = table.Column(name: "modified_at", type: "TEXT", nullable: true), - deletedat = table.Column(name: "deleted_at", type: "TEXT", nullable: true) - }, - constraints: table => - { - table.PrimaryKey("pk_user_bank_account", x => x.id); - table.ForeignKey( - name: "fk_user_bank_account_banks_bank_id", - column: x => x.bankid, - principalTable: "banks", - principalColumn: "id"); - table.ForeignKey( - name: "fk_user_bank_account_users_owner_id", - column: x => x.ownerid, - principalTable: "users", - principalColumn: "id"); - }); - - migrationBuilder.CreateTable( - name: "user_notification", - columns: table => new - { - id = table.Column(type: "TEXT", nullable: false), - ownerid = table.Column(name: "owner_id", type: "TEXT", nullable: true), - disabled = table.Column(type: "INTEGER", nullable: false), - channels = table.Column(type: "TEXT", nullable: false), - types = table.Column(type: "TEXT", nullable: false), - createdat = table.Column(name: "created_at", type: "TEXT", nullable: false), - modifiedat = table.Column(name: "modified_at", type: "TEXT", nullable: true), - deletedat = table.Column(name: "deleted_at", type: "TEXT", nullable: true) - }, - constraints: table => - { - table.PrimaryKey("pk_user_notification", x => x.id); - table.ForeignKey( - name: "fk_user_notification_users_owner_id", - column: x => x.ownerid, - principalTable: "users", - principalColumn: "id"); - }); - - migrationBuilder.CreateTable( - name: "user_setting", - columns: table => new - { - id = table.Column(type: "TEXT", nullable: false), - ownerid = table.Column(name: "owner_id", type: "TEXT", nullable: true), - darkmode = table.Column(name: "dark_mode", type: "INTEGER", nullable: false), - language = table.Column(type: "INTEGER", nullable: false), - createdat = table.Column(name: "created_at", type: "TEXT", nullable: false), - modifiedat = table.Column(name: "modified_at", type: "TEXT", nullable: true), - deletedat = table.Column(name: "deleted_at", type: "TEXT", nullable: true) - }, - constraints: table => - { - table.PrimaryKey("pk_user_setting", x => x.id); - table.ForeignKey( - name: "fk_user_setting_users_owner_id", - column: x => x.ownerid, - principalTable: "users", - principalColumn: "id"); - }); - - migrationBuilder.InsertData( - table: "banks", - columns: new[] { "id", "active", "created_at", "deleted_at", "description", "modified_at", "name", "swift_code" }, - values: new object[,] - { - { new Guid("01cb6bc8-b3a7-4a9f-8c25-37885fbd1ada"), false, new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), null, "", null, "Polaris Bank Limited", "" }, - { new Guid("1771e448-891d-43c4-a0aa-3784803e9af1"), false, new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), null, "", null, "Zenith Bank", "" }, - { new Guid("195fc39b-4791-41b7-9d9e-d9c31dcbe884"), false, new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), null, "", null, "First City Monument Bank", "" }, - { new Guid("2e6fa8fd-49ca-450d-a85d-54df1055816e"), false, new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), null, "", null, "Keystone Bank Limited", "" }, - { new Guid("3ce65741-39ef-4ca8-bc85-4afee4800a07"), false, new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), null, "", null, "Access Bank", "" }, - { new Guid("4a12f06b-352d-4786-899f-52ea979cc65c"), false, new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), null, "", null, "Fidelity Bank", "" }, - { new Guid("8b98faad-c950-4adc-ac13-4577c3e7d616"), false, new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), null, "", null, "United Bank for Africa", "" }, - { new Guid("8f2fdbbc-c992-4f57-86bf-167633c491fb"), false, new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), null, "", null, "Wema Bank", "" }, - { new Guid("ac444cc9-93c2-4b90-b7a4-cb759fe9bb1a"), false, new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), null, "", null, "Sterling Bank", "" }, - { new Guid("bcb4a992-7936-4126-9bba-602b0f0f979f"), false, new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), null, "", null, "Stanbic IBTC Bank", "" }, - { new Guid("dbb5aa84-e727-4b03-b18f-80315d2a18b4"), false, new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), null, "", null, "First Bank", "" }, - { new Guid("dcb125d2-1d42-4b01-bc2c-a7863e708a47"), false, new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), null, "", null, "GT Bank", "" }, - { new Guid("de625d37-6628-47d3-8656-6d457ca1b151"), false, new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), null, "", null, "Union Bank of Nigeria", "" } - }); - - migrationBuilder.InsertData( - table: "categories", - columns: new[] { "id", "active", "company_id", "created_at", "deleted_at", "description", "icon", "modified_at", "name" }, - values: new object[,] - { - { new Guid("8286de04-35da-48fa-9fd3-9a90910c54aa"), false, null, new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), null, "", "", null, "Internet Service" }, - { new Guid("8db67707-4665-43b0-b26f-cfca391aa4b0"), false, null, new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), null, "", "", null, "General Fuelling" } - }); - - migrationBuilder.InsertData( - table: "companies", - columns: new[] { "id", "active", "admin_email", "created_at", "deleted_at", "full_name", "manager_id", "modified_at", "short_name" }, - values: new object[,] - { - { new Guid("15539941-c7e7-45d4-b86e-05b5991f6215"), false, "", new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), null, "Multi Consumer Product LTD", null, null, "MCPL LTD" }, - { new Guid("3de60ed7-4c83-43d9-ac34-21c18e849b8f"), false, "", new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), null, "MCPL LTD - BHN Division", null, null, "BHN Logistics" }, - { new Guid("84cccd2f-2369-4337-bb89-7495146d8411"), false, "", new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), null, "X-Claim Instance Management", null, null, "X-Claim" }, - { new Guid("9f4598fe-bd5d-4e3b-8588-d293df693ba9"), false, "", new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), null, "Dufil Prima Foods Plc", null, null, "Dufil Prima" } - }); - - migrationBuilder.InsertData( - table: "currency_entity", - columns: new[] { "id", "active", "code", "created_at", "deleted_at", "description", "modified_at", "name", "rate", "symbol" }, - values: new object[,] - { - { new Guid("4b2bb3b9-2e37-4942-a499-2c852e5db1c7"), false, "USD", new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), null, "", null, "US Dollar", 0m, "$" }, - { new Guid("62184e4d-9397-459c-9623-1bb02a44419b"), false, "NGN", new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), null, "", null, "Naira", 0m, "₦" }, - { new Guid("85ad4afd-5c60-44ae-b809-170fdaac6b09"), false, "INR", new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), null, "", null, "Rupee", 0m, "₹" }, - { new Guid("88dddfe8-d318-4868-9bf5-8f267376e3a9"), false, "EUR", new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), null, "", null, "Euro", 0m, "€" }, - { new Guid("a9161b94-6223-4929-b4ef-bbcd82ba6719"), false, "GBP", new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), null, "", null, "British Pounds", 0m, "£" } - }); - - migrationBuilder.InsertData( - table: "domain_entity", - columns: new[] { "id", "active", "address", "created_at", "deleted_at", "description", "modified_at" }, - values: new object[,] - { - { new Guid("320655ca-4002-4539-8eab-3ee2dcac1804"), false, "dufil.com", new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), null, "", null }, - { new Guid("989e690e-7895-4dbf-93c6-fbb2cca3e632"), false, "outlook.com", new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), null, "", null }, - { new Guid("e3bfd149-0a86-43f4-9021-81a3d6fea9a2"), false, "tolaram.com", new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), null, "", null } - }); - - migrationBuilder.InsertData( - table: "categories", - columns: new[] { "id", "active", "company_id", "created_at", "deleted_at", "description", "icon", "modified_at", "name" }, - values: new object[,] - { - { new Guid("4197d752-02d5-450a-9d3c-6fa44489d97d"), false, new Guid("3de60ed7-4c83-43d9-ac34-21c18e849b8f"), new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), null, "", "", null, "BHN - Weekly meeting expense" }, - { new Guid("64c7b903-12e5-4168-96fd-026a1a67f73f"), false, new Guid("15539941-c7e7-45d4-b86e-05b5991f6215"), new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), null, "", "", null, "MCPL - Monthly training expense" } - }); - - migrationBuilder.InsertData( - table: "server", - columns: new[] { "id", "admin_email", "created_at", "currency_id", "deleted_at", "maintenance_mode", "maintenance_text", "modified_at", "service_name" }, - values: new object[] { new Guid("ca00807b-625a-48e4-9269-3cbbd890226d"), "admin@x-claim.dev", new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified), new Guid("62184e4d-9397-459c-9623-1bb02a44419b"), null, false, "In-Progress", null, "X-Claim" }); - - migrationBuilder.InsertData( - table: "teams", - columns: new[] { "id", "active", "company_id", "created_at", "deleted_at", "description", "manager_id", "modified_at", "name" }, - values: new object[,] - { - { new Guid("0a063653-f0f0-468f-aec8-85bdcfd22c21"), false, new Guid("3de60ed7-4c83-43d9-ac34-21c18e849b8f"), new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), null, "", null, null, "Account Dept" }, - { new Guid("47720f67-9f3d-4cce-b34c-8dc6aa26ddc6"), false, new Guid("15539941-c7e7-45d4-b86e-05b5991f6215"), new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), null, "", null, null, "Logistics Dept" }, - { new Guid("8f08bd2f-148b-410a-8a15-1c826c5a7ede"), false, new Guid("9f4598fe-bd5d-4e3b-8588-d293df693ba9"), new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), null, "", null, null, "Packaging Dept" } - }); - - migrationBuilder.InsertData( - table: "users", - columns: new[] { "id", "active", "balance", "company_id", "company_managed_id", "created_at", "currency_id", "deleted_at", "email", "first_name", "identifier", "image", "last_name", "modified_at", "permission", "phone", "profile_image", "team_id", "team_managed_id", "token" }, - values: new object[,] - { - { new Guid("88e90686-fc3e-4063-819c-1cd585dd49a3"), false, 0m, new Guid("3de60ed7-4c83-43d9-ac34-21c18e849b8f"), null, new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), null, null, "john.doe@tolaram.com", "John", "rtebe6r6mhpubcu7iitygg7woa", null, "Doe", null, 5, "+234012345567", null, new Guid("0a063653-f0f0-468f-aec8-85bdcfd22c21"), null, null }, - { new Guid("cc8e58ef-9920-4090-a972-a027ed3f48e2"), false, 0m, new Guid("15539941-c7e7-45d4-b86e-05b5991f6215"), null, new DateTime(2023, 2, 2, 22, 38, 43, 510, DateTimeKind.Local).AddTicks(5798), null, null, "jane.doe@tolaram.com", "Jane", "syrbh5p7fuxuljf66irs5bhahi", null, "Doe", null, 5, "+234022424553", null, new Guid("47720f67-9f3d-4cce-b34c-8dc6aa26ddc6"), null, null } - }); - - migrationBuilder.CreateIndex( - name: "ix_banks_deleted_at", - table: "banks", - column: "deleted_at"); - - migrationBuilder.CreateIndex( - name: "ix_banks_name", - table: "banks", - column: "name", - unique: true); - - migrationBuilder.CreateIndex( - name: "ix_categories_company_id", - table: "categories", - column: "company_id"); - - migrationBuilder.CreateIndex( - name: "ix_categories_deleted_at", - table: "categories", - column: "deleted_at"); - - migrationBuilder.CreateIndex( - name: "ix_claims_approved_by_id", - table: "claims", - column: "approved_by_id"); - - migrationBuilder.CreateIndex( - name: "ix_claims_category_id", - table: "claims", - column: "category_id"); - - migrationBuilder.CreateIndex( - name: "ix_claims_company_id", - table: "claims", - column: "company_id"); - - migrationBuilder.CreateIndex( - name: "ix_claims_confirmed_by_id", - table: "claims", - column: "confirmed_by_id"); - - migrationBuilder.CreateIndex( - name: "ix_claims_deleted_at", - table: "claims", - column: "deleted_at"); - - migrationBuilder.CreateIndex( - name: "ix_claims_owner_id", - table: "claims", - column: "owner_id"); - - migrationBuilder.CreateIndex( - name: "ix_claims_payment_id", - table: "claims", - column: "payment_id"); - - migrationBuilder.CreateIndex( - name: "ix_claims_reviewed_by_id", - table: "claims", - column: "reviewed_by_id"); - - migrationBuilder.CreateIndex( - name: "ix_comments_claim_id", - table: "comments", - column: "claim_id"); - - migrationBuilder.CreateIndex( - name: "ix_comments_deleted_at", - table: "comments", - column: "deleted_at"); - - migrationBuilder.CreateIndex( - name: "ix_comments_owner_id", - table: "comments", - column: "owner_id"); - - migrationBuilder.CreateIndex( - name: "ix_comments_payment_id", - table: "comments", - column: "payment_id"); - - migrationBuilder.CreateIndex( - name: "ix_companies_deleted_at", - table: "companies", - column: "deleted_at"); - - migrationBuilder.CreateIndex( - name: "ix_companies_manager_id", - table: "companies", - column: "manager_id", - unique: true); - - migrationBuilder.CreateIndex( - name: "ix_currency_entity_code", - table: "currency_entity", - column: "code", - unique: true); - - migrationBuilder.CreateIndex( - name: "ix_currency_entity_deleted_at", - table: "currency_entity", - column: "deleted_at"); - - migrationBuilder.CreateIndex( - name: "ix_currency_entity_name", - table: "currency_entity", - column: "name", - unique: true); - - migrationBuilder.CreateIndex( - name: "ix_events_claim_id", - table: "events", - column: "claim_id"); - - migrationBuilder.CreateIndex( - name: "ix_events_deleted_at", - table: "events", - column: "deleted_at"); - - migrationBuilder.CreateIndex( - name: "ix_events_payment_id", - table: "events", - column: "payment_id"); - - migrationBuilder.CreateIndex( - name: "ix_files_claim_entity_id", - table: "files", - column: "claim_entity_id"); - - migrationBuilder.CreateIndex( - name: "ix_files_deleted_at", - table: "files", - column: "deleted_at"); - - migrationBuilder.CreateIndex( - name: "ix_files_owner_id", - table: "files", - column: "owner_id"); - - migrationBuilder.CreateIndex( - name: "ix_files_payment_entity_id", - table: "files", - column: "payment_entity_id"); - - migrationBuilder.CreateIndex( - name: "ix_payments_confirmed_by_id", - table: "payments", - column: "confirmed_by_id"); - - migrationBuilder.CreateIndex( - name: "ix_payments_deleted_at", - table: "payments", - column: "deleted_at"); - - migrationBuilder.CreateIndex( - name: "ix_payments_owner_id", - table: "payments", - column: "owner_id"); - - migrationBuilder.CreateIndex( - name: "ix_server_currency_id", - table: "server", - column: "currency_id"); - - migrationBuilder.CreateIndex( - name: "ix_server_deleted_at", - table: "server", - column: "deleted_at"); - - migrationBuilder.CreateIndex( - name: "ix_teams_company_id", - table: "teams", - column: "company_id"); - - migrationBuilder.CreateIndex( - name: "ix_teams_deleted_at", - table: "teams", - column: "deleted_at"); - - migrationBuilder.CreateIndex( - name: "ix_teams_manager_id", - table: "teams", - column: "manager_id", - unique: true); - - migrationBuilder.CreateIndex( - name: "ix_user_bank_account_bank_id", - table: "user_bank_account", - column: "bank_id"); - - migrationBuilder.CreateIndex( - name: "ix_user_bank_account_deleted_at", - table: "user_bank_account", - column: "deleted_at"); - - migrationBuilder.CreateIndex( - name: "ix_user_bank_account_owner_id", - table: "user_bank_account", - column: "owner_id", - unique: true); - - migrationBuilder.CreateIndex( - name: "ix_user_notification_deleted_at", - table: "user_notification", - column: "deleted_at"); - - migrationBuilder.CreateIndex( - name: "ix_user_notification_owner_id", - table: "user_notification", - column: "owner_id", - unique: true); - - migrationBuilder.CreateIndex( - name: "ix_user_setting_deleted_at", - table: "user_setting", - column: "deleted_at"); - - migrationBuilder.CreateIndex( - name: "ix_user_setting_owner_id", - table: "user_setting", - column: "owner_id", - unique: true); - - migrationBuilder.CreateIndex( - name: "ix_users_company_id", - table: "users", - column: "company_id"); - - migrationBuilder.CreateIndex( - name: "ix_users_currency_id", - table: "users", - column: "currency_id"); - - migrationBuilder.CreateIndex( - name: "ix_users_deleted_at", - table: "users", - column: "deleted_at"); - - migrationBuilder.CreateIndex( - name: "ix_users_email", - table: "users", - column: "email", - unique: true); - - migrationBuilder.CreateIndex( - name: "ix_users_identifier", - table: "users", - column: "identifier", - unique: true); - - migrationBuilder.CreateIndex( - name: "ix_users_team_id", - table: "users", - column: "team_id"); - - migrationBuilder.AddForeignKey( - name: "fk_categories_companies_company_id", - table: "categories", - column: "company_id", - principalTable: "companies", - principalColumn: "id"); - - migrationBuilder.AddForeignKey( - name: "fk_claims_companies_company_id", - table: "claims", - column: "company_id", - principalTable: "companies", - principalColumn: "id"); - - migrationBuilder.AddForeignKey( - name: "fk_claims_payments_payment_id", - table: "claims", - column: "payment_id", - principalTable: "payments", - principalColumn: "id"); - - migrationBuilder.AddForeignKey( - name: "fk_claims_users_approved_by_id", - table: "claims", - column: "approved_by_id", - principalTable: "users", - principalColumn: "id"); - - migrationBuilder.AddForeignKey( - name: "fk_claims_users_confirmed_by_id", - table: "claims", - column: "confirmed_by_id", - principalTable: "users", - principalColumn: "id"); - - migrationBuilder.AddForeignKey( - name: "fk_claims_users_owner_id", - table: "claims", - column: "owner_id", - principalTable: "users", - principalColumn: "id"); - - migrationBuilder.AddForeignKey( - name: "fk_claims_users_reviewed_by_id", - table: "claims", - column: "reviewed_by_id", - principalTable: "users", - principalColumn: "id"); - - migrationBuilder.AddForeignKey( - name: "fk_comments_payments_payment_id", - table: "comments", - column: "payment_id", - principalTable: "payments", - principalColumn: "id"); - - migrationBuilder.AddForeignKey( - name: "fk_comments_users_owner_id", - table: "comments", - column: "owner_id", - principalTable: "users", - principalColumn: "id", - onDelete: ReferentialAction.Cascade); - - migrationBuilder.AddForeignKey( - name: "fk_companies_users_manager_id", - table: "companies", - column: "manager_id", - principalTable: "users", - principalColumn: "id", - onDelete: ReferentialAction.SetNull); - - migrationBuilder.AddForeignKey( - name: "fk_events_payments_payment_id", - table: "events", - column: "payment_id", - principalTable: "payments", - principalColumn: "id"); - - migrationBuilder.AddForeignKey( - name: "fk_files_payments_payment_entity_id", - table: "files", - column: "payment_entity_id", - principalTable: "payments", - principalColumn: "id"); - - migrationBuilder.AddForeignKey( - name: "fk_files_users_owner_id", - table: "files", - column: "owner_id", - principalTable: "users", - principalColumn: "id"); - - migrationBuilder.AddForeignKey( - name: "fk_payments_users_confirmed_by_id", - table: "payments", - column: "confirmed_by_id", - principalTable: "users", - principalColumn: "id"); - - migrationBuilder.AddForeignKey( - name: "fk_payments_users_owner_id", - table: "payments", - column: "owner_id", - principalTable: "users", - principalColumn: "id", - onDelete: ReferentialAction.Cascade); - - migrationBuilder.AddForeignKey( - name: "fk_teams_users_manager_id", - table: "teams", - column: "manager_id", - principalTable: "users", - principalColumn: "id", - onDelete: ReferentialAction.SetNull); - } - - /// - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropForeignKey( - name: "fk_teams_companies_company_id", - table: "teams"); - - migrationBuilder.DropForeignKey( - name: "fk_users_companies_company_id", - table: "users"); - - migrationBuilder.DropForeignKey( - name: "fk_teams_users_manager_id", - table: "teams"); - - migrationBuilder.DropTable( - name: "comments"); - - migrationBuilder.DropTable( - name: "domain_entity"); - - migrationBuilder.DropTable( - name: "events"); - - migrationBuilder.DropTable( - name: "files"); - - migrationBuilder.DropTable( - name: "server"); - - migrationBuilder.DropTable( - name: "user_bank_account"); - - migrationBuilder.DropTable( - name: "user_notification"); - - migrationBuilder.DropTable( - name: "user_setting"); - - migrationBuilder.DropTable( - name: "claims"); - - migrationBuilder.DropTable( - name: "banks"); - - migrationBuilder.DropTable( - name: "categories"); - - migrationBuilder.DropTable( - name: "payments"); - - migrationBuilder.DropTable( - name: "companies"); - - migrationBuilder.DropTable( - name: "users"); - - migrationBuilder.DropTable( - name: "currency_entity"); - - migrationBuilder.DropTable( - name: "teams"); - } - } -} From 6c1cc535c121bca301c086e647da7142ee6e9fd3 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Fri, 3 Feb 2023 19:46:23 +0100 Subject: [PATCH 110/185] Fix continuos reload bug --- src/Web/Client/App.razor | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/Web/Client/App.razor b/src/Web/Client/App.razor index 9f4f6d1b..3c1e7d37 100644 --- a/src/Web/Client/App.razor +++ b/src/Web/Client/App.razor @@ -14,19 +14,6 @@ var session = await AuthState.GetSession(); var isAuth = await AuthState.IsAuth(); - if (AppState.ServerState == null) { - var server = await ServerService.GetAsync(); - await AppState.LoadServerState(server.Data!); - await AuthState.Refresh(); - if (isAuth) { - var user = await AuthState.GetAccount(); - if (user != null) { - var lightMode = user.Setting?.DarkMode ?? false; - ThemeState.SetLightMode(!lightMode); - } - } - } - switch (isAuth) { case true when !session!.Confirmed && !isRegistrationPath: Nav.NavigateTo(WebConst.AppRegister, true); @@ -48,6 +35,19 @@ break; } } + + if (AppState.ServerState == null) { + var server = await ServerService.GetAsync(); + await AppState.LoadServerState(server.Data!); + if (isAuth) { + await AuthState.Refresh(); + var user = await AuthState.GetAccount(); + if (user != null) { + var lightMode = user.Setting?.DarkMode ?? false; + ThemeState.SetLightMode(!lightMode); + } + } + } } } From c46d5bccdfb909738001d6682340be04d55267c4 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Tue, 7 Feb 2023 17:29:24 +0100 Subject: [PATCH 111/185] Added docker deployment --- .dockerignore | 10 +++++++ .gitignore | 4 ++- Dockerfile | 18 +++++++++++++ docker-compose.prod.yaml | 0 docker-compose.yaml | 56 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 87 insertions(+), 1 deletion(-) create mode 100644 .dockerignore create mode 100644 Dockerfile create mode 100644 docker-compose.prod.yaml create mode 100644 docker-compose.yaml diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 00000000..04a14442 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,10 @@ +.idea +.fleet +.vscode +*.sqlite3* +StaticFiles +**/wwwroot/lib +bin +obj +secret.json +published \ No newline at end of file diff --git a/.gitignore b/.gitignore index 60125140..e7158b0f 100644 --- a/.gitignore +++ b/.gitignore @@ -479,4 +479,6 @@ $RECYCLE.BIN/ .fleet *.sqlite3* StaticFiles -**/wwwroot/lib \ No newline at end of file +**/wwwroot/lib +secret.json +published \ No newline at end of file diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000..27ba2b75 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,18 @@ +FROM mcr.microsoft.com/dotnet/aspnet:7.0-alpine as base +WORKDIR /app +EXPOSE 80 +EXPOSE 443 + +FROM mcr.microsoft.com/dotnet/sdk:7.0 as build +WORKDIR /src +COPY . . +RUN dotnet restore src/Web/XClaim.Web.sln +RUN dotnet build -c Release src/Web/Server/XClaim.Web.Server.csproj + +FROM build AS publish +RUN dotnet publish src/Web/Server/XClaim.Web.Server.csproj -c Release -o /app/published --self-contained + +FROM base as runtime +WORKDIR /app +COPY --from=publish /app/published . +ENTRYPOINT [ "dotnet", "/app/XClaim.Web.Server.dll" ] \ No newline at end of file diff --git a/docker-compose.prod.yaml b/docker-compose.prod.yaml new file mode 100644 index 00000000..e69de29b diff --git a/docker-compose.yaml b/docker-compose.yaml new file mode 100644 index 00000000..c0a0d705 --- /dev/null +++ b/docker-compose.yaml @@ -0,0 +1,56 @@ +version: '3.9' + +volumes: + db: + service-files: + +services: + service: + image: gpproton/x-claim:latest + restart: unless-stopped + depends_on: + - db + build: + context: . + dockerfile: Dockerfile + ports: + - "8000:80" + environment: + USER_SECRETS_ID: 836b9b8b-fd89-4aff-9286-809bda60998f + ROOT_URI: "http://localhost:8000" + # postgres | mysql | sqlite + DB_TYPE: postgres + DB_CONNECTION_STRING: "host=postgres_image;port=5432;database=x-claim;username=x-claim;password=x-claim" + ASPNETCORE_URLS: "https://+:443;http://+:80" +# ASPNETCORE_Kestrel__Certificates__Default__Password: dev +# ASPNETCORE_Kestrel__Certificates__Default__Path: /https/aspnetapp.pfx + volumes: + - service-files:/app/StaticFiles/ + - ~/.aspnet/https:/https:ro + - ./secret.json:"/root/.microsoft/usersecrets/${USER_SECRETS_ID}/secret.json:ro" + deploy: + mode: replicated + resources: + limits: + memory: 256M + reservations: + memory: 64M + + db: + image: postgres:15-alpine + restart: unless-stopped + volumes: + - db:/var/lib/postgresql/data + ports: + - "45432:5432" + environment: + POSTGRES_USER: x-claim + POSTGRES_PASSWORD: x-claim + POSTGRES_DB: x-claim + deploy: + mode: replicated + resources: + limits: + memory: 256M + reservations: + memory: 64M From 040ec65d597ebf0220a08f1799c057af2dd33949 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Tue, 7 Feb 2023 17:31:59 +0100 Subject: [PATCH 112/185] Implemented user transfer API --- .../Server/Entities/TransferRequestEntity.cs | 2 + .../Server/Modules/UserModule/IUserService.cs | 6 +-- .../Server/Modules/UserModule/UserModule.cs | 8 ++-- .../Server/Modules/UserModule/UserService.cs | 43 +++++++++++++------ 4 files changed, 40 insertions(+), 19 deletions(-) diff --git a/src/Web/Server/Entities/TransferRequestEntity.cs b/src/Web/Server/Entities/TransferRequestEntity.cs index 23a1ea37..41201ad9 100644 --- a/src/Web/Server/Entities/TransferRequestEntity.cs +++ b/src/Web/Server/Entities/TransferRequestEntity.cs @@ -5,5 +5,7 @@ namespace XClaim.Web.Server.Entities; public class TransferRequestEntity : BaseEntity { public UserEntity? User { get; set; } public Guid? UserId { get; set; } + public CompanyEntity? Company { get; set; } + public Guid? CompanyId { get; set; } public bool Completed { get; set; } } \ No newline at end of file diff --git a/src/Web/Server/Modules/UserModule/IUserService.cs b/src/Web/Server/Modules/UserModule/IUserService.cs index bef684a5..4bf9d406 100644 --- a/src/Web/Server/Modules/UserModule/IUserService.cs +++ b/src/Web/Server/Modules/UserModule/IUserService.cs @@ -7,8 +7,8 @@ public interface IUserService { public Task> GetByEmailAsync(string email); public Task>> GetAllAsync(UserFilter responseFilter); Task> GetTransferAsync(); - Task> CreateTransferAsync(); - Task>> GetAllTransferAsync(TransferRequestFilter filter); - Task> ApproveTransferAsync(TransferRequestResponse transfer); + Task> CreateTransferAsync(TransferRequestResponse value); + Task>> GetAllTransferAsync(TransferRequestFilter filter); + Task> ApproveTransferAsync(Guid id); Task> ArchiveTransferAsync(Guid id); } \ No newline at end of file diff --git a/src/Web/Server/Modules/UserModule/UserModule.cs b/src/Web/Server/Modules/UserModule/UserModule.cs index d6187e99..19a1b71c 100644 --- a/src/Web/Server/Modules/UserModule/UserModule.cs +++ b/src/Web/Server/Modules/UserModule/UserModule.cs @@ -60,12 +60,12 @@ await sv.GetAllAsync(filter)) return !result.Succeeded ? Results.NotFound() : TypedResults.Ok(result); }).WithName($"Get{name}TransferList").WithOpenApi(); - group.MapPost("/transfer", async (UserService sv) => - await sv.CreateTransferAsync()) + group.MapPost("/transfer", async (UserService sv, TransferRequestResponse transfer) => + await sv.CreateTransferAsync(transfer)) .WithName($"Create{name}Transfer").WithOpenApi(); - group.MapPut("/transfer", async (TransferRequestResponse value, UserService sv) => { - var result = await sv.ApproveTransferAsync(value); + group.MapPut("/transfer/{id:guid}", async (Guid id, UserService sv) => { + var result = await sv.ApproveTransferAsync(id); return !result.Succeeded ? Results.NotFound() : TypedResults.Ok(result); }).WithName($"Update{name}Transfer").WithOpenApi(); diff --git a/src/Web/Server/Modules/UserModule/UserService.cs b/src/Web/Server/Modules/UserModule/UserService.cs index 689de47a..40e65d98 100644 --- a/src/Web/Server/Modules/UserModule/UserService.cs +++ b/src/Web/Server/Modules/UserModule/UserService.cs @@ -167,12 +167,12 @@ public async Task>> GetAllAsync(UserFilter resp return response; } - public async Task> CreateTransferAsync() { + public async Task> CreateTransferAsync(TransferRequestResponse value) { var response = new Response(); try { var id = await this.GetId(); if (id != null) { - var item = new TransferRequestEntity { UserId = id, Completed = false }; + var item = new TransferRequestEntity { UserId = id, CompanyId = value.CompanyId, Completed = false }; await _ctx.TransferRequests.AddAsync(item); await _ctx.SaveChangesAsync(); var data = _mapper.Map(item); @@ -190,21 +190,33 @@ public async Task> CreateTransferAsync() { } - public async Task>> GetAllTransferAsync(TransferRequestFilter transferFilter) { - var result = new PagedResponse>(); + public async Task>> GetAllTransferAsync(TransferRequestFilter transferFilter) { + var result = new PagedResponse>(); try { var query = _ctx.TransferRequests .Where(x => x.Completed == false) - .Include(x => x.User); + .Include(x => x.Company) + .Include(x => x.User) + .ThenInclude(x => x!.Company) + .ApplyFilter(transferFilter) + .Select(x => new TransferRequestItem { + Id = x.Id, + CreatedAt = x.CreatedAt, + User = $"{x.User!.FirstName} {x.User!.LastName}", + UserId = x.User.Id, + Email = x.User.Email, + Company = x.Company!.ShortName, + PreviousCompany = x.User.Company!.ShortName, + Completed = x.Completed + }); var count = await query.CountAsync(); - var data = await query.ApplyFilter(transferFilter).ToListAsync(); - var response = _mapper.Map>(data); + var data = await query.ToListAsync(); var filter = new PaginationFilter { Page = transferFilter.Page, PerPage = transferFilter.PerPage }; - result = new PagedResponse>(response, count, filter) { + result = new PagedResponse>(data, count, filter) { Succeeded = true }; } @@ -218,12 +230,19 @@ public async Task>> GetAllTransferAs return result; } - public async Task> ApproveTransferAsync(TransferRequestResponse transfer) { + public async Task> ApproveTransferAsync(Guid id) { var response = new Response(); try { - var item = await _ctx.TransferRequests.FindAsync(transfer.Id); - if (item is null) return response; - _mapper.Map(transfer, item); + var item = await _ctx.TransferRequests.Where(x => x.Id == id) + .Include(x => x.Company) + .Include(x => x.User) + .FirstOrDefaultAsync(); + if (item!.UserId is null || item.CompanyId is null) return response; + var user = await _ctx.Users.FindAsync(item.UserId); + user!.CompanyId = item.CompanyId; + user.TeamId = null; + user.Permission = UserPermission.Standard; + _ctx.Update(user); _ctx.Update(item); await _ctx.SaveChangesAsync(); var data = _mapper.Map(item); From 04a24adc26a0699836be41cb781809a93681cbf7 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Tue, 7 Feb 2023 17:32:26 +0100 Subject: [PATCH 113/185] Optiimize config helper --- src/Web/Server/Helpers/ConfigHelper.cs | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/Web/Server/Helpers/ConfigHelper.cs b/src/Web/Server/Helpers/ConfigHelper.cs index 6235a760..91830230 100644 --- a/src/Web/Server/Helpers/ConfigHelper.cs +++ b/src/Web/Server/Helpers/ConfigHelper.cs @@ -4,20 +4,21 @@ namespace XClaim.Web.Server.Helpers; public static class ConfigHelper { - public static void ApplyDefaultAppConfiguration(HostBuilderContext hostingContext, IConfigurationBuilder appConfigBuilder, string[]? args) { + public static void ApplyDefaultAppConfiguration(HostBuilderContext hostingContext, IConfigurationBuilder builder, string[]? args) { IHostEnvironment env = hostingContext.HostingEnvironment; bool reloadOnChange = GetReloadConfigOnChangeValue(hostingContext); - var configFile = env.IsDevelopment() ? $"config.Development.ini" : "config.ini"; - appConfigBuilder.AddIniFile(configFile, optional: true, reloadOnChange: reloadOnChange); + builder.SetBasePath(env.ContentRootPath); + builder.AddIniFile("config.ini", optional: false, reloadOnChange: reloadOnChange); + builder.AddIniFile("config.Development.ini", optional: true, reloadOnChange: reloadOnChange); + builder.AddEnvironmentVariables(); + { + builder.AddCommandLine(args!); + } if (env.IsDevelopment() && env.ApplicationName is { Length: > 0 }) { var appAssembly = Assembly.Load(new AssemblyName(env.ApplicationName)); if (appAssembly != null) - appConfigBuilder.AddUserSecrets(appAssembly, optional: true, reloadOnChange: reloadOnChange); - } - - appConfigBuilder.AddEnvironmentVariables(); { - appConfigBuilder.AddCommandLine(args!); + builder.AddUserSecrets(appAssembly, optional: true, reloadOnChange: reloadOnChange); } [UnconditionalSuppressMessage("ReflectionAnalysis", "IL2026:RequiresUnreferencedCode", Justification = "Calling IConfiguration.GetValue is safe when the T is bool.")] From 172694a20e87ae93d3fbb8b3061a2e228275ab26 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Tue, 7 Feb 2023 17:32:44 +0100 Subject: [PATCH 114/185] minor config update --- src/Web/Server/config.Development.ini | 5 +++-- src/Web/Server/config.ini | 5 ++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Web/Server/config.Development.ini b/src/Web/Server/config.Development.ini index d6bd212d..94823011 100644 --- a/src/Web/Server/config.Development.ini +++ b/src/Web/Server/config.Development.ini @@ -1,10 +1,11 @@ ServiceName=X-Claim AllowedHosts=* -Database=sqlite [Logging.LogLevel] Default=Debug -Microsoft.AspNetCore=Debug +System=Information +Microsoft=Information +DbType=sqlite [ConnectionStrings] Default="Data Source=app-data.sqlite3" diff --git a/src/Web/Server/config.ini b/src/Web/Server/config.ini index 3671c0ec..4fe9a2a4 100644 --- a/src/Web/Server/config.ini +++ b/src/Web/Server/config.ini @@ -1,10 +1,9 @@ ServiceName=X-Claim AllowedHosts=* -Database=sqlite [Logging.LogLevel] -Default=Information -Microsoft.AspNetCore=Warning +Default=Warning +DbType=sqlite [ConnectionStrings] Default="Data Source=app-data.sqlite3" From f8d90cc869b414685b8946e388e9fc49c3aa69fb Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Tue, 7 Feb 2023 17:33:12 +0100 Subject: [PATCH 115/185] Additional fields to claim entity --- src/Web/Server/Entities/ClaimEntity.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Web/Server/Entities/ClaimEntity.cs b/src/Web/Server/Entities/ClaimEntity.cs index aab9fc93..0448022c 100644 --- a/src/Web/Server/Entities/ClaimEntity.cs +++ b/src/Web/Server/Entities/ClaimEntity.cs @@ -11,7 +11,6 @@ public sealed class ClaimEntity : BaseEntity { [MaxLength(1024)] public string? Notes { get; set; } public decimal Amount { get; set; } - public ClaimPriority Priority { get; set; } = ClaimPriority.Normal; public PaymentEntity? Payment { get; set; } public Guid? PaymentId { get; set; } [Required] @@ -20,9 +19,9 @@ public sealed class ClaimEntity : BaseEntity { public CompanyEntity? Company { get; set; } public Guid? CompanyId { get; set; } public ClaimStatus Status { get; set; } = ClaimStatus.Pending; - // [Required] public UserEntity? Owner { get; set; } public Guid? OwnerId { get; set; } + public DateTime? CancelledAt { get; set; } public UserEntity? ReviewedBy { get; set; } public Guid? ReviewedById { get; set; } public DateTime? ReviewedAt { get; set; } @@ -32,6 +31,8 @@ public sealed class ClaimEntity : BaseEntity { public UserEntity? ApprovedBy { get; set; } public Guid? ApprovedById { get; set; } public DateTime? ApprovedAt { get; set; } + public Guid? RejectedById { get; set; } + public DateTime? RejectedAt { get; set; } public ICollection Files { get; set; } = default!; public ICollection Comments { get; set; } = default!; } \ No newline at end of file From 86a68a79111f1914d4bfbf5effe83087a83aae5a Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Tue, 7 Feb 2023 17:34:26 +0100 Subject: [PATCH 116/185] Improve database setup and allow multiple database - Sqlite - Postgres - Mysql --- .../Extensions/DatabaseSetupExtension.cs | 35 +++++++++++++++++++ src/Web/Server/Helpers/DatabaseType.cs | 7 ++++ src/Web/Server/Program.cs | 20 +++++------ 3 files changed, 51 insertions(+), 11 deletions(-) create mode 100644 src/Web/Server/Extensions/DatabaseSetupExtension.cs create mode 100644 src/Web/Server/Helpers/DatabaseType.cs diff --git a/src/Web/Server/Extensions/DatabaseSetupExtension.cs b/src/Web/Server/Extensions/DatabaseSetupExtension.cs new file mode 100644 index 00000000..57ff0930 --- /dev/null +++ b/src/Web/Server/Extensions/DatabaseSetupExtension.cs @@ -0,0 +1,35 @@ +using Microsoft.EntityFrameworkCore; +using XClaim.Web.Server.Data; +using XClaim.Web.Server.Helpers; + +namespace XClaim.Web.Server.Extensions; + +public static class DatabaseSetupExtension { + public static IServiceCollection SetupDatabase(this IServiceCollection services, IConfiguration config) { + var configType = Environment.GetEnvironmentVariable("DB_TYPE") ?? config.GetValue("DbType") ?? "sqlite"; + var configConnection = Environment.GetEnvironmentVariable("DB_CONNECTION_STRING") ?? config.GetConnectionString("Default"); + Enum.TryParse(configType, true, out DatabaseType type); + + services.AddDbContext(options => { + switch (type) { + case DatabaseType.Postgres: + options.UseNpgsql(configConnection); + break; + case DatabaseType.Mysql: + options.UseMySql(configConnection, new MySqlServerVersion(new Version(8, 0, 29))); + break; + case DatabaseType.Sqlite: + default: + options.UseSqlite(configConnection); + break; + } + + options.UseSnakeCaseNamingConvention() + .LogTo(Console.WriteLine, LogLevel.Information) + .EnableSensitiveDataLogging() + .EnableDetailedErrors(); + }); + + return services; + } +} \ No newline at end of file diff --git a/src/Web/Server/Helpers/DatabaseType.cs b/src/Web/Server/Helpers/DatabaseType.cs new file mode 100644 index 00000000..7214786a --- /dev/null +++ b/src/Web/Server/Helpers/DatabaseType.cs @@ -0,0 +1,7 @@ +namespace XClaim.Web.Server.Helpers; + +public enum DatabaseType { + Sqlite, + Postgres, + Mysql, +} \ No newline at end of file diff --git a/src/Web/Server/Program.cs b/src/Web/Server/Program.cs index 61d84376..03b87f98 100644 --- a/src/Web/Server/Program.cs +++ b/src/Web/Server/Program.cs @@ -10,6 +10,7 @@ using Microsoft.OpenApi.Models; using XClaim.Web.Server; using XClaim.Web.Server.Data; +using XClaim.Web.Server.Extensions; using XClaim.Web.Server.Helpers; WebApplicationBuilder builder = WebApplication.CreateBuilder(args); @@ -18,12 +19,8 @@ ConfigHelper.ApplyDefaultAppConfiguration(ctx, builder.Configuration, args); }); -string? connectionString = builder.Configuration.GetConnectionString("Default"); -builder.Services.AddDbContext(options => { - options.UseSqlite(connectionString).UseSnakeCaseNamingConvention(); -}); - -builder.Services.Configure(options => { +builder.Services.SetupDatabase(builder.Configuration) +.Configure(options => { options.SerializerOptions.ReferenceHandler = ReferenceHandler.IgnoreCycles; }); @@ -69,13 +66,14 @@ builder.Services.AddRazorPages(); builder.Services.RegisterModules(); -IHealthChecksBuilder healthCheck = builder.Services.AddHealthChecks() - .AddApplicationStatus(); + builder.Services.AddHealthChecksUI() .AddInMemoryStorage(); - -if (connectionString != null) { - _ = healthCheck.AddSqlite(connectionString); +IHealthChecksBuilder healthCheck = builder.Services.AddHealthChecks() +.AddApplicationStatus(); +string? appConnectionString = builder.Configuration.GetConnectionString("Default"); +if (appConnectionString != null) { + _ = healthCheck.AddSqlite(appConnectionString); } WebApplication app = builder.Build(); From 40cee6138cfee0fbba14cf33018883f01067ebc2 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Tue, 7 Feb 2023 17:35:01 +0100 Subject: [PATCH 117/185] Discard unrequired build options --- src/Web/Components/XClaim.Web.Components.csproj | 2 -- src/Web/Components/bundleconfig.json | 1 - src/Web/Components/sasscompiler.json | 15 --------------- 3 files changed, 18 deletions(-) delete mode 100644 src/Web/Components/bundleconfig.json delete mode 100644 src/Web/Components/sasscompiler.json diff --git a/src/Web/Components/XClaim.Web.Components.csproj b/src/Web/Components/XClaim.Web.Components.csproj index efa5b55e..ac2c370a 100644 --- a/src/Web/Components/XClaim.Web.Components.csproj +++ b/src/Web/Components/XClaim.Web.Components.csproj @@ -13,8 +13,6 @@ - - diff --git a/src/Web/Components/bundleconfig.json b/src/Web/Components/bundleconfig.json deleted file mode 100644 index 0637a088..00000000 --- a/src/Web/Components/bundleconfig.json +++ /dev/null @@ -1 +0,0 @@ -[] \ No newline at end of file diff --git a/src/Web/Components/sasscompiler.json b/src/Web/Components/sasscompiler.json deleted file mode 100644 index 26236f47..00000000 --- a/src/Web/Components/sasscompiler.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "ScopedCssFolders": [ - "Layouts", - "Pages", - "Controls", - "Shared" - ], - "GenerateScopedCss": true, - "Arguments": "--style=compressed", - "Configurations": { - "Debug": { - "Arguments": "--style=expanded" - } - } -} \ No newline at end of file From 41cedae64f1b49f99440e79b9f02e087e589cee5 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Tue, 7 Feb 2023 17:35:50 +0100 Subject: [PATCH 118/185] Use env vars and configure docker build --- src/Web/Server/Modules/AuthModule/AuthModule.cs | 6 +++--- src/Web/Server/Properties/launchSettings.json | 3 ++- src/Web/Server/XClaim.Web.Server.csproj | 14 ++++++++++++++ 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/src/Web/Server/Modules/AuthModule/AuthModule.cs b/src/Web/Server/Modules/AuthModule/AuthModule.cs index 8b54be1d..dd484ee5 100644 --- a/src/Web/Server/Modules/AuthModule/AuthModule.cs +++ b/src/Web/Server/Modules/AuthModule/AuthModule.cs @@ -15,14 +15,14 @@ public IServiceCollection RegisterApiModule(IServiceCollection services) { public IEndpointRouteBuilder MapEndpoints(IEndpointRouteBuilder endpoints) { const string name = "Authentication"; - var url = $"/auth"; + const string url = $"/auth"; var group = endpoints.MapGroup(url).WithTags(name); group.MapGet("/sign-in", ([FromQuery] string? redirect) => { - var redirectValue = redirect.IsNullOrEmpty() ? WebConst.RootUri : redirect; + var redirectUri = Environment.GetEnvironmentVariable("ROOT_URI") ?? (redirect.IsNullOrEmpty() ? WebConst.RootUri : redirect); var props = new AuthenticationProperties { IsPersistent = true, - RedirectUri = redirectValue + RedirectUri = redirectUri }; return Results.Challenge(props, new[] { MicrosoftAccountDefaults.AuthenticationScheme }); diff --git a/src/Web/Server/Properties/launchSettings.json b/src/Web/Server/Properties/launchSettings.json index da9f9358..db5f0756 100644 --- a/src/Web/Server/Properties/launchSettings.json +++ b/src/Web/Server/Properties/launchSettings.json @@ -15,7 +15,8 @@ "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}", "applicationUrl": "https://localhost:7001", "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" + "ASPNETCORE_ENVIRONMENT": "Development", + "ROOT_URI": "https://localhost:7001" } } } diff --git a/src/Web/Server/XClaim.Web.Server.csproj b/src/Web/Server/XClaim.Web.Server.csproj index 2a40bf07..63be2642 100644 --- a/src/Web/Server/XClaim.Web.Server.csproj +++ b/src/Web/Server/XClaim.Web.Server.csproj @@ -5,6 +5,12 @@ enable enable 4102fda6-15af-4599-9d0f-a2916d92f41a + FileSystem + FileSystem + published + true + false + false @@ -34,7 +40,9 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive + + @@ -48,5 +56,11 @@ + + + Always + + + From a4976eeb3762fab99393f18ab4b1a33fa77e0880 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Tue, 7 Feb 2023 17:36:21 +0100 Subject: [PATCH 119/185] Minor server state fix --- src/Web/Client/App.razor | 7 +++---- src/Web/Shared/States/AppState.cs | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/Web/Client/App.razor b/src/Web/Client/App.razor index 3c1e7d37..ac90e292 100644 --- a/src/Web/Client/App.razor +++ b/src/Web/Client/App.razor @@ -21,14 +21,13 @@ case false when isAuthPath: break; case true when isAuthPath || isRootPath || (isRegistrationPath && session.Confirmed): - Nav.NavigateTo(WebConst.AppHome); + Nav.NavigateTo(WebConst.AppHome, true); break; case false when isRootPath: await AuthState.TriggerAuthentication(); if (isAuth) Nav.NavigateTo(!session!.Confirmed ? WebConst.AppRegister : WebConst.AppHome, true); else { - await Task.Delay(50); - Nav.NavigateTo(WebConst.AppAuth, true); + Nav.NavigateTo(WebConst.AppHome); } break; case false: { @@ -38,7 +37,7 @@ if (AppState.ServerState == null) { var server = await ServerService.GetAsync(); - await AppState.LoadServerState(server.Data!); + AppState.LoadServerState(server.Data!); if (isAuth) { await AuthState.Refresh(); var user = await AuthState.GetAccount(); diff --git a/src/Web/Shared/States/AppState.cs b/src/Web/Shared/States/AppState.cs index 3c1d6720..de1c1539 100644 --- a/src/Web/Shared/States/AppState.cs +++ b/src/Web/Shared/States/AppState.cs @@ -28,7 +28,7 @@ public void ToggleSidebar() { NotifyStateChanged(); } - public async Task LoadServerState(ServerStateResponse server) { + public void LoadServerState(ServerStateResponse server) { ServerState = server; AppTitle = server.ServiceName; NotifyStateChanged(); From 3cc01fffa64fd5d942938e40f30da34e236cd271 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Tue, 7 Feb 2023 17:36:53 +0100 Subject: [PATCH 120/185] Improve HTTP client service --- src/Common/Service/AbstractHttpService.cs | 10 ++++++++++ src/Common/Service/IHttpService.cs | 2 ++ 2 files changed, 12 insertions(+) diff --git a/src/Common/Service/AbstractHttpService.cs b/src/Common/Service/AbstractHttpService.cs index cc32cdf1..98747a31 100644 --- a/src/Common/Service/AbstractHttpService.cs +++ b/src/Common/Service/AbstractHttpService.cs @@ -30,6 +30,11 @@ public async Task Post(string uri, object? value) { var request = CreateRequest(HttpMethod.Post, uri, value); await SendRequest(request); } + + public async Task Post(string uri) { + var request = CreateRequest(HttpMethod.Post, uri); + return await SendRequest(request); + } public async Task Post(string uri, object? value) { var request = CreateRequest(HttpMethod.Post, uri, value); @@ -40,6 +45,11 @@ public async Task Put(string uri, object? value) { var request = CreateRequest(HttpMethod.Put, uri, value); await SendRequest(request); } + + public async Task Put(string uri) { + var request = CreateRequest(HttpMethod.Put, uri); + return await SendRequest(request); + } public async Task Put(string uri, object? value) { var request = CreateRequest(HttpMethod.Put, uri, value); diff --git a/src/Common/Service/IHttpService.cs b/src/Common/Service/IHttpService.cs index 1b767e1c..c999341e 100644 --- a/src/Common/Service/IHttpService.cs +++ b/src/Common/Service/IHttpService.cs @@ -7,7 +7,9 @@ public interface IHttpService { Task Get(string uri, object? query); Task Post(string uri, object? value); Task Post(string uri, object? value); + Task Post(string uri); Task Put(string uri, object? value); + Task Put(string uri); Task Put(string uri, object? value); Task Delete(string uri); Task Delete(string uri); From f1c2067221ae887cb17e74922ce4e9b3ec88d250 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Tue, 7 Feb 2023 17:37:34 +0100 Subject: [PATCH 121/185] minor setting tweaks --- src/Web/Components/Pages/Account/Notification.razor | 4 ++-- src/Web/Components/Pages/Settings/Server.razor | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Web/Components/Pages/Account/Notification.razor b/src/Web/Components/Pages/Account/Notification.razor index 915cd054..4e88fd53 100644 --- a/src/Web/Components/Pages/Account/Notification.razor +++ b/src/Web/Components/Pages/Account/Notification.razor @@ -12,8 +12,8 @@ MudForm? _form; private class EventObject { - public string Key { get; set; } - public string Name { get; set; } + public string? Key { get; set; } + public string? Name { get; set; } public EventType Value { get; set; } public bool Active { get; set; } } diff --git a/src/Web/Components/Pages/Settings/Server.razor b/src/Web/Components/Pages/Settings/Server.razor index 9af320fe..1d52a3c4 100644 --- a/src/Web/Components/Pages/Settings/Server.razor +++ b/src/Web/Components/Pages/Settings/Server.razor @@ -35,7 +35,7 @@ var result = await ServerService.UpdateAsync(Item); if (result.Succeeded) - await AppState.LoadServerState(result.Data!); + AppState.LoadServerState(result.Data!); Snackbar.Add(result.Succeeded ? "Deleted successfully" : "Archiving failed", result.Succeeded ? Severity.Success : Severity.Error); } From fae6480a851fff7f1aa2914c60640b6fcb0ac938 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Tue, 7 Feb 2023 17:38:04 +0100 Subject: [PATCH 122/185] Added HTTP client service for user entity --- src/Common/HTTP/IUserService.cs | 5 +++++ src/Common/HTTP/UserService.cs | 15 +++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/src/Common/HTTP/IUserService.cs b/src/Common/HTTP/IUserService.cs index a81dc12d..4e836c76 100644 --- a/src/Common/HTTP/IUserService.cs +++ b/src/Common/HTTP/IUserService.cs @@ -17,4 +17,9 @@ public interface IUserService { Task> ArchiveAsync(Guid id); Task>> ArchiveRangeAsync(List ids); + Task> GetTransferAsync(); + Task>> GetAllTransferAsync(object? query = null); + Task> CreateTransferAsync(TransferRequestResponse transfer); + Task> ApproveTransferAsync(Guid id); + Task> ArchiveTransferAsync(Guid id); } \ No newline at end of file diff --git a/src/Common/HTTP/UserService.cs b/src/Common/HTTP/UserService.cs index 51f85522..9e84e3c9 100644 --- a/src/Common/HTTP/UserService.cs +++ b/src/Common/HTTP/UserService.cs @@ -33,4 +33,19 @@ public async Task> ArchiveAsync(Guid id) { public async Task>> ArchiveRangeAsync(List ids) { return await _http.Delete>>(RootApi, ids); } + public async Task>> GetAllTransferAsync(object? query = null) { + return await _http.Get>>($"{RootApi}/transfer", query); + } + public async Task> GetTransferAsync() { + return await _http.Get>($"{RootApi}/transfer/profile"); + } + public async Task> CreateTransferAsync(TransferRequestResponse transfer) { + return await _http.Post>($"{RootApi}/transfer", transfer); + } + public async Task> ApproveTransferAsync(Guid id) { + return await _http.Put>($"{RootApi}/transfer/{id}"); + } + public async Task> ArchiveTransferAsync(Guid id) { + return await _http.Delete>($"{RootApi}/transfer/{id}"); + } } \ No newline at end of file From 639b050cbd75de0c4268a7fbd672220a29a73c97 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Tue, 7 Feb 2023 17:38:10 +0100 Subject: [PATCH 123/185] Update ObjectExtensions.cs --- src/Common/Extensions/ObjectExtensions.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Common/Extensions/ObjectExtensions.cs b/src/Common/Extensions/ObjectExtensions.cs index 6b2238cc..4292125e 100644 --- a/src/Common/Extensions/ObjectExtensions.cs +++ b/src/Common/Extensions/ObjectExtensions.cs @@ -7,7 +7,7 @@ public static string GetQueryString(this object? obj) { if (obj == null) return string.Empty; var properties = from p in obj.GetType().GetProperties() where p.GetValue(obj, null) != null - select p.Name + "=" + HttpUtility.UrlEncode(p.GetValue(obj, null).ToString()); + select p.Name + "=" + HttpUtility.UrlEncode(p!.GetValue(obj, null).ToString()); return "?" + String.Join("&", properties.ToArray()); } From 832b07dd245e875e9143fd0b50849e13596870df Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Tue, 7 Feb 2023 17:38:14 +0100 Subject: [PATCH 124/185] Update StringHelpers.cs --- src/Common/Helpers/StringHelpers.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Common/Helpers/StringHelpers.cs b/src/Common/Helpers/StringHelpers.cs index b3770503..cd6077d9 100644 --- a/src/Common/Helpers/StringHelpers.cs +++ b/src/Common/Helpers/StringHelpers.cs @@ -10,7 +10,7 @@ public static string GetInitialsText(string?[] value) { if (f == null || l == null) return "FL"; try { return string.Concat(f[0], l[0]); - } catch (Exception e) { + } catch (Exception) { // ignore } return string.Empty; From b3f0ddeee4027192163cf2ddf414e4a359ddb80e Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Tue, 7 Feb 2023 17:39:01 +0100 Subject: [PATCH 125/185] update and added additional DTo for company transfer --- src/Common/Dtos/TransferRequestItem.cs | 12 ++++++++++++ src/Common/Dtos/TransferRequestResponse.cs | 3 +++ 2 files changed, 15 insertions(+) create mode 100644 src/Common/Dtos/TransferRequestItem.cs diff --git a/src/Common/Dtos/TransferRequestItem.cs b/src/Common/Dtos/TransferRequestItem.cs new file mode 100644 index 00000000..df6cbc91 --- /dev/null +++ b/src/Common/Dtos/TransferRequestItem.cs @@ -0,0 +1,12 @@ +using XClaim.Common.Base; + +namespace XClaim.Common.Dtos; + +public class TransferRequestItem : BaseResponse { + public string? User { get; set; } + public Guid? UserId { get; set; } + public string? Company { get; set; } + public string? PreviousCompany { get; set; } + public string? Email { get; set; } + public bool Completed { get; set; } +} \ No newline at end of file diff --git a/src/Common/Dtos/TransferRequestResponse.cs b/src/Common/Dtos/TransferRequestResponse.cs index e1f48e91..f73f5e6d 100644 --- a/src/Common/Dtos/TransferRequestResponse.cs +++ b/src/Common/Dtos/TransferRequestResponse.cs @@ -5,4 +5,7 @@ namespace XClaim.Common.Dtos; public class TransferRequestResponse : BaseResponse { public UserResponse? User { get; set; } public Guid? UserId { get; set; } + public CompanyResponse? Company { get; set; } + public Guid? CompanyId { get; set; } + public bool Completed { get; set; } } \ No newline at end of file From e12f0925b0ddfd09553d50692e81c0bd5ac11459 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Tue, 7 Feb 2023 17:39:59 +0100 Subject: [PATCH 126/185] Implemented initial company transfer features --- .../Components/Pages/Account/Settings.razor | 82 +++++++++++++++++- .../User/{ => Components}/MutateUser.razor | 0 src/Web/Components/Pages/User/Index.razor | 3 +- src/Web/Components/Pages/User/Layout.razor | 35 ++++++++ .../Pages/User/TransferRequest.razor | 86 +++++++++++++++++++ src/Web/Components/Pages/User/_Imports.razor | 1 + 6 files changed, 201 insertions(+), 6 deletions(-) rename src/Web/Components/Pages/User/{ => Components}/MutateUser.razor (100%) create mode 100644 src/Web/Components/Pages/User/Layout.razor create mode 100644 src/Web/Components/Pages/User/TransferRequest.razor create mode 100644 src/Web/Components/Pages/User/_Imports.razor diff --git a/src/Web/Components/Pages/Account/Settings.razor b/src/Web/Components/Pages/Account/Settings.razor index 29c49663..81a06d6b 100644 --- a/src/Web/Components/Pages/Account/Settings.razor +++ b/src/Web/Components/Pages/Account/Settings.razor @@ -1,13 +1,16 @@ +@using XClaim.Common.Enums +@using Nextended.Core.Extensions +@using XClaim.Common.Dtos +@using XClaim.Common.Helpers @implements IDisposable @inject Navigation Nav @inject IProfileService ProfileService +@inject ICompanyService CompanyService +@inject IUserService UserService @inject ISnackbar Snackbar @inject ThemeState ThemeState @inject AuthState AuthState @page "/app/account/settings" -@using XClaim.Common.Enums -@using Nextended.Core.Extensions -@using XClaim.Common.Dtos @attribute [Authorize] @code { @@ -15,6 +18,14 @@ string[] _errors = { }; MudForm? _form; private SettingResponse Item { get; set; } = new SettingResponse(); + private bool TransferRequestView { get; set; } + private TransferRequestResponse? TransferRequest { get; set; } + private CompanyResponse? Company { get; set; } + + private async Task> SearchCompany(string value) { + var response = await CompanyService.GetAllAsync(new SearchFilter { Search = value }); + return (response.Succeeded ? response.Data : new List {})!; + } protected override async Task OnInitializedAsync() { await base.OnInitializedAsync(); @@ -22,6 +33,7 @@ if (result is { Succeeded: true, Data: { } }) { Item = result.Data; } + await this.LoadUserTransfer(); } private async Task Submit() { @@ -38,6 +50,34 @@ await Task.Delay(500); Snackbar.Add(result.Succeeded ? "Updated successfully.." : "Update failed..", result.Succeeded ? Severity.Success : Severity.Error); } + + private async Task LoadUserTransfer() { + var transfer = await UserService.GetTransferAsync(); + if(transfer.Succeeded) TransferRequest = transfer.Data; + } + + private async Task TransferUser() { + var user = await AuthState.GetAccount(); + if (Company!.Id == null && user!.Id == null) + return; + + var payload = new TransferRequestResponse { + UserId = user!.Id, + CompanyId = Company!.Id + }; + var transfer = await UserService.CreateTransferAsync(payload); + if (transfer.Succeeded) + await this.LoadUserTransfer(); + } + + private async Task CancelTransfer() { + if(TransferRequest!.Id == null) + return; + var id = (Guid) TransferRequest.Id!; + var transfer = await UserService.ArchiveTransferAsync(id); + if (transfer.Succeeded) + TransferRequest = null; + } public void Dispose() => ThemeState.OnChange -= StateHasChanged; } @@ -50,7 +90,7 @@ - @foreach (var lang in Enum.GetValues()) { @lang.ToDescriptionString().Capitalize() @@ -60,6 +100,40 @@ + + + + @if (TransferRequest != null) { + + Pending company transfer.. + Cancel + + } else { + @if (!TransferRequestView) { + + Request for company transfer + Get Started + + } + else { + + + + Cancel + Request + + + } + } + + + ? _dataGrid; private HashSet SelectedItems { get; set; } = new HashSet(); - private Func Filter => x => string.IsNullOrWhiteSpace(Search) || x.FullName.Contains(Search, StringComparison.OrdinalIgnoreCase) diff --git a/src/Web/Components/Pages/User/Layout.razor b/src/Web/Components/Pages/User/Layout.razor new file mode 100644 index 00000000..611d8be9 --- /dev/null +++ b/src/Web/Components/Pages/User/Layout.razor @@ -0,0 +1,35 @@ +@inherits LayoutComponentBase +@layout MainLayout +@inject NavigationManager Nav + +@code { + private int TabState { get; set; } + + private record ManagePage(string Title, string Path, string Icon = Icons.Material.Filled.Settings); + + private readonly List _pages = new List() { + new ManagePage("Users", "app/users", Icons.Material.Filled.VerifiedUser), + new ManagePage("Transfers", "app/users/transfer-request", Icons.Material.Filled.Transform) + }; + + private void TriggerNavigation(ManagePage page) { + TabState = _pages.IndexOf(page); + Nav.NavigateTo(page.Path); + } + + protected override void OnInitialized() { + base.OnInitialized(); + var page = _pages.Find(x => Nav.ToAbsoluteUri(x.Path).ToString() == Nav.Uri); + if (page == null) return; + TabState = _pages.IndexOf(page); + } +} + + + @foreach (var tab in _pages) { + + } + + + @Body + \ No newline at end of file diff --git a/src/Web/Components/Pages/User/TransferRequest.razor b/src/Web/Components/Pages/User/TransferRequest.razor new file mode 100644 index 00000000..9e1513bb --- /dev/null +++ b/src/Web/Components/Pages/User/TransferRequest.razor @@ -0,0 +1,86 @@ +@using XClaim.Common.Dtos +@using XClaim.Common.Helpers +@using XClaim.Web.Components.Pages.User.Components +@page "/app/users/transfer-request" +@inject IUserService Http +@attribute [Authorize(Roles = "System")] + +@code { + private string Search { get; set; } = string.Empty; + private bool Loading { get; set; } + private int Current { get; set; } = 1; + MudDataGrid? _dataGrid; + private HashSet SelectedItems { get; set; } = new HashSet(); + private Func Filter => x => + string.IsNullOrWhiteSpace(Search) + || x.User!.Contains(Search, StringComparison.OrdinalIgnoreCase) + || x.Email!.Contains(Search, StringComparison.OrdinalIgnoreCase); + + private async Task> ServerDataFunc(GridState state) { + SelectedItems.Clear(); + this.Loading = true; + var filter = new SearchFilter { + Page = Current, + PerPage = state.PageSize, + Search = Search.Length > 2 ? Search : null + }; + var items = await Http.GetAllTransferAsync(filter); + this.Loading = false; + return new GridData { + Items = items.Data, + TotalItems = items.Total + }; + } + + private async Task ArchiveSelectedItems(bool allow) { + if (!allow) return; + List items = SelectedItems + .Where(f => f?.Id != null) + .Select(f => ((Guid) f.Id!)).ToList(); + if (items.Count > 0) { + var result = (await Http.ArchiveRangeAsync(items)); + await ReloadList(result.Succeeded); + } + } + + private async Task ReloadList(bool reload) { + if (reload) await _dataGrid!.ReloadServerData(); + } +} + +User Account Transfers + + + + + + + + + + + + + @* *@ + @* *@ + @* *@ + @* *@ + @* *@ + @* *@ + @* *@ + + + + + @(context.Item.Completed ? "Yes" : "No") + + + + + + + + + \ No newline at end of file diff --git a/src/Web/Components/Pages/User/_Imports.razor b/src/Web/Components/Pages/User/_Imports.razor new file mode 100644 index 00000000..cc2a445c --- /dev/null +++ b/src/Web/Components/Pages/User/_Imports.razor @@ -0,0 +1 @@ +@layout Layout \ No newline at end of file From 0a9bfc352f799bd30c527f7b0bd66e84526e69b3 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Tue, 7 Feb 2023 17:40:07 +0100 Subject: [PATCH 127/185] Update XClaim.Web.sln --- src/Web/XClaim.Web.sln | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Web/XClaim.Web.sln b/src/Web/XClaim.Web.sln index 18689620..5872742a 100644 --- a/src/Web/XClaim.Web.sln +++ b/src/Web/XClaim.Web.sln @@ -5,7 +5,7 @@ VisualStudioVersion = 17.0.31903.59 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XClaim.Common", "..\Common\XClaim.Common.csproj", "{7296F081-81BD-4E64-A5BF-658B989D8907}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XClaim.Web.Pages", "Components\XClaim.Web.Pages.csproj", "{E948EEF5-8827-45B9-8BEA-AA17269F59D7}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XClaim.Web.Pages", "Components\XClaim.Web.Components.csproj", "{E948EEF5-8827-45B9-8BEA-AA17269F59D7}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XClaim.Web.Client", "Client\XClaim.Web.Client.csproj", "{67A320D0-39EB-4DFD-B7B4-DE28B192392B}" EndProject From 7e5d1d8a93ec767334d477e122ae3bb35c71de74 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Tue, 7 Feb 2023 17:40:26 +0100 Subject: [PATCH 128/185] Added Cancelled state to claim state --- src/Common/Enums/ClaimStatus.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Common/Enums/ClaimStatus.cs b/src/Common/Enums/ClaimStatus.cs index 955238a1..bf782175 100644 --- a/src/Common/Enums/ClaimStatus.cs +++ b/src/Common/Enums/ClaimStatus.cs @@ -2,8 +2,9 @@ public enum ClaimStatus { Pending, + Rejected, + Cancelled, Reviewed, Confirmed, - Approved, - Rejected + Approved } \ No newline at end of file From bb4fa75e34539879ae46018ecf2851ba0e437ed7 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Wed, 8 Feb 2023 10:58:50 +0100 Subject: [PATCH 129/185] Rename ArchiveConfirmation to ConfirmationDialog --- ...rmation.razor => ConfirmationDialog.razor} | 0 .../Components/Pages/Claims/MutateClaim.razor | 2 +- .../Components/Pages/Manage/Bank/Index.razor | 2 +- .../Pages/Manage/Bank/MutateBank.razor | 2 +- .../Pages/Manage/Category/Index.razor | 2 +- .../Manage/Category/MutateCategory.razor | 2 +- .../Pages/Manage/Company/Index.razor | 2 +- .../Pages/Manage/Company/MutateCompany.razor | 2 +- .../Pages/Manage/Currency/Index.razor | 2 +- .../Manage/Currency/MutateCurrency.razor | 2 +- .../Pages/Manage/Domains/Index.razor | 2 +- .../Pages/Manage/Domains/MutateDomain.razor | 2 +- .../Components/Pages/Manage/Teams/Index.razor | 2 +- .../Pages/Manage/Teams/MutateTeam.razor | 2 +- .../Pages/User/Components/MutateUser.razor | 2 +- src/Web/Components/Pages/User/Index.razor | 2 +- .../Pages/User/TransferRequest.razor | 22 +++++++++---------- 17 files changed, 26 insertions(+), 26 deletions(-) rename src/Web/Components/Controls/{ArchiveConfirmation.razor => ConfirmationDialog.razor} (100%) diff --git a/src/Web/Components/Controls/ArchiveConfirmation.razor b/src/Web/Components/Controls/ConfirmationDialog.razor similarity index 100% rename from src/Web/Components/Controls/ArchiveConfirmation.razor rename to src/Web/Components/Controls/ConfirmationDialog.razor diff --git a/src/Web/Components/Pages/Claims/MutateClaim.razor b/src/Web/Components/Pages/Claims/MutateClaim.razor index c882f33c..f2daed09 100644 --- a/src/Web/Components/Pages/Claims/MutateClaim.razor +++ b/src/Web/Components/Pages/Claims/MutateClaim.razor @@ -74,7 +74,7 @@ @Title @if (Id != null) { - + } diff --git a/src/Web/Components/Pages/Manage/Bank/Index.razor b/src/Web/Components/Pages/Manage/Bank/Index.razor index 08707bb4..58870067 100644 --- a/src/Web/Components/Pages/Manage/Bank/Index.razor +++ b/src/Web/Components/Pages/Manage/Bank/Index.razor @@ -54,7 +54,7 @@ - + diff --git a/src/Web/Components/Pages/Manage/Bank/MutateBank.razor b/src/Web/Components/Pages/Manage/Bank/MutateBank.razor index 4c35c119..2feb1c63 100644 --- a/src/Web/Components/Pages/Manage/Bank/MutateBank.razor +++ b/src/Web/Components/Pages/Manage/Bank/MutateBank.razor @@ -50,7 +50,7 @@ @Title @if (Id != null) { - + } diff --git a/src/Web/Components/Pages/Manage/Category/Index.razor b/src/Web/Components/Pages/Manage/Category/Index.razor index 5ed6c118..ad1eb25e 100644 --- a/src/Web/Components/Pages/Manage/Category/Index.razor +++ b/src/Web/Components/Pages/Manage/Category/Index.razor @@ -54,7 +54,7 @@ - + diff --git a/src/Web/Components/Pages/Manage/Category/MutateCategory.razor b/src/Web/Components/Pages/Manage/Category/MutateCategory.razor index cb64dc4e..adee2ae5 100644 --- a/src/Web/Components/Pages/Manage/Category/MutateCategory.razor +++ b/src/Web/Components/Pages/Manage/Category/MutateCategory.razor @@ -65,7 +65,7 @@ @Title @if (Id != null) { - + } diff --git a/src/Web/Components/Pages/Manage/Company/Index.razor b/src/Web/Components/Pages/Manage/Company/Index.razor index 06ef5c79..882b37bc 100644 --- a/src/Web/Components/Pages/Manage/Company/Index.razor +++ b/src/Web/Components/Pages/Manage/Company/Index.razor @@ -59,7 +59,7 @@ - + diff --git a/src/Web/Components/Pages/Manage/Company/MutateCompany.razor b/src/Web/Components/Pages/Manage/Company/MutateCompany.razor index 86e4e31c..af6a0e1f 100644 --- a/src/Web/Components/Pages/Manage/Company/MutateCompany.razor +++ b/src/Web/Components/Pages/Manage/Company/MutateCompany.razor @@ -64,7 +64,7 @@ @Title @if (Id != null) { - + } diff --git a/src/Web/Components/Pages/Manage/Currency/Index.razor b/src/Web/Components/Pages/Manage/Currency/Index.razor index 6819c44f..fa502562 100644 --- a/src/Web/Components/Pages/Manage/Currency/Index.razor +++ b/src/Web/Components/Pages/Manage/Currency/Index.razor @@ -49,7 +49,7 @@ - + diff --git a/src/Web/Components/Pages/Manage/Currency/MutateCurrency.razor b/src/Web/Components/Pages/Manage/Currency/MutateCurrency.razor index 1b3aa0ee..edc4a06d 100644 --- a/src/Web/Components/Pages/Manage/Currency/MutateCurrency.razor +++ b/src/Web/Components/Pages/Manage/Currency/MutateCurrency.razor @@ -50,7 +50,7 @@ @Title @if (Id != null) { - + } diff --git a/src/Web/Components/Pages/Manage/Domains/Index.razor b/src/Web/Components/Pages/Manage/Domains/Index.razor index 132fdfdd..cece5b66 100644 --- a/src/Web/Components/Pages/Manage/Domains/Index.razor +++ b/src/Web/Components/Pages/Manage/Domains/Index.razor @@ -52,7 +52,7 @@ - + diff --git a/src/Web/Components/Pages/Manage/Domains/MutateDomain.razor b/src/Web/Components/Pages/Manage/Domains/MutateDomain.razor index eeab1f1b..cbedc1b7 100644 --- a/src/Web/Components/Pages/Manage/Domains/MutateDomain.razor +++ b/src/Web/Components/Pages/Manage/Domains/MutateDomain.razor @@ -50,7 +50,7 @@ @Title @if (Id != null) { - + } diff --git a/src/Web/Components/Pages/Manage/Teams/Index.razor b/src/Web/Components/Pages/Manage/Teams/Index.razor index aa9c2844..ac7a6e63 100644 --- a/src/Web/Components/Pages/Manage/Teams/Index.razor +++ b/src/Web/Components/Pages/Manage/Teams/Index.razor @@ -56,7 +56,7 @@ - + diff --git a/src/Web/Components/Pages/Manage/Teams/MutateTeam.razor b/src/Web/Components/Pages/Manage/Teams/MutateTeam.razor index cd2025cb..75bf3bfd 100644 --- a/src/Web/Components/Pages/Manage/Teams/MutateTeam.razor +++ b/src/Web/Components/Pages/Manage/Teams/MutateTeam.razor @@ -76,7 +76,7 @@ @Title @if (Id != null) { - + } diff --git a/src/Web/Components/Pages/User/Components/MutateUser.razor b/src/Web/Components/Pages/User/Components/MutateUser.razor index 4e6711a5..9cfc9420 100644 --- a/src/Web/Components/Pages/User/Components/MutateUser.razor +++ b/src/Web/Components/Pages/User/Components/MutateUser.razor @@ -82,7 +82,7 @@ @Title @if (Id != null) { - + } diff --git a/src/Web/Components/Pages/User/Index.razor b/src/Web/Components/Pages/User/Index.razor index 7bf8579e..edf2557e 100644 --- a/src/Web/Components/Pages/User/Index.razor +++ b/src/Web/Components/Pages/User/Index.razor @@ -55,7 +55,7 @@ SortMode="SortMode.Multiple" Filterable="false" QuickFilter="@Filter" Hideable="true" CurrentPage="Current"> - + diff --git a/src/Web/Components/Pages/User/TransferRequest.razor b/src/Web/Components/Pages/User/TransferRequest.razor index 9e1513bb..fa97d2b5 100644 --- a/src/Web/Components/Pages/User/TransferRequest.razor +++ b/src/Web/Components/Pages/User/TransferRequest.razor @@ -32,16 +32,16 @@ }; } - private async Task ArchiveSelectedItems(bool allow) { - if (!allow) return; - List items = SelectedItems - .Where(f => f?.Id != null) - .Select(f => ((Guid) f.Id!)).ToList(); - if (items.Count > 0) { - var result = (await Http.ArchiveRangeAsync(items)); - await ReloadList(result.Succeeded); - } - } + // private async Task ArchiveSelectedItems(bool allow) { + // if (!allow) return; + // List items = SelectedItems + // .Where(f => f?.Id != null) + // .Select(f => ((Guid) f.Id!)).ToList(); + // if (items.Count > 0) { + // var result = (await Http.ArchiveRangeAsync(items)); + // await ReloadList(result.Succeeded); + // } + // } private async Task ReloadList(bool reload) { if (reload) await _dataGrid!.ReloadServerData(); @@ -55,7 +55,7 @@ SortMode="SortMode.Multiple" Filterable="false" QuickFilter="@Filter" Hideable="true" CurrentPage="Current"> - + @* *@ From 2e3768d95ad0c6b75fa1fdfb2351d3d132ab5e69 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Wed, 8 Feb 2023 11:16:11 +0100 Subject: [PATCH 130/185] parameter update on ConfirmationDialog --- .../Controls/ConfirmationDialog.razor | 32 ++++++++++++------- .../Components/Pages/Claims/MutateClaim.razor | 2 +- .../Components/Pages/Manage/Bank/Index.razor | 2 +- .../Pages/Manage/Bank/MutateBank.razor | 2 +- .../Pages/Manage/Category/Index.razor | 2 +- .../Manage/Category/MutateCategory.razor | 2 +- .../Pages/Manage/Company/Index.razor | 2 +- .../Pages/Manage/Company/MutateCompany.razor | 2 +- .../Pages/Manage/Currency/Index.razor | 2 +- .../Manage/Currency/MutateCurrency.razor | 2 +- .../Pages/Manage/Domains/Index.razor | 2 +- .../Pages/Manage/Domains/MutateDomain.razor | 2 +- .../Components/Pages/Manage/Teams/Index.razor | 2 +- .../Pages/Manage/Teams/MutateTeam.razor | 2 +- .../Pages/User/Components/MutateUser.razor | 2 +- src/Web/Components/Pages/User/Index.razor | 2 +- .../Pages/User/TransferRequest.razor | 2 +- 17 files changed, 37 insertions(+), 27 deletions(-) diff --git a/src/Web/Components/Controls/ConfirmationDialog.razor b/src/Web/Components/Controls/ConfirmationDialog.razor index 365974db..e84e63e9 100644 --- a/src/Web/Components/Controls/ConfirmationDialog.razor +++ b/src/Web/Components/Controls/ConfirmationDialog.razor @@ -5,33 +5,43 @@ public int Count { get; set; } [Parameter] - public EventCallback OnArchived { get; set; } + public EventCallback OnTriggered { get; set; } [Parameter] public bool Small { get; set; } [Parameter] - public bool Form { get; set; } + public bool TextButton { get; set; } - private string Title { + [Parameter] + public string? Title { get; set; } + + [Parameter] + public string? Text { get; set; } = "Archive"; + + [Parameter] + public string Icon { get; set; } = Icons.Material.Filled.Archive; + + private string ArchiveTitle { get { const string text = "Confirm Archiving"; return Count < 2 ? text : $"{text} {Count} items"; } } - async Task DeleteRequest() { - var result = await (await DialogService.ShowAsync(Title)).Result; + async Task TriggerRequest() { + var result = await (await DialogService.ShowAsync(Title ?? ArchiveTitle)).Result; if (!result.Canceled) { var value = result.Data.As(); - await OnArchived.InvokeAsync(value); + await OnTriggered.InvokeAsync(value); } } } -@if (Count > 0 && !Form) { - -} else if (Form) { - Archive +@if (Count > 0 && !TextButton) { + +} else if (TextButton) { + @Text } \ No newline at end of file diff --git a/src/Web/Components/Pages/Claims/MutateClaim.razor b/src/Web/Components/Pages/Claims/MutateClaim.razor index f2daed09..d1527f0c 100644 --- a/src/Web/Components/Pages/Claims/MutateClaim.razor +++ b/src/Web/Components/Pages/Claims/MutateClaim.razor @@ -74,7 +74,7 @@ @Title @if (Id != null) { - + } diff --git a/src/Web/Components/Pages/Manage/Bank/Index.razor b/src/Web/Components/Pages/Manage/Bank/Index.razor index 58870067..81e11038 100644 --- a/src/Web/Components/Pages/Manage/Bank/Index.razor +++ b/src/Web/Components/Pages/Manage/Bank/Index.razor @@ -54,7 +54,7 @@ - + diff --git a/src/Web/Components/Pages/Manage/Bank/MutateBank.razor b/src/Web/Components/Pages/Manage/Bank/MutateBank.razor index 2feb1c63..f9ecb90b 100644 --- a/src/Web/Components/Pages/Manage/Bank/MutateBank.razor +++ b/src/Web/Components/Pages/Manage/Bank/MutateBank.razor @@ -50,7 +50,7 @@ @Title @if (Id != null) { - + } diff --git a/src/Web/Components/Pages/Manage/Category/Index.razor b/src/Web/Components/Pages/Manage/Category/Index.razor index ad1eb25e..75a36eb3 100644 --- a/src/Web/Components/Pages/Manage/Category/Index.razor +++ b/src/Web/Components/Pages/Manage/Category/Index.razor @@ -54,7 +54,7 @@ - + diff --git a/src/Web/Components/Pages/Manage/Category/MutateCategory.razor b/src/Web/Components/Pages/Manage/Category/MutateCategory.razor index adee2ae5..d2eb7864 100644 --- a/src/Web/Components/Pages/Manage/Category/MutateCategory.razor +++ b/src/Web/Components/Pages/Manage/Category/MutateCategory.razor @@ -65,7 +65,7 @@ @Title @if (Id != null) { - + } diff --git a/src/Web/Components/Pages/Manage/Company/Index.razor b/src/Web/Components/Pages/Manage/Company/Index.razor index 882b37bc..5e63bd8d 100644 --- a/src/Web/Components/Pages/Manage/Company/Index.razor +++ b/src/Web/Components/Pages/Manage/Company/Index.razor @@ -59,7 +59,7 @@ - + diff --git a/src/Web/Components/Pages/Manage/Company/MutateCompany.razor b/src/Web/Components/Pages/Manage/Company/MutateCompany.razor index af6a0e1f..b1c88a09 100644 --- a/src/Web/Components/Pages/Manage/Company/MutateCompany.razor +++ b/src/Web/Components/Pages/Manage/Company/MutateCompany.razor @@ -64,7 +64,7 @@ @Title @if (Id != null) { - + } diff --git a/src/Web/Components/Pages/Manage/Currency/Index.razor b/src/Web/Components/Pages/Manage/Currency/Index.razor index fa502562..1e249a90 100644 --- a/src/Web/Components/Pages/Manage/Currency/Index.razor +++ b/src/Web/Components/Pages/Manage/Currency/Index.razor @@ -49,7 +49,7 @@ - + diff --git a/src/Web/Components/Pages/Manage/Currency/MutateCurrency.razor b/src/Web/Components/Pages/Manage/Currency/MutateCurrency.razor index edc4a06d..4e640f9b 100644 --- a/src/Web/Components/Pages/Manage/Currency/MutateCurrency.razor +++ b/src/Web/Components/Pages/Manage/Currency/MutateCurrency.razor @@ -50,7 +50,7 @@ @Title @if (Id != null) { - + } diff --git a/src/Web/Components/Pages/Manage/Domains/Index.razor b/src/Web/Components/Pages/Manage/Domains/Index.razor index cece5b66..45688404 100644 --- a/src/Web/Components/Pages/Manage/Domains/Index.razor +++ b/src/Web/Components/Pages/Manage/Domains/Index.razor @@ -52,7 +52,7 @@ - + diff --git a/src/Web/Components/Pages/Manage/Domains/MutateDomain.razor b/src/Web/Components/Pages/Manage/Domains/MutateDomain.razor index cbedc1b7..8a880f54 100644 --- a/src/Web/Components/Pages/Manage/Domains/MutateDomain.razor +++ b/src/Web/Components/Pages/Manage/Domains/MutateDomain.razor @@ -50,7 +50,7 @@ @Title @if (Id != null) { - + } diff --git a/src/Web/Components/Pages/Manage/Teams/Index.razor b/src/Web/Components/Pages/Manage/Teams/Index.razor index ac7a6e63..0e5a0192 100644 --- a/src/Web/Components/Pages/Manage/Teams/Index.razor +++ b/src/Web/Components/Pages/Manage/Teams/Index.razor @@ -56,7 +56,7 @@ - + diff --git a/src/Web/Components/Pages/Manage/Teams/MutateTeam.razor b/src/Web/Components/Pages/Manage/Teams/MutateTeam.razor index 75bf3bfd..a569053e 100644 --- a/src/Web/Components/Pages/Manage/Teams/MutateTeam.razor +++ b/src/Web/Components/Pages/Manage/Teams/MutateTeam.razor @@ -76,7 +76,7 @@ @Title @if (Id != null) { - + } diff --git a/src/Web/Components/Pages/User/Components/MutateUser.razor b/src/Web/Components/Pages/User/Components/MutateUser.razor index 9cfc9420..9e796baf 100644 --- a/src/Web/Components/Pages/User/Components/MutateUser.razor +++ b/src/Web/Components/Pages/User/Components/MutateUser.razor @@ -82,7 +82,7 @@ @Title @if (Id != null) { - + } diff --git a/src/Web/Components/Pages/User/Index.razor b/src/Web/Components/Pages/User/Index.razor index edf2557e..ed00c303 100644 --- a/src/Web/Components/Pages/User/Index.razor +++ b/src/Web/Components/Pages/User/Index.razor @@ -55,7 +55,7 @@ SortMode="SortMode.Multiple" Filterable="false" QuickFilter="@Filter" Hideable="true" CurrentPage="Current"> - + diff --git a/src/Web/Components/Pages/User/TransferRequest.razor b/src/Web/Components/Pages/User/TransferRequest.razor index fa97d2b5..75002e72 100644 --- a/src/Web/Components/Pages/User/TransferRequest.razor +++ b/src/Web/Components/Pages/User/TransferRequest.razor @@ -55,7 +55,7 @@ SortMode="SortMode.Multiple" Filterable="false" QuickFilter="@Filter" Hideable="true" CurrentPage="Current"> - @* *@ + @* *@ From ea7b77dc1a391b1b1c654c5c28fdd11e92fc8d0a Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Wed, 8 Feb 2023 12:20:27 +0100 Subject: [PATCH 131/185] Complete basic user transfer feature --- .../Controls/ConfirmationDialog.razor | 18 ++++-- .../Components/Pages/Claims/MutateClaim.razor | 2 +- .../Pages/Manage/Bank/MutateBank.razor | 2 +- .../Manage/Category/MutateCategory.razor | 2 +- .../Pages/Manage/Company/MutateCompany.razor | 2 +- .../Manage/Currency/MutateCurrency.razor | 2 +- .../Pages/Manage/Domains/MutateDomain.razor | 2 +- .../Pages/Manage/Teams/MutateTeam.razor | 2 +- .../Pages/User/Components/MutateUser.razor | 2 +- .../Pages/User/TransferRequest.razor | 61 +++++++++++-------- .../Server/Modules/UserModule/UserService.cs | 1 + 11 files changed, 58 insertions(+), 38 deletions(-) diff --git a/src/Web/Components/Controls/ConfirmationDialog.razor b/src/Web/Components/Controls/ConfirmationDialog.razor index e84e63e9..92628fc9 100644 --- a/src/Web/Components/Controls/ConfirmationDialog.razor +++ b/src/Web/Components/Controls/ConfirmationDialog.razor @@ -9,9 +9,15 @@ [Parameter] public bool Small { get; set; } + + [Parameter] + public Variant? ButtonVariant { get; set; } [Parameter] - public bool TextButton { get; set; } + public bool ButtonText { get; set; } + + [Parameter] + public Color? ButtonColor { get; set; } [Parameter] public string? Title { get; set; } @@ -38,10 +44,10 @@ } } -@if (Count > 0 && !TextButton) { - -} else if (TextButton) { - 0 && !ButtonText) { + +} else if (ButtonText) { + @Text } \ No newline at end of file diff --git a/src/Web/Components/Pages/Claims/MutateClaim.razor b/src/Web/Components/Pages/Claims/MutateClaim.razor index d1527f0c..23b183ba 100644 --- a/src/Web/Components/Pages/Claims/MutateClaim.razor +++ b/src/Web/Components/Pages/Claims/MutateClaim.razor @@ -74,7 +74,7 @@ @Title @if (Id != null) { - + } diff --git a/src/Web/Components/Pages/Manage/Bank/MutateBank.razor b/src/Web/Components/Pages/Manage/Bank/MutateBank.razor index f9ecb90b..0ca705fe 100644 --- a/src/Web/Components/Pages/Manage/Bank/MutateBank.razor +++ b/src/Web/Components/Pages/Manage/Bank/MutateBank.razor @@ -50,7 +50,7 @@ @Title @if (Id != null) { - + } diff --git a/src/Web/Components/Pages/Manage/Category/MutateCategory.razor b/src/Web/Components/Pages/Manage/Category/MutateCategory.razor index d2eb7864..4e5541ae 100644 --- a/src/Web/Components/Pages/Manage/Category/MutateCategory.razor +++ b/src/Web/Components/Pages/Manage/Category/MutateCategory.razor @@ -65,7 +65,7 @@ @Title @if (Id != null) { - + } diff --git a/src/Web/Components/Pages/Manage/Company/MutateCompany.razor b/src/Web/Components/Pages/Manage/Company/MutateCompany.razor index b1c88a09..cf54e969 100644 --- a/src/Web/Components/Pages/Manage/Company/MutateCompany.razor +++ b/src/Web/Components/Pages/Manage/Company/MutateCompany.razor @@ -64,7 +64,7 @@ @Title @if (Id != null) { - + } diff --git a/src/Web/Components/Pages/Manage/Currency/MutateCurrency.razor b/src/Web/Components/Pages/Manage/Currency/MutateCurrency.razor index 4e640f9b..2395ec92 100644 --- a/src/Web/Components/Pages/Manage/Currency/MutateCurrency.razor +++ b/src/Web/Components/Pages/Manage/Currency/MutateCurrency.razor @@ -50,7 +50,7 @@ @Title @if (Id != null) { - + } diff --git a/src/Web/Components/Pages/Manage/Domains/MutateDomain.razor b/src/Web/Components/Pages/Manage/Domains/MutateDomain.razor index 8a880f54..ee1c1428 100644 --- a/src/Web/Components/Pages/Manage/Domains/MutateDomain.razor +++ b/src/Web/Components/Pages/Manage/Domains/MutateDomain.razor @@ -50,7 +50,7 @@ @Title @if (Id != null) { - + } diff --git a/src/Web/Components/Pages/Manage/Teams/MutateTeam.razor b/src/Web/Components/Pages/Manage/Teams/MutateTeam.razor index a569053e..729caec0 100644 --- a/src/Web/Components/Pages/Manage/Teams/MutateTeam.razor +++ b/src/Web/Components/Pages/Manage/Teams/MutateTeam.razor @@ -76,7 +76,7 @@ @Title @if (Id != null) { - + } diff --git a/src/Web/Components/Pages/User/Components/MutateUser.razor b/src/Web/Components/Pages/User/Components/MutateUser.razor index 9e796baf..1fb92a28 100644 --- a/src/Web/Components/Pages/User/Components/MutateUser.razor +++ b/src/Web/Components/Pages/User/Components/MutateUser.razor @@ -82,7 +82,7 @@ @Title @if (Id != null) { - + } diff --git a/src/Web/Components/Pages/User/TransferRequest.razor b/src/Web/Components/Pages/User/TransferRequest.razor index 75002e72..007d5fb4 100644 --- a/src/Web/Components/Pages/User/TransferRequest.razor +++ b/src/Web/Components/Pages/User/TransferRequest.razor @@ -3,6 +3,7 @@ @using XClaim.Web.Components.Pages.User.Components @page "/app/users/transfer-request" @inject IUserService Http +@inject ISnackbar Snackbar @attribute [Authorize(Roles = "System")] @code { @@ -32,44 +33,56 @@ }; } - // private async Task ArchiveSelectedItems(bool allow) { - // if (!allow) return; - // List items = SelectedItems - // .Where(f => f?.Id != null) - // .Select(f => ((Guid) f.Id!)).ToList(); - // if (items.Count > 0) { - // var result = (await Http.ArchiveRangeAsync(items)); - // await ReloadList(result.Succeeded); - // } - // } - private async Task ReloadList(bool reload) { if (reload) await _dataGrid!.ReloadServerData(); } + + private async Task TriggerSnack(bool success) { + Snackbar.Clear(); + await Task.Delay(500); + Snackbar.Add(success ? "Succeeded.." : "Failed..", success ? Severity.Success : Severity.Error); + } + + private async Task Approve(bool state, Guid id) { + if(!state) return; + var result = await Http.ApproveTransferAsync(id); + await TriggerSnack(result.Succeeded); + await this.ReloadList(result.Succeeded); + } + + private async Task Reject(bool state, Guid id) { + if(!state) return; + var result = await Http.ArchiveTransferAsync(id); + await TriggerSnack(result.Succeeded); + await this.ReloadList(result.Succeeded); + } } User Account Transfers - - - @* *@ + - - @* *@ - @* *@ - @* *@ - @* *@ - @* *@ - @* *@ - @* *@ + + + + + + + + @@ -77,8 +90,8 @@ @(context.Item.Completed ? "Yes" : "No") - - + + diff --git a/src/Web/Server/Modules/UserModule/UserService.cs b/src/Web/Server/Modules/UserModule/UserService.cs index 40e65d98..1583c0a1 100644 --- a/src/Web/Server/Modules/UserModule/UserService.cs +++ b/src/Web/Server/Modules/UserModule/UserService.cs @@ -243,6 +243,7 @@ public async Task>> GetAllTransferAsync( user.TeamId = null; user.Permission = UserPermission.Standard; _ctx.Update(user); + item.Completed = true; _ctx.Update(item); await _ctx.SaveChangesAsync(); var data = _mapper.Map(item); From 7867e48f75cbf9f0c24d010dbc8637a912dfc919 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Wed, 8 Feb 2023 14:39:36 +0100 Subject: [PATCH 132/185] discard un-required method --- src/Web/Server/Modules/UserModule/UserService.cs | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/Web/Server/Modules/UserModule/UserService.cs b/src/Web/Server/Modules/UserModule/UserService.cs index 1583c0a1..2343f225 100644 --- a/src/Web/Server/Modules/UserModule/UserService.cs +++ b/src/Web/Server/Modules/UserModule/UserService.cs @@ -16,12 +16,7 @@ public sealed class UserService : GenericService logger, IdentityHelper identity) : base(ctx, mapper, logger) { _identity = identity; } - - private async Task GetId() { - var profile = await _identity.GetUser(); - return profile!.Id; - } - + public async Task> GetByEmailAsync(string email) { var item = await _ctx.Users .Where(x => x.DeletedAt == null) @@ -136,7 +131,7 @@ public async Task>> GetAllAsync(UserFilter resp private async Task GetTransfer() { try { - var id = await this.GetId(); + var id = await _identity.GetId(); if (id == null) return null; return await _ctx.TransferRequests.Where(x => x.UserId == id && x.Completed == false) .Include(x => x.User) @@ -170,7 +165,7 @@ public async Task>> GetAllAsync(UserFilter resp public async Task> CreateTransferAsync(TransferRequestResponse value) { var response = new Response(); try { - var id = await this.GetId(); + var id = await _identity.GetId(); if (id != null) { var item = new TransferRequestEntity { UserId = id, CompanyId = value.CompanyId, Completed = false }; await _ctx.TransferRequests.AddAsync(item); From f8a0f3bfc4fad97ac73855fb7485e46f605f0811 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Wed, 8 Feb 2023 14:40:16 +0100 Subject: [PATCH 133/185] Added additional permission helper methods --- src/Web/Server/Helpers/IdentityHelper.cs | 48 +++++++++++++++++++++--- 1 file changed, 43 insertions(+), 5 deletions(-) diff --git a/src/Web/Server/Helpers/IdentityHelper.cs b/src/Web/Server/Helpers/IdentityHelper.cs index 5bde796a..91104531 100644 --- a/src/Web/Server/Helpers/IdentityHelper.cs +++ b/src/Web/Server/Helpers/IdentityHelper.cs @@ -3,6 +3,7 @@ using IdentityModel; using Microsoft.AspNetCore.Authentication; using Microsoft.EntityFrameworkCore; +using Nextended.Core.Extensions; using XClaim.Common.Dtos; using XClaim.Web.Server.Data; using XClaim.Web.Server.Entities; @@ -14,6 +15,7 @@ public sealed class IdentityHelper { private const string UserKey = "identity-user-state"; private const string ManagerKey = "identity-manager-state"; + private const string TeamMembersKey = "identity-team-members-state"; private readonly IHttpContextAccessor _contextAccessor; private readonly ServerContext _ctx; @@ -97,7 +99,7 @@ public bool IsAuthenticated { .Include(x => x.Team) .Include(x => x.Currency) .FirstOrDefaultAsync(); - var result = _mapper.Map(query); + var result = query.MapTo(); ctx!.Session.Set(UserKey, result); return result; @@ -109,19 +111,55 @@ public bool IsAuthenticated { return response; } + + public async Task GetId() { + var profile = await this.GetUser(); + return profile!.Id; + } public async Task GetCompany() { var user = await this.GetUser(); - return user?.Company; } + public async Task GetCompanyId() { + var company = await this.GetCompany(); + return company?.Id; + } + public async Task GetTeam() { var user = await this.GetUser(); return user?.Team; } + + private async Task GetTeamId() { + var team = await this.GetTeam(); + + return team?.Id; + } + + public async Task> GetTeamMembers() { + var ctx = _contextAccessor!.HttpContext; + var cache = ctx!.Session.Get>(TeamMembersKey); + if (cache != null) + return cache; + + var id = await this.GetTeamId(); + if (id == null) return new List { }; + + var result = await _ctx.Users.Where(x => x.TeamId == id).ToListAsync(); + ctx!.Session.Set(ManagerKey, result); + + return result.MapTo>(); + } + public async Task> GetTeamMemberId() { + var members = await this.GetTeamMembers(); + + return members.Select(x => x.Id.MapTo()).ToList(); + } + public async Task GetManager() { var ctx = _contextAccessor!.HttpContext; var cache = ctx!.Session.Get(ManagerKey); @@ -132,10 +170,10 @@ public bool IsAuthenticated { var team = await this.GetTeam(); if (team!.ManagerId == null) return null; Guid managerId = ((Guid)team!.ManagerId!); - var manager = await this.GetByIdAsync(managerId); - ctx!.Session.Set(ManagerKey, manager); + var result = await this.GetByIdAsync(managerId); + ctx!.Session.Set(ManagerKey, result); - return manager; + return result; } public async Task HasManager() => await this.GetManager() != null; From 80d091f6aee84811808e56dcc4079905a0193416 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Wed, 8 Feb 2023 14:40:52 +0100 Subject: [PATCH 134/185] Fix claim ownership --- .../Modules/ClaimModule/ClaimService.cs | 23 ++++++++++++++++++- .../Modules/ClaimModule/IClaimService.cs | 6 +++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/src/Web/Server/Modules/ClaimModule/ClaimService.cs b/src/Web/Server/Modules/ClaimModule/ClaimService.cs index 3a41c0f4..659da52f 100644 --- a/src/Web/Server/Modules/ClaimModule/ClaimService.cs +++ b/src/Web/Server/Modules/ClaimModule/ClaimService.cs @@ -25,7 +25,7 @@ public ClaimService(ServerContext ctx, IMapper mapper, ILogger log } new public async Task>> GetAllAsync(PaginationFilterBase responseFilter) { - var id = ((await _identity.GetUser())!).Id; + var id = await _identity.GetId(); var result = new PagedResponse>(); var query = (await ClaimPersonalQuery(_ctx.Claims)) .Where(x => x.OwnerId == id); @@ -66,6 +66,27 @@ public ClaimService(ServerContext ctx, IMapper mapper, ILogger log return response; } + + new public async Task> CreateAsync(ClaimResponse value) { + var response = new Response(); + try { + var item = _mapper.Map(value); + await _ctx.Set().AddAsync(item); + item.OwnerId = await _identity.GetId(); + item.CompanyId = await _identity.GetCompanyId(); + await _ctx.SaveChangesAsync(); + var data = _mapper.Map(item); + response = new Response(data!) { + Succeeded = data != null + }; + } + catch (Exception e) { + response.Errors = new[] { e.ToString() }; + _logger.LogError(e.ToString()); + } + + return response; + } public async Task>> GetReviewsAsync(PaginationFilterBase responseFilter) => default!; diff --git a/src/Web/Server/Modules/ClaimModule/IClaimService.cs b/src/Web/Server/Modules/ClaimModule/IClaimService.cs index eb5179aa..8d5bfcd0 100644 --- a/src/Web/Server/Modules/ClaimModule/IClaimService.cs +++ b/src/Web/Server/Modules/ClaimModule/IClaimService.cs @@ -1,5 +1,11 @@ +using AutoFilterer.Types; +using XClaim.Common.Dtos; +using XClaim.Common.Wrappers; + namespace XClaim.Web.Server.Modules.ClaimModule; public interface IClaimService { + public Task>> GetReviewsAsync(PaginationFilterBase responseFilter); + public Task> ReviewAsync(Guid id); } \ No newline at end of file From b557e97f0a27467b89f07045a5bbd571cee9f5af Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Wed, 8 Feb 2023 14:40:59 +0100 Subject: [PATCH 135/185] Update ClaimStatus.cs --- src/Common/Enums/ClaimStatus.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Common/Enums/ClaimStatus.cs b/src/Common/Enums/ClaimStatus.cs index bf782175..5797830c 100644 --- a/src/Common/Enums/ClaimStatus.cs +++ b/src/Common/Enums/ClaimStatus.cs @@ -6,5 +6,6 @@ public enum ClaimStatus { Cancelled, Reviewed, Confirmed, - Approved + Approved, + None } \ No newline at end of file From 9ee3b6d7e96407ab2b52ef3fd95b4ccc6e817be0 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Thu, 9 Feb 2023 14:56:54 +0100 Subject: [PATCH 136/185] Added claim state DTO --- src/Common/Dtos/ClaimResponse.cs | 4 +++- src/Common/Dtos/ClaimStateResponse.cs | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 src/Common/Dtos/ClaimStateResponse.cs diff --git a/src/Common/Dtos/ClaimResponse.cs b/src/Common/Dtos/ClaimResponse.cs index fb3f19f8..e3e8b9b9 100644 --- a/src/Common/Dtos/ClaimResponse.cs +++ b/src/Common/Dtos/ClaimResponse.cs @@ -6,12 +6,14 @@ namespace XClaim.Common.Dtos; public class ClaimResponse : BaseResponse { public string Description { get; set; } = string.Empty; public string Notes { get; set; } = string.Empty; - public decimal Amount { get; set; } + public decimal Amount { get; set; } = 100; public ClaimPriority Priority { get; set; } = ClaimPriority.Normal; public CategoryResponse? Category { get; set; } public Guid? CategoryId { get; set; } public CompanyResponse? Company { get; set; } public Guid? CompanyId { get; set; } + public CurrencyResponse? Currency { get; set; } + public Guid? CurrencyId { get; set; } public ClaimStatus Status { get; set; } = ClaimStatus.Pending; public UserResponse? Owner { get; set; } public UserResponse? ReviewedBy { get; set; } diff --git a/src/Common/Dtos/ClaimStateResponse.cs b/src/Common/Dtos/ClaimStateResponse.cs new file mode 100644 index 00000000..7f369567 --- /dev/null +++ b/src/Common/Dtos/ClaimStateResponse.cs @@ -0,0 +1,19 @@ +using XClaim.Common.Base; +using XClaim.Common.Enums; + +namespace XClaim.Common.Dtos; + +public class ClaimStateResponse : BaseResponse { + public string? Description { get; set; } + public string? Notes { get; set; } + public string? Currency { get; set; } = "$"; + public decimal Amount { get; set; } + public string? Category { get; set; } + public ClaimStatus Status { get; set; } + public string? Owner { get; set; } + public Guid? OwnerId { get; set; } + public bool Approved { get; set; } + public bool Completed { get; set; } + + public bool Payed { get; set; } +} \ No newline at end of file From 5a6983da5ec778caf39224868ec489228df72c30 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Thu, 9 Feb 2023 14:58:28 +0100 Subject: [PATCH 137/185] Implemented claims review resolution --- src/Web/Server/Entities/ClaimEntity.cs | 2 + src/Web/Server/Entities/CurrencyEntity.cs | 2 +- src/Web/Server/Helpers/ClaimStateResolver.cs | 138 +++++++++++++++++ .../Server/Modules/ClaimModule/ClaimModule.cs | 35 ++++- .../Modules/ClaimModule/ClaimService.cs | 146 ++++++++++++++++-- .../Modules/ClaimModule/IClaimService.cs | 7 +- 6 files changed, 311 insertions(+), 19 deletions(-) create mode 100644 src/Web/Server/Helpers/ClaimStateResolver.cs diff --git a/src/Web/Server/Entities/ClaimEntity.cs b/src/Web/Server/Entities/ClaimEntity.cs index 0448022c..f15ffff5 100644 --- a/src/Web/Server/Entities/ClaimEntity.cs +++ b/src/Web/Server/Entities/ClaimEntity.cs @@ -11,6 +11,8 @@ public sealed class ClaimEntity : BaseEntity { [MaxLength(1024)] public string? Notes { get; set; } public decimal Amount { get; set; } + public CurrencyEntity? Currency { get; set; } + public Guid? CurrencyId { get; set; } public PaymentEntity? Payment { get; set; } public Guid? PaymentId { get; set; } [Required] diff --git a/src/Web/Server/Entities/CurrencyEntity.cs b/src/Web/Server/Entities/CurrencyEntity.cs index 8cc21eca..c3817efa 100644 --- a/src/Web/Server/Entities/CurrencyEntity.cs +++ b/src/Web/Server/Entities/CurrencyEntity.cs @@ -9,7 +9,7 @@ namespace XClaim.Web.Server.Entities; public class CurrencyEntity : BaseEntity { public string Name { get; set; } = string.Empty; [MaxLength(1)] - public string Symbol { get; set; } = string.Empty; + public string? Symbol { get; set; } = string.Empty; [MaxLength(3)] public string Code { get; set; } = string.Empty; public decimal Rate { get; set; } diff --git a/src/Web/Server/Helpers/ClaimStateResolver.cs b/src/Web/Server/Helpers/ClaimStateResolver.cs new file mode 100644 index 00000000..b94c80c9 --- /dev/null +++ b/src/Web/Server/Helpers/ClaimStateResolver.cs @@ -0,0 +1,138 @@ +using XClaim.Common.Dtos; +using XClaim.Common.Enums; +using XClaim.Web.Server.Entities; + +namespace XClaim.Web.Server.Helpers; + +public class ClaimStateResolver { + private readonly IdentityHelper _identity; + private ClaimEntity? _claim; + + public ClaimStateResolver(IdentityHelper identity) { + _identity = identity; + } + + public ClaimStateResolver InitializeState(ClaimEntity? claim) { + _claim = claim; + + return this; + } + + private bool StateInactive { get { return _claim?.Status is ClaimStatus.Rejected || _claim?.RejectedAt != null || _claim?.RejectedById != null || _claim?.CancelledAt != null; }} + private bool StatePending { get { return _claim?.Status == ClaimStatus.Pending; }} + private bool StateReviewed { get { return !StatePending && _claim is { ReviewedAt: { }, ReviewedById: { } }; }} + private bool StateConfirmed { get { return StateReviewed && _claim is { ConfirmedAt: { }, ApprovedById: { } }; }} + private bool StateApproved { get { return StateConfirmed && _claim is { ApprovedAt: { }, ApprovedById: { } }; }} + + public async Task Transform(ClaimStatus preferredAction = ClaimStatus.None) { + var user = await _identity.GetUser(); + if (user?.Id == null || _claim == null) + return _claim; + + var currentTime = DateTime.Now; + var id = user.Id; + var owner = id == _claim.OwnerId; + + void SetReviewed() { + _claim!.ReviewedAt = currentTime; + _claim.ReviewedById = id; + } + void SetConfirmed() { + _claim.ConfirmedAt = currentTime; + _claim.ConfirmedById = id; + } + void SetApproved() { + _claim!.ApprovedAt = currentTime; + _claim.ApprovedById = id; + } + + switch (preferredAction) { + case ClaimStatus.Cancelled: + _claim.CancelledAt = currentTime; + _claim.Status = ClaimStatus.Cancelled; + break; + case ClaimStatus.Rejected: + _claim.RejectedAt = currentTime; + _claim.RejectedById = id; + _claim.Status = ClaimStatus.Rejected; + break; + case ClaimStatus.None: + case ClaimStatus.Pending: + case ClaimStatus.Reviewed: + case ClaimStatus.Confirmed: + case ClaimStatus.Approved: + default: + switch (user.Permission) { + case UserPermission.System: + case UserPermission.Administrator: + if (owner && _claim.Status < ClaimStatus.Confirmed) { + SetReviewed(); + SetConfirmed(); + _claim.Status = ClaimStatus.Confirmed; + } else { + SetApproved(); + _claim.Status = ClaimStatus.Approved; + } + break; + case UserPermission.Finance: + if (owner && _claim.Status < ClaimStatus.Reviewed) { + SetReviewed(); + SetConfirmed(); + } else + SetConfirmed(); + _claim.Status = ClaimStatus.Confirmed; + break; + case UserPermission.Lead: + SetReviewed(); + _claim.Status = ClaimStatus.Reviewed; + break; + case UserPermission.Cashier: + case UserPermission.Standard: + case UserPermission.Anonymous: + default: + break; + } + break; + } + + return _claim; + } + + public async Task Resolve() { + return new ClaimStateResponse { + Id = _claim!.Id, + Description = _claim?.Description, + Notes = _claim?.Notes, + Currency = _claim!.Currency!.Symbol, + Amount = _claim.Amount, + Status = _claim.Status, + Category = _claim!.Category!.Name, + Owner = $"{_claim!.Owner!.FirstName} {_claim!.Owner!.LastName}", + OwnerId = _claim.OwnerId, + CreatedAt = _claim.CreatedAt, + Approved = this.StateApproved, + Completed = await this.IsCompleted(), + Payed = _claim!.Payment != null && _claim!.Payment!.Confirmed, + }; + } + + private async Task IsCompleted() { + var user = await _identity.GetUser(); + if (user == null || _claim == null) + return false; + switch (user.Permission) { + case UserPermission.System: + case UserPermission.Administrator: + return StateApproved || StateInactive; + case UserPermission.Finance: + return StateConfirmed || StateInactive; + case UserPermission.Lead: + return StateReviewed || StateInactive; + case UserPermission.Cashier: + case UserPermission.Standard: + case UserPermission.Anonymous: + default: + return !StatePending || StateInactive; + } + } +} \ No newline at end of file diff --git a/src/Web/Server/Modules/ClaimModule/ClaimModule.cs b/src/Web/Server/Modules/ClaimModule/ClaimModule.cs index feea25af..1a38e415 100644 --- a/src/Web/Server/Modules/ClaimModule/ClaimModule.cs +++ b/src/Web/Server/Modules/ClaimModule/ClaimModule.cs @@ -1,11 +1,14 @@ using Microsoft.AspNetCore.Mvc; using XClaim.Common.Dtos; +using XClaim.Common.Enums; using XClaim.Web.Server.Helpers; +using YamlDotNet.Core.Events; namespace XClaim.Web.Server.Modules.ClaimModule; public class ClaimModule : IModule { public IServiceCollection RegisterApiModule(IServiceCollection services) { + services.AddTransient(); services.AddScoped(); return services; @@ -14,7 +17,8 @@ public IServiceCollection RegisterApiModule(IServiceCollection services) { public IEndpointRouteBuilder MapEndpoints(IEndpointRouteBuilder endpoints) { const string name = "Claim"; var url = $"{Constants.RootApi}/{name.ToLower()}"; - var group = endpoints.MapGroup(url).WithTags(name); + var group = endpoints.MapGroup(url).WithTags(name) + .RequireAuthorization(); group.MapGet("/", async (ClaimService sv, [AsParameters] ClaimFilter filter) => await sv.GetAllAsync(filter)) @@ -32,7 +36,6 @@ await sv.GetAllAsync(filter)) }).WithName($"Create{name}").WithOpenApi(); group.MapPost("/upload/{id:guid}", async (Guid id, ClaimService sv, IFormFileCollection files, FileUploadService upload) => { - // TODO: Get claim and save in upload service var result = (await sv.GetByIdAsync(id)); if (result.Data == null) return Results.NotFound(result); @@ -52,11 +55,6 @@ await sv.GetAllAsync(filter)) return !result.Succeeded ? Results.NotFound(result) : TypedResults.Ok(result); }).WithName($"Update{name}").WithOpenApi(); - group.MapPost("/review/{id:guid}", () => { - // TODO: new claim review service - Results.Ok(); - }).WithName($"Review{name}").WithOpenApi(); - group.MapDelete("/{id:guid}", async (Guid id, ClaimService sv) => { var item = await sv.DeleteAsync(id); return !item.Succeeded ? Results.NotFound(item) : TypedResults.Ok(item); @@ -66,6 +64,29 @@ await sv.GetAllAsync(filter)) var items = await sv.DeleteRangeAsync(ids); return !items.Succeeded ? Results.NotFound(items) : TypedResults.Ok(items); }).WithName($"RangeArchive{name}").WithOpenApi(); + + group.MapGet("/review", async (ClaimService sv, [AsParameters] ClaimFilter filter) => + await sv.GetReviewAllAsync(filter)).WithName($"Review{name}List").WithOpenApi(); + + group.MapGet("/review/{id:guid}", async (Guid id, ClaimService sv) => { + var result = await sv.GetReviewByIdAsync(id); + return !result.Succeeded ? Results.NotFound(result) : TypedResults.Ok(result); + }).WithName($"Review{name}ById").WithOpenApi(); + + group.MapPut("/review/reject/{id:guid}", async (Guid id, CommentResponse comment, ClaimService sv) => { + var result = await sv.ReviewValidateAsync(id, ClaimStatus.Rejected, comment); + return !result.Succeeded ? Results.BadRequest(result) : TypedResults.Ok(result); + }).WithName($"ReviewReject{name}").WithOpenApi(); + + group.MapPut("/review/validate/{id:guid}", async (Guid id, CommentResponse comment, ClaimService sv) => { + var result = await sv.ReviewValidateAsync(id, ClaimStatus.None, comment); + return TypedResults.Ok(result); + }).WithName($"ReviewValidate{name}").WithOpenApi(); + + group.MapPut("/review/cancel/{id:guid}", async (Guid id, ClaimService sv) => { + var result = await sv.ReviewValidateAsync(id, ClaimStatus.Cancelled, null); + return !result.Succeeded ? Results.BadRequest(result) : TypedResults.Ok(result); + }).WithName($"ReviewCancel{name}").WithOpenApi(); return group; } diff --git a/src/Web/Server/Modules/ClaimModule/ClaimService.cs b/src/Web/Server/Modules/ClaimModule/ClaimService.cs index 659da52f..b7359fb1 100644 --- a/src/Web/Server/Modules/ClaimModule/ClaimService.cs +++ b/src/Web/Server/Modules/ClaimModule/ClaimService.cs @@ -3,7 +3,9 @@ using AutoMapper; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Query; +using Nextended.Core.Extensions; using XClaim.Common.Dtos; +using XClaim.Common.Enums; using XClaim.Common.Helpers; using XClaim.Common.Wrappers; using XClaim.Web.Server.Data; @@ -14,14 +16,17 @@ namespace XClaim.Web.Server.Modules.ClaimModule; public sealed class ClaimService : GenericService, IClaimService { private readonly IdentityHelper _identity; - public ClaimService(ServerContext ctx, IMapper mapper, ILogger logger, IdentityHelper identity) : base(ctx, mapper, logger) { + private readonly ClaimStateResolver _stateResolver; + public ClaimService(ServerContext ctx, IMapper mapper, ILogger logger, IdentityHelper identity, ClaimStateResolver stateResolver) : base(ctx, mapper, logger) { _identity = identity; + _stateResolver = stateResolver; } - private static Task> ClaimPersonalQuery(IQueryable queryable) { + private static Task> ClaimPersonalQuery(IQueryable queryable) { return Task.FromResult(queryable.Where(x => x.DeletedAt == null) .Include(x => x.Owner) - .Include(x => x.Category)); + .Include(x => x.Category) + .Include(x => x.Currency)); } new public async Task>> GetAllAsync(PaginationFilterBase responseFilter) { @@ -33,10 +38,7 @@ public ClaimService(ServerContext ctx, IMapper mapper, ILogger log var count = await query.CountAsync(); var data = await query.ApplyFilter(responseFilter).ToListAsync(); var response = _mapper.Map>(data); - var filter = new PaginationFilter { - Page = responseFilter.Page, - PerPage = responseFilter.PerPage - }; + var filter = responseFilter.MapTo(); result = new PagedResponse>(response, count, filter) { Succeeded = true }; @@ -54,6 +56,7 @@ public ClaimService(ServerContext ctx, IMapper mapper, ILogger log var item = await (await ClaimPersonalQuery(_ctx.Claims)) .Where(x => x.Id == id) .Include(x => x.Payment) + .Include(x => x.Currency) .Include(x => x.Files) .FirstOrDefaultAsync(); var data = _mapper.Map(item); @@ -68,6 +71,7 @@ public ClaimService(ServerContext ctx, IMapper mapper, ILogger log } new public async Task> CreateAsync(ClaimResponse value) { + var user = await _identity.GetUser(); var response = new Response(); try { var item = _mapper.Map(value); @@ -75,6 +79,9 @@ public ClaimService(ServerContext ctx, IMapper mapper, ILogger log item.OwnerId = await _identity.GetId(); item.CompanyId = await _identity.GetCompanyId(); await _ctx.SaveChangesAsync(); + if (user is { Permission: <= UserPermission.Finance }) + await this.ReviewValidateAsync(item.Id, ClaimStatus.None, new CommentResponse { Content = "Confirmed by default."}); + var data = _mapper.Map(item); response = new Response(data!) { Succeeded = data != null @@ -88,7 +95,128 @@ public ClaimService(ServerContext ctx, IMapper mapper, ILogger log return response; } - public async Task>> GetReviewsAsync(PaginationFilterBase responseFilter) => default!; + private async Task> ResolveClaimEntity() { + var user = await _identity.GetUser(); + var userId = await _identity.GetId(); + var company = await _identity.GetCompanyId(); + var users = await _identity.GetTeamMemberId(); + IQueryable filtered; + var query = _ctx.Claims.Where(x => x.OwnerId != userId) + .Where(x => x.PaymentId == null); + if (user != null) { + switch (user.Permission) { + case UserPermission.System: + filtered = query.Where(x => true); + break; + case UserPermission.Administrator: + filtered = query.Where(x => x.CompanyId == company) + .Where(x => x.Status >= ClaimStatus.Confirmed); + break; + case UserPermission.Finance: + filtered = query.Where(x => x.CompanyId == company) + .Where(x => x.Status >= ClaimStatus.Reviewed); + break; + case UserPermission.Lead: + filtered = query.Where(x => x.CompanyId == company && users.Contains(x.OwnerId!.Value)) + .Where(x => x.Status >= ClaimStatus.Pending); + break; + case UserPermission.Cashier: + case UserPermission.Standard: + case UserPermission.Anonymous: + default: + filtered = query.Where(x => false); + break; + } + } + else { + filtered = query.Where(x => false); + } + + return filtered.Include(x => x.Owner) + .Include(x => x.Category) + .Include(x => x.Payment) + .Include(x => x.Currency); + } + + public async Task>> GetReviewAllAsync(ClaimFilter responseFilter) { + var response = new PagedResponse>(); + try { + var query = await this.ResolveClaimEntity(); + async Task TransformEntity(ClaimEntity x) { + var state = _stateResolver.InitializeState(x); + return await state.Resolve(); + } + + var result = query.ApplyFilter(responseFilter); + var count = await result.CountAsync(); + var db = await result.ToListAsync(); + var data = db.Select(x => TransformEntity(x).Result).ToList(); + var filter = responseFilter.MapTo(); + response = new PagedResponse>(data, count, filter) { + Succeeded = true + }; + } + catch (Exception e) { + response.Errors = new[] { e.ToString() }; + _logger.LogError(e.ToString()); + } + + return response; + } + + public async Task> GetReviewByIdAsync(Guid id) { + var response = new Response(); + Func> transformEntity = async x => { + var state = _stateResolver.InitializeState(x); + return await state.Resolve(); + }; + try { + var user = await _identity.GetUser(); + if(user?.Id != null) { + var query = await this.ResolveClaimEntity(); + var data = await query.Where(x => x.Id == id) + .Select(x => transformEntity(x).Result).FirstOrDefaultAsync(); + response.Data = data; + response.Succeeded = data != null; + } + } + catch (Exception e) { + response.Errors = new[] { e.ToString() }; + _logger.LogError(e.ToString()); + } + + return response; + } + + public async Task> ReviewValidateAsync(Guid id, ClaimStatus action, CommentResponse? comment) { + var response = new Response(); + var userId = await _identity.GetId(); + try { + var item = await (await ClaimPersonalQuery(_ctx.Claims)) + .Where(x => x.Id == id) + .Include(x => x.Payment) + .Include(x => x.Files) + .FirstOrDefaultAsync(); + if (item is null) return response; + var value = await _stateResolver.InitializeState(item).Transform(action); + _mapper.Map(value, item); + if (comment != null) { + _ctx.Comments.Add(new CommentEntity { + OwnerId = userId, + ClaimId = item.Id, + Content = comment.Content + }); + } + _ctx.Update(item); + await _ctx.SaveChangesAsync(); + response.Data = await _stateResolver.InitializeState(value).Resolve(); + response.Succeeded = response.Data != null; + } + catch (Exception e) { + response.Errors = new[] { e.ToString() }; + _logger.LogError(e.ToString()); + } - public async Task> ReviewAsync(Guid id) => default!; + return response; + } } \ No newline at end of file diff --git a/src/Web/Server/Modules/ClaimModule/IClaimService.cs b/src/Web/Server/Modules/ClaimModule/IClaimService.cs index 8d5bfcd0..14371bf0 100644 --- a/src/Web/Server/Modules/ClaimModule/IClaimService.cs +++ b/src/Web/Server/Modules/ClaimModule/IClaimService.cs @@ -1,11 +1,14 @@ using AutoFilterer.Types; using XClaim.Common.Dtos; +using XClaim.Common.Enums; using XClaim.Common.Wrappers; namespace XClaim.Web.Server.Modules.ClaimModule; public interface IClaimService { - public Task>> GetReviewsAsync(PaginationFilterBase responseFilter); + public Task>> GetReviewAllAsync(ClaimFilter filter); - public Task> ReviewAsync(Guid id); + public Task> GetReviewByIdAsync(Guid id); + + Task> ReviewValidateAsync(Guid id, ClaimStatus action, CommentResponse comment); } \ No newline at end of file From 4aa7c3507b2da0faf18b6d9ba84d1e1ac73a61b8 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Thu, 9 Feb 2023 14:58:50 +0100 Subject: [PATCH 138/185] Update Registration.razor --- src/Web/Components/Pages/Startup/Registration.razor | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Web/Components/Pages/Startup/Registration.razor b/src/Web/Components/Pages/Startup/Registration.razor index d005516f..3eda7c0d 100644 --- a/src/Web/Components/Pages/Startup/Registration.razor +++ b/src/Web/Components/Pages/Startup/Registration.razor @@ -58,6 +58,7 @@ Item.CompanyId = Company?.Id; Item.CurrencyId = Currency?.Id; var result = await Http.RegistrationAsync(Item); + Snackbar.Clear(); if (result.Succeeded) { await AuthState.TriggerAuthentication(); Snackbar.Add("Verification successful..", Severity.Success); From d53bf0198ba9048858b6b0f9406c2aea297edf79 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Thu, 9 Feb 2023 15:00:31 +0100 Subject: [PATCH 139/185] Implement claim review details view --- src/Common/HTTP/ClaimService.cs | 23 +++- src/Common/HTTP/IClaimService.cs | 11 +- .../Components/Controls/CommentViewer.razor | 5 + src/Web/Components/Controls/FileViewer.razor | 5 + .../Pages/Reviews/ClaimDetails.razor | 109 ++++++++++++++++++ src/Web/Components/Pages/Reviews/Index.razor | 44 ++++--- .../Pages/Reviews/MutateReview.razor | 69 ++++------- 7 files changed, 198 insertions(+), 68 deletions(-) create mode 100644 src/Web/Components/Controls/CommentViewer.razor create mode 100644 src/Web/Components/Controls/FileViewer.razor create mode 100644 src/Web/Components/Pages/Reviews/ClaimDetails.razor diff --git a/src/Common/HTTP/ClaimService.cs b/src/Common/HTTP/ClaimService.cs index a1911d67..e3b25ddf 100644 --- a/src/Common/HTTP/ClaimService.cs +++ b/src/Common/HTTP/ClaimService.cs @@ -1,3 +1,5 @@ +using System.Text; +using System.Web; using XClaim.Common.Dtos; using XClaim.Common.Service; using XClaim.Common.Wrappers; @@ -26,10 +28,25 @@ public async Task> CreateAsync(ClaimResponse claim) { public async Task> UpdateAsync(ClaimResponse claim) { return await _http.Put>(RootApi, claim); } - public async Task> ReviewAsync(ClaimResponse claim) { - return await _http.Put>(RootApi, claim); - } + public async Task> ArchiveAsync(Guid id) { return await _http.Delete>($"{RootApi}/{id}"); } + public async Task>> GetReviewAllAsync(object? query = null) { + return await _http.Get>>($"{RootApi}/review", query); + } + public async Task> GetReviewByIdAsync(Guid id) { + return await _http.Get>($"{RootApi}/review/{id}"); + } + public async Task> CancelReviewAsync(Guid id) { + return await _http.Put>($"{RootApi}/review/cancel/{id}"); + } + public async Task> RejectReviewAsync(Guid id, string comment) { + var uri = $"{RootApi}/review/reject/{id}"; + return await _http.Put>(uri, new CommentResponse { Content = comment}); + } + public async Task> ValidateReviewAsync(Guid id, string comment) { + var uri = $"{RootApi}/review/validate/{id}"; + return await _http.Put>(uri, new CommentResponse { Content = comment}); + } } \ No newline at end of file diff --git a/src/Common/HTTP/IClaimService.cs b/src/Common/HTTP/IClaimService.cs index 89e9b942..d388b86a 100644 --- a/src/Common/HTTP/IClaimService.cs +++ b/src/Common/HTTP/IClaimService.cs @@ -14,7 +14,14 @@ public interface IClaimService { Task> UpdateAsync(ClaimResponse claim); - Task> ReviewAsync(ClaimResponse claim); - Task> ArchiveAsync(Guid id); + + Task>> GetReviewAllAsync(object? query = null); + + Task> GetReviewByIdAsync(Guid id); + Task> CancelReviewAsync(Guid id); + + Task> RejectReviewAsync(Guid id, string comment); + + Task> ValidateReviewAsync(Guid id, string comment); } \ No newline at end of file diff --git a/src/Web/Components/Controls/CommentViewer.razor b/src/Web/Components/Controls/CommentViewer.razor new file mode 100644 index 00000000..758437e0 --- /dev/null +++ b/src/Web/Components/Controls/CommentViewer.razor @@ -0,0 +1,5 @@ +@code { + +} + +Comments diff --git a/src/Web/Components/Controls/FileViewer.razor b/src/Web/Components/Controls/FileViewer.razor new file mode 100644 index 00000000..9dd182a4 --- /dev/null +++ b/src/Web/Components/Controls/FileViewer.razor @@ -0,0 +1,5 @@ +@code { + +} + +Files \ No newline at end of file diff --git a/src/Web/Components/Pages/Reviews/ClaimDetails.razor b/src/Web/Components/Pages/Reviews/ClaimDetails.razor new file mode 100644 index 00000000..e6ffc0a6 --- /dev/null +++ b/src/Web/Components/Pages/Reviews/ClaimDetails.razor @@ -0,0 +1,109 @@ +@using XClaim.Common.Dtos +@using XClaim.Common.Extensions +@using XClaim.Common.Wrappers +@inject IClaimService Http +@inject ISnackbar Snackbar + +@code { + private enum ActionState { + None, + Approve, + Reject, + } + + bool _success; + string[] _errors = { }; + MudForm? _form; + private bool Loading { get; set; } + private string Comment { get; set; } = string.Empty; + private ActionState State { get; set; } = ActionState.None; + + [Parameter] + public ClaimStateResponse? Item { get; set; } = new ClaimStateResponse(); + + private async Task Submit() { + Loading = true; + await _form!.Validate(); + if (!_success) return; + var id = (Guid) Item!.Id!; + Response result = null!; + switch (State) { + case ActionState.Approve: + result = await Http.ValidateReviewAsync(id, Comment); + break; + case ActionState.Reject: + result = await Http.RejectReviewAsync(id, Comment); + break; + case ActionState.None: + default: + break; + } + + if (result != null) { + var state = result.Succeeded; + Snackbar.Clear(); + Snackbar.Add(state ? "Successful" : "Failed", state ? Severity.Success : Severity.Error); + if (state) { + Loading = false; + Item = result.Data; + await Task.Delay(200); + State = ActionState.None; + } + } + } +} + + + @if (Item != null) { + + + @(Item?.Owner ?? "Firstname Lastname") + @(Item.Description ?? "Unknown") + + + + + + @if (!Item.Completed) { + @Item.Status + } + @Item.Currency @($"{Item.Amount:N0}") + @Item.Notes.Truncate(55) + + @if (Item.Completed) { + + @Item.Status + + } else { + @if (State == ActionState.None) { + + Approve + Reject + + } + else { + + + + + + + Cancel + Continue + + + + + + } + } + + } + \ No newline at end of file diff --git a/src/Web/Components/Pages/Reviews/Index.razor b/src/Web/Components/Pages/Reviews/Index.razor index 407fcdeb..f75ac92a 100644 --- a/src/Web/Components/Pages/Reviews/Index.razor +++ b/src/Web/Components/Pages/Reviews/Index.razor @@ -1,6 +1,7 @@ @using XClaim.Common.Dtos @using XClaim.Common.Helpers @inject IClaimService Http +@inject AuthState AuthState @page "/app/reviews" @attribute [Authorize(Roles = "System, Administrator, Finance, Lead")] @@ -9,16 +10,23 @@ private bool Loading { get; set; } private int Current { get; set; } = 1; private DateRange DateRange { get; set; } = WebConst.AppDateRange; - MudDataGrid? _dataGrid; + MudDataGrid? _dataGrid; + private string? DefaultCurrency { get;set; } - private HashSet SelectedItems { get; set; } = new HashSet(); + private HashSet SelectedItems { get; set; } = new HashSet(); - private Func Filter => x => + protected override async Task OnInitializedAsync() { + await base.OnInitializedAsync(); + var user = await AuthState.GetAccount(); + DefaultCurrency = user!.Currency!.Symbol ?? "$"; + } + + private Func Filter => x => string.IsNullOrWhiteSpace(Search) - || x.Description.Contains(Search, StringComparison.OrdinalIgnoreCase) - || x.Notes.Contains(Search, StringComparison.OrdinalIgnoreCase); + || x.Description!.Contains(Search, StringComparison.OrdinalIgnoreCase) + || x.Notes!.Contains(Search, StringComparison.OrdinalIgnoreCase); - private async Task> ServerDataFunc(GridState state) { + private async Task> ServerDataFunc(GridState state) { SelectedItems.Clear(); this.Loading = true; var filter = new DateSearchFilter { @@ -26,9 +34,9 @@ PerPage = state.PageSize, Search = Search.Length > 2 ? Search : null }; - var items = await Http.GetReviewsAsync(filter); + var items = await Http.GetReviewAllAsync(filter); this.Loading = false; - return new GridData { + return new GridData { Items = items.Data, TotalItems = items.Total }; @@ -41,7 +49,7 @@ Claim Reviews - @@ -52,26 +60,26 @@ - - + + - @(context.Item.Owner?.FullName ?? "None") + @(context.Item.Owner ?? "None") - - + - @(context.Item.Category?.Name ?? "None") + @(context.Item.Currency ?? DefaultCurrency)@(context.Item.Amount) - - + + + - + \ No newline at end of file diff --git a/src/Web/Components/Pages/Reviews/MutateReview.razor b/src/Web/Components/Pages/Reviews/MutateReview.razor index 8a07e20e..3129007d 100644 --- a/src/Web/Components/Pages/Reviews/MutateReview.razor +++ b/src/Web/Components/Pages/Reviews/MutateReview.razor @@ -1,28 +1,23 @@ @using XClaim.Common.Dtos @inject IClaimService Http -@inject ISnackbar Snackbar @code { [CascadingParameter] MudDialogInstance MudDialog { get; set; } = default!; + private bool Loading { get; set; } + [Parameter] public Guid? Id { get; set; } - private CategoryResponse? Category { get; set; } - - private bool Loading { get; set; } - - private ClaimResponse Item { get; set; } = new ClaimResponse(); + private ClaimStateResponse? Item { get; set; } protected override async Task OnInitializedAsync() { await base.OnInitializedAsync(); if (Id != null) { Loading = true; - var response = (await Http.GetByIdAsync(Id.Value)).Data; + var response = (await Http.GetReviewByIdAsync(Id.Value)).Data; if (response != null) { - Category = response.Category; - response.Company = null; Item = response; } Loading = false; @@ -32,43 +27,27 @@ - - - - - - - - - - @(Item.Description ?? "Unknown") - @(Item?.Owner?.FullName ?? "Unknown Unknown") - - - - - - N @($"{Item.Amount:N0}") - @(Item.Notes) - - - Approve - Reject - - - - - - - Media - - - - Message - - + @if (Item == null || Loading) { + + + + } else { + + + + + + + + + + + + + + + } \ No newline at end of file From f96c780bb651d7c614b1e8e49c63748bf048cac8 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Thu, 9 Feb 2023 15:01:55 +0100 Subject: [PATCH 140/185] Show company auto complete --- .../Components/Pages/User/Components/MutateUser.razor | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/Web/Components/Pages/User/Components/MutateUser.razor b/src/Web/Components/Pages/User/Components/MutateUser.razor index 1fb92a28..64369707 100644 --- a/src/Web/Components/Pages/User/Components/MutateUser.razor +++ b/src/Web/Components/Pages/User/Components/MutateUser.razor @@ -124,13 +124,14 @@ } - - - + + + + Date: Thu, 9 Feb 2023 15:02:22 +0100 Subject: [PATCH 141/185] Shoe company in team form --- .../Pages/Manage/Teams/MutateTeam.razor | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/Web/Components/Pages/Manage/Teams/MutateTeam.razor b/src/Web/Components/Pages/Manage/Teams/MutateTeam.razor index 729caec0..fb145617 100644 --- a/src/Web/Components/Pages/Manage/Teams/MutateTeam.razor +++ b/src/Web/Components/Pages/Manage/Teams/MutateTeam.razor @@ -5,6 +5,7 @@ @inject IUserService UserService @inject ICompanyService CompanyService @inject ISnackbar Snackbar +@inject AuthState AuthState @code { [CascadingParameter] @@ -37,11 +38,15 @@ get { return $"{ActionText} Team"; } } + private bool IsSystemUser { get; set; } + private TeamResponse Item { get; set; } = new TeamResponse(); protected override async Task OnInitializedAsync() { await base.OnInitializedAsync(); if (Id != null) { + var user = await AuthState.GetAccount(); + IsSystemUser = user is {Permission: UserPermission.System }; Loading = true; var response = (await Http.GetByIdAsync(Id.Value)).Data; if (response != null) { @@ -97,15 +102,11 @@ Variant="Variant.Outlined" ShowProgressIndicator="true" OnClearButtonClick="() => Manager = null" Clearable="true" ToStringFunc="@(e => e == null ? null : $"{e.FullName} - {e.Permission}")"/> - - - - - - - + + + From 2ad75d37ef2df130f24622fe11b222ab2f1c3c58 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Thu, 9 Feb 2023 15:02:47 +0100 Subject: [PATCH 142/185] Added currency to claim request --- .../Components/Pages/Claims/MutateClaim.razor | 164 ++++++++++++------ 1 file changed, 108 insertions(+), 56 deletions(-) diff --git a/src/Web/Components/Pages/Claims/MutateClaim.razor b/src/Web/Components/Pages/Claims/MutateClaim.razor index 23b183ba..1de15503 100644 --- a/src/Web/Components/Pages/Claims/MutateClaim.razor +++ b/src/Web/Components/Pages/Claims/MutateClaim.razor @@ -4,22 +4,34 @@ @using Nextended.Core.Extensions @inject IClaimService Http @inject ICategoryService CategoryService +@inject ICurrencyService CurrencyService +@inject AuthState AuthState @inject ISnackbar Snackbar @code { [CascadingParameter] MudDialogInstance MudDialog { get; set; } = default!; + bool _success; + string[] _errors = { }; + MudForm? _form; [Parameter] public Guid? Id { get; set; } private CategoryResponse? Category { get; set; } + private CurrencyResponse? Currency { get; set; } + private async Task> SearchCategory(string value) { var response = await CategoryService.GetAllAsync(new SearchFilter { Search = value }); return (response.Succeeded ? response.Data : new List {})!; } + private async Task> SearchCurrency(string value) { + var response = await CurrencyService.GetAllAsync(new SearchFilter { Search = value }); + return (response.Succeeded ? response.Data : new List {})!; + } + private string ActionText { get { return Id == null ? "Create" : "Update"; } } @@ -39,15 +51,24 @@ var response = (await Http.GetByIdAsync(Id.Value)).Data; if (response != null) { Category = response.Category; + Currency = response.Currency; response.Company = null; + response.Currency = null; Item = response; } Loading = false; + } else { + var user = await AuthState.GetAccount(); + Currency = user!.Currency; } } async Task Submit() { + await _form!.Validate(); + if (!_success) return; + Item.CategoryId = Category?.Id; + Item.CurrencyId = Currency?.Id; var result = Id == null ? (await Http.CreateAsync(Item)) : (await Http.UpdateAsync(Item)); MudDialog.Close(DialogResult.Ok(result.Succeeded)); } @@ -62,6 +83,10 @@ readonly IList _files = new List(); + private string? AmountTooLow(string s) { + return Decimal.Parse(s) < 100 ? "Amount must be more than 100" : null; + } + private void UploadFiles(IReadOnlyList files) { foreach (var file in files) { this._files.Add(file); @@ -83,65 +108,92 @@ - - - - - - - - - - - - - - - - - - - - - - @foreach (var priority in Enum.GetValues()) { - @priority.ToDescriptionString().Capitalize() - } - - - - - - - @if (_files.Count > 0) { - - - Uploads - - - @foreach (var file in _files) { - - - @file.Name - @(Math.Round(file.Size / (decimal) (1000 * 1000), 2))Mb - + + + + + + + + + + + + + + + + + + + + + + + + + + + @foreach (var priority in Enum.GetValues()) { + @priority.ToDescriptionString().Capitalize() + } + + + + + + + + + + + + + @if (_files.Count > 0) { + + + Uploads + + + @foreach (var file in _files) { + + + @file.Name - @(Math.Round(file.Size / (decimal)(1000 * 1000), 2))Mb + + + + + } + + + } + else { + + No file uploaded. - - - } - - - } - - - - + } + + + + + + + + - @ActionText + @ActionText \ No newline at end of file From 64aefa2b988f231481731b91cf1baf135adf797b Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Thu, 9 Feb 2023 15:03:20 +0100 Subject: [PATCH 143/185] Currency indication in payment view --- src/Web/Components/Pages/Claims/Index.razor | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/Web/Components/Pages/Claims/Index.razor b/src/Web/Components/Pages/Claims/Index.razor index 177af698..a1396d1c 100644 --- a/src/Web/Components/Pages/Claims/Index.razor +++ b/src/Web/Components/Pages/Claims/Index.razor @@ -2,6 +2,7 @@ @using XClaim.Common.Enums @using XClaim.Common.Helpers @inject IClaimService Http +@inject AuthState AuthState @page "/app/claims" @attribute [Authorize] @@ -9,6 +10,7 @@ private string Search { get; set; } = string.Empty; private bool Loading { get; set; } private int Current { get; set; } = 1; + private string? DefaultCurrency { get;set; } MudDataGrid? _dataGrid; private DateRange DateRange { get; set; } = WebConst.AppDateRange; private HashSet SelectedItems { get; set; } = new HashSet(); @@ -17,7 +19,13 @@ string.IsNullOrWhiteSpace(Search) || x.Description.Contains(Search, StringComparison.OrdinalIgnoreCase) || x.Notes.Contains(Search, StringComparison.OrdinalIgnoreCase); - + + protected override async Task OnInitializedAsync() { + await base.OnInitializedAsync(); + var user = await AuthState.GetAccount(); + DefaultCurrency = user!.Currency!.Symbol ?? "$"; + } + private async Task> ServerDataFunc(GridState state) { SelectedItems.Clear(); this.Loading = true; @@ -55,7 +63,11 @@ - + + + @(context.Item.Currency?.Symbol ?? DefaultCurrency)@(context.Item.Amount) + + From 52c5d71a8ad4f5947c0263f6a9d784bb955f1c9c Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Thu, 9 Feb 2023 15:03:32 +0100 Subject: [PATCH 144/185] Update PaymentEntity.cs --- src/Web/Server/Entities/PaymentEntity.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Web/Server/Entities/PaymentEntity.cs b/src/Web/Server/Entities/PaymentEntity.cs index 7f179abc..767d6652 100644 --- a/src/Web/Server/Entities/PaymentEntity.cs +++ b/src/Web/Server/Entities/PaymentEntity.cs @@ -15,7 +15,7 @@ public sealed class PaymentEntity : BaseEntity { public DateTime? ConfirmedAt { get; set; } public UserEntity? ConfirmedBy { get; set; } public Guid? ConfirmedById { get; set; } - public bool Confirmed => ConfirmedAt != null; + public bool Confirmed => ConfirmedAt != null || ConfirmedById != null; public int Count { get; set; } public ICollection Claims { get; set; } = default!; public ICollection Files { get; set; } = default!; From 80d277cc430cb67f3591b18b7c60cf1fb7e0dde5 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Thu, 9 Feb 2023 15:03:39 +0100 Subject: [PATCH 145/185] Update GenericService.cs --- src/Web/Server/Modules/GenericService.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Web/Server/Modules/GenericService.cs b/src/Web/Server/Modules/GenericService.cs index 6e574ecf..202d2ce1 100644 --- a/src/Web/Server/Modules/GenericService.cs +++ b/src/Web/Server/Modules/GenericService.cs @@ -115,8 +115,7 @@ public async Task> CreateAsync(TResponse value) { response.Errors = new[] { e.ToString() }; _logger.LogError(e.ToString()); } - - + return response; } From 9d499044ce9ea145682b9c0815de27a0e34d6d03 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Thu, 9 Feb 2023 15:27:21 +0100 Subject: [PATCH 146/185] Use review detail as claim detail --- .../Components/Controls/FormEditTrigger.razor | 5 +++- src/Web/Components/Pages/Claims/Index.razor | 5 +++- .../Server/Modules/ClaimModule/ClaimModule.cs | 6 ++-- .../Modules/ClaimModule/ClaimService.cs | 29 +++++++++++-------- 4 files changed, 28 insertions(+), 17 deletions(-) diff --git a/src/Web/Components/Controls/FormEditTrigger.razor b/src/Web/Components/Controls/FormEditTrigger.razor index 207775d7..49e70374 100644 --- a/src/Web/Components/Controls/FormEditTrigger.razor +++ b/src/Web/Components/Controls/FormEditTrigger.razor @@ -11,6 +11,9 @@ [Parameter] public string Icon { get; set; } = Icons.Material.Filled.Edit; + + [Parameter] + public Color ButtonColor { get; set; } = Color.Warning; [Parameter] public EventCallback OnTriggered { get; set; } @@ -31,4 +34,4 @@ } } - \ No newline at end of file + \ No newline at end of file diff --git a/src/Web/Components/Pages/Claims/Index.razor b/src/Web/Components/Pages/Claims/Index.razor index a1396d1c..1b2a6d38 100644 --- a/src/Web/Components/Pages/Claims/Index.razor +++ b/src/Web/Components/Pages/Claims/Index.razor @@ -1,6 +1,7 @@ @using XClaim.Common.Dtos @using XClaim.Common.Enums @using XClaim.Common.Helpers +@using XClaim.Web.Components.Pages.Reviews @inject IClaimService Http @inject AuthState AuthState @page "/app/claims" @@ -79,7 +80,9 @@ @if (context.Item.Status == ClaimStatus.Pending) { } else { - + @* *@ + } diff --git a/src/Web/Server/Modules/ClaimModule/ClaimModule.cs b/src/Web/Server/Modules/ClaimModule/ClaimModule.cs index 1a38e415..e36223d9 100644 --- a/src/Web/Server/Modules/ClaimModule/ClaimModule.cs +++ b/src/Web/Server/Modules/ClaimModule/ClaimModule.cs @@ -75,17 +75,17 @@ await sv.GetAllAsync(filter)) group.MapPut("/review/reject/{id:guid}", async (Guid id, CommentResponse comment, ClaimService sv) => { var result = await sv.ReviewValidateAsync(id, ClaimStatus.Rejected, comment); - return !result.Succeeded ? Results.BadRequest(result) : TypedResults.Ok(result); + return !result.Succeeded ? Results.NotFound(result) : TypedResults.Ok(result); }).WithName($"ReviewReject{name}").WithOpenApi(); group.MapPut("/review/validate/{id:guid}", async (Guid id, CommentResponse comment, ClaimService sv) => { var result = await sv.ReviewValidateAsync(id, ClaimStatus.None, comment); - return TypedResults.Ok(result); + return !result.Succeeded ? Results.NotFound(result) : TypedResults.Ok(result); }).WithName($"ReviewValidate{name}").WithOpenApi(); group.MapPut("/review/cancel/{id:guid}", async (Guid id, ClaimService sv) => { var result = await sv.ReviewValidateAsync(id, ClaimStatus.Cancelled, null); - return !result.Succeeded ? Results.BadRequest(result) : TypedResults.Ok(result); + return !result.Succeeded ? Results.NotFound(result) : TypedResults.Ok(result); }).WithName($"ReviewCancel{name}").WithOpenApi(); return group; diff --git a/src/Web/Server/Modules/ClaimModule/ClaimService.cs b/src/Web/Server/Modules/ClaimModule/ClaimService.cs index b7359fb1..72fbbcee 100644 --- a/src/Web/Server/Modules/ClaimModule/ClaimService.cs +++ b/src/Web/Server/Modules/ClaimModule/ClaimService.cs @@ -95,29 +95,35 @@ public ClaimService(ServerContext ctx, IMapper mapper, ILogger log return response; } - private async Task> ResolveClaimEntity() { + private async Task> ResolveClaimEntity(bool skipFilter = false) { var user = await _identity.GetUser(); var userId = await _identity.GetId(); var company = await _identity.GetCompanyId(); var users = await _identity.GetTeamMemberId(); IQueryable filtered; - var query = _ctx.Claims.Where(x => x.OwnerId != userId) - .Where(x => x.PaymentId == null); - if (user != null) { - switch (user.Permission) { + var query = _ctx.Claims; + if (!skipFilter) { + switch (user!.Permission) { case UserPermission.System: - filtered = query.Where(x => true); + filtered = query.Where(x => x.OwnerId != userId) + .Where(x => x.PaymentId == null); break; case UserPermission.Administrator: - filtered = query.Where(x => x.CompanyId == company) + filtered = query.Where(x => x.OwnerId != userId) + .Where(x => x.PaymentId == null) + .Where(x => x.CompanyId == company) .Where(x => x.Status >= ClaimStatus.Confirmed); break; case UserPermission.Finance: - filtered = query.Where(x => x.CompanyId == company) + filtered = query.Where(x => x.OwnerId != userId) + .Where(x => x.PaymentId == null) + .Where(x => x.CompanyId == company) .Where(x => x.Status >= ClaimStatus.Reviewed); break; case UserPermission.Lead: filtered = query.Where(x => x.CompanyId == company && users.Contains(x.OwnerId!.Value)) + .Where(x => x.OwnerId != userId) + .Where(x => x.PaymentId == null) .Where(x => x.Status >= ClaimStatus.Pending); break; case UserPermission.Cashier: @@ -127,9 +133,8 @@ private async Task> ResolveClaimEntity() { filtered = query.Where(x => false); break; } - } - else { - filtered = query.Where(x => false); + } else { + filtered = query.Where(x => x.Status != ClaimStatus.Pending); } return filtered.Include(x => x.Owner) @@ -173,7 +178,7 @@ async Task TransformEntity(ClaimEntity x) { try { var user = await _identity.GetUser(); if(user?.Id != null) { - var query = await this.ResolveClaimEntity(); + var query = await this.ResolveClaimEntity(true); var data = await query.Where(x => x.Id == id) .Select(x => transformEntity(x).Result).FirstOrDefaultAsync(); response.Data = data; From 6d1f13b34b22455c035b73daec9ceb7361230b30 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Thu, 9 Feb 2023 18:47:34 +0100 Subject: [PATCH 147/185] Improvements to claim details view --- src/Web/Components/Pages/Claims/Index.razor | 3 +- .../Pages/Reviews/ClaimDetails.razor | 38 ++++++++++++++++--- src/Web/Components/Pages/Reviews/Index.razor | 2 +- 3 files changed, 35 insertions(+), 8 deletions(-) diff --git a/src/Web/Components/Pages/Claims/Index.razor b/src/Web/Components/Pages/Claims/Index.razor index 1b2a6d38..b6d4b412 100644 --- a/src/Web/Components/Pages/Claims/Index.razor +++ b/src/Web/Components/Pages/Claims/Index.razor @@ -66,7 +66,7 @@ - @(context.Item.Currency?.Symbol ?? DefaultCurrency)@(context.Item.Amount) + @(context.Item.Currency?.Symbol ?? DefaultCurrency)@($"{context.Item.Amount:N0}") @@ -80,7 +80,6 @@ @if (context.Item.Status == ClaimStatus.Pending) { } else { - @* *@ } diff --git a/src/Web/Components/Pages/Reviews/ClaimDetails.razor b/src/Web/Components/Pages/Reviews/ClaimDetails.razor index e6ffc0a6..c0ec4ade 100644 --- a/src/Web/Components/Pages/Reviews/ClaimDetails.razor +++ b/src/Web/Components/Pages/Reviews/ClaimDetails.razor @@ -1,8 +1,10 @@ @using XClaim.Common.Dtos +@using XClaim.Common.Enums @using XClaim.Common.Extensions @using XClaim.Common.Wrappers @inject IClaimService Http @inject ISnackbar Snackbar +@inject AuthState AuthState @code { private enum ActionState { @@ -17,10 +19,17 @@ private bool Loading { get; set; } private string Comment { get; set; } = string.Empty; private ActionState State { get; set; } = ActionState.None; + private Guid? UserId { get; set; } = default!; [Parameter] public ClaimStateResponse? Item { get; set; } = new ClaimStateResponse(); - + + protected override async Task OnInitializedAsync() { + await base.OnInitializedAsync(); + var user = await AuthState.GetAccount(); + UserId = user!.Id; + } + private async Task Submit() { Loading = true; await _form!.Validate(); @@ -44,13 +53,26 @@ Snackbar.Clear(); Snackbar.Add(state ? "Successful" : "Failed", state ? Severity.Success : Severity.Error); if (state) { - Loading = false; Item = result.Data; + Loading = false; await Task.Delay(200); State = ActionState.None; } } } + private async Task Cancel() { + var id = (Guid) Item!.Id!; + var result = await Http.CancelReviewAsync(id); + Loading = true; + var state = result.Succeeded; + Snackbar.Clear(); + Snackbar.Add(state ? "Successful" : "Failed", state ? Severity.Success : Severity.Error); + if (state) { + Item = result.Data; + await Task.Delay(200); + Loading = false; + } + } } @@ -72,10 +94,17 @@ @Item.Notes.Truncate(55) @if (Item.Completed) { - + @Item.Status + @if (Item.OwnerId == UserId && Item.Status != ClaimStatus.Cancelled) { + + @(Item.Status == ClaimStatus.Cancelled ? Item.Status : "Cancel") + + } } else { @if (State == ActionState.None) { @@ -85,8 +114,7 @@ Reject - } - else { + } else { diff --git a/src/Web/Components/Pages/Reviews/Index.razor b/src/Web/Components/Pages/Reviews/Index.razor index f75ac92a..c978fb8c 100644 --- a/src/Web/Components/Pages/Reviews/Index.razor +++ b/src/Web/Components/Pages/Reviews/Index.razor @@ -68,7 +68,7 @@ - @(context.Item.Currency ?? DefaultCurrency)@(context.Item.Amount) + @(context.Item.Currency ?? DefaultCurrency)@($"{context.Item.Amount:N0}") From 2c958116e975eae411344116dfe6657cf62e38c8 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Sun, 12 Feb 2023 21:23:56 +0100 Subject: [PATCH 148/185] Improve auth design --- src/Web/Components/Layouts/AuthLayout.razor | 37 ++++++++++--------- src/Web/Components/Pages/Startup/Auth.razor | 41 +++++++++++++++++---- 2 files changed, 54 insertions(+), 24 deletions(-) diff --git a/src/Web/Components/Layouts/AuthLayout.razor b/src/Web/Components/Layouts/AuthLayout.razor index a025356b..98a4fb15 100644 --- a/src/Web/Components/Layouts/AuthLayout.razor +++ b/src/Web/Components/Layouts/AuthLayout.razor @@ -1,25 +1,28 @@ @inherits LayoutComponentBase @inject AuthState AuthState +@inject AppState AppState +@inject Navigation Nav -@code { - void SignIn() => AuthState.TriggerApiAuth(); - async Task SignOut() => await AuthState.TriggerSignOut(); -} - - - X-Claim - - - - Sign Out - - - Sign In - - + + + + X + + @AppState.AppTitle + + + + + + + Sign Out + + + - + @Body \ No newline at end of file diff --git a/src/Web/Components/Pages/Startup/Auth.razor b/src/Web/Components/Pages/Startup/Auth.razor index 541d357e..ce3bafd9 100644 --- a/src/Web/Components/Pages/Startup/Auth.razor +++ b/src/Web/Components/Pages/Startup/Auth.razor @@ -1,12 +1,39 @@ @inject NavigationManager Nav +@inject AuthState AuthState @page "/app/auth" -@code { - private void BackHome() => Nav.NavigateTo(WebConst.AppHome); -} - Sign In - - - \ No newline at end of file + + + + + + + + + + + + Expense platform + + + + @("Sign in with Microsoft") + + + + + + + + + \ No newline at end of file From e836905a99dbb90c5f640fde00f32844955df2ba Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Sun, 12 Feb 2023 21:25:36 +0100 Subject: [PATCH 149/185] Updated payment models --- src/Common/Dtos/PaymentResponse.cs | 5 +++-- src/Web/Server/Entities/PaymentEntity.cs | 7 +++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Common/Dtos/PaymentResponse.cs b/src/Common/Dtos/PaymentResponse.cs index ad6c542a..d8453138 100644 --- a/src/Common/Dtos/PaymentResponse.cs +++ b/src/Common/Dtos/PaymentResponse.cs @@ -8,10 +8,11 @@ public class PaymentResponse : BaseResponse { public string Notes { get; set; } = string.Empty; public UserResponse? Owner { get; set; } public Guid? OwnerId { get; set; } + public UserResponse? CreatedBy { get; set; } + public Guid? CreatedById { get; set; } public DateTime? ConfirmedAt { get; set; } - public UserResponse? ConfirmedBy { get; set; } - public Guid? ConfirmedById { get; set; } public bool Confirmed => ConfirmedAt != null; public int Count { get; set; } public ICollection Claims { get; set; } = default!; + public ICollection Files { get; set; } = default!; } \ No newline at end of file diff --git a/src/Web/Server/Entities/PaymentEntity.cs b/src/Web/Server/Entities/PaymentEntity.cs index 767d6652..784423ed 100644 --- a/src/Web/Server/Entities/PaymentEntity.cs +++ b/src/Web/Server/Entities/PaymentEntity.cs @@ -9,13 +9,12 @@ public sealed class PaymentEntity : BaseEntity { [MaxLength(1024)] public string? Notes { get; set; } public decimal Amount { get; set; } - [Required] public UserEntity? Owner { get; set; } public Guid? OwnerId { get; set; } + public UserEntity? CreatedBy { get; set; } + public Guid? CreatedById { get; set; } public DateTime? ConfirmedAt { get; set; } - public UserEntity? ConfirmedBy { get; set; } - public Guid? ConfirmedById { get; set; } - public bool Confirmed => ConfirmedAt != null || ConfirmedById != null; + public bool Confirmed => ConfirmedAt != null; public int Count { get; set; } public ICollection Claims { get; set; } = default!; public ICollection Files { get; set; } = default!; From 449b052a934a678b1ed6a0f6b01e534458aeac96 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Sun, 12 Feb 2023 21:26:11 +0100 Subject: [PATCH 150/185] Create PaymentStateResponse.cs --- src/Common/Dtos/PaymentStateResponse.cs | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 src/Common/Dtos/PaymentStateResponse.cs diff --git a/src/Common/Dtos/PaymentStateResponse.cs b/src/Common/Dtos/PaymentStateResponse.cs new file mode 100644 index 00000000..fcc0aaca --- /dev/null +++ b/src/Common/Dtos/PaymentStateResponse.cs @@ -0,0 +1,17 @@ +using XClaim.Common.Base; + +namespace XClaim.Common.Dtos; + +public class PaymentStateResponse : BaseResponse { + public string Description { get; set; } = string.Empty; + public decimal Amount { get; set; } + public string Notes { get; set; } = string.Empty; + public string? Owner { get; set; } + public Guid? OwnerId { get; set; } + public string? CreatedBy { get; set; } + public DateTime? ConfirmedAt { get; set; } + public bool Confirmed => ConfirmedAt != null; + public int Count { get; set; } + public ICollection Claims { get; set; } = default!; + public ICollection Files { get; set; } = default!; +} \ No newline at end of file From 1f6df7da642d79fe5d8c22cc9b98b8a70e164c69 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Sun, 12 Feb 2023 21:26:37 +0100 Subject: [PATCH 151/185] Added help section into application --- src/Web/Components/Layouts/HelpLayout.razor | 58 ++++++++++++++++++++ src/Web/Components/Pages/Help/Index.razor | 9 ++- src/Web/Components/Pages/Help/_Imports.razor | 1 + 3 files changed, 65 insertions(+), 3 deletions(-) create mode 100644 src/Web/Components/Layouts/HelpLayout.razor create mode 100644 src/Web/Components/Pages/Help/_Imports.razor diff --git a/src/Web/Components/Layouts/HelpLayout.razor b/src/Web/Components/Layouts/HelpLayout.razor new file mode 100644 index 00000000..b4ee4c39 --- /dev/null +++ b/src/Web/Components/Layouts/HelpLayout.razor @@ -0,0 +1,58 @@ +@inherits LayoutComponentBase +@inject AuthState AuthState +@inject AppState AppState +@inject Navigation Nav + +@code { + bool _drawerOpen = true; + void DrawerToggle() => _drawerOpen = !_drawerOpen; +} + + + + + + X + + @AppState.AppTitle + + + + + Sign In + + + Sign Out + + + + +
+ + + Get Started + Basic Usage + Claims + + + + Admin + Support + +
+ + + + @Body + + + \ No newline at end of file diff --git a/src/Web/Components/Pages/Help/Index.razor b/src/Web/Components/Pages/Help/Index.razor index ece2a176..8ae84897 100644 --- a/src/Web/Components/Pages/Help/Index.razor +++ b/src/Web/Components/Pages/Help/Index.razor @@ -1,8 +1,11 @@ @page "/app/help" -Help & FAQ -

Index

@code { -} \ No newline at end of file +} + +Help & FAQ + + +Help & Faq diff --git a/src/Web/Components/Pages/Help/_Imports.razor b/src/Web/Components/Pages/Help/_Imports.razor new file mode 100644 index 00000000..34a00a9f --- /dev/null +++ b/src/Web/Components/Pages/Help/_Imports.razor @@ -0,0 +1 @@ +@layout HelpLayout \ No newline at end of file From 0586bf13a3e6032072379bf11477401d162d573b Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Sun, 12 Feb 2023 21:26:54 +0100 Subject: [PATCH 152/185] Change auth image --- src/Web/Components/wwwroot/vectors/auth.svg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Web/Components/wwwroot/vectors/auth.svg b/src/Web/Components/wwwroot/vectors/auth.svg index 556a3117..da6b88b1 100644 --- a/src/Web/Components/wwwroot/vectors/auth.svg +++ b/src/Web/Components/wwwroot/vectors/auth.svg @@ -1 +1 @@ - \ No newline at end of file +online_transactions \ No newline at end of file From ec166de6dcc8cbadb8ed20078d0e49ea86b4335b Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Sun, 12 Feb 2023 21:27:22 +0100 Subject: [PATCH 153/185] Improvements to comment and file entities --- src/Web/Server/Entities/CommentEntity.cs | 6 ++---- src/Web/Server/Entities/FileEntity.cs | 5 +++++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/Web/Server/Entities/CommentEntity.cs b/src/Web/Server/Entities/CommentEntity.cs index 9aac7997..db5a0c33 100644 --- a/src/Web/Server/Entities/CommentEntity.cs +++ b/src/Web/Server/Entities/CommentEntity.cs @@ -4,14 +4,12 @@ namespace XClaim.Web.Server.Entities; public sealed class CommentEntity : BaseEntity { + public UserEntity? Owner { get; set; } + public Guid? OwnerId { get; set; } public ClaimEntity? Claim { get; set; } public Guid? ClaimId { get; set; } public PaymentEntity? Payment { get; set; } public Guid? PaymentId { get; set; } - [Required] - public UserEntity? Owner { get; set; } - public Guid? OwnerId { get; set; } - [Required] [MaxLength(1024)] public string? Content { get; set; } } \ No newline at end of file diff --git a/src/Web/Server/Entities/FileEntity.cs b/src/Web/Server/Entities/FileEntity.cs index b6faf76a..1cd056cb 100644 --- a/src/Web/Server/Entities/FileEntity.cs +++ b/src/Web/Server/Entities/FileEntity.cs @@ -12,4 +12,9 @@ public sealed class FileEntity : BaseEntity { [MaxLength(8)] public string? Extension { get; set; } public UserEntity? Owner { get; set; } + public Guid? OwnerId { get; set; } + public ClaimEntity? Claim { get; set; } + public Guid? ClaimId { get; set; } + public PaymentEntity? Payment { get; set; } + public Guid? PaymentId { get; set; } } \ No newline at end of file From 9dfa2bc07c615f488d0b0927c8bd6f1aa2e4185f Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Sun, 12 Feb 2023 21:27:35 +0100 Subject: [PATCH 154/185] Update AuthState.cs --- src/Web/Shared/States/AuthState.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Web/Shared/States/AuthState.cs b/src/Web/Shared/States/AuthState.cs index 302107c7..1e0c485c 100644 --- a/src/Web/Shared/States/AuthState.cs +++ b/src/Web/Shared/States/AuthState.cs @@ -49,14 +49,14 @@ public async Task TriggerAuthentication() { if (response is { Data: { }, Succeeded: true }) await Profile.UpdateAuthenticationState(response.Data); else - await Profile.UpdateAuthenticationState(null); + await Profile.ClearAuthInfo(); } public void TriggerApiAuth() => _nav.NavigateTo($"{_nav.BaseUri}{WebConst.ApiAuth}", true); public async Task TriggerSignOut() { await _profileService.SignOutAsync(); - await Profile.UpdateAuthenticationState(null); + await Profile.ClearAuthInfo(); _nav.NavigateTo(WebConst.AppAuth, true); } } \ No newline at end of file From 1f509e46ec5f30cacd2a142d464440bc5cb470f4 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Sun, 12 Feb 2023 23:13:52 +0100 Subject: [PATCH 155/185] Fix enum descriptions --- src/Common/Enums/NotificationChannels.cs | 2 +- src/Common/Enums/UserPermission.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Common/Enums/NotificationChannels.cs b/src/Common/Enums/NotificationChannels.cs index 02e12e0d..5344b2fe 100644 --- a/src/Common/Enums/NotificationChannels.cs +++ b/src/Common/Enums/NotificationChannels.cs @@ -8,7 +8,7 @@ public enum NotificationChannels { Push, [Description("SMS Notifications")] Sms, - [Description("MS Teams Notifications")] + [Description("Teams Notifications")] Teams } } \ No newline at end of file diff --git a/src/Common/Enums/UserPermission.cs b/src/Common/Enums/UserPermission.cs index 7c6fddbb..7dc6333f 100644 --- a/src/Common/Enums/UserPermission.cs +++ b/src/Common/Enums/UserPermission.cs @@ -7,9 +7,9 @@ public enum UserPermission { Administrator, [Description("Finance Manager")] Finance, + [Description("Department Head")] Lead, Cashier, - [Description("Department Head")] Standard, Anonymous } \ No newline at end of file From 2bb0e0d49a57efa17fe05621cae9d1276ec844e7 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Sun, 12 Feb 2023 23:14:42 +0100 Subject: [PATCH 156/185] Optimize for mobile --- src/Web/Components/Layouts/AuthLayout.razor | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Web/Components/Layouts/AuthLayout.razor b/src/Web/Components/Layouts/AuthLayout.razor index 98a4fb15..6412d583 100644 --- a/src/Web/Components/Layouts/AuthLayout.razor +++ b/src/Web/Components/Layouts/AuthLayout.razor @@ -13,10 +13,10 @@ + OnClick='() => Nav.NavigateTo("/app/help")' Class="mr-lg-3 mr-md-1 pa-2"> - Sign Out + Sign Out From 498f931b042f6350fa0c12b7db5c71becda24c42 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Mon, 13 Feb 2023 09:27:49 +0100 Subject: [PATCH 157/185] Update ClaimDetails.razor --- src/Web/Components/Pages/Reviews/ClaimDetails.razor | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Web/Components/Pages/Reviews/ClaimDetails.razor b/src/Web/Components/Pages/Reviews/ClaimDetails.razor index c0ec4ade..ecc0cc50 100644 --- a/src/Web/Components/Pages/Reviews/ClaimDetails.razor +++ b/src/Web/Components/Pages/Reviews/ClaimDetails.razor @@ -24,6 +24,8 @@ [Parameter] public ClaimStateResponse? Item { get; set; } = new ClaimStateResponse(); + private bool IsOwner => Item.OwnerId == UserId; + protected override async Task OnInitializedAsync() { await base.OnInitializedAsync(); var user = await AuthState.GetAccount(); @@ -109,9 +111,11 @@ } else { @if (State == ActionState.None) { - Approve - Reject } else { From ed5818c46b17cf6c21cd636d85165d4617d371fb Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Mon, 13 Feb 2023 13:16:47 +0100 Subject: [PATCH 158/185] Added improvements to claim module API --- .../Server/Modules/ClaimModule/ClaimModule.cs | 16 ++++ .../Modules/ClaimModule/ClaimService.cs | 73 +++++++++++++++++-- .../Modules/ClaimModule/IClaimService.cs | 8 +- 3 files changed, 91 insertions(+), 6 deletions(-) diff --git a/src/Web/Server/Modules/ClaimModule/ClaimModule.cs b/src/Web/Server/Modules/ClaimModule/ClaimModule.cs index e36223d9..988e12aa 100644 --- a/src/Web/Server/Modules/ClaimModule/ClaimModule.cs +++ b/src/Web/Server/Modules/ClaimModule/ClaimModule.cs @@ -2,6 +2,7 @@ using XClaim.Common.Dtos; using XClaim.Common.Enums; using XClaim.Web.Server.Helpers; +using XClaim.Web.Server.Modules.UserModule; using YamlDotNet.Core.Events; namespace XClaim.Web.Server.Modules.ClaimModule; @@ -87,6 +88,21 @@ await sv.GetAllAsync(filter)) var result = await sv.ReviewValidateAsync(id, ClaimStatus.Cancelled, null); return !result.Succeeded ? Results.NotFound(result) : TypedResults.Ok(result); }).WithName($"ReviewCancel{name}").WithOpenApi(); + + group.MapGet("/pending-users", async (ClaimService sv, [AsParameters] UserFilter filter) => + await sv.GetPendingClaimUserListAsync(filter)) + .WithName($"GetAllPending{name}Users") + .WithOpenApi(); + + group.MapGet("/file/{id:guid}", async (Guid id, ClaimService sv) => { + var result = await sv.GetFileAsync(id); + return !result.Succeeded ? Results.NotFound(result) : TypedResults.Ok(result); + }).WithName($"Review{name}Files").WithOpenApi(); + + group.MapGet("/comment/{id:guid}", async (Guid id, ClaimService sv) => { + var result = await sv.GetCommentAsync(id); + return !result.Succeeded ? Results.NotFound(result) : TypedResults.Ok(result); + }).WithName($"Review{name}Comments").WithOpenApi(); return group; } diff --git a/src/Web/Server/Modules/ClaimModule/ClaimService.cs b/src/Web/Server/Modules/ClaimModule/ClaimService.cs index 72fbbcee..3cd189f3 100644 --- a/src/Web/Server/Modules/ClaimModule/ClaimService.cs +++ b/src/Web/Server/Modules/ClaimModule/ClaimService.cs @@ -11,6 +11,7 @@ using XClaim.Web.Server.Data; using XClaim.Web.Server.Entities; using XClaim.Web.Server.Helpers; +using XClaim.Web.Server.Modules.UserModule; namespace XClaim.Web.Server.Modules.ClaimModule; @@ -57,7 +58,6 @@ public ClaimService(ServerContext ctx, IMapper mapper, ILogger log .Where(x => x.Id == id) .Include(x => x.Payment) .Include(x => x.Currency) - .Include(x => x.Files) .FirstOrDefaultAsync(); var data = _mapper.Map(item); response.Data = data; @@ -74,14 +74,14 @@ public ClaimService(ServerContext ctx, IMapper mapper, ILogger log var user = await _identity.GetUser(); var response = new Response(); try { - var item = _mapper.Map(value); - await _ctx.Set().AddAsync(item); + var item = value.MapTo(); item.OwnerId = await _identity.GetId(); item.CompanyId = await _identity.GetCompanyId(); + await _ctx.Claims.AddAsync(item); await _ctx.SaveChangesAsync(); - if (user is { Permission: <= UserPermission.Finance }) + if (user is { Permission: <= UserPermission.Finance }) { await this.ReviewValidateAsync(item.Id, ClaimStatus.None, new CommentResponse { Content = "Confirmed by default."}); - + } var data = _mapper.Map(item); response = new Response(data!) { Succeeded = data != null @@ -222,6 +222,69 @@ async Task TransformEntity(ClaimEntity x) { _logger.LogError(e.ToString()); } + return response; + } + public async Task>> GetPendingClaimUserListAsync(UserFilter requestFilter) { + var response = new PagedResponse>(); + try { + var companyId = await _identity.GetCompanyId(); + var claimUsers = await _ctx.Claims.Where(x => x.CompanyId == companyId) + .Where(x => x.PaymentId == null) + .Select(x => x.OwnerId) + .Take(55) + .ToListAsync(); + var query = _ctx.Users + .Where(x => claimUsers.Contains(x.Id)) + .ApplyFilter(requestFilter); + var count = await query.CountAsync(); + var data = await query.ToListAsync(); + var filter = requestFilter.MapTo(); + var result = data.MapTo>(); + response = new PagedResponse>(result, count, filter) { + Succeeded = true + }; + } + catch (Exception e) { + response.Errors = new[] { e.ToString() }; + _logger.LogError(e.ToString()); + } + + return response; + } + + public async Task>> GetFileAsync(Guid claimId) { + var response = new Response>(); + try { + var item = await _ctx.Claims.Where(x => x.Id == claimId) + .Include(x => x.Files) + .Select(x => x.Files) + .ToListAsync(); + var data = item.MapTo>(); + response.Data = data; + response.Succeeded = true; + } catch (Exception e) { + response.Errors = new[] { e.ToString() }; + _logger.LogError(e.ToString()); + } + + return response; + } + + public async Task>> GetCommentAsync(Guid claimId) { + var response = new Response>(); + try { + var item = await _ctx.Claims.Where(x => x.Id == claimId) + .Include(x => x.Comments) + .Select(x => x.Comments) + .ToListAsync(); + var data = item.MapTo>(); + response.Data = data; + response.Succeeded = true; + } catch (Exception e) { + response.Errors = new[] { e.ToString() }; + _logger.LogError(e.ToString()); + } + return response; } } \ No newline at end of file diff --git a/src/Web/Server/Modules/ClaimModule/IClaimService.cs b/src/Web/Server/Modules/ClaimModule/IClaimService.cs index 14371bf0..190ab466 100644 --- a/src/Web/Server/Modules/ClaimModule/IClaimService.cs +++ b/src/Web/Server/Modules/ClaimModule/IClaimService.cs @@ -1,7 +1,7 @@ -using AutoFilterer.Types; using XClaim.Common.Dtos; using XClaim.Common.Enums; using XClaim.Common.Wrappers; +using XClaim.Web.Server.Modules.UserModule; namespace XClaim.Web.Server.Modules.ClaimModule; @@ -11,4 +11,10 @@ public interface IClaimService { public Task> GetReviewByIdAsync(Guid id); Task> ReviewValidateAsync(Guid id, ClaimStatus action, CommentResponse comment); + + Task>> GetPendingClaimUserListAsync(UserFilter requestFilter); + + Task>> GetFileAsync(Guid claimId); + + Task>> GetCommentAsync(Guid claimId); } \ No newline at end of file From 5511cd0a3e2fffaba5ca41557cbb266857fa74b4 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Mon, 13 Feb 2023 13:17:01 +0100 Subject: [PATCH 159/185] Update UserFilter.cs --- src/Web/Server/Modules/UserModule/UserFilter.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Web/Server/Modules/UserModule/UserFilter.cs b/src/Web/Server/Modules/UserModule/UserFilter.cs index f7572bb5..bfe7577b 100644 --- a/src/Web/Server/Modules/UserModule/UserFilter.cs +++ b/src/Web/Server/Modules/UserModule/UserFilter.cs @@ -4,7 +4,7 @@ namespace XClaim.Web.Server.Modules.UserModule; -public class UserFilter : GenericFilter { +public sealed class UserFilter : GenericFilter { [CompareTo(nameof(UserEntity.FirstName), nameof(UserEntity.LastName), nameof(UserEntity.Email), CombineWith = CombineType.Or)] [ToLowerContainsComparison] public string? Search { get; set; } From 1b7143bde808ce440c87638edcf3f1394798042c Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Mon, 13 Feb 2023 13:17:20 +0100 Subject: [PATCH 160/185] Remove sentitive info logging --- src/Web/Server/Extensions/DatabaseSetupExtension.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Web/Server/Extensions/DatabaseSetupExtension.cs b/src/Web/Server/Extensions/DatabaseSetupExtension.cs index 57ff0930..25d3b8d9 100644 --- a/src/Web/Server/Extensions/DatabaseSetupExtension.cs +++ b/src/Web/Server/Extensions/DatabaseSetupExtension.cs @@ -26,7 +26,7 @@ public static IServiceCollection SetupDatabase(this IServiceCollection services, options.UseSnakeCaseNamingConvention() .LogTo(Console.WriteLine, LogLevel.Information) - .EnableSensitiveDataLogging() + // .EnableSensitiveDataLogging(); .EnableDetailedErrors(); }); From 0272b0fb30e4aa33fc3db8676938147e176a9479 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Mon, 13 Feb 2023 13:17:58 +0100 Subject: [PATCH 161/185] Improve permission access in permission assignment --- .../Pages/User/Components/MutateUser.razor | 33 ++++++++++++------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/src/Web/Components/Pages/User/Components/MutateUser.razor b/src/Web/Components/Pages/User/Components/MutateUser.razor index 64369707..5cd5babb 100644 --- a/src/Web/Components/Pages/User/Components/MutateUser.razor +++ b/src/Web/Components/Pages/User/Components/MutateUser.razor @@ -15,6 +15,8 @@ [Parameter] public Guid? Id { get; set; } + private UserPermission AccountPermission { get; set; } + private CompanyResponse? Company { get; set; } private TeamResponse? Team { get; set; } @@ -29,20 +31,17 @@ return (response.Succeeded ? response.Data : new List {})!; } - private string ActionText { - get { return Id == null ? "Create" : "Update"; } - } + private string ActionText => Id == null ? "Create" : "Update"; private bool Loading { get; set; } - private string Title { - get { return $"{ActionText} User"; } - } + private string Title => $"{ActionText} User"; private UserResponse Item { get; set; } = new UserResponse(); protected override async Task OnInitializedAsync() { - + await base.OnInitializedAsync(); + AccountPermission = await AuthState.GetPermission(); if (Id != null) { Loading = true; var res = await Http.GetByIdAsync(Id.Value); @@ -56,7 +55,6 @@ } Loading = false; } - await base.OnInitializedAsync(); } async Task Submit() { @@ -114,17 +112,30 @@ - + @foreach (var p in Enum.GetValues()) { - @p.ToDescriptionString().Capitalize() + @switch (p) { + case UserPermission.System: + @if (AccountPermission == UserPermission.System) { + @p.ToDescriptionString().Capitalize() + } + break; + case UserPermission.Administrator: + @if (AccountPermission <= UserPermission.Administrator) { + @p.ToDescriptionString().Capitalize() + } + break; + default: + @p.ToDescriptionString().Capitalize() + break; + } } - From a421bf99526d518709d13b5156bfa7151f32538d Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Mon, 13 Feb 2023 13:18:25 +0100 Subject: [PATCH 162/185] Minor tool bar generics improvements --- .../Components/Controls/TableToolbar.razor | 21 +++++++------------ 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/src/Web/Components/Controls/TableToolbar.razor b/src/Web/Components/Controls/TableToolbar.razor index 4fa764dc..b5689df1 100644 --- a/src/Web/Components/Controls/TableToolbar.razor +++ b/src/Web/Components/Controls/TableToolbar.razor @@ -5,7 +5,6 @@ @typeparam TValue @code { - // Search bindings string _search = string.Empty; [Parameter] @@ -18,7 +17,6 @@ [Parameter] public EventCallback SearchChanged { get; set; } - // Date bindings [Parameter] public bool IsFilterActive { get; set; } @@ -37,11 +35,9 @@ [Parameter] public EventCallback ValueChanged { get; set; } - // Create click event callback [Parameter] public EventCallback OnCreateClicked { get; set; } - - // Extra content + [Parameter] public RenderFragment? ChildContent { get; set; } @@ -52,27 +48,24 @@ public string CreateTitle { get; set; } = "Create"; [Parameter] - public DialogParameters DialogParameters { get; set; } = new() { }; + public DialogParameters DialogParameters { get; set; } = new DialogParameters { }; [Parameter] - public DialogOptions DialogOptions { get; set; } = new () { CloseButton = false, MaxWidth = MaxWidth.ExtraSmall }; + public DialogOptions DialogOptions { get; set; } = new DialogOptions { CloseButton = false, MaxWidth = MaxWidth.ExtraSmall }; [Parameter] - public DialogOptions CreateDialogOptions { get; set; } = new () { CloseButton = false, MaxWidth = MaxWidth.Medium }; + public DialogOptions CreateDialogOptions { get; set; } = new DialogOptions { CloseButton = false, MaxWidth = MaxWidth.Medium }; - async Task TriggerFilter() - { + async Task TriggerFilter() { var dialog = await DialogService.ShowAsync(FilterTitle, DialogParameters, DialogOptions); var result = await dialog.Result; if (!result.Canceled) Value = result.Data.As(); } - async Task TriggerCreate() - { + async Task TriggerCreate() { var dialog = await DialogService.ShowAsync(CreateTitle, DialogParameters, CreateDialogOptions); var result = await dialog.Result; - if (!result.Canceled) - { + if (!result.Canceled) { var value = result.Data.As(); Snackbar.Clear(); Snackbar.Configuration.PositionClass = Defaults.Classes.Position.BottomCenter; From 352ff044d07360daa1fc0a14c8da8f5da17fc1cb Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Mon, 13 Feb 2023 13:18:54 +0100 Subject: [PATCH 163/185] Nullable improvements --- .../Components/Controls/FormEditTrigger.razor | 2 +- .../Pages/Account/BankAccount.razor | 24 +++++++++---------- .../Components/Pages/Claims/MutateClaim.razor | 18 +++++--------- 3 files changed, 18 insertions(+), 26 deletions(-) diff --git a/src/Web/Components/Controls/FormEditTrigger.razor b/src/Web/Components/Controls/FormEditTrigger.razor index 49e70374..fd12fa72 100644 --- a/src/Web/Components/Controls/FormEditTrigger.razor +++ b/src/Web/Components/Controls/FormEditTrigger.razor @@ -25,7 +25,7 @@ if (!result.Canceled) { var value = result.Data.As(); - await OnTriggered.InvokeAsync(value)!; + await OnTriggered.InvokeAsync(value); Snackbar.Clear(); Snackbar.Configuration.PositionClass = Defaults.Classes.Position.BottomCenter; if (value) Snackbar.Add("Saved successfully", Severity.Success); diff --git a/src/Web/Components/Pages/Account/BankAccount.razor b/src/Web/Components/Pages/Account/BankAccount.razor index cfe85586..fa5b21f8 100644 --- a/src/Web/Components/Pages/Account/BankAccount.razor +++ b/src/Web/Components/Pages/Account/BankAccount.razor @@ -12,10 +12,10 @@ bool _success; string[] _errors = { }; MudForm? _form; - - private BankResponse? Bank { get; set; } - private BankAccountResponse? Item { get; set; } = new BankAccountResponse(); + private BankResponse Bank { get; set; } = new BankResponse(); + + private BankAccountResponse Item { get; set; } = new BankAccountResponse(); private async Task> SearchBank(string value) { var response = await BankService.GetAllAsync(new SearchFilter { Search = value }); @@ -27,7 +27,7 @@ Loading = true; var result = await ProfileService.GetBankAccountAsync(); if (result is { Succeeded: true, Data: { } }) { - Bank = result.Data.Bank; + Bank = result.Data.Bank!; Item = result.Data; } Loading = false; @@ -37,15 +37,13 @@ await _form!.Validate(); if (!_success) return; - if (Item != null) { - Item.BankId = Bank?.Id; - var result = await ProfileService.UpdateBankAccountAsync(Item); - Snackbar.Clear(); - await Task.Delay(500); - Snackbar.Add(result.Succeeded ? "Updated successfully.." : "Update failed..", result.Succeeded ? Severity.Success : Severity.Error); - if (result.Succeeded) { - Nav.NavigateBack(); - } + Item.BankId = Bank?.Id; + var result = await ProfileService.UpdateBankAccountAsync(Item); + Snackbar.Clear(); + await Task.Delay(500); + Snackbar.Add(result.Succeeded ? "Updated successfully.." : "Update failed..", result.Succeeded ? Severity.Success : Severity.Error); + if (result.Succeeded) { + Nav.NavigateBack(); } } } diff --git a/src/Web/Components/Pages/Claims/MutateClaim.razor b/src/Web/Components/Pages/Claims/MutateClaim.razor index 1de15503..0e45c272 100644 --- a/src/Web/Components/Pages/Claims/MutateClaim.razor +++ b/src/Web/Components/Pages/Claims/MutateClaim.razor @@ -24,23 +24,19 @@ private async Task> SearchCategory(string value) { var response = await CategoryService.GetAllAsync(new SearchFilter { Search = value }); - return (response.Succeeded ? response.Data : new List {})!; + return (response.Succeeded ? response.Data : new List())!; } private async Task> SearchCurrency(string value) { var response = await CurrencyService.GetAllAsync(new SearchFilter { Search = value }); - return (response.Succeeded ? response.Data : new List {})!; + return (response.Succeeded ? response.Data : new List())!; } - private string ActionText { - get { return Id == null ? "Create" : "Update"; } - } + private string ActionText => Id == null ? "Create" : "Update"; private bool Loading { get; set; } - private string Title { - get { return $"{ActionText} Claim"; } - } + private string Title => $"{ActionText} Claim"; private ClaimResponse Item { get; set; } = new ClaimResponse(); @@ -74,7 +70,7 @@ } async Task TriggerArchive(bool state) { - if (Item?.Id != null && state) { + if (Item.Id != null && state) { var result = (await Http.ArchiveAsync(Item.Id.Value)).Succeeded; Snackbar.Add(result ? "Deleted successfully" : "Archiving failed", result ? Severity.Success : Severity.Error); MudDialog.Close(DialogResult.Ok(result)); @@ -83,9 +79,7 @@ readonly IList _files = new List(); - private string? AmountTooLow(string s) { - return Decimal.Parse(s) < 100 ? "Amount must be more than 100" : null; - } + private static string? AmountTooLow(string s) => Decimal.Parse(s) < 100 ? "Amount must be more than 100" : null; private void UploadFiles(IReadOnlyList files) { foreach (var file in files) { From ca95549773bad3454ef1d56a6da6e4b2aa433f9f Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Mon, 13 Feb 2023 13:19:33 +0100 Subject: [PATCH 164/185] Added company key to payment and remove redundant properties --- src/Common/Dtos/PaymentResponse.cs | 2 ++ src/Common/Dtos/PaymentStateResponse.cs | 2 -- src/Web/Server/Entities/PaymentEntity.cs | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Common/Dtos/PaymentResponse.cs b/src/Common/Dtos/PaymentResponse.cs index d8453138..622d5e88 100644 --- a/src/Common/Dtos/PaymentResponse.cs +++ b/src/Common/Dtos/PaymentResponse.cs @@ -8,6 +8,8 @@ public class PaymentResponse : BaseResponse { public string Notes { get; set; } = string.Empty; public UserResponse? Owner { get; set; } public Guid? OwnerId { get; set; } + public CompanyResponse? Company { get; set; } + public Guid? CompanyId { get; set; } public UserResponse? CreatedBy { get; set; } public Guid? CreatedById { get; set; } public DateTime? ConfirmedAt { get; set; } diff --git a/src/Common/Dtos/PaymentStateResponse.cs b/src/Common/Dtos/PaymentStateResponse.cs index fcc0aaca..ecb3c7b0 100644 --- a/src/Common/Dtos/PaymentStateResponse.cs +++ b/src/Common/Dtos/PaymentStateResponse.cs @@ -12,6 +12,4 @@ public class PaymentStateResponse : BaseResponse { public DateTime? ConfirmedAt { get; set; } public bool Confirmed => ConfirmedAt != null; public int Count { get; set; } - public ICollection Claims { get; set; } = default!; - public ICollection Files { get; set; } = default!; } \ No newline at end of file diff --git a/src/Web/Server/Entities/PaymentEntity.cs b/src/Web/Server/Entities/PaymentEntity.cs index 784423ed..a0643d4d 100644 --- a/src/Web/Server/Entities/PaymentEntity.cs +++ b/src/Web/Server/Entities/PaymentEntity.cs @@ -11,6 +11,8 @@ public sealed class PaymentEntity : BaseEntity { public decimal Amount { get; set; } public UserEntity? Owner { get; set; } public Guid? OwnerId { get; set; } + public CompanyEntity? Company { get; set; } + public Guid? CompanyId { get; set; } public UserEntity? CreatedBy { get; set; } public Guid? CreatedById { get; set; } public DateTime? ConfirmedAt { get; set; } From 744062245ae2fb0dc66e5fd801f3bffb0cfec878 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Mon, 13 Feb 2023 13:43:25 +0100 Subject: [PATCH 165/185] Change file and comment method response to paged type --- .../Server/Modules/ClaimModule/ClaimModule.cs | 10 +++---- .../Modules/ClaimModule/ClaimService.cs | 28 +++++++++++-------- .../Modules/ClaimModule/IClaimService.cs | 7 +++-- 3 files changed, 25 insertions(+), 20 deletions(-) diff --git a/src/Web/Server/Modules/ClaimModule/ClaimModule.cs b/src/Web/Server/Modules/ClaimModule/ClaimModule.cs index 988e12aa..bfb9932a 100644 --- a/src/Web/Server/Modules/ClaimModule/ClaimModule.cs +++ b/src/Web/Server/Modules/ClaimModule/ClaimModule.cs @@ -90,17 +90,17 @@ await sv.GetAllAsync(filter)) }).WithName($"ReviewCancel{name}").WithOpenApi(); group.MapGet("/pending-users", async (ClaimService sv, [AsParameters] UserFilter filter) => - await sv.GetPendingClaimUserListAsync(filter)) + await sv.GetPendingUserAsync(filter)) .WithName($"GetAllPending{name}Users") .WithOpenApi(); - group.MapGet("/file/{id:guid}", async (Guid id, ClaimService sv) => { - var result = await sv.GetFileAsync(id); + group.MapGet("/file/{id:guid}", async (Guid id, ClaimService sv, [AsParameters] GenericFilter filter) => { + var result = await sv.GetFileAsync(id, filter); return !result.Succeeded ? Results.NotFound(result) : TypedResults.Ok(result); }).WithName($"Review{name}Files").WithOpenApi(); - group.MapGet("/comment/{id:guid}", async (Guid id, ClaimService sv) => { - var result = await sv.GetCommentAsync(id); + group.MapGet("/comment/{id:guid}", async (Guid id, ClaimService sv, [AsParameters] GenericFilter filter) => { + var result = await sv.GetCommentAsync(id, filter); return !result.Succeeded ? Results.NotFound(result) : TypedResults.Ok(result); }).WithName($"Review{name}Comments").WithOpenApi(); diff --git a/src/Web/Server/Modules/ClaimModule/ClaimService.cs b/src/Web/Server/Modules/ClaimModule/ClaimService.cs index 3cd189f3..d3eddfd3 100644 --- a/src/Web/Server/Modules/ClaimModule/ClaimService.cs +++ b/src/Web/Server/Modules/ClaimModule/ClaimService.cs @@ -224,7 +224,7 @@ async Task TransformEntity(ClaimEntity x) { return response; } - public async Task>> GetPendingClaimUserListAsync(UserFilter requestFilter) { + public async Task>> GetPendingUserAsync(UserFilter requestFilter) { var response = new PagedResponse>(); try { var companyId = await _identity.GetCompanyId(); @@ -252,16 +252,20 @@ public async Task>> GetPendingClaimUserListAsyn return response; } - public async Task>> GetFileAsync(Guid claimId) { - var response = new Response>(); + public async Task>> GetFileAsync(Guid claimId, PaginationFilterBase requestFilter) { + var response = new PagedResponse>(); try { - var item = await _ctx.Claims.Where(x => x.Id == claimId) - .Include(x => x.Files) - .Select(x => x.Files) - .ToListAsync(); - var data = item.MapTo>(); - response.Data = data; - response.Succeeded = true; + var query = _ctx.Claims.Where(x => x.Id == claimId) + .ApplyFilter(requestFilter) + .Include(x => x.Files) + .Select(x => x.Files); + var count = await query.CountAsync(); + var data = await query.ToListAsync(); + var filter = requestFilter.MapTo(); + var result = data.MapTo>(); + response = new PagedResponse>(result, count, filter) { + Succeeded = true + }; } catch (Exception e) { response.Errors = new[] { e.ToString() }; _logger.LogError(e.ToString()); @@ -270,8 +274,8 @@ public async Task>> GetFileAsync(Guid claimId) { return response; } - public async Task>> GetCommentAsync(Guid claimId) { - var response = new Response>(); + public async Task>> GetCommentAsync(Guid claimId, PaginationFilterBase requestFilter) { + var response = new PagedResponse>(); try { var item = await _ctx.Claims.Where(x => x.Id == claimId) .Include(x => x.Comments) diff --git a/src/Web/Server/Modules/ClaimModule/IClaimService.cs b/src/Web/Server/Modules/ClaimModule/IClaimService.cs index 190ab466..a5b2aead 100644 --- a/src/Web/Server/Modules/ClaimModule/IClaimService.cs +++ b/src/Web/Server/Modules/ClaimModule/IClaimService.cs @@ -1,3 +1,4 @@ +using AutoFilterer.Types; using XClaim.Common.Dtos; using XClaim.Common.Enums; using XClaim.Common.Wrappers; @@ -12,9 +13,9 @@ public interface IClaimService { Task> ReviewValidateAsync(Guid id, ClaimStatus action, CommentResponse comment); - Task>> GetPendingClaimUserListAsync(UserFilter requestFilter); + Task>> GetPendingUserAsync(UserFilter requestFilter); - Task>> GetFileAsync(Guid claimId); + Task>> GetFileAsync(Guid claimId, PaginationFilterBase requestFilter); - Task>> GetCommentAsync(Guid claimId); + Task>> GetCommentAsync(Guid claimId, PaginationFilterBase requestFilter); } \ No newline at end of file From 24c7693ed9393358ec33eeb1645c675d7a3c0ef3 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Mon, 13 Feb 2023 15:23:05 +0100 Subject: [PATCH 166/185] Improve claim mutate design --- .../Components/Pages/Claims/MutateClaim.razor | 155 +++++++++--------- 1 file changed, 78 insertions(+), 77 deletions(-) diff --git a/src/Web/Components/Pages/Claims/MutateClaim.razor b/src/Web/Components/Pages/Claims/MutateClaim.razor index 0e45c272..a75f3340 100644 --- a/src/Web/Components/Pages/Claims/MutateClaim.razor +++ b/src/Web/Components/Pages/Claims/MutateClaim.razor @@ -103,91 +103,92 @@ - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - @foreach (var priority in Enum.GetValues()) { - @priority.ToDescriptionString().Capitalize() - } - - - - - - - - - - - - - @if (_files.Count > 0) { - - - Uploads - - - @foreach (var file in _files) { - - - @file.Name - @(Math.Round(file.Size / (decimal)(1000 * 1000), 2))Mb - - - - - } - - - } - else { - - No file uploaded. - + + + + + + + + + + + + + + + + @foreach (var priority in Enum.GetValues()) { + @priority.ToDescriptionString().Capitalize() } + + + + + + + + + + + + + @if (_files.Count > 0) { + + + Uploads + + + @foreach (var file in _files) { + + + @file.Name - @(Math.Round(file.Size / (decimal)(1000 * 1000), 2))Mb + + + + + } + - - - - + } + else { + + No file uploaded. + + } + + + - @ActionText + + Cancel + @ActionText + \ No newline at end of file From 1ef9120b214e6a67a9ba4281cf7ca80b36de52ec Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Thu, 23 Feb 2023 18:44:38 +0100 Subject: [PATCH 167/185] Updated core project files --- .editorconfig | 74 +------------------------------- global.json | 4 +- src/Mobile/.editorconfig | 91 ++++------------------------------------ src/Web/.editorconfig | 91 ++++------------------------------------ 4 files changed, 21 insertions(+), 239 deletions(-) diff --git a/.editorconfig b/.editorconfig index 8acf34b3..a5a0e743 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,72 +1,5 @@ root=true -[*.{c++,cc,cpp,cppm,cxx,h,h++,hh,hpp,hxx,inl,ipp,ixx,tlh,tli}] - -# Visual C++ Code Style settings - -cpp_generate_documentation_comments = xml - -# Visual C++ Formatting settings - -cpp_indent_braces = false -cpp_indent_multi_line_relative_to = innermost_parenthesis -cpp_indent_within_parentheses = indent -cpp_indent_preserve_within_parentheses = true -cpp_indent_case_contents = true -cpp_indent_case_labels = false -cpp_indent_case_contents_when_block = false -cpp_indent_lambda_braces_when_parameter = true -cpp_indent_goto_labels = one_left -cpp_indent_preprocessor = leftmost_column -cpp_indent_access_specifiers = false -cpp_indent_namespace_contents = true -cpp_indent_preserve_comments = false -cpp_new_line_before_open_brace_namespace = ignore -cpp_new_line_before_open_brace_type = ignore -cpp_new_line_before_open_brace_function = ignore -cpp_new_line_before_open_brace_block = ignore -cpp_new_line_before_open_brace_lambda = ignore -cpp_new_line_scope_braces_on_separate_lines = false -cpp_new_line_close_brace_same_line_empty_type = false -cpp_new_line_close_brace_same_line_empty_function = false -cpp_new_line_before_catch = true -cpp_new_line_before_else = true -cpp_new_line_before_while_in_do_while = false -cpp_space_before_function_open_parenthesis = remove -cpp_space_within_parameter_list_parentheses = false -cpp_space_between_empty_parameter_list_parentheses = false -cpp_space_after_keywords_in_control_flow_statements = true -cpp_space_within_control_flow_statement_parentheses = false -cpp_space_before_lambda_open_parenthesis = false -cpp_space_within_cast_parentheses = false -cpp_space_after_cast_close_parenthesis = false -cpp_space_within_expression_parentheses = false -cpp_space_before_block_open_brace = true -cpp_space_between_empty_braces = false -cpp_space_before_initializer_list_open_brace = false -cpp_space_within_initializer_list_braces = true -cpp_space_preserve_in_initializer_list = true -cpp_space_before_open_square_bracket = false -cpp_space_within_square_brackets = false -cpp_space_before_empty_square_brackets = false -cpp_space_between_empty_square_brackets = false -cpp_space_group_square_brackets = true -cpp_space_within_lambda_brackets = false -cpp_space_between_empty_lambda_brackets = false -cpp_space_before_comma = false -cpp_space_after_comma = true -cpp_space_remove_around_member_operators = true -cpp_space_before_inheritance_colon = true -cpp_space_before_constructor_colon = true -cpp_space_remove_before_semicolon = true -cpp_space_after_semicolon = true -cpp_space_remove_around_unary_operator = true -cpp_space_around_binary_operator = insert -cpp_space_around_assignment_operator = insert -cpp_space_pointer_reference_alignment = left -cpp_space_around_ternary_operator = insert -cpp_wrap_preserve_blocks = one_liners - [*.{cs,vb,razor}] #### Naming styles #### @@ -105,11 +38,6 @@ dotnet_naming_style.begins_with_i.required_suffix = dotnet_naming_style.begins_with_i.word_separator = dotnet_naming_style.begins_with_i.capitalization = pascal_case -dotnet_naming_style.pascal_case.required_prefix = -dotnet_naming_style.pascal_case.required_suffix = -dotnet_naming_style.pascal_case.word_separator = -dotnet_naming_style.pascal_case.capitalization = pascal_case - dotnet_naming_style.pascal_case.required_prefix = dotnet_naming_style.pascal_case.required_suffix = dotnet_naming_style.pascal_case.word_separator = @@ -150,7 +78,7 @@ dotnet_style_qualification_for_method = false:silent dotnet_style_qualification_for_event = false:silent insert_final_newline = false -[*.{cs,razor}] +[*.{cs,vb,razor}] csharp_indent_labels = one_less_than_current csharp_using_directive_placement = outside_namespace:silent csharp_prefer_simple_using_statement = true:suggestion diff --git a/global.json b/global.json index d936b9af..9b7db758 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "7.0.102", + "version": "7.0.*", "rollForward": "latestPatch" }, "scripts": { @@ -12,4 +12,4 @@ "dev:blazor": "DOTNET_USE_POLLING_FILE_WATCHER=true dotnet watch --project src/Web/Client/", "dev:web": "DOTNET_USE_POLLING_FILE_WATCHER=true dotnet r web" } -} \ No newline at end of file +} diff --git a/src/Mobile/.editorconfig b/src/Mobile/.editorconfig index 8acf34b3..9fc60f8c 100644 --- a/src/Mobile/.editorconfig +++ b/src/Mobile/.editorconfig @@ -1,72 +1,5 @@ root=true -[*.{c++,cc,cpp,cppm,cxx,h,h++,hh,hpp,hxx,inl,ipp,ixx,tlh,tli}] - -# Visual C++ Code Style settings - -cpp_generate_documentation_comments = xml - -# Visual C++ Formatting settings - -cpp_indent_braces = false -cpp_indent_multi_line_relative_to = innermost_parenthesis -cpp_indent_within_parentheses = indent -cpp_indent_preserve_within_parentheses = true -cpp_indent_case_contents = true -cpp_indent_case_labels = false -cpp_indent_case_contents_when_block = false -cpp_indent_lambda_braces_when_parameter = true -cpp_indent_goto_labels = one_left -cpp_indent_preprocessor = leftmost_column -cpp_indent_access_specifiers = false -cpp_indent_namespace_contents = true -cpp_indent_preserve_comments = false -cpp_new_line_before_open_brace_namespace = ignore -cpp_new_line_before_open_brace_type = ignore -cpp_new_line_before_open_brace_function = ignore -cpp_new_line_before_open_brace_block = ignore -cpp_new_line_before_open_brace_lambda = ignore -cpp_new_line_scope_braces_on_separate_lines = false -cpp_new_line_close_brace_same_line_empty_type = false -cpp_new_line_close_brace_same_line_empty_function = false -cpp_new_line_before_catch = true -cpp_new_line_before_else = true -cpp_new_line_before_while_in_do_while = false -cpp_space_before_function_open_parenthesis = remove -cpp_space_within_parameter_list_parentheses = false -cpp_space_between_empty_parameter_list_parentheses = false -cpp_space_after_keywords_in_control_flow_statements = true -cpp_space_within_control_flow_statement_parentheses = false -cpp_space_before_lambda_open_parenthesis = false -cpp_space_within_cast_parentheses = false -cpp_space_after_cast_close_parenthesis = false -cpp_space_within_expression_parentheses = false -cpp_space_before_block_open_brace = true -cpp_space_between_empty_braces = false -cpp_space_before_initializer_list_open_brace = false -cpp_space_within_initializer_list_braces = true -cpp_space_preserve_in_initializer_list = true -cpp_space_before_open_square_bracket = false -cpp_space_within_square_brackets = false -cpp_space_before_empty_square_brackets = false -cpp_space_between_empty_square_brackets = false -cpp_space_group_square_brackets = true -cpp_space_within_lambda_brackets = false -cpp_space_between_empty_lambda_brackets = false -cpp_space_before_comma = false -cpp_space_after_comma = true -cpp_space_remove_around_member_operators = true -cpp_space_before_inheritance_colon = true -cpp_space_before_constructor_colon = true -cpp_space_remove_before_semicolon = true -cpp_space_after_semicolon = true -cpp_space_remove_around_unary_operator = true -cpp_space_around_binary_operator = insert -cpp_space_around_assignment_operator = insert -cpp_space_pointer_reference_alignment = left -cpp_space_around_ternary_operator = insert -cpp_wrap_preserve_blocks = one_liners - [*.{cs,vb,razor}] #### Naming styles #### @@ -88,31 +21,25 @@ dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case dotnet_naming_symbols.interface.applicable_kinds = interface dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected -dotnet_naming_symbols.interface.required_modifiers = +dotnet_naming_symbols.interface.required_modifiers = dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected -dotnet_naming_symbols.types.required_modifiers = +dotnet_naming_symbols.types.required_modifiers = dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected -dotnet_naming_symbols.non_field_members.required_modifiers = +dotnet_naming_symbols.non_field_members.required_modifiers = # Naming styles dotnet_naming_style.begins_with_i.required_prefix = I -dotnet_naming_style.begins_with_i.required_suffix = -dotnet_naming_style.begins_with_i.word_separator = +dotnet_naming_style.begins_with_i.required_suffix = +dotnet_naming_style.begins_with_i.word_separator = dotnet_naming_style.begins_with_i.capitalization = pascal_case - -dotnet_naming_style.pascal_case.required_prefix = -dotnet_naming_style.pascal_case.required_suffix = -dotnet_naming_style.pascal_case.word_separator = -dotnet_naming_style.pascal_case.capitalization = pascal_case - -dotnet_naming_style.pascal_case.required_prefix = -dotnet_naming_style.pascal_case.required_suffix = -dotnet_naming_style.pascal_case.word_separator = +dotnet_naming_style.pascal_case.required_prefix = +dotnet_naming_style.pascal_case.required_suffix = +dotnet_naming_style.pascal_case.word_separator = dotnet_naming_style.pascal_case.capitalization = pascal_case dotnet_style_operator_placement_when_wrapping = beginning_of_line tab_width = 4 @@ -150,7 +77,7 @@ dotnet_style_qualification_for_method = false:silent dotnet_style_qualification_for_event = false:silent insert_final_newline = false -[*.{cs,razor}] +[*.{cs,vb,razor}] csharp_indent_labels = one_less_than_current csharp_using_directive_placement = outside_namespace:silent csharp_prefer_simple_using_statement = true:suggestion diff --git a/src/Web/.editorconfig b/src/Web/.editorconfig index 8acf34b3..9fc60f8c 100644 --- a/src/Web/.editorconfig +++ b/src/Web/.editorconfig @@ -1,72 +1,5 @@ root=true -[*.{c++,cc,cpp,cppm,cxx,h,h++,hh,hpp,hxx,inl,ipp,ixx,tlh,tli}] - -# Visual C++ Code Style settings - -cpp_generate_documentation_comments = xml - -# Visual C++ Formatting settings - -cpp_indent_braces = false -cpp_indent_multi_line_relative_to = innermost_parenthesis -cpp_indent_within_parentheses = indent -cpp_indent_preserve_within_parentheses = true -cpp_indent_case_contents = true -cpp_indent_case_labels = false -cpp_indent_case_contents_when_block = false -cpp_indent_lambda_braces_when_parameter = true -cpp_indent_goto_labels = one_left -cpp_indent_preprocessor = leftmost_column -cpp_indent_access_specifiers = false -cpp_indent_namespace_contents = true -cpp_indent_preserve_comments = false -cpp_new_line_before_open_brace_namespace = ignore -cpp_new_line_before_open_brace_type = ignore -cpp_new_line_before_open_brace_function = ignore -cpp_new_line_before_open_brace_block = ignore -cpp_new_line_before_open_brace_lambda = ignore -cpp_new_line_scope_braces_on_separate_lines = false -cpp_new_line_close_brace_same_line_empty_type = false -cpp_new_line_close_brace_same_line_empty_function = false -cpp_new_line_before_catch = true -cpp_new_line_before_else = true -cpp_new_line_before_while_in_do_while = false -cpp_space_before_function_open_parenthesis = remove -cpp_space_within_parameter_list_parentheses = false -cpp_space_between_empty_parameter_list_parentheses = false -cpp_space_after_keywords_in_control_flow_statements = true -cpp_space_within_control_flow_statement_parentheses = false -cpp_space_before_lambda_open_parenthesis = false -cpp_space_within_cast_parentheses = false -cpp_space_after_cast_close_parenthesis = false -cpp_space_within_expression_parentheses = false -cpp_space_before_block_open_brace = true -cpp_space_between_empty_braces = false -cpp_space_before_initializer_list_open_brace = false -cpp_space_within_initializer_list_braces = true -cpp_space_preserve_in_initializer_list = true -cpp_space_before_open_square_bracket = false -cpp_space_within_square_brackets = false -cpp_space_before_empty_square_brackets = false -cpp_space_between_empty_square_brackets = false -cpp_space_group_square_brackets = true -cpp_space_within_lambda_brackets = false -cpp_space_between_empty_lambda_brackets = false -cpp_space_before_comma = false -cpp_space_after_comma = true -cpp_space_remove_around_member_operators = true -cpp_space_before_inheritance_colon = true -cpp_space_before_constructor_colon = true -cpp_space_remove_before_semicolon = true -cpp_space_after_semicolon = true -cpp_space_remove_around_unary_operator = true -cpp_space_around_binary_operator = insert -cpp_space_around_assignment_operator = insert -cpp_space_pointer_reference_alignment = left -cpp_space_around_ternary_operator = insert -cpp_wrap_preserve_blocks = one_liners - [*.{cs,vb,razor}] #### Naming styles #### @@ -88,31 +21,25 @@ dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case dotnet_naming_symbols.interface.applicable_kinds = interface dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected -dotnet_naming_symbols.interface.required_modifiers = +dotnet_naming_symbols.interface.required_modifiers = dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected -dotnet_naming_symbols.types.required_modifiers = +dotnet_naming_symbols.types.required_modifiers = dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected -dotnet_naming_symbols.non_field_members.required_modifiers = +dotnet_naming_symbols.non_field_members.required_modifiers = # Naming styles dotnet_naming_style.begins_with_i.required_prefix = I -dotnet_naming_style.begins_with_i.required_suffix = -dotnet_naming_style.begins_with_i.word_separator = +dotnet_naming_style.begins_with_i.required_suffix = +dotnet_naming_style.begins_with_i.word_separator = dotnet_naming_style.begins_with_i.capitalization = pascal_case - -dotnet_naming_style.pascal_case.required_prefix = -dotnet_naming_style.pascal_case.required_suffix = -dotnet_naming_style.pascal_case.word_separator = -dotnet_naming_style.pascal_case.capitalization = pascal_case - -dotnet_naming_style.pascal_case.required_prefix = -dotnet_naming_style.pascal_case.required_suffix = -dotnet_naming_style.pascal_case.word_separator = +dotnet_naming_style.pascal_case.required_prefix = +dotnet_naming_style.pascal_case.required_suffix = +dotnet_naming_style.pascal_case.word_separator = dotnet_naming_style.pascal_case.capitalization = pascal_case dotnet_style_operator_placement_when_wrapping = beginning_of_line tab_width = 4 @@ -150,7 +77,7 @@ dotnet_style_qualification_for_method = false:silent dotnet_style_qualification_for_event = false:silent insert_final_newline = false -[*.{cs,razor}] +[*.{cs,vb,razor}] csharp_indent_labels = one_less_than_current csharp_using_directive_placement = outside_namespace:silent csharp_prefer_simple_using_statement = true:suggestion From c764f0d5b3394a61c47ed0cd58f6e5ad93e0b175 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Thu, 23 Feb 2023 18:45:18 +0100 Subject: [PATCH 168/185] Updated based entity types --- src/Common/Base/BaseEntity.cs | 3 --- src/Common/Base/IBaseEntity.cs | 3 --- src/Common/Base/ITimeEntity.cs | 8 ++++++++ src/Common/Base/TimedEntity.cs | 7 +++++++ 4 files changed, 15 insertions(+), 6 deletions(-) create mode 100644 src/Common/Base/ITimeEntity.cs create mode 100644 src/Common/Base/TimedEntity.cs diff --git a/src/Common/Base/BaseEntity.cs b/src/Common/Base/BaseEntity.cs index df17ff9c..a53d22f9 100644 --- a/src/Common/Base/BaseEntity.cs +++ b/src/Common/Base/BaseEntity.cs @@ -4,7 +4,4 @@ namespace XClaim.Common.Base; public abstract class BaseEntity : IBaseEntity { [Key, Required] public Guid Id { get; set; } - public DateTime CreatedAt { get; set; } - public DateTime? ModifiedAt { get; set; } - public DateTime? DeletedAt { get; set; } } \ No newline at end of file diff --git a/src/Common/Base/IBaseEntity.cs b/src/Common/Base/IBaseEntity.cs index 580974a1..e98a7007 100644 --- a/src/Common/Base/IBaseEntity.cs +++ b/src/Common/Base/IBaseEntity.cs @@ -2,7 +2,4 @@ namespace XClaim.Common.Base; public interface IBaseEntity { public Guid Id { get; set; } - public DateTime CreatedAt { get; set; } - public DateTime? ModifiedAt { get; set; } - public DateTime? DeletedAt { get; set; } } \ No newline at end of file diff --git a/src/Common/Base/ITimeEntity.cs b/src/Common/Base/ITimeEntity.cs new file mode 100644 index 00000000..4b2e71af --- /dev/null +++ b/src/Common/Base/ITimeEntity.cs @@ -0,0 +1,8 @@ +namespace XClaim.Common.Base; + +public class ITimedEntity : IBaseEntity { + public Guid Id { get; set; } + public DateTime CreatedAt { get; set; } + public DateTime? ModifiedAt { get; set; } + public DateTime? DeletedAt { get; set; } +} \ No newline at end of file diff --git a/src/Common/Base/TimedEntity.cs b/src/Common/Base/TimedEntity.cs new file mode 100644 index 00000000..60858af7 --- /dev/null +++ b/src/Common/Base/TimedEntity.cs @@ -0,0 +1,7 @@ +namespace XClaim.Common.Base; + +public abstract class TimedEntity : ITimedEntity { + new public DateTime CreatedAt { get; set; } + new public DateTime? ModifiedAt { get; set; } + new public DateTime? DeletedAt { get; set; } +} \ No newline at end of file From 5e2d57b894d5ed530f150a076a3c8f687715e003 Mon Sep 17 00:00:00 2001 From: radioActive DROID Date: Thu, 23 Feb 2023 18:46:22 +0100 Subject: [PATCH 169/185] improve shared components and layouts --- .../Components/Controls/TableToolbar.razor | 23 +++++++++++-------- src/Web/Components/Layouts/HelpLayout.razor | 6 +++-- src/Web/Components/Layouts/MainLayout.razor | 4 ++-- src/Web/Components/Shared/AppBar.razor | 10 ++++---- 4 files changed, 24 insertions(+), 19 deletions(-) diff --git a/src/Web/Components/Controls/TableToolbar.razor b/src/Web/Components/Controls/TableToolbar.razor index b5689df1..0e8b644c 100644 --- a/src/Web/Components/Controls/TableToolbar.razor +++ b/src/Web/Components/Controls/TableToolbar.razor @@ -5,6 +5,7 @@ @typeparam TValue @code { + #pragma warning disable BL0007 string _search = string.Empty; [Parameter] @@ -76,14 +77,16 @@ } } - - - -@ChildContent + + + + @ChildContent + @if (IsFilterActive) { + + } + @if (IsCreateActive) { + + } + + -@if (IsFilterActive) { - -} -@if (IsCreateActive) { - -} \ No newline at end of file diff --git a/src/Web/Components/Layouts/HelpLayout.razor b/src/Web/Components/Layouts/HelpLayout.razor index b4ee4c39..9756f120 100644 --- a/src/Web/Components/Layouts/HelpLayout.razor +++ b/src/Web/Components/Layouts/HelpLayout.razor @@ -45,8 +45,10 @@
- - @Body + + + @Body +