minor fixes

suxrobGM · Jan 18, 2024 · 8609ae1 · 8609ae1
1 parent 5855f1f
commit 8609ae1
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 11 deletions.
diff --git a/src/Core/Logistics.Infrastructure.EF/Data/TenantDbContext.cs b/src/Core/Logistics.Infrastructure.EF/Data/TenantDbContext.cs
@@ -13,12 +13,12 @@ public class TenantDbContext : DbContext
     private readonly string _connectionString;
 
     public TenantDbContext(
-        TenantDbContextOptions tenantDbContextOptions, 
-        ITenantService? tenantService,
-        DispatchDomainEventsInterceptor? dispatchDomainEventsInterceptor)
+        TenantDbContextOptions? tenantDbContextOptions = null, 
+        ITenantService? tenantService = null,
+        DispatchDomainEventsInterceptor? dispatchDomainEventsInterceptor = null)
     {
         _dispatchDomainEventsInterceptor = dispatchDomainEventsInterceptor;
-        _connectionString = tenantDbContextOptions.ConnectionString ?? ConnectionStrings.LocalDefaultTenant;
+        _connectionString = tenantDbContextOptions?.ConnectionString ?? ConnectionStrings.LocalDefaultTenant;
         TenantService = tenantService;
     }
 

diff --git a/src/Core/Logistics.Infrastructure.EF/Data/TenantDbContextFactory.cs b/src/Core/Logistics.Infrastructure.EF/Data/TenantDbContextFactory.cs
@@ -7,6 +7,6 @@ public class TenantDbContextFactory : IDesignTimeDbContextFactory<TenantDbContex
 {
     public TenantDbContext CreateDbContext(string[] args)
     {
-        return new TenantDbContext(new TenantDbContextOptions(), null, null);
+        return new TenantDbContext();
     }
 }
diff --git a/src/Core/Logistics.Infrastructure.EF/Registrar.cs b/src/Core/Logistics.Infrastructure.EF/Registrar.cs
@@ -67,7 +67,7 @@ public static class Registrar
             services.AddSingleton(tenantsSettings);
         }
 
-        if (string.IsNullOrEmpty(connectionString))
+        if (!string.IsNullOrEmpty(connectionString))
         {
             var options = new TenantDbContextOptions
             {

diff --git a/src/Core/Logistics.Infrastructure.EF/Services/TenantService.cs b/src/Core/Logistics.Infrastructure.EF/Services/TenantService.cs
@@ -9,14 +9,14 @@ namespace Logistics.Infrastructure.EF.Services;
 
 internal class TenantService : ITenantService
 {
-    private readonly TenantDbContextOptions _dbContextOptions;
+    private readonly TenantDbContextOptions? _dbContextOptions;
     private readonly MasterDbContext _masterDbContext;
     private readonly HttpContext? _httpContext;
     private Tenant? _currentTenant;
 
     public TenantService(
-        TenantDbContextOptions dbContextContextOptions,
         MasterDbContext masterDbContext, 
+        TenantDbContextOptions? dbContextContextOptions = null,
         IHttpContextAccessor? contextAccessor = null)
     {
         _dbContextOptions = dbContextContextOptions;
@@ -36,7 +36,7 @@ public Tenant GetTenant()
             var defaultTenant = new Tenant
             {
                 Name = "default",
-                ConnectionString = _dbContextOptions.ConnectionString,
+                ConnectionString = _dbContextOptions?.ConnectionString ?? ConnectionStrings.LocalDefaultTenant,
             };
 
             _currentTenant = defaultTenant;

diff --git a/src/Server/Logistics.API/appsettings.json b/src/Server/Logistics.API/appsettings.json
@@ -31,7 +31,8 @@
     ]
   },
   "ConnectionStrings": {
-    "MasterDatabase": "Server=.\\SQLEXPRESS; Database=master_logistics; Uid=LogisticsUser; Pwd=Test12345; TrustServerCertificate=true"
+    "MasterDatabase": "Server=.\\SQLEXPRESS; Database=master_logistics; Uid=LogisticsUser; Pwd=Test12345; TrustServerCertificate=true",
+    "DefaultTenantDatabase": "Server=.\\SQLEXPRESS; Database=default_logistics; Uid=LogisticsUser; Pwd=Test12345#;"
   },
   "IdentityServer": {
     "Authority": "https://localhost:7001",

diff --git a/src/Shared/Logistics.Shared.Core/PagedQuery.cs b/src/Shared/Logistics.Shared.Core/PagedQuery.cs
@@ -7,7 +7,7 @@ public class PagedQuery
         int page = 1,
         int pageSize = 10)
     {
-        OrderBy = orderBy ?? string.Empty;
+        OrderBy = orderBy;
         Page = page;
         PageSize = pageSize;
     }