Merge pull request 'Refactored connection string name' (#41) from midrandshop into master

Reviewed-on: #41

.drone.yml

@@ -21,6 +21,8 @@ steps:
       - dotnet nuget push dist/LiteCharms.Features.$VERSION.nupkg --api-key $NEXUS_KEY --source $NEXUS_URL
       - dotnet pack LiteCharms.Features.TechShop/LiteCharms.Features.TechShop.csproj -c Release -p:PackageVersion=$VERSION -o dist/
       - dotnet nuget push dist/LiteCharms.Features.TechShop.$VERSION.nupkg --api-key $NEXUS_KEY --source $NEXUS_URL
+      - dotnet pack LiteCharms.Features.MidrandBooks/LiteCharms.Features.MidrandBooks.csproj -c Release -p:PackageVersion=$VERSION -o dist/
+      - dotnet nuget push dist/LiteCharms.Features.MidrandBooks.$VERSION.nupkg --api-key $NEXUS_KEY --source $NEXUS_URL
 
   - name: gitea-tag-release
     image: alpine/git
@@ -43,7 +45,7 @@ steps:
                \"tag_name\": \"$VERSION\",
                \"target_commitish\": \"${DRONE_COMMIT_SHA}\",
                \"name\": \"Library Suite $VERSION\",
-               \"body\": \"### Published NuGet Packages\nAll packages versioned as **$VERSION**:\n* LiteCharms.Features\n* LiteCharms.Features.TechShop\n\n[View in Nexus](https://nexus.khongisa.co.za/repository/nuget-group/)\",
+               \"body\": \"### Published NuGet Packages\nAll packages versioned as **$VERSION**:\n* LiteCharms.Features\n* LiteCharms.Features.TechShop\n* LiteCharms.Features.MidrandBooks\n\n[View in Nexus](https://nexus.khongisa.co.za/repository/nuget-group/)\",
                \"draft\": false,
                \"prerelease\": false
              }"

LiteCharms.Features.MidrandBooks.Tests/Fixture.cs

@@ -0,0 +1,38 @@
+using LiteCharms.Features.Extensions;
+using LiteCharms.Features.MidrandBooks.Extensions;
+
+namespace LiteCharms.Features.MidrandBooks.Tests;
+
+public class Fixture : IDisposable
+{
+    public IConfiguration Configuration { get; set; }
+
+    public IServiceProvider Services { get; set; }
+
+    public IMediator Mediator { get; set; }
+
+    public Fixture()
+    {
+        Configuration = new ConfigurationBuilder()
+            .SetBasePath(Directory.GetCurrentDirectory())
+            .AddUserSecrets<Fixture>()
+            .AddJsonFile(Path.Combine(Directory.GetCurrentDirectory(), "appsettings.json"), optional: true, reloadOnChange: true)
+            .AddEnvironmentVariables()
+            .Build();
+
+        Services = new ServiceCollection()            
+            .AddMediator()
+            .AddLogging()
+            //.AddMidrandShopServices()
+            .AddEmailServiceBus()
+            .AddGarageS3(Configuration)
+            .AddMidrandShopDatabase(Configuration)
+            .AddEmailServices(Configuration)
+            .AddSingleton(Configuration)
+            .BuildServiceProvider();
+
+        Mediator = Services.GetRequiredService<IMediator>();
+    }
+
+    public void Dispose() { }
+}

LiteCharms.Features.MidrandBooks.Tests/LiteCharms.Features.MidrandBooks.Tests.csproj

@@ -0,0 +1,51 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net10.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <IsPackable>false</IsPackable>
+    <UserSecretsId>b205af96-ceef-44e1-851c-458c9fd1c437</UserSecretsId>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="coverlet.collector" Version="10.0.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Mediator.SourceGenerator" Version="3.0.2">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.5.1" />
+    <PackageReference Include="xunit" Version="2.9.3" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <!-- Global Usings -->
+  <ItemGroup>
+    <Using Include="Mediator" />
+    <Using Include="Xunit.Abstractions" />
+    <Using Include="Microsoft.Extensions.DependencyInjection" />
+    <Using Include="Microsoft.Extensions.Configuration" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\LiteCharms.Features.MidrandBooks\LiteCharms.Features.MidrandBooks.csproj" />
+    <ProjectReference Include="..\LiteCharms.Features\LiteCharms.Features.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Using Include="Xunit" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="appsettings.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
+</Project>

LiteCharms.Features.MidrandBooks.Tests/appsettings.json

@@ -0,0 +1,34 @@
+{
+  "BookshopS3Settings": {
+    "ServiceUrl": "http://192.168.1.177:30900",
+    "Region": "garage",
+    "BucketName": "bookshop",
+    "CdnBaseUrl": "https://bookshop.cdn.khongisa.co.za"
+  },
+  "BookshopQuotesS3Settings": {
+    "ServiceUrl": "http://192.168.1.177:30900",
+    "Region": "garage",
+    "BucketName": "bookshop.quotes",
+    "CdnBaseUrl": "https://bookshop.quotes.cdn.khongisa.co.za"
+  },
+  "Email": {
+    "Credentials": {
+      "Username": "shop@litecharms.co.za"
+    },
+    "Port": 465,
+    "Host": "mail.litecharms.co.za",
+    "UseSsl": true
+  },
+  "Monitoring": {
+    "ApiKey": "",
+    "Address": "http://aspire-dashboard-service.aspire.svc.cluster.local:18889",
+    "ServiceName": "LiteCharms.LeadGenerator"
+  },
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  },
+  "AllowedHosts": "*"
+}

LiteCharms.Features.MidrandBooks/Extensions/HealthChecks.cs

@@ -1,13 +1,14 @@
-using LiteCharms.Features.HealthChecks;
+using LiteCharms.Features.MidrandBooks.HealthChecks;
 using static LiteCharms.Features.Extensions.Postgres;
+using static LiteCharms.Features.MidrandBooks.Extensions.Postgres;
 
-namespace LiteCharms.Features.Extensions;
+namespace LiteCharms.Features.MidrandBooks.Extensions;
 
 public static class HealthChecks
 {
     public static IServiceCollection AddMidrandShopQuartzHealthCheck(this IServiceCollection services)
     {
-        services.AddHealthChecks().AddCheck<MidrandShopQuartzHealthCheck>("MidrandShopQuartz");
+        services.AddHealthChecks().AddCheck<MidrandShopQuartzHealthCheck>(SchedulerDbConfigName);
 
         return services;
     }
@@ -24,12 +25,6 @@ public static class HealthChecks
         services.AddHealthChecks()
             .AddCheck("Self", () => HealthCheckResult.Healthy());
 
-        //services.AddHealthChecksUI(setup =>
-        //{
-        //    setup.AddHealthCheckEndpoint("Lead Generator", $"{configuration["ASPNETCORE_URLS"]}/health");
-        //    setup.SetEvaluationTimeInSeconds(15);
-        //}).AddInMemoryStorage(databaseName: "healthuidb");
-
         return services;
     }
 }

LiteCharms.Features.MidrandBooks/Extensions/Postgres.cs

@@ -0,0 +1,16 @@
+using LiteCharms.Features.MidrandBooks.Postgres;
+
+namespace LiteCharms.Features.MidrandBooks.Extensions;
+
+public static class Postgres
+{
+    public const string MidrandShopDbConfigName = "PostgresMidrandBooks";
+
+    public static IServiceCollection AddMidrandShopDatabase(this IServiceCollection services, IConfiguration configuration)
+    {
+        services.AddPooledDbContextFactory<MidrandShopDbContext>(options =>
+            options.UseNpgsql(configuration.GetConnectionString(MidrandShopDbConfigName)));
+
+        return services;
+    }
+}

LiteCharms.Features.MidrandBooks/HealthChecks/MidrandShopQuartzHealthCheck.cs

@@ -1,6 +1,6 @@
 using static LiteCharms.Features.Extensions.Quartz;
 
-namespace LiteCharms.Features.HealthChecks;
+namespace LiteCharms.Features.MidrandBooks.HealthChecks;
 
 public class MidrandShopQuartzHealthCheck(ISchedulerFactory schedulerFactory) : IHealthCheck
 {

LiteCharms.Features.MidrandBooks/HealthChecks/PostgresMidrandShopHealthCheck.cs

@@ -1,6 +1,6 @@
-using static LiteCharms.Features.Extensions.Postgres;
+using static LiteCharms.Features.MidrandBooks.Extensions.Postgres;
 
-namespace LiteCharms.Features.HealthChecks;
+namespace LiteCharms.Features.MidrandBooks.HealthChecks;
 
 public class PostgresMidrandShopHealthCheck(IConfiguration configuration) : IHealthCheck
 {

LiteCharms.Features.MidrandBooks/LiteCharms.Features.MidrandBooks.csproj

@@ -0,0 +1,166 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net10.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <SignAssembly>True</SignAssembly>
+    <AssemblyOriginatorKeyFile>..\LiteCharms.snk</AssemblyOriginatorKeyFile>
+    <UserSecretsId>5be62f49-3ed0-4468-884e-1b04e048b45a</UserSecretsId>
+  </PropertyGroup>
+
+  <!-- Nuget Package Details -->
+  <PropertyGroup>
+    <PackageId>LiteCharms.Features.MidrandBooks</PackageId>
+    <Version>1.0.20</Version>
+    <Authors>Khwezi Mngoma</Authors>
+    <Company>Lite Charms (PTY) Ltd</Company>
+    <Description>MidrandBooks feature components for Lite Charms applications.</Description>
+    <PackageProjectUrl>https://gitea.khongisa.co.za/litecharms/components</PackageProjectUrl>
+    <RepositoryUrl>https://gitea.khongisa.co.za/litecharms/components.git</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
+    <PackageLicenseFile>LICENSE</PackageLicenseFile>
+    <PackageTags>utility;dotnet</PackageTags>
+    <PackageIcon>icon.png</PackageIcon>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Include="..\LICENSE" Pack="true" PackagePath="\" />
+    <None Include="..\icon.png" Pack="true" PackagePath="\" />
+  </ItemGroup>
+
+  <!-- Quartz Scheduler-->
+  <ItemGroup>
+    <PackageReference Include="OpenTelemetry" Version="1.15.3" />
+    <PackageReference Include="Quartz" Version="3.18.1" />
+    <PackageReference Include="Quartz.Plugins" Version="3.18.1" />
+    <PackageReference Include="Quartz.Plugins.TimeZoneConverter" Version="3.18.1" />
+    <PackageReference Include="Quartz.Serialization.SystemTextJson" Version="3.18.1" />
+    <PackageReference Include="Quartz.AspNetCore" Version="3.18.1" />
+    <PackageReference Include="Quartz.Extensions.DependencyInjection" Version="3.18.1" />
+
+    <!-- Global Usings -->
+    <Using Include="Quartz" />
+  </ItemGroup>
+
+  <!-- Configuration -->
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.8" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.8" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.8" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.8" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.8" />
+
+    <!-- Global Usings -->
+    <Using Include="Microsoft.Extensions.Configuration" />
+  </ItemGroup>
+
+  <!-- Health Checks -->
+  <ItemGroup>
+    <PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="9.0.0" />
+    <PackageReference Include="AspNetCore.HealthChecks.UI" Version="9.0.0" />
+    <PackageReference Include="AspNetCore.HealthChecks.UI.Core" Version="9.0.0" />
+    <PackageReference Include="AspNetCore.HealthChecks.UI.Data" Version="9.0.0" />
+    <PackageReference Include="AspNetCore.HealthChecks.UI.InMemory.Storage" Version="9.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.8" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.8" />
+    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="10.0.8" />
+
+    <!-- Global Usings -->
+    <Using Include="Microsoft.Extensions.Diagnostics.HealthChecks" />
+    <Using Include="Microsoft.AspNetCore.Diagnostics.HealthChecks" />
+  </ItemGroup>
+
+  <!-- Open Telemetry -->
+  <ItemGroup>
+    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.15.3" />
+    <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.15.3" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.15.2" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.15.1" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.15.1" />
+    <PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.15.3" />
+
+    <!-- Global Usings -->
+    <Using Include="OpenTelemetry.Resources" />
+    <Using Include="OpenTelemetry.Exporter" />
+    <Using Include="OpenTelemetry.Logs" />
+    <Using Include="OpenTelemetry.Metrics" />
+    <Using Include="OpenTelemetry.Trace" />
+  </ItemGroup>
+
+  <!-- Database -->
+  <ItemGroup>
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.8" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.8">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.8" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.8">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.1" />
+
+    <!-- Global Usings -->
+    <Using Include="Npgsql" />
+    <Using Include="Microsoft.EntityFrameworkCore" />
+    <Using Include="Microsoft.EntityFrameworkCore.Design" />
+    <Using Include="Microsoft.EntityFrameworkCore.Metadata.Builders" />
+  </ItemGroup>
+
+  <!-- Email -->
+  <ItemGroup>
+    <PackageReference Include="MailKit" Version="4.16.0" />
+    <PackageReference Include="MimeKit" Version="4.16.0" />
+
+    <!-- Global Usings-->
+    <Using Include="MimeKit" />
+    <Using Include="MailKit.Net.Smtp" />
+  </ItemGroup>
+
+  <!-- CQRS -->
+  <ItemGroup>
+    <PackageReference Include="FluentResults" Version="4.0.0" />
+    <PackageReference Include="Mediator.Abstractions" Version="3.0.2" />
+
+    <!-- Global Usings -->
+    <Using Include="FluentResults" />
+    <Using Include="Mediator" />
+  </ItemGroup>
+
+  <!-- Amazon S3 SDK -->
+  <ItemGroup>
+    <PackageReference Include="AWSSDK.Extensions.NetCore.Setup" Version="4.0.4.1" />
+    <PackageReference Include="AWSSDK.S3" Version="4.0.23.4" />
+    <ProjectReference Include="..\LiteCharms.Features\LiteCharms.Features.csproj" />
+
+    <!-- global Usings -->
+    <Using Include="Amazon.S3" />
+    <Using Include="Amazon.S3.Model" />
+    <Using Include="Amazon.Runtime" />
+  </ItemGroup>
+
+  <!-- Shared Usings -->
+  <ItemGroup>
+    <Using Include="Microsoft.AspNetCore.Builder" />
+    <Using Include="Microsoft.Extensions.Hosting" />
+    <Using Include="System.Text" />
+    <Using Include="System.Text.Json" />
+    <Using Include="System.Threading.Channels" />
+    <Using Include="System.Collections.ObjectModel" />
+    <Using Include="System.Diagnostics" />
+    <Using Include="System.Diagnostics.Metrics" />
+    <Using Include="Microsoft.Extensions.DependencyInjection" />
+    <Using Include="System.Security.Cryptography" />
+    <Using Include="Microsoft.Extensions.Options" />
+    <Using Include="Microsoft.Extensions.Logging" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="appsettings.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
+</Project>

LiteCharms.Features.MidrandBooks/Postgres/MidrandShopDbContext.cs

@@ -1,4 +1,4 @@
-namespace LiteCharms.Features.MidrandShop.Postgres;
+namespace LiteCharms.Features.MidrandBooks.Postgres;
 
 public class MidrandShopDbContext(DbContextOptions<MidrandShopDbContext> options) : DbContext(options)
 {

LiteCharms.Features.MidrandBooks/Postgres/MidrandShopDbContextFactory.cs

@@ -1,6 +1,6 @@
-using static LiteCharms.Features.Extensions.Postgres;
+using static LiteCharms.Features.MidrandBooks.Extensions.Postgres;
 
-namespace LiteCharms.Features.MidrandShop.Postgres;
+namespace LiteCharms.Features.MidrandBooks.Postgres;
 
 public class MidrandShopDbContextFactory : IDesignTimeDbContextFactory<MidrandShopDbContext>
 {

LiteCharms.Features.MidrandBooks/appsettings.json

@@ -10,7 +10,7 @@
   "Monitoring": {
     "ApiKey": "",
     "Address": "http://aspire-dashboard-service.aspire.svc.cluster.local:18889",
-    "ServiceName": "LiteCharms.LeadGenerator"
+    "ServiceName": "MidrandBooks"
   },
   "Logging": {
     "LogLevel": {

LiteCharms.Features.TechShop.Tests/LiteCharms.Features.TechShop.Tests.csproj

@@ -48,10 +48,4 @@
     </None>
   </ItemGroup>
 
-  <ItemGroup>
-    <None Update="appsettings.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
 </Project>

LiteCharms.Features.TechShop/Extensions/HealthChecks.cs

@@ -15,7 +15,7 @@ public static class HealthChecks
     
     public static IServiceCollection AddShopPostgresHealthCheck(this IServiceCollection services)
     {
-        services.AddHealthChecks().AddCheck<PostgresShopHealthCheck>(ShopDbConfigName);
+        services.AddHealthChecks().AddCheck<PostgresShopHealthCheck>(TechShopDbConfigName);
 
         return services;
     }    

LiteCharms.Features.TechShop/Extensions/Postgres.cs

@@ -4,12 +4,12 @@ namespace LiteCharms.Features.TechShop.Extensions;
 
 public static class Postgres
 {
-    public const string ShopDbConfigName = "PostgresShop";
+    public const string TechShopDbConfigName = "PostgresShop";
 
     public static IServiceCollection AddTechShopDatabase(this IServiceCollection services, IConfiguration configuration)
     {
         services.AddPooledDbContextFactory<ShopDbContext>(options =>
-            options.UseNpgsql(configuration.GetConnectionString(ShopDbConfigName)));
+            options.UseNpgsql(configuration.GetConnectionString(TechShopDbConfigName)));
 
         return services;
     }

LiteCharms.Features.TechShop/HealthChecks/PostgresShopHealthCheck.cs

@@ -4,7 +4,7 @@ namespace LiteCharms.Features.TechShop.HealthChecks;
 
 public class PostgresShopHealthCheck(IConfiguration configuration) : IHealthCheck
 {
-    private readonly string connectionString = configuration.GetConnectionString(ShopDbConfigName)!;
+    private readonly string connectionString = configuration.GetConnectionString(TechShopDbConfigName)!;
 
     public async Task<HealthCheckResult> CheckHealthAsync(HealthCheckContext context, CancellationToken cancellationToken = default)
     {
@@ -18,11 +18,11 @@ public class PostgresShopHealthCheck(IConfiguration configuration) : IHealthChec
 
             await command.ExecuteScalarAsync(cancellationToken);
 
-            return HealthCheckResult.Healthy($"{ShopDbConfigName} is responsive.");
+            return HealthCheckResult.Healthy($"{TechShopDbConfigName} is responsive.");
         }
         catch (Exception ex)
         {
-            return HealthCheckResult.Unhealthy($"{ShopDbConfigName} is unreachable.", ex);
+            return HealthCheckResult.Unhealthy($"{TechShopDbConfigName} is unreachable.", ex);
         }
     }
 }

LiteCharms.Features.TechShop/HealthChecks/ShopQuartzHealthCheck.cs

@@ -8,21 +8,21 @@ public class ShopQuartzHealthCheck(ISchedulerFactory schedulerFactory) : IHealth
     {
         try
         {
-            var scheduler = await schedulerFactory.GetScheduler(ShopSchedulerName, cancellationToken);
+            var scheduler = await schedulerFactory.GetScheduler(TechShopSchedulerName, cancellationToken);
 
             if(scheduler == null) 
-                return HealthCheckResult.Unhealthy($"Scheduler with name '{ShopSchedulerName}' not found.");
+                return HealthCheckResult.Unhealthy($"Scheduler with name '{TechShopSchedulerName}' not found.");
 
             if (!scheduler.IsStarted)
-                return HealthCheckResult.Unhealthy($"{ShopSchedulerName} Quartz scheduler is not running");
+                return HealthCheckResult.Unhealthy($"{TechShopSchedulerName} Quartz scheduler is not running");
 
             await scheduler.CheckExists(new JobKey(Guid.NewGuid().ToString()), cancellationToken);
 
-            return HealthCheckResult.Healthy($"{ShopSchedulerName} Quartz scheduler is ready");
+            return HealthCheckResult.Healthy($"{TechShopSchedulerName} Quartz scheduler is ready");
         }
         catch (SchedulerException)
         {
-            return HealthCheckResult.Unhealthy($"{ShopSchedulerName} Quartz scheduler cannot connect to the store");
+            return HealthCheckResult.Unhealthy($"{TechShopSchedulerName} Quartz scheduler cannot connect to the store");
         }
     }
 }

LiteCharms.Features.TechShop/Postgres/ShopDbContextFactory.cs

@@ -14,7 +14,7 @@ public class ShopDbContextFactory : IDesignTimeDbContextFactory<ShopDbContext>
             .Build();
 
         var optionsBuilder = new DbContextOptionsBuilder<ShopDbContext>();
-        optionsBuilder.UseNpgsql(configuration.GetConnectionString(ShopDbConfigName));
+        optionsBuilder.UseNpgsql(configuration.GetConnectionString(TechShopDbConfigName));
 
         return new ShopDbContext(optionsBuilder.Options);
     }

LiteCharms.Features/Extensions/Postgres.cs

@@ -1,17 +1,6 @@
-using LiteCharms.Features.MidrandShop.Postgres;
+namespace LiteCharms.Features.Extensions;
-
-namespace LiteCharms.Features.Extensions;
 
 public static class Postgres
 {
-    public const string MidrandShopDbConfigName = "PostgresMidrandShop";
     public const string SchedulerDbConfigName = "PostgresScheduler";    
-
-    public static IServiceCollection AddMidrandShopDatabase(this IServiceCollection services, IConfiguration configuration)
-    {
-        services.AddPooledDbContextFactory<MidrandShopDbContext>(options =>
-            options.UseNpgsql(configuration.GetConnectionString(MidrandShopDbConfigName)));
-
-        return services;
-    }
 }

LiteCharms.Features/Extensions/Quartz.cs

@@ -6,8 +6,8 @@ namespace LiteCharms.Features.Extensions;
 
 public static class Quartz
 {
-    public const string ShopSchedulerName = "shop";
+    public const string TechShopSchedulerName = "tech-shop";
-    public const string MidrandShopSchedulerName = "midrandshop";
+    public const string MidrandShopSchedulerName = "midrand-shop";
 
     public static IServiceCollection AddQuartzSchedulerClient(this IServiceCollection services, string schedulerName, IConfiguration configuration)
     {

LiteCharms.Features/LiteCharms.Features.csproj

@@ -155,10 +155,5 @@
     <Using Include="Microsoft.Extensions.Options" />
     <Using Include="Microsoft.Extensions.Logging" />
   </ItemGroup>
-  <ItemGroup>
-    <None Update="appsettings.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
 
 </Project>

LiteCharmsShared.slnx

@@ -2,8 +2,14 @@
   <Folder Name="/Solution Items/">
     <File Path=".drone.yml" />
   </Folder>
-  <Project Path="LiteCharms.Features.TechShop.Tests/LiteCharms.Features.TechShop.Tests.csproj" Id="0e0967c2-7f28-4668-a387-2fc437ab066f" />
+  <Folder Name="/src/">
-  <Project Path="LiteCharms.Features.TechShop/LiteCharms.Features.TechShop.csproj" Id="a66b623b-7424-42c4-b492-534f72fbf9dd" />
+    <Project Path="LiteCharms.Features.MidrandBooks/LiteCharms.Features.MidrandBooks.csproj" Id="a9c12f0b-5f50-4519-87bd-ec8823b0bc9a" />
-  <Project Path="LiteCharms.Features.Tests/LiteCharms.Features.Tests.csproj" Id="0696323f-7148-4ab9-9145-68b7b5df5415" />
+    <Project Path="LiteCharms.Features.TechShop/LiteCharms.Features.TechShop.csproj" Id="a66b623b-7424-42c4-b492-534f72fbf9dd" />
-  <Project Path="LiteCharms.Features/LiteCharms.Features.csproj" />
+    <Project Path="LiteCharms.Features/LiteCharms.Features.csproj" />
+  </Folder>
+  <Folder Name="/tests/">
+    <Project Path="LiteCharms.Features.MidrandBooks.Tests/LiteCharms.Features.MidrandBooks.Tests.csproj" Id="cac2f738-dbb5-4538-8565-3c2bd6f65259" />
+    <Project Path="LiteCharms.Features.TechShop.Tests/LiteCharms.Features.TechShop.Tests.csproj" Id="0e0967c2-7f28-4668-a387-2fc437ab066f" />
+    <Project Path="LiteCharms.Features.Tests/LiteCharms.Features.Tests.csproj" Id="0696323f-7148-4ab9-9145-68b7b5df5415" />
+  </Folder>
 </Solution>