Fix minor things

woksin-org · Jan 25, 2024 · af9523b · af9523b
1 parent 476e4c7
commit af9523b
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 8 deletions.
diff --git a/...urations/Source/Tenancy/CannotResolveTenantConfigurationWhenTenantContextIsNotResolved.cs b/...urations/Source/Tenancy/CannotResolveTenantConfigurationWhenTenantContextIsNotResolved.cs
@@ -9,7 +9,7 @@ namespace Woksin.Extensions.Configurations.Tenancy;
 public class CannotResolveTenantConfigurationWhenTenantContextIsNotResolved : Exception
 {
     public CannotResolveTenantConfigurationWhenTenantContextIsNotResolved(Type tenantConfigurationType)
-        : base($"Cannot create tenant configuration '{tenantConfigurationType}' from root container")
+        : base($"Cannot create tenant configuration '{tenantConfigurationType}' when tenant context is not resolved")
     {
     }
 }
diff --git a/Packages/DotNET/Samples/Samples.Configurations/appsettings.json b/Packages/DotNET/Samples/Samples.Configurations/appsettings.json
@@ -20,6 +20,7 @@
         }
     },
     "Tenancy": {
+        "Strict": true,
         "Tenants": [
             {
                 "Id": "id_1",

diff --git a/Packages/DotNET/Tenancy/Source/Base/Context/TenantResolver.cs b/Packages/DotNET/Tenancy/Source/Base/Context/TenantResolver.cs
@@ -29,8 +29,15 @@ public async Task<ITenantContext<TTenant>> Resolve(object context)
     {
         var config = options.CurrentValue;
         foreach (var strategy in Strategies)
-        {
-            var (resolvedIdentifier, identifier) = await TryResolveIdentifier(config, strategy, context);
+        {        
+            var wrappedStrategy = new SafeStrategyWrapper(strategy, loggerFactory?.CreateLogger(strategy.GetType()) ?? NullLogger.Instance);
+            if (!wrappedStrategy.CanResolveFromContext(context, out var cannotResolveReason))
+            {
+                LogCannotNotResolveFromContext(_logger, strategy.GetType(), cannotResolveReason);
+                continue;
+            }
+            LogTryingToResolve(_logger, strategy.GetType());
+            var (resolvedIdentifier, identifier) = await TryResolveIdentifier(config, wrappedStrategy, context);
             if (resolvedIdentifier && TryGetTenantContext(config, identifier!, strategy, out var tenantContext))
             {
                 return tenantContext;
@@ -41,10 +48,9 @@ public async Task<ITenantContext<TTenant>> Resolve(object context)
         return TenantContext<TTenant>.Unresolved();
     }
 
-    async Task<(bool, string?)> TryResolveIdentifier(TenancyOptions<TTenant> config, ITenantResolutionStrategy strategy, object context)
+    async Task<(bool, string?)> TryResolveIdentifier(TenancyOptions<TTenant> config, SafeStrategyWrapper strategy, object context)
     {
-        var wrappedStrategy = new SafeStrategyWrapper(strategy, loggerFactory?.CreateLogger(strategy.GetType()) ?? NullLogger.Instance);
-        var identifier = await wrappedStrategy.Resolve(context);
+        var identifier = await strategy.Resolve(context);
         if (!config.Ignored.Contains(identifier, StringComparer.OrdinalIgnoreCase))
         {
             return string.IsNullOrWhiteSpace(identifier)
@@ -86,7 +92,7 @@ async Task<ITenantContext> IResolveTenant.Resolve(object context)
     [LoggerMessage(0, LogLevel.Debug, "Resolved tenant identifier {Identifier} is configured to be ignored")]
     static partial void LogIgnoreTenant(ILogger logger, string identifier);
 
-    [LoggerMessage(1, LogLevel.Debug, "Resolved tenant identifier {Identifier} is not configured and should not be used")]
+    [LoggerMessage(1, LogLevel.Warning, "Resolved tenant identifier {Identifier} is not configured and should not be used")]
     static partial void LogTenantNotConfigured(ILogger logger, string identifier);
 
     [LoggerMessage(2, LogLevel.Debug, "Resolved tenant identifier {Identifier} is not configured but will be used")]
@@ -95,6 +101,12 @@ async Task<ITenantContext> IResolveTenant.Resolve(object context)
     [LoggerMessage(3, LogLevel.Debug, "Resolved tenant identifier {Identifier} with name {TenantName} is configured")]
     static partial void LogUsingConfiguredTenant(ILogger logger, string identifier, string? tenantName);
 
-    [LoggerMessage(4, LogLevel.Warning, "Could not resolve tenant from any strategy")]
+    [LoggerMessage(4, LogLevel.Debug, "Could not resolve tenant from any strategy")]
     static partial void LogCouldNotResolveTenant(ILogger logger);
+
+    [LoggerMessage(5, LogLevel.Debug, "Could not resolve tenant from context using strategy {StrategyType}. {Reason}")]
+    static partial void LogCannotNotResolveFromContext(ILogger logger, Type strategyType, string reason);
+
+    [LoggerMessage(6, LogLevel.Debug, "Trying to resolve tenant from context using strategy {StrategyType}")]
+    static partial void LogTryingToResolve(ILogger logger, Type strategyType);
 }