ITenantRepository refactoring (#209)

* added GetAll to ITenantRepository removed GetByHost from ITenantRepository added ITenantHostRepository fix PostMan collection * remove cache for all tenants * put back GetByHost added repo test Co-authored-by: [email protected] <[email protected]>
osstotalsoft · Feb 18, 2022 · 5744ce4 · 5744ce4
1 parent f68bc7e
commit 5744ce4
Show file tree

Hide file tree

Showing 10 changed files with 142 additions and 65 deletions.
diff --git a/samples/MultiTenancy/MultiTenantTodoList.postman_collection.json b/samples/MultiTenancy/MultiTenantTodoList.postman_collection.json
@@ -1,6 +1,6 @@
 {
 	"info": {
-		"_postman_id": "fe2223de-d906-4829-b07f-e1172bd2d2c7",
+		"_postman_id": "a6cf0814-a93a-4ca1-8320-d0424ddd19c5",
 		"name": "MultiTenantTodoList",
 		"schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"
 	},
@@ -48,7 +48,7 @@
 				],
 				"body": {
 					"mode": "raw",
-					"raw": "{\n  \"Name\": \"My task name\",\n  \"Description\": \"My task description\"\n}"
+					"raw": "{\n  \"Name\": \"My task name\",\n  \"Description\": \"My task description\",\n  \"DueDate\": \"2022-07-01\"\n}"
 				},
 				"url": {
 					"raw": "http://localhost:58733/api/todo",

diff --git a/samples/MultiTenancy/NBB.Todo.Worker/Program.cs b/samples/MultiTenancy/NBB.Todo.Worker/Program.cs
@@ -84,7 +84,7 @@ private static void ConfigureServices(HostBuilderContext hostingContext, IServic
             services.AddMultitenancy(hostingContext.Configuration)
                 .AddMultiTenantMessaging()
                 .AddDefaultMessagingTenantIdentification()
-                .AddTenantRepository<BasicTenantRepository>();
+                .AddTenantRepository<ConfigurationTenantRepository>();
         }
 
         private static void ConfigureLogging(HostBuilderContext ctx, ILoggingBuilder _builder)

diff --git a/src/MultiTenancy/NBB.MultiTenancy.Abstractions/Repositories/BasicTenantRepository.cs b/src/MultiTenancy/NBB.MultiTenancy.Abstractions/Repositories/BasicTenantRepository.cs
diff --git a/...ultiTenancy/NBB.MultiTenancy.Abstractions/Repositories/CachedTenantRepositoryDecorator.cs b/...ultiTenancy/NBB.MultiTenancy.Abstractions/Repositories/CachedTenantRepositoryDecorator.cs
@@ -4,6 +4,7 @@
 using Microsoft.Extensions.Caching.Distributed;
 using Newtonsoft.Json;
 using System;
+using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -42,16 +43,37 @@ public async Task<Tenant> Get(Guid id, CancellationToken token)
             return dbTenant;
         }
 
+        private async Task<Tenant> GetTenantFromCache(string key, CancellationToken token = default)
+        {
+            var sTenant = await _cache.GetStringAsync(key, token);
+            return string.IsNullOrWhiteSpace(sTenant) ? null : JsonConvert.DeserializeObject<Tenant>(sTenant);
+        }
+
+        private async Task SetTenantToCache(Tenant tenant, string key, CancellationToken token = default)
+        {
+            var sTenant = JsonConvert.SerializeObject(tenant);
+            await _cache.SetStringAsync(key, sTenant,
+                new DistributedCacheEntryOptions
+                {
+                    AbsoluteExpirationRelativeToNow = TimeSpan.FromMinutes(3)
+                },token);
+        }
+
+        public async Task<List<Tenant>> GetAll(CancellationToken token = default)
+        {
+            var tenants = await _tenantRepository.GetAll(token);
+            return tenants;
+        }
+
         public async Task<Tenant> GetByHost(string host, CancellationToken token)
         {
-
             var cacheKey = CacheTenantByHostKey(host);
             var cachedTenant = await GetTenantFromCache(cacheKey, token);
             if (cachedTenant != null)
             {
                 return cachedTenant;
             }
-                        
+
             var dbTenant = await _tenantRepository.GetByHost(host, token);
             if (dbTenant == null)
             {
@@ -62,21 +84,5 @@ public async Task<Tenant> GetByHost(string host, CancellationToken token)
 
             return dbTenant;
         }
-
-        private async Task<Tenant> GetTenantFromCache(string key, CancellationToken token = default)
-        {
-            var sTenant = await _cache.GetStringAsync(key, token);
-            return string.IsNullOrWhiteSpace(sTenant) ? null : JsonConvert.DeserializeObject<Tenant>(sTenant);
-        }
-
-        private async Task SetTenantToCache(Tenant tenant, string key, CancellationToken token = default)
-        {
-            var sTenant = JsonConvert.SerializeObject(tenant);
-            await _cache.SetStringAsync(key, sTenant,
-                new DistributedCacheEntryOptions
-                {
-                    AbsoluteExpirationRelativeToNow = TimeSpan.FromMinutes(3)
-                },token);
-        }
     }
 }
diff --git a/src/MultiTenancy/NBB.MultiTenancy.Abstractions/Repositories/ConfigurationTenantRepository.cs b/src/MultiTenancy/NBB.MultiTenancy.Abstractions/Repositories/ConfigurationTenantRepository.cs
@@ -6,6 +6,8 @@
 using NBB.MultiTenancy.Abstractions.Options;
 using System;
 using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -43,7 +45,6 @@ public ConfigurationTenantRepository(IConfiguration configuration, IOptions<Tena
 
         public Task<Tenant> Get(Guid id, CancellationToken token = default)
         {
-
             return Task.FromResult(tenantMap.TryGetValue(id, out var result) ? result : throw new Exception($"Tenant configuration not found for tenant {id}"));
         }
 
@@ -72,5 +73,10 @@ private void LoadDefaultTenant()
             var newTenant = Tenant.Default;
             tenantMap = new ConcurrentDictionary<Guid, Tenant>() { [newTenant.TenantId] = newTenant };
         }
+
+        public Task<List<Tenant>> GetAll(CancellationToken token = default)
+        {
+            return Task.FromResult(tenantMap.Values.ToList());
+        }
     }
 }
diff --git a/src/MultiTenancy/NBB.MultiTenancy.Abstractions/Repositories/ITenantRepository.cs b/src/MultiTenancy/NBB.MultiTenancy.Abstractions/Repositories/ITenantRepository.cs
@@ -2,6 +2,7 @@
 // This source code is licensed under the MIT license.
 
 using System;
+using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -11,5 +12,6 @@ public interface ITenantRepository
     {
         Task<Tenant> Get(Guid id, CancellationToken token = default);
         Task<Tenant> GetByHost(string host, CancellationToken token = default);
+        Task<List<Tenant>> GetAll(CancellationToken token = default);
     }
 }
diff --git a/src/MultiTenancy/NBB.MultiTenancy.Identification/Identifiers/HostTenantIdentifier.cs b/src/MultiTenancy/NBB.MultiTenancy.Identification/Identifiers/HostTenantIdentifier.cs
@@ -9,16 +9,16 @@ namespace NBB.MultiTenancy.Identification.Identifiers
 {
     public class HostTenantIdentifier : ITenantIdentifier
     {
-        private readonly ITenantRepository _hostTenantRepository;
+        private readonly ITenantRepository _tenantRepository;
 
-        public HostTenantIdentifier(ITenantRepository hostTenantRepository)
+        public HostTenantIdentifier(ITenantRepository tenantRepository)
         {
-            _hostTenantRepository = hostTenantRepository;
+            _tenantRepository = tenantRepository;
         }
 
         public async Task<Guid> GetTenantIdAsync(string tenantToken)
         {
-            var tenant = await _hostTenantRepository.GetByHost(tenantToken);
+            var tenant = await _tenantRepository.GetByHost(tenantToken);
             return tenant.TenantId;
         }
     }

diff --git a/test/UnitTests/MultiTenancy/NBB.MultiTenancy.Configuration.Tests/TenantConfigurationTests.cs b/test/UnitTests/MultiTenancy/NBB.MultiTenancy.Configuration.Tests/TenantConfigurationTests.cs
@@ -8,6 +8,7 @@
 using NBB.MultiTenancy.Abstractions.Configuration;
 using NBB.MultiTenancy.Abstractions.Context;
 using NBB.MultiTenancy.Abstractions.Options;
+using NBB.MultiTenancy.Abstractions.Repositories;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -18,8 +19,6 @@ namespace NBB.MultiTenancy.Configuration.Tests
 {
     public class TenantConfigurationTests
     {
-
-
         [Fact]
         public void load_value_from_config()
         {
@@ -375,7 +374,7 @@ public void load_connectionString_with_concatenated_defaults()
                       ""MultiTenancy"": {
                         ""Defaults"": {
                           ""ConnectionStrings"": {
-                            ""Leasing_Database"": ""Server=server0;Database=lsngdbqa;User Id=web;Password=pas;MultipleActiveResultSets=true""
+                            ""Leasing_Database"": ""Server=server0;Database=db2;User Id=web;Password=pas;MultipleActiveResultSets=true""
                           }
                         },
                         ""Tenants"": [
@@ -443,7 +442,7 @@ public void load_connectionString_concatenated_with_splitted_defaults()
                           {
                             ""TenantId"": ""68a448a2-e7d8-4875-8127-f18668217eb6"",
                             ""ConnectionStrings"": {
-                              ""Leasing_Database"": ""Server=server0;Database=lsngdbqa;User Id=web;Password=B1llpwd!;MultipleActiveResultSets=true""
+                              ""Leasing_Database"": ""Server=server0;Database=db;User Id=a;Password=a;MultipleActiveResultSets=true""
                             }
                           },
                           {
@@ -475,8 +474,10 @@ public void load_connectionString_concatenated_with_splitted_defaults()
 
             // Assert
             tenantConfig.GetConnectionString("ConnectionString_").Should().BeNull();
-            tenantConfig.GetConnectionString("Leasing_Database").Should().Be("Server=server0;Database=lsngdbqa;User Id=web;Password=B1llpwd!;MultipleActiveResultSets=true");
+            tenantConfig.GetConnectionString("Leasing_Database").Should().Be("Server=server0;Database=db;User Id=a;Password=a;MultipleActiveResultSets=true");
             tenantConfig.GetValue<string>("TenantId").Should().Be("68a448a2-e7d8-4875-8127-f18668217eb6");
         }
+
+
     }
 }
diff --git a/test/UnitTests/MultiTenancy/NBB.MultiTenancy.Configuration.Tests/TenantRepositoryTests.cs b/test/UnitTests/MultiTenancy/NBB.MultiTenancy.Configuration.Tests/TenantRepositoryTests.cs
@@ -0,0 +1,89 @@
+// Copyright (c) TotalSoft.
+// This source code is licensed under the MIT license.
+
+using FluentAssertions;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Options;
+using NBB.MultiTenancy.Abstractions;
+using NBB.MultiTenancy.Abstractions.Configuration;
+using NBB.MultiTenancy.Abstractions.Context;
+using NBB.MultiTenancy.Abstractions.Options;
+using NBB.MultiTenancy.Abstractions.Repositories;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using Xunit;
+
+
+namespace NBB.MultiTenancy.Configuration.Tests
+{
+    public class TenantRepositoryTests
+    {
+        [Fact]
+        public void get_all_tenants_should_work()
+        {
+            // Arrange
+            var myConfiguration = @"{
+                      ""MultiTenancy"": {
+                        ""Defaults"": {
+                          ""ConnectionStrings"": {
+                              ""Leasing_Database"": {
+                                ""Server"": ""server1"",
+                                ""Database"": ""db1"",
+                                ""UserName"": ""web"",
+                                ""OtherParams"": ""MultipleActiveResultSets=true""
+                              }
+                          }
+                        },
+                        ""Tenants"": [
+                          {
+                            ""TenantId"": ""68a448a2-e7d8-4875-8127-f18668217eb6"",
+                            ""ConnectionStrings"": {
+                              ""Leasing_Database"": ""Server=server0;Database=lsngdbqa;User Id=web;Password=;MultipleActiveResultSets=true""
+                            }
+                          },
+                          {
+                            ""TenantId"": ""ef8d5362-9969-4e02-8794-0d1af56816f6"",
+                            ""Code"": ""BCR""
+                          },
+                          {
+                            ""TenantId"": ""da84628a-2925-4b69-9116-a90dd5a72b1f"",
+                            ""Code"": ""DEV""
+                          }
+                        ]
+                      }
+                    }";
+
+            var configuration = new ConfigurationBuilder()
+                .AddInMemoryCollection()
+                .AddJsonStream(new MemoryStream(Encoding.UTF8.GetBytes(myConfiguration)))
+                .Build();
+
+            var tenancyHostingOptions = new TenancyHostingOptions()
+            {
+                TenancyType = TenancyType.MultiTenant
+            };
+
+            var options = new OptionsWrapper<TenancyHostingOptions>(tenancyHostingOptions);
+
+            var repo = new ConfigurationTenantRepository(configuration, options);
+
+            //arrange
+            var all = repo.GetAll().GetAwaiter().GetResult();
+
+            // Assert
+            all.Should().NotBeNull();
+            all.Should().NotBeEmpty();
+            all.Count.Should().Be(3);
+
+            //all[0].TenantId.Should().Be(Guid.Parse("ef8d5362-9969-4e02-8794-0d1af56816f6"));
+            //all[1].TenantId.Should().Be(Guid.Parse("68a448a2-e7d8-4875-8127-f18668217eb6"));
+            //all[2].TenantId.Should().Be(Guid.Parse("da84628a-2925-4b69-9116-a90dd5a72b1f"));
+
+            //all[0].Code.Should().Be("BCR");
+            //all[1].Code.Should().BeNull();
+            //all[2].Code.Should().Be("DEV");
+        }
+    }
+}
diff --git a/...ltiTenancy/NBB.MultiTenancy.Identification.Tests/Identifiers/HostTenantIdentifierTests.cs b/...ltiTenancy/NBB.MultiTenancy.Identification.Tests/Identifiers/HostTenantIdentifierTests.cs
@@ -15,11 +15,11 @@ namespace NBB.MultiTenancy.Identification.Tests.Identifiers
 {
     public class HostTenantIdentifierTests
     {
-        private readonly Mock<ITenantRepository> _hostTenantRepository;
+        private readonly Mock<ITenantRepository> _tenantRepository;
 
         public HostTenantIdentifierTests()
         {
-            _hostTenantRepository = new Mock<ITenantRepository>();
+            _tenantRepository = new Mock<ITenantRepository>();
         }
 
         [Fact]
@@ -28,8 +28,8 @@ public void Should_Return_TenantId()
             // Arrange
             var tenantId = Guid.NewGuid();
             var tenant = new Tenant(tenantId, string.Empty);
-            _hostTenantRepository.Setup(r => r.GetByHost(It.IsAny<string>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(tenant));
-            var sut = new HostTenantIdentifier(_hostTenantRepository.Object);
+            _tenantRepository.Setup(r => r.GetByHost(It.IsAny<string>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(tenant));
+            var sut = new HostTenantIdentifier(_tenantRepository.Object);
 
             // Act
             var result = sut.GetTenantIdAsync(string.Empty).Result;
@@ -43,14 +43,14 @@ public void Should_Pass_Token_To_Repository()
         {
             // Arrange
             const string tenantToken = "tenant token";
-            _hostTenantRepository.Setup(r => r.GetByHost(It.IsAny<string>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(new Tenant(Guid.Empty, string.Empty)));
-            var sut = new HostTenantIdentifier(_hostTenantRepository.Object);
+            _tenantRepository.Setup(r => r.GetByHost(It.IsAny<string>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(new Tenant(Guid.Empty, string.Empty)));
+            var sut = new HostTenantIdentifier(_tenantRepository.Object);
 
             // Act
             var _ = sut.GetTenantIdAsync(tenantToken).Result;
 
             // Assert
-            _hostTenantRepository.Verify(r => r.GetByHost(It.Is<string>(s => string.Equals(s, tenantToken)), It.IsAny<CancellationToken>()), Times.Once());
+            _tenantRepository.Verify(r => r.GetByHost(It.Is<string>(s => string.Equals(s, tenantToken)), It.IsAny<CancellationToken>()), Times.Once());
         }
     }
 }