Add ScopedAttribute and update service collection extensions for scoped bindings

Author: woksin

Source/DotNET/Fundamentals.Specs/DependencyInjection/for_ServiceCollectionExtensions/when_adding_bindings_by_convention_with_scoped_implementation.cs

@@ -0,0 +1,28 @@
+// Copyright (c) Cratis. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Cratis.DependencyInjection.for_ServiceCollectionExtensions;
+
+public class when_adding_bindings_by_convention_with_scoped_implementation : Specification
+{
+    IServiceCollection _services;
+    ServiceDescriptor _serviceDescriptor;
+
+    void Establish() => _services = new ServiceCollection();
+
+    void Because()
+    {
+        _services.AddBindingsByConvention();
+        _serviceDescriptor = _services.Single(_ => _.ServiceType == typeof(IMyScopedBinding));
+    }
+
+    [Fact] void should_register_the_implementation() => _serviceDescriptor.ImplementationType.ShouldEqual(typeof(MyScopedBinding));
+    [Fact] void should_register_with_scoped_lifetime() => _serviceDescriptor.Lifetime.ShouldEqual(ServiceLifetime.Scoped);
+}
+
+public interface IMyScopedBinding;
+
+[Scoped]
+public class MyScopedBinding : IMyScopedBinding;

Source/DotNET/Fundamentals.Specs/DependencyInjection/for_ServiceCollectionExtensions/when_adding_self_bindings_with_scoped_attribute.cs

@@ -0,0 +1,34 @@
+// Copyright (c) Cratis. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Cratis.DependencyInjection.for_ServiceCollectionExtensions;
+
+public class when_adding_self_bindings_with_scoped_attribute : Specification
+{
+    IServiceCollection _services;
+    ServiceDescriptor _serviceDescriptor;
+
+    void Establish()
+    {
+        _services = new ServiceCollection();
+        _services.AddSingleton<IExistingService, ExistingService>();
+    }
+
+    void Because()
+    {
+        _services.AddSelfBindings();
+        _serviceDescriptor = _services.FirstOrDefault(_ => _.ServiceType == typeof(MyScopedSelfBinding));
+    }
+
+    [Fact] void should_register_the_implementation_type() => _serviceDescriptor.ImplementationType.ShouldEqual(typeof(MyScopedSelfBinding));
+    [Fact] void should_register_with_scoped_lifetime() => _serviceDescriptor.Lifetime.ShouldEqual(ServiceLifetime.Scoped);
+}
+
+public interface IExistingService;
+
+public class ExistingService : IExistingService;
+
+[Scoped]
+public class MyScopedSelfBinding;

Source/DotNET/Fundamentals/DependencyInjection/ScopedAttribute.cs

@@ -0,0 +1,10 @@
+// Copyright (c) Cratis. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+namespace Cratis.DependencyInjection;
+
+/// <summary>
+/// Attribute to adorn types for the IoC hookup to recognize it as Scoped.
+/// </summary>
+[AttributeUsage(AttributeTargets.Class)]
+public sealed class ScopedAttribute : Attribute;

Source/DotNET/Fundamentals/DependencyInjection/ServiceCollectionExtensions.cs

@@ -53,9 +53,12 @@ public static IServiceCollection AddBindingsByConvention(this IServiceCollection
                 continue;
             }
 
-            _ = conventionBasedType.HasAttribute<SingletonAttribute>() ?
-                services.AddSingleton(interfaceToBind, conventionBasedType) :
-                services.AddTransient(interfaceToBind, conventionBasedType);
+            _ = GetServiceLifetime(conventionBasedType) switch
+            {
+                ServiceLifetime.Singleton => services.AddSingleton(interfaceToBind, conventionBasedType),
+                ServiceLifetime.Scoped => services.AddScoped(interfaceToBind, conventionBasedType),
+                _ => services.AddTransient(interfaceToBind, conventionBasedType)
+            };
         }
 
         return services;
@@ -82,9 +85,12 @@ public static IServiceCollection AddSelfBindings(this IServiceCollection service
             services.Any(s => s.ServiceType != _)).ToList().ForEach(_ =>
         {
 #pragma warning disable SA1312 // Variable names should begin with lower-case letter
-            var __ = _.HasAttribute<SingletonAttribute>() ?
-                services.AddSingleton(_, _) :
-                services.AddTransient(_, _);
+            var __ = GetServiceLifetime(_) switch
+            {
+                ServiceLifetime.Singleton => services.AddSingleton(_, _),
+                ServiceLifetime.Scoped => services.AddScoped(_, _),
+                _ => services.AddTransient(_, _)
+            };
 #pragma warning restore SA1312 // Variable names should begin with lower-case letter
         });
 
@@ -102,4 +108,19 @@ static bool HasConstructorWithUnresolvableParameters(Type type) =>
 
     static bool HasConstructorWithRecordTypes(Type type) =>
         type.GetConstructors().Any(_ => _.GetParameters().Any(p => p.ParameterType.IsRecord()));
+
+    static ServiceLifetime GetServiceLifetime(Type type)
+    {
+        if (type.HasAttribute<SingletonAttribute>())
+        {
+            return ServiceLifetime.Singleton;
+        }
+
+        if (type.HasAttribute<ScopedAttribute>())
+        {
+            return ServiceLifetime.Scoped;
+        }
+
+        return ServiceLifetime.Transient;
+    }
 }