Merge pull request #100 from deveel/60-auto-populate-ihavetimestamp-and-ihaveowner-properties-on-create-and-update

tsutomi · web-flow · commit d9cd98c865b5 · 2026-05-28T18:36:55.000+02:00
diff --git a/samples/Kista.SampleApp.Owners/src/Kista.SampleApp.Owners/Program.cs b/samples/Kista.SampleApp.Owners/src/Kista.SampleApp.Owners/Program.cs
@@ -38,4 +38,4 @@
 app.MapNoteEndpoints();
 app.MapTaskEndpoints();
 
-app.Run();
+await app.RunAsync();
diff --git a/src/Kista.Owners/ClaimUserIdentifierStrategy.cs b/src/Kista.Owners/ClaimUserIdentifierStrategy.cs
@@ -56,7 +56,7 @@ public ClaimUserIdentifierStrategy(string claimType = "sub")
 			return ConvertValue(value);
 		}
 
-		private TKey? ConvertValue(string value)
+		private static TKey? ConvertValue(string value)
 		{
 			try
 			{
@@ -66,7 +66,19 @@ public ClaimUserIdentifierStrategy(string claimType = "sub")
 				var converter = TypeDescriptor.GetConverter(typeof(TKey));
 				return (TKey?)converter.ConvertFromInvariantString(value);
 			}
-			catch
+			catch (FormatException)
+			{
+				return default;
+			}
+			catch (NotSupportedException)
+			{
+				return default;
+			}
+			catch (ArgumentException)
+			{
+				return default;
+			}
+			catch (InvalidCastException)
 			{
 				return default;
 			}
diff --git a/src/Kista.Owners/CompositeUserIdentifierStrategy.cs b/src/Kista.Owners/CompositeUserIdentifierStrategy.cs
@@ -43,14 +43,9 @@ public CompositeUserIdentifierStrategy<TKey> Add(IUserIdentifierStrategy<TKey> s
 		/// <inheritdoc/>
 		public TKey? GetUserId(IServiceProvider? serviceProvider = null)
 		{
-			foreach (var strategy in strategies)
-			{
-				var userId = strategy.GetUserId(serviceProvider);
-				if (userId != null)
-					return userId;
-			}
-
-			return default;
+			return strategies
+				.Select(strategy => strategy.GetUserId(serviceProvider))
+				.FirstOrDefault(userId => !EqualityComparer<TKey>.Default.Equals(userId, default));
 		}
 	}
 
diff --git a/src/Kista.Owners/IUserIdentifierStrategy.cs b/src/Kista.Owners/IUserIdentifierStrategy.cs
@@ -18,7 +18,7 @@ namespace Kista
 	/// Defines a strategy for resolving the current user identifier.
 	/// </summary>
 	/// <typeparam name="TKey">The type of the user identifier key.</typeparam>
-	public interface IUserIdentifierStrategy<TKey>
+	public interface IUserIdentifierStrategy<out TKey>
 	{
 		/// <summary>
 		/// Resolves the current user identifier.
diff --git a/src/Kista.Owners/QueryStringUserIdentifierStrategy.cs b/src/Kista.Owners/QueryStringUserIdentifierStrategy.cs
@@ -54,7 +54,7 @@ public QueryStringUserIdentifierStrategy(string parameter = "user_id")
 			return ConvertValue(value);
 		}
 
-		private TKey? ConvertValue(string value)
+		private static TKey? ConvertValue(string value)
 		{
 			try
 			{
@@ -64,7 +64,19 @@ public QueryStringUserIdentifierStrategy(string parameter = "user_id")
 				var converter = TypeDescriptor.GetConverter(typeof(TKey));
 				return (TKey?)converter.ConvertFromInvariantString(value);
 			}
-			catch
+			catch (FormatException)
+			{
+				return default;
+			}
+			catch (NotSupportedException)
+			{
+				return default;
+			}
+			catch (ArgumentException)
+			{
+				return default;
+			}
+			catch (InvalidCastException)
 			{
 				return default;
 			}
diff --git a/src/Kista.Owners/RepositoryBuilderExtensions.cs b/src/Kista.Owners/RepositoryBuilderExtensions.cs
@@ -1,3 +1,4 @@
+using System.Linq;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace Kista
@@ -53,10 +54,8 @@ public static RepositoryBuilder WithOwnerScoping(
 
 		private static Type? FindUserKeyType(Type entityType)
 		{
-			foreach (var iface in entityType.GetInterfaces())
+			foreach (var iface in entityType.GetInterfaces().Where(iface => iface.IsGenericType))
 			{
-				if (!iface.IsGenericType) continue;
-
 				var genericDef = iface.GetGenericTypeDefinition();
 				if (genericDef == typeof(IHaveOwner<>) ||
 					genericDef.FullName == "Kista.IHaveOwner`1")
diff --git a/src/Kista.Owners/RouteUserIdentifierStrategy.cs b/src/Kista.Owners/RouteUserIdentifierStrategy.cs
@@ -54,7 +54,7 @@ public RouteUserIdentifierStrategy(string key = "userId")
 			return ConvertValue(value);
 		}
 
-		private TKey? ConvertValue(string value)
+		private static TKey? ConvertValue(string value)
 		{
 			try
 			{
@@ -64,7 +64,19 @@ public RouteUserIdentifierStrategy(string key = "userId")
 				var converter = TypeDescriptor.GetConverter(typeof(TKey));
 				return (TKey?)converter.ConvertFromInvariantString(value);
 			}
-			catch
+			catch (FormatException)
+			{
+				return default;
+			}
+			catch (NotSupportedException)
+			{
+				return default;
+			}
+			catch (ArgumentException)
+			{
+				return default;
+			}
+			catch (InvalidCastException)
 			{
 				return default;
 			}
diff --git a/src/Kista.Owners/UserScopedRepositoryDecorator.cs b/src/Kista.Owners/UserScopedRepositoryDecorator.cs
@@ -1,3 +1,4 @@
+using System.Collections.Generic;
 using System.Linq.Expressions;
 using System.Reflection;
 
@@ -36,6 +37,7 @@ public class UserScopedRepositoryDecorator<TEntity, TKey, TUserKey>
 		where TEntity : class, IHaveOwner<TUserKey>
 		where TKey : notnull
 	{
+		private const string UserContextNotSetMessage = "User context is not set";
 		private static readonly Lazy<PropertyInfo> _ownerProperty = new(DiscoverOwnerProperty);
 
 		private readonly IRepository<TEntity, TKey> _inner;
@@ -72,9 +74,9 @@ public UserScopedRepositoryDecorator(
 		public ValueTask<TEntity?> FindAsync(TKey key, CancellationToken cancellationToken = default)
 		{
 			var userId = _userAccessor.GetUserId();
-			if (userId == null)
+			if (EqualityComparer<TUserKey>.Default.Equals(userId, default))
 				return Options.ThrowWhenUserNotSet
-					? throw new System.InvalidOperationException("User context is not set")
+					? throw new System.InvalidOperationException(UserContextNotSetMessage)
 					: new ValueTask<TEntity?>(default(TEntity));
 
 			return FindScopedAsync(key, userId, cancellationToken);
@@ -102,7 +104,7 @@ public ValueTask AddRangeAsync(IEnumerable<TEntity> entities, CancellationToken
 			System.ArgumentNullException.ThrowIfNull(entities);
 
 			var userId = _userAccessor.GetUserId();
-			if (userId != null)
+			if (!EqualityComparer<TUserKey>.Default.Equals(userId, default))
 			{
 				foreach (var entity in entities)
 				{
@@ -111,7 +113,7 @@ public ValueTask AddRangeAsync(IEnumerable<TEntity> entities, CancellationToken
 			}
 			else if (Options.ThrowWhenUserNotSet)
 			{
-				throw new System.InvalidOperationException("User context is not set");
+				throw new System.InvalidOperationException(UserContextNotSetMessage);
 			}
 
 			return _inner.AddRangeAsync(entities, cancellationToken);
@@ -162,13 +164,13 @@ private ValueTask ApplyOwnerAndCallAsync(TEntity entity, Func<ValueTask> action)
 			System.ArgumentNullException.ThrowIfNull(entity);
 
 			var userId = _userAccessor.GetUserId();
-			if (userId != null)
+			if (!EqualityComparer<TUserKey>.Default.Equals(userId, default))
 			{
 				_ownerProperty.Value.SetValue(entity, userId);
 			}
 			else if (Options.ThrowWhenUserNotSet)
 			{
-				throw new System.InvalidOperationException("User context is not set");
+				throw new System.InvalidOperationException(UserContextNotSetMessage);
 			}
 
 			return action();
@@ -178,9 +180,9 @@ private async ValueTask<IList<TEntity>> ApplyOwnerFilterAndCallAsync(
 			IQuery query, Func<IQuery, ValueTask<IList<TEntity>>> action)
 		{
 			var userId = _userAccessor.GetUserId();
-			if (userId == null)
+			if (EqualityComparer<TUserKey>.Default.Equals(userId, default))
 				return Options.ThrowWhenUserNotSet
-					? throw new System.InvalidOperationException("User context is not set")
+					? throw new System.InvalidOperationException(UserContextNotSetMessage)
 					: Array.Empty<TEntity>();
 
 			var scopedQuery = ApplyOwnerToQuery(query, userId);
@@ -191,7 +193,7 @@ private async ValueTask<IList<TEntity>> ApplyOwnerFilterAndCallAsync(
 			IQuery query, Func<IQuery, ValueTask<TEntity?>> action)
 		{
 			var userId = _userAccessor.GetUserId();
-			if (userId == null)
+			if (EqualityComparer<TUserKey>.Default.Equals(userId, default))
 				return null;
 
 			var scopedQuery = ApplyOwnerToQuery(query, userId);
@@ -202,7 +204,7 @@ private async ValueTask<long> ApplyOwnerFilterAndCallAsync(
 			IQueryFilter filter, Func<IQueryFilter, ValueTask<long>> action)
 		{
 			var userId = _userAccessor.GetUserId();
-			if (userId == null)
+			if (EqualityComparer<TUserKey>.Default.Equals(userId, default))
 				return 0;
 
 			var ownerFilter = BuildOwnerFilter(userId);
@@ -214,7 +216,7 @@ private async ValueTask<bool> ApplyOwnerFilterAndCallAsync(
 			IQueryFilter filter, Func<IQueryFilter, ValueTask<bool>> action)
 		{
 			var userId = _userAccessor.GetUserId();
-			if (userId == null)
+			if (EqualityComparer<TUserKey>.Default.Equals(userId, default))
 				return false;
 
 			var ownerFilter = BuildOwnerFilter(userId);
@@ -226,9 +228,9 @@ private async ValueTask<PageResult<TEntity>> ApplyOwnerFilterAndCallAsync(
 			PageQuery<TEntity> request, Func<PageQuery<TEntity>, ValueTask<PageResult<TEntity>>> action)
 		{
 			var userId = _userAccessor.GetUserId();
-			if (userId == null)
+			if (EqualityComparer<TUserKey>.Default.Equals(userId, default))
 				return Options.ThrowWhenUserNotSet
-					? throw new System.InvalidOperationException("User context is not set")
+					? throw new System.InvalidOperationException(UserContextNotSetMessage)
 					: new PageResult<TEntity>(request, 0, Array.Empty<TEntity>());
 
 			var scopedRequest = ApplyOwnerToRequest(request, userId);
@@ -261,9 +263,8 @@ private static PropertyInfo DiscoverOwnerProperty()
 
 			foreach (var prop in entityType.GetProperties(BindingFlags.Public | BindingFlags.Instance))
 			{
-				foreach (var attr in prop.GetCustomAttributes())
+				foreach (var attrType in prop.GetCustomAttributes().Select(attr => attr.GetType()))
 				{
-					var attrType = attr.GetType();
 					if (attrType.Name == "DataOwnerAttribute" &&
 						(attrType.Namespace == "Kista" || attrType.Namespace == "Kista.Owners"))
 					{
@@ -287,7 +288,7 @@ private static PropertyInfo DiscoverOwnerProperty()
 
 		// === FILTER BUILDING ===
 
-		private IQueryFilter BuildOwnerFilter(TUserKey userId)
+		private static IQueryFilter BuildOwnerFilter(TUserKey userId)
 		{
 			return new ExpressionQueryFilter<TEntity>(BuildOwnerExpression(userId));
 		}
diff --git a/src/Kista/RepositoryContextBuilder.cs b/src/Kista/RepositoryContextBuilder.cs
@@ -97,10 +97,14 @@ internal void TrackRepositoryType(Type repositoryType) {
 	/// further type-specific configuration (e.g. owner scoping).
 	/// </summary>
 	public RepositoryBuilder AddRepository<TRepository>(ServiceLifetime lifetime = ServiceLifetime.Scoped) where TRepository : class {
-		_services.AddRepository(typeof(TRepository), lifetime);
+		var repoInterface = FindRepositoryInterface(typeof(TRepository));
+		var serviceTypes = RepositoryRegistrationUtil.GetRepositoryServiceTypes(typeof(TRepository));
+		foreach (var serviceType in serviceTypes) {
+			_services.TryAdd(new ServiceDescriptor(serviceType, typeof(TRepository), lifetime));
+		}
+		_services.TryAdd(new ServiceDescriptor(typeof(TRepository), typeof(TRepository), lifetime));
 		TrackRepositoryType(typeof(TRepository));
 
-		var repoInterface = FindRepositoryInterface(typeof(TRepository));
 		var entityType = repoInterface.GetGenericArguments()[0];
 		var keyType = repoInterface.GetGenericArguments()[1];
 
@@ -117,6 +121,19 @@ public RepositoryContextBuilder AddRepository<TRepository>(Action<RepositoryBuil
 		return this;
 	}
 
+	/// <summary>
+	/// Registers a repository type in the service collection and tracks it.
+	/// </summary>
+	public RepositoryContextBuilder AddRepository(Type repositoryType, ServiceLifetime lifetime = ServiceLifetime.Scoped) {
+		if (repositoryType.IsGenericTypeDefinition) {
+			RegisterOpenGenericRepository(repositoryType, lifetime);
+		} else {
+			_services.AddRepository(repositoryType, lifetime);
+		}
+		TrackRepositoryType(repositoryType);
+		return this;
+	}
+
 	private static Type FindRepositoryInterface(Type repositoryType) {
 		foreach (var iface in repositoryType.GetInterfaces()) {
 			if (iface.IsGenericType &&
@@ -129,19 +146,6 @@ private static Type FindRepositoryInterface(Type repositoryType) {
 			$"The type '{repositoryType}' does not implement IRepository<,>");
 	}
 
-		/// <summary>
-		/// Registers a repository type in the service collection and tracks it.
-		/// </summary>
-		public RepositoryContextBuilder AddRepository(Type repositoryType, ServiceLifetime lifetime = ServiceLifetime.Scoped) {
-			if (repositoryType.IsGenericTypeDefinition) {
-				RegisterOpenGenericRepository(repositoryType, lifetime);
-			} else {
-				_services.AddRepository(repositoryType, lifetime);
-			}
-			TrackRepositoryType(repositoryType);
-			return this;
-		}
-
 		/// <summary>
 		/// Registers an open generic repository type with the service collection.
 		/// </summary>
diff --git a/test/Kista.Manager.XUnit/Unit/UserAccessorTests.cs b/test/Kista.Manager.XUnit/Unit/UserAccessorTests.cs
@@ -25,7 +25,7 @@ public void StaticUserIdentifierStrategy_Should_ReturnUserId_RegardlessOfService
 
 		var userId = strategy.GetUserId(null);
 
-		Assert.NotEqual(default(Guid), userId);
+		Assert.NotEqual(Guid.Empty, userId);
 	}
 
 	#endregion
@@ -170,7 +170,7 @@ public void ClaimUserIdentifierStrategy_Should_ReturnDefault_WhenConversionFails
 
 		var userId = strategy.GetUserId(services);
 
-		Assert.Equal(default(Guid), userId);
+		Assert.Equal(Guid.Empty, userId);
 	}
 
 	#endregion
@@ -456,7 +456,7 @@ private static IServiceProvider CreateServicesWithEmptyContext() {
 		return services.BuildServiceProvider();
 	}
 
-	private class NullReturningStrategy<TKey> : IUserIdentifierStrategy<TKey> {
+	private sealed class NullReturningStrategy<TKey> : IUserIdentifierStrategy<TKey> {
 		public TKey? GetUserId(IServiceProvider? serviceProvider = null) => default;
 	}
 
diff --git a/test/Kista.Owners.XUnit/Unit/UserScopedRepositoryDecoratorEdgeTests.cs b/test/Kista.Owners.XUnit/Unit/UserScopedRepositoryDecoratorEdgeTests.cs
@@ -349,7 +349,7 @@ public GenericInMemoryRepo(IServiceProvider sp) : base(null, null, sp) { }
     // Helpers
     // ============================================================
 
-    private class StaticUserAccessor : IUserAccessor<string>
+    private sealed class StaticUserAccessor : IUserAccessor<string>
     {
         private readonly string _userId;
         public StaticUserAccessor(string userId) => _userId = userId;
diff --git a/test/Kista.Owners.XUnit/Unit/UserScopedRepositoryDecoratorTests.cs b/test/Kista.Owners.XUnit/Unit/UserScopedRepositoryDecoratorTests.cs
@@ -1,3 +1,4 @@
+using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq.Expressions;
 using Kista;
@@ -370,7 +371,7 @@ private static ServiceProvider CreateServices<TEntity, TKey, TUserKey>(
 
         var strategy = new StaticUserIdentifierStrategy<TUserKey>(userId);
         var composite = new CompositeUserIdentifierStrategy<TUserKey>();
-        if (userId != null)
+        if (!EqualityComparer<TUserKey>.Default.Equals(userId, default))
             composite.Add(strategy);
         services.AddSingleton(composite);
         services.AddSingleton<IUserAccessor<TUserKey>>(
diff --git a/test/Kista.Testing.TUnit/Suites/MultiTenantRepositoryTestSuite_T3.cs b/test/Kista.Testing.TUnit/Suites/MultiTenantRepositoryTestSuite_T3.cs
@@ -25,9 +25,7 @@ public abstract class MultiTenantRepositoryTestSuite<TTenantInfo, TPerson, TKey>
 
     protected virtual int EntitySetCount => 100;
 
-    private static readonly string[] DefaultTenantIds = { "tenant1", "tenant2", "tenant3" };
-
-    protected virtual string[] TenantIds => DefaultTenantIds;
+    protected virtual string[] TenantIds => Defaults.TenantIds;
 
     protected virtual IDictionary<string, IReadOnlyList<TPerson>>? People { get; private set; }
 
@@ -43,6 +41,11 @@ public abstract class MultiTenantRepositoryTestSuite<TTenantInfo, TPerson, TKey>
 
     protected abstract TTenantInfo CreateTenantInfo(string tenantId);
 
+    private static class Defaults
+    {
+        public static readonly string[] TenantIds = { "tenant1", "tenant2", "tenant3" };
+    }
+
     protected virtual void ConfigureServices(IServiceCollection services)
     {
         services.AddMultiTenant<TTenantInfo>()
diff --git a/test/Kista.Testing/Suites/MultiTenantRepositoryTestSuite_T3.cs b/test/Kista.Testing/Suites/MultiTenantRepositoryTestSuite_T3.cs
diff --git a/test/Kista.XUnit/Unit/CombinedFilterTests.cs b/test/Kista.XUnit/Unit/CombinedFilterTests.cs
diff --git a/test/Kista.XUnit/Unit/LifecycleTests.cs b/test/Kista.XUnit/Unit/LifecycleTests.cs
diff --git a/test/Kista.XUnit/Unit/RepositoryCoreTests.cs b/test/Kista.XUnit/Unit/RepositoryCoreTests.cs
diff --git a/test/Kista.XUnit/Unit/ServiceCollectionExtensionsTests.cs b/test/Kista.XUnit/Unit/ServiceCollectionExtensionsTests.cs

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public ClaimUserIdentifierStrategy(string claimType = "sub")`
`56`	`56`	`return ConvertValue(value);`
`57`	`57`	`}`
`58`	`58`
`59`		`- private TKey? ConvertValue(string value)`
	`59`	`+ private static TKey? ConvertValue(string value)`
`60`	`60`	`{`
`61`	`61`	`try`
`62`	`62`	`{`
`@@ -66,7 +66,19 @@ public ClaimUserIdentifierStrategy(string claimType = "sub")`
`66`	`66`	`var converter = TypeDescriptor.GetConverter(typeof(TKey));`
`67`	`67`	`return (TKey?)converter.ConvertFromInvariantString(value);`
`68`	`68`	`}`
`69`		`- catch`
	`69`	`+ catch (FormatException)`
	`70`	`+ {`
	`71`	`+ return default;`
	`72`	`+ }`
	`73`	`+ catch (NotSupportedException)`
	`74`	`+ {`
	`75`	`+ return default;`
	`76`	`+ }`
	`77`	`+ catch (ArgumentException)`
	`78`	`+ {`
	`79`	`+ return default;`
	`80`	`+ }`
	`81`	`+ catch (InvalidCastException)`
`70`	`82`	`{`
`71`	`83`	`return default;`
`72`	`84`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,14 +43,9 @@ public CompositeUserIdentifierStrategy<TKey> Add(IUserIdentifierStrategy<TKey> s`
`43`	`43`	`/// <inheritdoc/>`
`44`	`44`	`public TKey? GetUserId(IServiceProvider? serviceProvider = null)`
`45`	`45`	`{`
`46`		`- foreach (var strategy in strategies)`
`47`		`- {`
`48`		`- var userId = strategy.GetUserId(serviceProvider);`
`49`		`- if (userId != null)`
`50`		`- return userId;`
`51`		`- }`
`52`		`-`
`53`		`- return default;`
	`46`	`+ return strategies`
	`47`	`+ .Select(strategy => strategy.GetUserId(serviceProvider))`
	`48`	`+ .FirstOrDefault(userId => !EqualityComparer<TKey>.Default.Equals(userId, default));`
`54`	`49`	`}`
`55`	`50`	`}`
`56`	`51`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ namespace Kista`
`18`	`18`	`/// Defines a strategy for resolving the current user identifier.`
`19`	`19`	`/// </summary>`
`20`	`20`	`/// <typeparam name="TKey">The type of the user identifier key.</typeparam>`
`21`		`- public interface IUserIdentifierStrategy<TKey>`
	`21`	`+ public interface IUserIdentifierStrategy<out TKey>`
`22`	`22`	`{`
`23`	`23`	`/// <summary>`
`24`	`24`	`/// Resolves the current user identifier.`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public QueryStringUserIdentifierStrategy(string parameter = "user_id")`
`54`	`54`	`return ConvertValue(value);`
`55`	`55`	`}`
`56`	`56`
`57`		`- private TKey? ConvertValue(string value)`
	`57`	`+ private static TKey? ConvertValue(string value)`
`58`	`58`	`{`
`59`	`59`	`try`
`60`	`60`	`{`
`@@ -64,7 +64,19 @@ public QueryStringUserIdentifierStrategy(string parameter = "user_id")`
`64`	`64`	`var converter = TypeDescriptor.GetConverter(typeof(TKey));`
`65`	`65`	`return (TKey?)converter.ConvertFromInvariantString(value);`
`66`	`66`	`}`
`67`		`- catch`
	`67`	`+ catch (FormatException)`
	`68`	`+ {`
	`69`	`+ return default;`
	`70`	`+ }`
	`71`	`+ catch (NotSupportedException)`
	`72`	`+ {`
	`73`	`+ return default;`
	`74`	`+ }`
	`75`	`+ catch (ArgumentException)`
	`76`	`+ {`
	`77`	`+ return default;`
	`78`	`+ }`
	`79`	`+ catch (InvalidCastException)`
`68`	`80`	`{`
`69`	`81`	`return default;`
`70`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+using System.Linq;`
`1`	`2`	`using Microsoft.Extensions.DependencyInjection;`
`2`	`3`
`3`	`4`	`namespace Kista`
`@@ -53,10 +54,8 @@ public static RepositoryBuilder WithOwnerScoping(`
`53`	`54`
`54`	`55`	`private static Type? FindUserKeyType(Type entityType)`
`55`	`56`	`{`
`56`		`- foreach (var iface in entityType.GetInterfaces())`
	`57`	`+ foreach (var iface in entityType.GetInterfaces().Where(iface => iface.IsGenericType))`
`57`	`58`	`{`
`58`		`- if (!iface.IsGenericType) continue;`
`59`		`-`
`60`	`59`	`var genericDef = iface.GetGenericTypeDefinition();`
`61`	`60`	`if (genericDef == typeof(IHaveOwner<>) \|\|`
`62`	`61`	genericDef.FullName == "Kista.IHaveOwner`1")
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public RouteUserIdentifierStrategy(string key = "userId")`
`54`	`54`	`return ConvertValue(value);`
`55`	`55`	`}`
`56`	`56`
`57`		`- private TKey? ConvertValue(string value)`
	`57`	`+ private static TKey? ConvertValue(string value)`
`58`	`58`	`{`
`59`	`59`	`try`
`60`	`60`	`{`
`@@ -64,7 +64,19 @@ public RouteUserIdentifierStrategy(string key = "userId")`
`64`	`64`	`var converter = TypeDescriptor.GetConverter(typeof(TKey));`
`65`	`65`	`return (TKey?)converter.ConvertFromInvariantString(value);`
`66`	`66`	`}`
`67`		`- catch`
	`67`	`+ catch (FormatException)`
	`68`	`+ {`
	`69`	`+ return default;`
	`70`	`+ }`
	`71`	`+ catch (NotSupportedException)`
	`72`	`+ {`
	`73`	`+ return default;`
	`74`	`+ }`
	`75`	`+ catch (ArgumentException)`
	`76`	`+ {`
	`77`	`+ return default;`
	`78`	`+ }`
	`79`	`+ catch (InvalidCastException)`
`68`	`80`	`{`
`69`	`81`	`return default;`
`70`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+using System.Collections.Generic;`
`1`	`2`	`using System.Linq.Expressions;`
`2`	`3`	`using System.Reflection;`
`3`	`4`
`@@ -36,6 +37,7 @@ public class UserScopedRepositoryDecorator<TEntity, TKey, TUserKey>`
`36`	`37`	`where TEntity : class, IHaveOwner<TUserKey>`
`37`	`38`	`where TKey : notnull`
`38`	`39`	`{`
	`40`	`+ private const string UserContextNotSetMessage = "User context is not set";`
`39`	`41`	`private static readonly Lazy<PropertyInfo> _ownerProperty = new(DiscoverOwnerProperty);`
`40`	`42`
`41`	`43`	`private readonly IRepository<TEntity, TKey> _inner;`
`@@ -72,9 +74,9 @@ public UserScopedRepositoryDecorator(`
`72`	`74`	`public ValueTask<TEntity?> FindAsync(TKey key, CancellationToken cancellationToken = default)`
`73`	`75`	`{`
`74`	`76`	`var userId = _userAccessor.GetUserId();`
`75`		`- if (userId == null)`
	`77`	`+ if (EqualityComparer<TUserKey>.Default.Equals(userId, default))`
`76`	`78`	`return Options.ThrowWhenUserNotSet`
`77`		`- ? throw new System.InvalidOperationException("User context is not set")`
	`79`	`+ ? throw new System.InvalidOperationException(UserContextNotSetMessage)`
`78`	`80`	`: new ValueTask<TEntity?>(default(TEntity));`
`79`	`81`
`80`	`82`	`return FindScopedAsync(key, userId, cancellationToken);`
`@@ -102,7 +104,7 @@ public ValueTask AddRangeAsync(IEnumerable<TEntity> entities, CancellationToken`
`102`	`104`	`System.ArgumentNullException.ThrowIfNull(entities);`
`103`	`105`
`104`	`106`	`var userId = _userAccessor.GetUserId();`
`105`		`- if (userId != null)`
	`107`	`+ if (!EqualityComparer<TUserKey>.Default.Equals(userId, default))`
`106`	`108`	`{`
`107`	`109`	`foreach (var entity in entities)`
`108`	`110`	`{`
`@@ -111,7 +113,7 @@ public ValueTask AddRangeAsync(IEnumerable<TEntity> entities, CancellationToken`
`111`	`113`	`}`
`112`	`114`	`else if (Options.ThrowWhenUserNotSet)`
`113`	`115`	`{`
`114`		`- throw new System.InvalidOperationException("User context is not set");`
	`116`	`+ throw new System.InvalidOperationException(UserContextNotSetMessage);`
`115`	`117`	`}`
`116`	`118`
`117`	`119`	`return _inner.AddRangeAsync(entities, cancellationToken);`
`@@ -162,13 +164,13 @@ private ValueTask ApplyOwnerAndCallAsync(TEntity entity, Func<ValueTask> action)`
`162`	`164`	`System.ArgumentNullException.ThrowIfNull(entity);`
`163`	`165`
`164`	`166`	`var userId = _userAccessor.GetUserId();`
`165`		`- if (userId != null)`
	`167`	`+ if (!EqualityComparer<TUserKey>.Default.Equals(userId, default))`
`166`	`168`	`{`
`167`	`169`	`_ownerProperty.Value.SetValue(entity, userId);`
`168`	`170`	`}`
`169`	`171`	`else if (Options.ThrowWhenUserNotSet)`
`170`	`172`	`{`
`171`		`- throw new System.InvalidOperationException("User context is not set");`
	`173`	`+ throw new System.InvalidOperationException(UserContextNotSetMessage);`
`172`	`174`	`}`
`173`	`175`
`174`	`176`	`return action();`
`@@ -178,9 +180,9 @@ private async ValueTask<IList<TEntity>> ApplyOwnerFilterAndCallAsync(`
`178`	`180`	`IQuery query, Func<IQuery, ValueTask<IList<TEntity>>> action)`
`179`	`181`	`{`
`180`	`182`	`var userId = _userAccessor.GetUserId();`
`181`		`- if (userId == null)`
	`183`	`+ if (EqualityComparer<TUserKey>.Default.Equals(userId, default))`
`182`	`184`	`return Options.ThrowWhenUserNotSet`
`183`		`- ? throw new System.InvalidOperationException("User context is not set")`
	`185`	`+ ? throw new System.InvalidOperationException(UserContextNotSetMessage)`
`184`	`186`	`: Array.Empty<TEntity>();`
`185`	`187`
`186`	`188`	`var scopedQuery = ApplyOwnerToQuery(query, userId);`
`@@ -191,7 +193,7 @@ private async ValueTask<IList<TEntity>> ApplyOwnerFilterAndCallAsync(`
`191`	`193`	`IQuery query, Func<IQuery, ValueTask<TEntity?>> action)`
`192`	`194`	`{`
`193`	`195`	`var userId = _userAccessor.GetUserId();`
`194`		`- if (userId == null)`
	`196`	`+ if (EqualityComparer<TUserKey>.Default.Equals(userId, default))`
`195`	`197`	`return null;`
`196`	`198`
`197`	`199`	`var scopedQuery = ApplyOwnerToQuery(query, userId);`
`@@ -202,7 +204,7 @@ private async ValueTask<long> ApplyOwnerFilterAndCallAsync(`
`202`	`204`	`IQueryFilter filter, Func<IQueryFilter, ValueTask<long>> action)`
`203`	`205`	`{`
`204`	`206`	`var userId = _userAccessor.GetUserId();`
`205`		`- if (userId == null)`
	`207`	`+ if (EqualityComparer<TUserKey>.Default.Equals(userId, default))`
`206`	`208`	`return 0;`
`207`	`209`
`208`	`210`	`var ownerFilter = BuildOwnerFilter(userId);`
`@@ -214,7 +216,7 @@ private async ValueTask<bool> ApplyOwnerFilterAndCallAsync(`
`214`	`216`	`IQueryFilter filter, Func<IQueryFilter, ValueTask<bool>> action)`
`215`	`217`	`{`
`216`	`218`	`var userId = _userAccessor.GetUserId();`
`217`		`- if (userId == null)`
	`219`	`+ if (EqualityComparer<TUserKey>.Default.Equals(userId, default))`
`218`	`220`	`return false;`
`219`	`221`
`220`	`222`	`var ownerFilter = BuildOwnerFilter(userId);`
`@@ -226,9 +228,9 @@ private async ValueTask<PageResult<TEntity>> ApplyOwnerFilterAndCallAsync(`
`226`	`228`	`PageQuery<TEntity> request, Func<PageQuery<TEntity>, ValueTask<PageResult<TEntity>>> action)`
`227`	`229`	`{`
`228`	`230`	`var userId = _userAccessor.GetUserId();`
`229`		`- if (userId == null)`
	`231`	`+ if (EqualityComparer<TUserKey>.Default.Equals(userId, default))`
`230`	`232`	`return Options.ThrowWhenUserNotSet`
`231`		`- ? throw new System.InvalidOperationException("User context is not set")`
	`233`	`+ ? throw new System.InvalidOperationException(UserContextNotSetMessage)`
`232`	`234`	`: new PageResult<TEntity>(request, 0, Array.Empty<TEntity>());`
`233`	`235`
`234`	`236`	`var scopedRequest = ApplyOwnerToRequest(request, userId);`
`@@ -261,9 +263,8 @@ private static PropertyInfo DiscoverOwnerProperty()`
`261`	`263`
`262`	`264`	`foreach (var prop in entityType.GetProperties(BindingFlags.Public \| BindingFlags.Instance))`
`263`	`265`	`{`
`264`		`- foreach (var attr in prop.GetCustomAttributes())`
	`266`	`+ foreach (var attrType in prop.GetCustomAttributes().Select(attr => attr.GetType()))`
`265`	`267`	`{`
`266`		`- var attrType = attr.GetType();`
`267`	`268`	`if (attrType.Name == "DataOwnerAttribute" &&`
`268`	`269`	`(attrType.Namespace == "Kista" \|\| attrType.Namespace == "Kista.Owners"))`
`269`	`270`	`{`
`@@ -287,7 +288,7 @@ private static PropertyInfo DiscoverOwnerProperty()`
`287`	`288`
`288`	`289`	`// === FILTER BUILDING ===`
`289`	`290`
`290`		`- private IQueryFilter BuildOwnerFilter(TUserKey userId)`
	`291`	`+ private static IQueryFilter BuildOwnerFilter(TUserKey userId)`
`291`	`292`	`{`
`292`	`293`	`return new ExpressionQueryFilter<TEntity>(BuildOwnerExpression(userId));`
`293`	`294`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public void StaticUserIdentifierStrategy_Should_ReturnUserId_RegardlessOfService`
`25`	`25`
`26`	`26`	`var userId = strategy.GetUserId(null);`
`27`	`27`
`28`		`- Assert.NotEqual(default(Guid), userId);`
	`28`	`+ Assert.NotEqual(Guid.Empty, userId);`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`#endregion`
`@@ -170,7 +170,7 @@ public void ClaimUserIdentifierStrategy_Should_ReturnDefault_WhenConversionFails`
`170`	`170`
`171`	`171`	`var userId = strategy.GetUserId(services);`
`172`	`172`
`173`		`- Assert.Equal(default(Guid), userId);`
	`173`	`+ Assert.Equal(Guid.Empty, userId);`
`174`	`174`	`}`
`175`	`175`
`176`	`176`	`#endregion`
`@@ -456,7 +456,7 @@ private static IServiceProvider CreateServicesWithEmptyContext() {`
`456`	`456`	`return services.BuildServiceProvider();`
`457`	`457`	`}`
`458`	`458`
`459`		`- private class NullReturningStrategy<TKey> : IUserIdentifierStrategy<TKey> {`
	`459`	`+ private sealed class NullReturningStrategy<TKey> : IUserIdentifierStrategy<TKey> {`
`460`	`460`	`public TKey? GetUserId(IServiceProvider? serviceProvider = null) => default;`
`461`	`461`	`}`
`462`	`462`