Fix a lot of issues

marinasundstrom · Mar 3, 2024 · 5190f23 · 5190f23
1 parent 6560ed1
commit 5190f23
Show file tree

Hide file tree

Showing 33 changed files with 286 additions and 766 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,5 +1,5 @@
 {
-    "editor.formatOnSave": true,
+    "editor.formatOnSave": false,
     "restoreTerminals.terminals": [
         {
             "splitTerminals": [

diff --git a/ApiKeys/ApiKeys.Client/OpenAPIs/apikeys.json b/ApiKeys/ApiKeys.Client/OpenAPIs/apikeys.json
@@ -1,5 +1,5 @@
 {
-  "x-generator": "NSwag v13.16.0.0 (NJsonSchema v10.7.1.0 (Newtonsoft.Json v13.0.0.0))",
+  "x-generator": "NSwag v13.18.2.0 (NJsonSchema v10.8.0.0 (Newtonsoft.Json v13.0.0.0))",
   "openapi": "3.0.0",
   "info": {
     "title": "ApiKeys API",

diff --git a/AppService/AppService.Client/OpenAPIs/AppService.json b/AppService/AppService.Client/OpenAPIs/AppService.json
@@ -1,5 +1,5 @@
 {
-  "x-generator": "NSwag v13.16.1.0 (NJsonSchema v10.7.2.0 (Newtonsoft.Json v13.0.0.0))",
+  "x-generator": "NSwag v13.18.2.0 (NJsonSchema v10.8.0.0 (Newtonsoft.Json v13.0.0.0))",
   "openapi": "3.0.0",
   "info": {
     "title": "Web API",
@@ -547,6 +547,39 @@
         }
       }
     },
+    "/Modules": {
+      "get": {
+        "tags": [
+          "Modules"
+        ],
+        "operationId": "Modules_GetModules",
+        "responses": {
+          "200": {
+            "description": "",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/ModuleDto"
+                  }
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/Notifications": {
       "get": {
         "tags": [
@@ -797,12 +830,7 @@
           "200": {
             "description": ""
           }
-        },
-        "security": [
-          {
-            "JWT": []
-          }
-        ]
+        }
       }
     },
     "/DoSomething": {
@@ -1115,6 +1143,21 @@
           }
         }
       },
+      "ModuleDto": {
+        "type": "object",
+        "additionalProperties": false,
+        "properties": {
+          "name": {
+            "type": "string"
+          },
+          "assembly": {
+            "type": "string"
+          },
+          "enabled": {
+            "type": "boolean"
+          }
+        }
+      },
       "NotificationsResults": {
         "allOf": [
           {

diff --git a/Catalog/Catalog.Client/OpenAPIs/catalog.json b/Catalog/Catalog.Client/OpenAPIs/catalog.json
@@ -1,5 +1,5 @@
 {
-  "x-generator": "NSwag v13.16.1.0 (NJsonSchema v10.7.2.0 (Newtonsoft.Json v13.0.0.0))",
+  "x-generator": "NSwag v13.18.2.0 (NJsonSchema v10.8.0.0 (Newtonsoft.Json v13.0.0.0))",
   "swagger": "2.0",
   "info": {
     "title": "Catalog API",

diff --git a/Catalog/Catalog/Program.cs b/Catalog/Catalog/Program.cs
@@ -78,12 +78,12 @@
 
 builder.Services.AddDocumentsClients((sp, http) =>
 {
-    http.BaseAddress = new Uri($"{Configuration.GetServiceUri("nginx", "https")}/api/documents/");
+    http.BaseAddress = new Uri($"https://localhost:5174/api/documents/");
 });
 
 builder.Services.AddPaymentsClients((sp, http) =>
 {
-    http.BaseAddress = new Uri($"{Configuration.GetServiceUri("nginx", "https")}/api/payments/");
+    http.BaseAddress = new Uri($"https://localhost:5174/api/payments/");
 });
 
 var app = builder.Build();

diff --git a/Customers/Customers/Program.cs b/Customers/Customers/Program.cs
@@ -68,12 +68,12 @@
 
 builder.Services.AddDocumentsClients((sp, http) =>
 {
-    http.BaseAddress = new Uri($"{Configuration.GetServiceUri("nginx", "https")}/api/documents/");
+    http.BaseAddress = new Uri($"https://localhost:5174/api/documents/");
 });
 
 builder.Services.AddPaymentsClients((sp, http) =>
 {
-    http.BaseAddress = new Uri($"{Configuration.GetServiceUri("nginx", "https")}/api/payments/");
+    http.BaseAddress = new Uri($"https://localhost:5174/api/payments/");
 });
 
 var app = builder.Build();

diff --git a/Documents/Documents/Infrastructure/ServiceCollectionExtensions.cs b/Documents/Documents/Infrastructure/ServiceCollectionExtensions.cs
@@ -17,6 +17,8 @@ public static IServiceCollection AddInfrastructure(this IServiceCollection servi
 
         services.AddScoped<IDomainEventDispatcher, DomainEventDispatcher>();
 
+        RemoveFaultyDomainEventHandlerRegistrations(services);
+
         try 
         {
             services.Decorate(typeof(INotificationHandler<>), typeof(IdempotentDomainEventHandler<>));
@@ -46,4 +48,22 @@ public static IServiceCollection AddInfrastructure(this IServiceCollection servi
 
         return services;
     }
+
+    private static void RemoveFaultyDomainEventHandlerRegistrations(IServiceCollection services)
+    {
+        // This removes registrations between INotificationHandler<T> to IdempotentDomainEventHandler<T>. This was not a problem before MediatR 12.0.
+        // An alternative would be to put IdempotentDomainEventHandler in a library separate from Application logic, so that MediatR doesn't register that implementation as a real handler.
+
+        foreach (var reg in services.Where(reg => reg.ServiceType.Name.Contains("INotificationHandler")).ToList())
+        {
+            var notificationHandlerType = reg.ServiceType!;
+            var notificationHandlerImplType = reg.ImplementationType!;
+
+            var requestType = notificationHandlerType.GetGenericArguments().FirstOrDefault();
+
+            if (!notificationHandlerImplType.Name.Contains("IdempotentDomainEventHandler")) continue;
+
+            services.Remove(reg);
+        }
+    }
 }
diff --git a/Finance/Accounting/Accountant/Accountant/Program.cs b/Finance/Accounting/Accountant/Accountant/Program.cs
@@ -44,30 +44,30 @@
 
 builder.Services.AddAccountingClients((sp, http) =>
 {
-    http.BaseAddress = new Uri($"{Configuration.GetServiceUri("nginx", "https")}/api/accounting/");
+    http.BaseAddress = new Uri($"https://localhost:5174/api/accounting/");
 });
 
 builder.Services.AddInvoicingClients((sp, http) =>
 {
-    http.BaseAddress = new Uri($"{Configuration.GetServiceUri("nginx", "https")}/api/invoicing/");
+    http.BaseAddress = new Uri($"https://localhost:5174/api/invoicing/");
 });
 
 builder.Services.AddPaymentsClients((sp, http) =>
 {
-    http.BaseAddress = new Uri($"{Configuration.GetServiceUri("nginx", "https")}/api/payments/");
+    http.BaseAddress = new Uri($"https://localhost:5174/api/payments/");
 });
 
 builder.Services.AddDocumentsClients((sp, http) =>
 {
-    http.BaseAddress = new Uri($"{Configuration.GetServiceUri("nginx", "https")}/api/documents/");
+    http.BaseAddress = new Uri($"https://localhost:5174/api/documents/");
 });
 
 // Add Hangfire services.
 builder.Services.AddHangfire(configuration => configuration
     .SetDataCompatibilityLevel(CompatibilityLevel.Version_170)
     .UseSimpleAssemblyNameTypeSerializer()
     .UseRecommendedSerializerSettings()
-    .UseSqlServerStorage(Configuration.GetConnectionString2("mssql", "HangfireDB"), new SqlServerStorageOptions
+    .UseSqlServerStorage(Configuration.GetConnectionString("HangfireConnection"), new SqlServerStorageOptions
     {
         CommandBatchMaxTimeout = TimeSpan.FromMinutes(5),
         SlidingInvisibilityTimeout = TimeSpan.FromMinutes(5),
@@ -92,7 +92,7 @@
 
 app.MapHangfireDashboard();
 
-using (var connection = new SqlConnection(Configuration.GetConnectionString2("mssql", "HangfireDB")))
+using (var connection = new SqlConnection(Configuration.GetConnectionString("HangfireConnection")))
 {
     connection.Open();
 

diff --git a/Finance/Accounting/Accountant/Accountant/appsettings.Development.json b/Finance/Accounting/Accountant/Accountant/appsettings.Development.json
@@ -1,4 +1,8 @@
 {
+  "ConnectionStrings": {
+      "DefaultConnection": "Server=localhost,1433;User Id=sa;Password=P@ssw0rd;Encrypt=false;Database=Accountant",
+      "HangfireConnection": "Server=localhost,1433;Database=HangfireDB;User Id=sa;Password=P@ssw0rd;Encrypt=false;"
+  },
   "Logging": {
     "LogLevel": {
       "Default": "Information",

diff --git a/Finance/Accounting/Accounting.UI/ModuleInitializer.cs b/Finance/Accounting/Accounting.UI/ModuleInitializer.cs
@@ -38,7 +38,7 @@ public static void ConfigureServices(IServiceProvider services)
         var group2 = group.GetGroup("accounting") ?? group.CreateGroup("accounting", () => resources["Accounting"], MudBlazor.Icons.Material.Filled.List);
 
         group2.CreateItem("accounts", () => resources["Accounts"], MudBlazor.Icons.Material.Filled.List, "/accounts");
-        group2.CreateItem("ledger", () => resources["Ledger"], MudBlazor.Icons.Material.Filled.List, "/ledger");
-        group2.CreateItem("verifications", () => resources["Verifications"], MudBlazor.Icons.Material.Filled.List, "/verifications");
+        group2.CreateItem("ledger", () => resources["General ledger"], MudBlazor.Icons.Material.Filled.List, "/ledger");
+        group2.CreateItem("journal", () => resources["Journal"], MudBlazor.Icons.Material.Filled.List, "/journal");
     }
 }
diff --git a/Finance/Accounting/Accounting.UI/Verifications/NewVerificationPage.razor b/Finance/Accounting/Accounting.UI/Verifications/NewVerificationPage.razor
@@ -1,4 +1,4 @@
-@page "/verifications/new"
+@page "/journal/new"
 @using System.ComponentModel.DataAnnotations
 @inject NavigationManager NavigationManager
 @inject IAccountsClient AccountsClient
@@ -229,7 +229,7 @@
                 * 10000), file.Name));
             }
 
-            NavigationManager.NavigateTo("/verifications");
+            NavigationManager.NavigateTo("/journal");
         }
 
         private Task<IEnumerable<AccountDto>> Search(string value)