5.0.0-preview022 - backtrack on some changes

JonPSmith · JonPSmith · commit bc77524be64f · 2023-05-29T08:57:25.000+01:00
diff --git a/AuthPermissions.AspNetCore/CreateNuGetDebug.nuspec b/AuthPermissions.AspNetCore/CreateNuGetDebug.nuspec
@@ -2,7 +2,7 @@
 <package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>AuthPermissions.AspNetCore</id>
-    <version>5.0.0-preview020debug</version>
+    <version>5.0.0-preview022debug</version>
     <authors>Jon P Smith</authors>
     <product>AuthPermissions.AspNetCore</product>
     <copyright>Copyright (c) 2021 Jon P Smith</copyright>
diff --git a/AuthPermissions.AspNetCore/MultiProjPack.xml b/AuthPermissions.AspNetCore/MultiProjPack.xml
@@ -4,7 +4,7 @@
   <!-- See documentation for all the possible values -->
   <metadata>
     <id>AuthPermissions.AspNetCore</id>
-    <version>5.0.0-preview020debug</version>
+    <version>5.0.0-preview022debug</version>
     <authors>Jon P Smith</authors>
     <product>AuthPermissions.AspNetCore</product>
     <copyright>Copyright (c) 2021 Jon P Smith</copyright>
diff --git a/AuthPermissions.AspNetCore/SetupExtensions.cs b/AuthPermissions.AspNetCore/SetupExtensions.cs
@@ -168,8 +168,8 @@ public static AuthSetupData SetupMultiTenantSharding(this AuthSetupData setupDat
             setupData.Options.Configuration.AddJsonFile(shardingFileName, optional: true, reloadOnChange: true);
 
             setupData.Services.AddScoped<IAccessDatabaseInformationVer5, AccessDatabaseInformationJsonFile>();
-            setupData.Services.AddScoped<IShardingConnections, ShardingConnectionsJsonFile>();
-            setupData.Services.AddScoped<ILinkToTenantDataService, LinkToTenantDataService>();
+            setupData.Services.AddTransient<IShardingConnections, ShardingConnectionsJsonFile>();
+            setupData.Services.AddTransient<ILinkToTenantDataService, LinkToTenantDataService>();
 
             switch (setupData.Options.LinkToTenantType)
             {
diff --git a/AuthPermissions.AspNetCore/ShardingServices/DatabaseInformation.cs b/AuthPermissions.AspNetCore/ShardingServices/DatabaseInformation.cs
@@ -2,12 +2,12 @@
 // Licensed under MIT license. See License.txt in the project root for license information.
 
 using System.ComponentModel.DataAnnotations;
+using AuthPermissions.BaseCode;
 using AuthPermissions.BaseCode.CommonCode;
 using AuthPermissions.BaseCode.DataLayer.EfCode;
 using AuthPermissions.BaseCode.SetupCode;
-using Microsoft.EntityFrameworkCore;
 
-namespace AuthPermissions.BaseCode;
+namespace AuthPermissions.AspNetCore.ShardingServices;
 
 /// <summary>
 /// This class holds the information about each database used by the AuthP sharding feature
diff --git a/AuthPermissions.AspNetCore/ShardingServices/ProviderNameExtension.cs b/AuthPermissions.AspNetCore/ShardingServices/ProviderNameExtension.cs
diff --git a/AuthPermissions/AdminCode/ITenantChangeService.cs b/AuthPermissions/AdminCode/ITenantChangeService.cs
@@ -1,10 +1,7 @@
 ﻿// Copyright (c) 2021 Jon P Smith, GitHub: JonPSmith, web: http://www.thereformedprogrammer.net/
 // Licensed under MIT license. See License.txt in the project root for license information.
 
-using System.Collections.Generic;
-using System.Threading.Tasks;
 using AuthPermissions.AdminCode.Services;
-using AuthPermissions.BaseCode;
 using AuthPermissions.BaseCode.DataLayer.Classes;
 
 namespace AuthPermissions.AdminCode
@@ -24,10 +21,8 @@ public interface ITenantChangeService
         /// NOTE: With hierarchical tenants you cannot be sure that the tenant has, or will have, children
         /// </summary>
         /// <param name="tenant">The tenant data used to create a new tenant</param>
-        /// <param name="databaseInformation">Optional: If sharding and "sign up" feature  you need to provide the DatabaseInformation.
-        /// This overcomes a problem that the ShardingConnectionsJsonFile doesn't update quickly enough.</param>
         /// <returns>Returns null if all OK, otherwise the create is rolled back and the return string is shown to the user</returns>
-        Task<string> CreateNewTenantAsync(Tenant tenant, DatabaseInformation databaseInformation = null);
+        Task<string> CreateNewTenantAsync(Tenant tenant);
 
         //----------------------------------------------------
         // Single-level only methods
diff --git a/Example3.InvoiceCode/EfCoreCode/InvoiceTenantChangeService.cs b/Example3.InvoiceCode/EfCoreCode/InvoiceTenantChangeService.cs
@@ -7,6 +7,7 @@
 using System.Threading.Tasks;
 using AuthPermissions.AdminCode;
 using AuthPermissions.AdminCode.Services;
+using AuthPermissions.AspNetCore.ShardingServices;
 using AuthPermissions.BaseCode;
 using AuthPermissions.BaseCode.CommonCode;
 using AuthPermissions.BaseCode.DataLayer.Classes;
@@ -40,10 +41,8 @@ public InvoiceTenantChangeService(InvoicesDbContext context, ILogger<InvoiceTena
         /// NOTE: With hierarchical tenants you cannot be sure that the tenant has, or will have, children
         /// </summary>
         /// <param name="tenant">The tenant data used to create a new tenant</param>
-        /// <param name="databaseInformation">Optional: If sharding and "sign up" feature  you need to provide the DatabaseInformation.
-        /// This overcomes a problem that the ShardingConnectionsJsonFile doesn't update quickly enough.</param>
         /// <returns>Returns null if all OK, otherwise the create is rolled back and the return string is shown to the user</returns>
-        public async Task<string> CreateNewTenantAsync(Tenant tenant, DatabaseInformation databaseInformation = null)
+        public async Task<string> CreateNewTenantAsync(Tenant tenant)
         {
             var newCompanyTenant = new CompanyTenant
             {
diff --git a/Example4.ShopCode/EfCoreCode/RetailTenantChangeService.cs b/Example4.ShopCode/EfCoreCode/RetailTenantChangeService.cs
@@ -8,6 +8,7 @@
 using System.Threading.Tasks;
 using AuthPermissions.AdminCode;
 using AuthPermissions.AdminCode.Services;
+using AuthPermissions.AspNetCore.ShardingServices;
 using AuthPermissions.BaseCode;
 using AuthPermissions.BaseCode.CommonCode;
 using AuthPermissions.BaseCode.DataLayer.Classes;
@@ -37,10 +38,8 @@ public RetailTenantChangeService(RetailDbContext context, ILogger<RetailTenantCh
         /// NOTE: With hierarchical tenants you cannot be sure that the tenant has, or will have, children so we always add a retail
         /// </summary>
         /// <param name="tenant">The tenant data used to create a new tenant</param>
-        /// <param name="databaseInformation">Optional: If sharding and "sign up" feature  you need to provide the DatabaseInformation.
-        /// This overcomes a problem that the ShardingConnectionsJsonFile doesn't update quickly enough.</param>
         /// <returns>Returns null if all OK, otherwise the create is rolled back and the return string is shown to the user</returns>
-        public async Task<string> CreateNewTenantAsync(Tenant tenant, DatabaseInformation databaseInformation = null)
+        public async Task<string> CreateNewTenantAsync(Tenant tenant)
         {
             _context.Add(new RetailOutlet(tenant.TenantId, tenant.TenantFullName, tenant.GetTenantDataKey()));
             await _context.SaveChangesAsync();
diff --git a/Example6.MvcWebApp.Sharding/Views/Sharding/Index.cshtml b/Example6.MvcWebApp.Sharding/Views/Sharding/Index.cshtml
@@ -1,7 +1,7 @@
 ﻿@using AuthPermissions.BaseCode.PermissionsCode
 @using Example6.MvcWebApp.Sharding.PermissionsCode
 @using Microsoft.AspNetCore.Mvc.TagHelpers
-@model IEnumerable<AuthPermissions.BaseCode.DatabaseInformation>
+@model IEnumerable<AuthPermissions.AspNetCore.ShardingServices.DatabaseInformation>
 
 @{
     ViewData["Title"] = "Database Info";
diff --git a/Example6.SingleLevelSharding/EfCoreCode/ShardingTenantChangeService.cs b/Example6.SingleLevelSharding/EfCoreCode/ShardingTenantChangeService.cs
@@ -48,10 +48,8 @@ public ShardingTenantChangeService(DbContextOptions<ShardingSingleDbContext> opt
     /// This creates a <see cref="CompanyTenant"/> in the given database
     /// </summary>
     /// <param name="tenant">The tenant data used to create a new tenant</param>
-    /// <param name="databaseInformation">Optional: If sharding and "sign up" feature  you need to provide the DatabaseInformation.
-    /// This overcomes a problem that the ShardingConnectionsJsonFile doesn't update quickly enough.</param>
     /// <returns>Returns null if all OK, otherwise the create is rolled back and the return string is shown to the user</returns>
-    public async Task<string> CreateNewTenantAsync(Tenant tenant, DatabaseInformation databaseInformation = null)
+    public async Task<string> CreateNewTenantAsync(Tenant tenant)
     {
         using var context = GetShardingSingleDbContext(tenant.DatabaseInfoName, tenant.GetTenantDataKey());
         if (context == null)
diff --git a/Test/StubClasses/StubITenantChangeService.cs b/Test/StubClasses/StubITenantChangeService.cs
@@ -5,6 +5,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using AuthPermissions.AdminCode;
+using AuthPermissions.AspNetCore.ShardingServices;
 using AuthPermissions.BaseCode;
 using AuthPermissions.BaseCode.CommonCode;
 using AuthPermissions.BaseCode.DataLayer.Classes;
@@ -46,7 +47,7 @@ public StubITenantChangeService(StubITenantChangeServiceFactory factory, string
                 _errorMessage = errorMessage;
             }
 
-            public Task<string> CreateNewTenantAsync(Tenant tenant, DatabaseInformation databaseInformation = null)
+            public Task<string> CreateNewTenantAsync(Tenant tenant)
             {
                 _factory.NewTenantName = tenant.TenantFullName;
 
diff --git a/Test/TestData/shardingsettings.Test.json b/Test/TestData/shardingsettings.Test.json
@@ -3,8 +3,8 @@
     {
       "Name": "Default Database",
       "DatabaseName": null,
-      "ConnectionName": "UnitTestConnection",
-      "DatabaseType": "SqlServer"
+      "ConnectionName": "PostgreSqlConnection",
+      "DatabaseType": "SqliteInMemory"
     },
     {
       "Name": "Other Database",
@@ -17,24 +17,6 @@
       "DatabaseName": "StubTest",
       "ConnectionName": "PostgreSqlConnection",
       "DatabaseType": "PostgreSQL"
-    },
-    {
-      "Name": "Name1",
-      "DatabaseName": "DatabaseName1",
-      "ConnectionName": "UnitTestConnection",
-      "DatabaseType": "PostgreSQL"
-    },
-    {
-      "Name": "Name2",
-      "DatabaseName": "DatabaseName2",
-      "ConnectionName": "UnitTestConnection",
-      "DatabaseType": "PostgreSQL"
-    },
-    {
-      "Name": "Name3",
-      "DatabaseName": "DatabaseName3",
-      "ConnectionName": "UnitTestConnection",
-      "DatabaseType": "PostgreSQL"
     }
   ]
 }

Original file line number	Diff line number	Diff line change
`@@ -168,8 +168,8 @@ public static AuthSetupData SetupMultiTenantSharding(this AuthSetupData setupDat`
`168`	`168`	`setupData.Options.Configuration.AddJsonFile(shardingFileName, optional: true, reloadOnChange: true);`
`169`	`169`
`170`	`170`	`setupData.Services.AddScoped<IAccessDatabaseInformationVer5, AccessDatabaseInformationJsonFile>();`
`171`		`- setupData.Services.AddScoped<IShardingConnections, ShardingConnectionsJsonFile>();`
`172`		`- setupData.Services.AddScoped<ILinkToTenantDataService, LinkToTenantDataService>();`
	`171`	`+ setupData.Services.AddTransient<IShardingConnections, ShardingConnectionsJsonFile>();`
	`172`	`+ setupData.Services.AddTransient<ILinkToTenantDataService, LinkToTenantDataService>();`
`173`	`173`
`174`	`174`	`switch (setupData.Options.LinkToTenantType)`
`175`	`175`	`{`