Merge pull request #2 from albumprinter/feature/service-collection-imps

Implemented ServiceCollection Helper Properly and Added Related Tests

Author: cristeh

src/Albelli.Extensions.Caching.DynamoDb/DynamoDbCache.cs

@@ -6,6 +6,7 @@
 using Amazon.DynamoDBv2;
 using Amazon.DynamoDBv2.Model;
 using Microsoft.Extensions.Caching.Distributed;
+using Microsoft.Extensions.Options;
 
 namespace Albelli.Extensions.Caching.DynamoDb
 {
@@ -15,9 +16,9 @@ public sealed class DynamoDbCache : IDistributedCache
         private readonly IAmazonDynamoDB _dynamoDb;
         private readonly ISystemClock _systemClock;
 
-        public DynamoDbCache(DynamoDbCacheOptions options, ISystemClock systemClock, IAmazonDynamoDB dynamoDb = null)
+        public DynamoDbCache(IOptions<DynamoDbCacheOptions> options, ISystemClock systemClock, IAmazonDynamoDB dynamoDb = null)
         {
-            _options = options ?? throw new ArgumentNullException(nameof(options));
+            _options = options?.Value ?? throw new ArgumentNullException(nameof(options));
             if (_options.CustomDynamoDbClient != null)
             {
                 _dynamoDb = _options.CustomDynamoDbClient;

src/Albelli.Extensions.Caching.DynamoDb/DynamoDbCacheServiceCollectionExtensions.cs

@@ -6,7 +6,14 @@ namespace Albelli.Extensions.Caching.DynamoDb
 {
     public static class DynamoDbCacheServiceCollectionExtensions
     {
-        public static IServiceCollection AddStackExchangeRedisCache(this IServiceCollection services, Action<DynamoDbCacheOptions> setupAction)
+        /// <summary>
+        /// Use DynamoDb as a provider for the IDistributedCache.
+        /// </summary>
+        /// <param name="services">The service collection to add this to.</param>
+        /// <param name="setupAction">The configuration object for this implementation.</param>
+        /// <returns>A chain result with the same service collection.</returns>
+        /// <exception cref="ArgumentNullException"></exception>
+        public static IServiceCollection AddDynamoDbCache(this IServiceCollection services, Action<DynamoDbCacheOptions> setupAction)
         {
             if (services == null)
             {

test/Albelli.Extensions.Caching.Tests.Integration/Albelli.Extensions.Caching.Tests.Integration.csproj

@@ -12,7 +12,9 @@
         <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
         <PackageReference Include="coverlet.collector" Version="1.2.0" />
         <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="3.1.6" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.6" />
         <PackageReference Include="AWSSDK.DynamoDBv2" Version="3.3.106.39" />
+        <PackageReference Include="Moq" Version="4.14.5" />
     </ItemGroup>
 
     <ItemGroup>

test/Albelli.Extensions.Caching.Tests.Integration/DynamoDbCacheServiceCollectionExtensionsTests.cs

@@ -0,0 +1,68 @@
+using System;
+using System.Linq;
+using Albelli.Extensions.Caching.DynamoDb;
+using Amazon.DynamoDBv2;
+using Microsoft.Extensions.Caching.Distributed;
+using Microsoft.Extensions.DependencyInjection;
+using Moq;
+using Xunit;
+
+namespace Albelli.Extensions.Caching.Integration
+{
+    public class DynamoDbCacheServiceCollectionExtensionsTests
+    {
+        [Fact]
+        public void DynamoDb_Is_Registered_Correctly()
+        {
+            var serviceCollection = new ServiceCollection();
+            serviceCollection.AddDynamoDbCache(o =>
+            {
+                o.TableName = "test";
+            });
+            var distributedCache = serviceCollection.FirstOrDefault(desc => desc.ServiceType == typeof(IDistributedCache));
+            Assert.NotNull(distributedCache);
+            Assert.Equal(ServiceLifetime.Singleton, distributedCache.Lifetime);
+            var systemClock = serviceCollection.FirstOrDefault(desc => desc.ServiceType == typeof(ISystemClock));
+            Assert.NotNull(systemClock);
+            Assert.Equal(ServiceLifetime.Singleton, systemClock.Lifetime);
+        }
+        
+        [Fact]
+        public void ServiceProvider_Throws_Without_A_DynamoDbClient_Registered_In_the_DI()
+        {
+            var serviceCollection = new ServiceCollection();
+            serviceCollection.AddDynamoDbCache(o =>
+            {
+                o.TableName = "test";
+            });
+            var serviceProvider = serviceCollection.BuildServiceProvider();
+            Assert.Throws<ArgumentNullException>(() => serviceProvider.GetService(typeof(IDistributedCache)));
+        }
+        
+        [Fact]
+        public void ServiceProvider_Is_Retrieved_Successfully_With_A_DynamoDbClient_Registered_In_the_DI()
+        {
+            var serviceCollection = new ServiceCollection();
+            serviceCollection.AddDynamoDbCache(o =>
+            {
+                o.TableName = "test";
+            });
+            serviceCollection.AddSingleton<IAmazonDynamoDB>(m => new Mock<AmazonDynamoDBClient>().Object);
+            var serviceProvider = serviceCollection.BuildServiceProvider();
+            Assert.NotNull(serviceProvider.GetService(typeof(IDistributedCache)));
+        }
+        
+        [Fact]
+        public void ServiceProvider_Is_Retrieved_Successfully_With_A_Manually_Provided_DynamoDBClient()
+        {
+            var serviceCollection = new ServiceCollection();
+            serviceCollection.AddDynamoDbCache(o =>
+            {
+                o.TableName = "test";
+                o.CustomDynamoDbClient = new Mock<AmazonDynamoDBClient>().Object;
+            });
+            var serviceProvider = serviceCollection.BuildServiceProvider();
+            Assert.NotNull(serviceProvider.GetService(typeof(IDistributedCache)));
+        }
+    }
+}