Refactoring Web -> Bot project (#24)

danilbrenner · Dec 4, 2024 · 9515d65 · 9515d65
1 parent 6a6618b
commit 9515d65
Show file tree

Hide file tree

Showing 19 changed files with 23 additions and 27 deletions.
diff --git a/Bw.VaultDigest.sln b/Bw.VaultDigest.sln
@@ -4,7 +4,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A7F1BBFA-321
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{FBEA0FE3-3679-47B8-BAC0-F8EB6C89C207}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bw.VaultDigest.Web", "src\Bw.VaultDigest.Web\Bw.VaultDigest.Web.csproj", "{50807D46-15B1-43A4-827D-65F0582739B5}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bw.VaultDigest.Bot", "src\Bw.VaultDigest.Bot\Bw.VaultDigest.Bot.csproj", "{50807D46-15B1-43A4-827D-65F0582739B5}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bw.VaultDigest.UnitTests", "tests\Bw.VaultDigest.UnitTests\Bw.VaultDigest.UnitTests.csproj", "{7A62018F-0504-43A3-B24E-4C8188E1A3A4}"
 EndProject

diff --git a/...igest.Web/ApplicationBuilderExtensions.cs → ...igest.Bot/ApplicationBuilderExtensions.cs b/...igest.Web/ApplicationBuilderExtensions.cs → ...igest.Bot/ApplicationBuilderExtensions.cs
@@ -1,4 +1,4 @@
-namespace Bw.VaultDigest.Web;
+namespace Bw.VaultDigest.Bot;
 
 public static class ApplicationBuilderExtensions
 {

diff --git a/...VaultDigest.Web/Bw.VaultDigest.Web.csproj → ...VaultDigest.Bot/Bw.VaultDigest.Bot.csproj b/...VaultDigest.Web/Bw.VaultDigest.Web.csproj → ...VaultDigest.Bot/Bw.VaultDigest.Bot.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Worker">
 
     <PropertyGroup>
         <TargetFramework>net8.0</TargetFramework>

diff --git a/...st.Web/Handlers/SendDigestEmailHandler.cs → ...st.Bot/Handlers/SendDigestEmailHandler.cs b/...st.Web/Handlers/SendDigestEmailHandler.cs → ...st.Bot/Handlers/SendDigestEmailHandler.cs
@@ -1,12 +1,12 @@
+using Bw.VaultDigest.Bot.Options;
+using Bw.VaultDigest.Bot.Requests;
 using Bw.VaultDigest.Data.Abstractions;
 using Bw.VaultDigest.Infrastructure.Abstractions;
 using Bw.VaultDigest.Telemetry;
-using Bw.VaultDigest.Web.Options;
-using Bw.VaultDigest.Web.Requests;
 using MediatR;
 using Microsoft.Extensions.Options;
 
-namespace Bw.VaultDigest.Web.Handlers;
+namespace Bw.VaultDigest.Bot.Handlers;
 
 public class SendDigestEmailHandler(
     MetricsFactory metricsFactory,

diff --git a/...tDigest.Web/Handlers/SyncLoginsHandler.cs → ...tDigest.Bot/Handlers/SyncLoginsHandler.cs b/...tDigest.Web/Handlers/SyncLoginsHandler.cs → ...tDigest.Bot/Handlers/SyncLoginsHandler.cs
@@ -1,11 +1,11 @@
+using Bw.VaultDigest.Bot.Requests;
 using Bw.VaultDigest.Data.Abstractions;
 using Bw.VaultDigest.Infrastructure;
 using Bw.VaultDigest.Infrastructure.Abstractions;
 using Bw.VaultDigest.Telemetry;
-using Bw.VaultDigest.Web.Requests;
 using MediatR;
 
-namespace Bw.VaultDigest.Web.Handlers;
+namespace Bw.VaultDigest.Bot.Handlers;
 
 public class SyncLoginsHandler(
     ILogger<SyncLoginsHandler> logger,

diff --git a/...eb/HostedServices/ScheduledServiceBase.cs → ...ot/HostedServices/ScheduledServiceBase.cs b/...eb/HostedServices/ScheduledServiceBase.cs → ...ot/HostedServices/ScheduledServiceBase.cs
@@ -1,6 +1,6 @@
 using NCrontab;
 
-namespace Bw.VaultDigest.Web.HostedServices;
+namespace Bw.VaultDigest.Bot.HostedServices;
 
 public abstract class ScheduledServiceBase(CrontabSchedule cron, bool skipOnStartup, ILogger logger) : BackgroundService
 {

diff --git a/...t.Web/HostedServices/SendDigestService.cs → ...t.Bot/HostedServices/SendDigestService.cs b/...t.Web/HostedServices/SendDigestService.cs → ...t.Bot/HostedServices/SendDigestService.cs
@@ -1,10 +1,10 @@
-using Bw.VaultDigest.Web.Options;
-using Bw.VaultDigest.Web.Requests;
+using Bw.VaultDigest.Bot.Options;
+using Bw.VaultDigest.Bot.Requests;
 using MediatR;
 using Microsoft.Extensions.Options;
 using NCrontab;
 
-namespace Bw.VaultDigest.Web.HostedServices;
+namespace Bw.VaultDigest.Bot.HostedServices;
 
 public class SendDigestService(ILogger<SendDigestService> logger, IOptions<ScheduleOptions> options, IMediator mediator) 
     : ScheduledServiceBase(CrontabSchedule.Parse(options.Value.SendDigest), true, logger)

diff --git a/...tDigest.Web/HostedServices/SyncService.cs → ...tDigest.Bot/HostedServices/SyncService.cs b/...tDigest.Web/HostedServices/SyncService.cs → ...tDigest.Bot/HostedServices/SyncService.cs
@@ -1,10 +1,10 @@
-using Bw.VaultDigest.Web.Options;
-using Bw.VaultDigest.Web.Requests;
+using Bw.VaultDigest.Bot.Options;
+using Bw.VaultDigest.Bot.Requests;
 using MediatR;
 using Microsoft.Extensions.Options;
 using NCrontab;
 
-namespace Bw.VaultDigest.Web.HostedServices;
+namespace Bw.VaultDigest.Bot.HostedServices;
 
 public class SyncService(ILogger<SyncService> logger, IOptions<ScheduleOptions> options, IMediator mediator)
     : ScheduledServiceBase(CrontabSchedule.Parse(options.Value.SyncLogins), true, logger)

diff --git a/...Digest.Web/Options/EmailContentOptions.cs → ...Digest.Bot/Options/EmailContentOptions.cs b/...Digest.Web/Options/EmailContentOptions.cs → ...Digest.Bot/Options/EmailContentOptions.cs
@@ -1,4 +1,4 @@
-namespace Bw.VaultDigest.Web.Options;
+namespace Bw.VaultDigest.Bot.Options;
 
 public class EmailContentOptions
 {

diff --git a/...aultDigest.Web/Options/ScheduleOptions.cs → ...aultDigest.Bot/Options/ScheduleOptions.cs b/...aultDigest.Web/Options/ScheduleOptions.cs → ...aultDigest.Bot/Options/ScheduleOptions.cs
@@ -1,4 +1,4 @@
-namespace Bw.VaultDigest.Web.Options;
+namespace Bw.VaultDigest.Bot.Options;
 
 public class ScheduleOptions
 {

diff --git a/src/Bw.VaultDigest.Web/Program.cs → src/Bw.VaultDigest.Bot/Program.cs b/src/Bw.VaultDigest.Web/Program.cs → src/Bw.VaultDigest.Bot/Program.cs
@@ -1,9 +1,9 @@
 using Bw.VaultDigest.Data;
 using Bw.VaultDigest.Infrastructure;
-using Bw.VaultDigest.Web;
-using Bw.VaultDigest.Web.Options;
+using Bw.VaultDigest.Bot;
+using Bw.VaultDigest.Bot.Options;
 using Bw.VaultDigest.Telemetry;
-using Bw.VaultDigest.Web.HostedServices;
+using Bw.VaultDigest.Bot.HostedServices;
 using Serilog;
 
 Log.Logger = new LoggerConfiguration()

diff --git a/...Digest.Web/Properties/launchSettings.json → ...Digest.Bot/Properties/launchSettings.json b/...Digest.Web/Properties/launchSettings.json → ...Digest.Bot/Properties/launchSettings.json
@@ -4,17 +4,13 @@
     "Local": {
       "commandName": "Project",
       "dotnetRunMessages": true,
-      "launchBrowser": false,
-      "applicationUrl": "http://localhost:5000",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Local"
       }
     },
     "Production": {
       "commandName": "Project",
       "dotnetRunMessages": true,
-      "launchBrowser": false,
-      "applicationUrl": "http://localhost:5000",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Production"
       }

diff --git a/src/Bw.VaultDigest.Web/Requests/Commands.cs → src/Bw.VaultDigest.Bot/Requests/Commands.cs b/src/Bw.VaultDigest.Web/Requests/Commands.cs → src/Bw.VaultDigest.Bot/Requests/Commands.cs
@@ -1,7 +1,7 @@
 using Bw.VaultDigest.Model;
 using MediatR;
 
-namespace Bw.VaultDigest.Web.Requests;
+namespace Bw.VaultDigest.Bot.Requests;
 
 public record SyncLoginsCommand : IRequest;
 public record SendDigestCommand : IRequest;
diff --git a/...Bw.VaultDigest.Web/appsettings.Local.json → ...Bw.VaultDigest.Bot/appsettings.Local.json b/...Bw.VaultDigest.Web/appsettings.Local.json → ...Bw.VaultDigest.Bot/appsettings.Local.json
diff --git a/...ultDigest.Web/appsettings.Production.json → ...ultDigest.Bot/appsettings.Production.json b/...ultDigest.Web/appsettings.Production.json → ...ultDigest.Bot/appsettings.Production.json
diff --git a/src/Bw.VaultDigest.Web/appsettings.json → src/Bw.VaultDigest.Bot/appsettings.json b/src/Bw.VaultDigest.Web/appsettings.json → src/Bw.VaultDigest.Bot/appsettings.json
diff --git a/....VaultDigest.Web/assets/statistics.liquid → ....VaultDigest.Bot/assets/statistics.liquid b/....VaultDigest.Web/assets/statistics.liquid → ....VaultDigest.Bot/assets/statistics.liquid
diff --git a/tests/Bw.VaultDigest.UnitTests/Bw.VaultDigest.UnitTests.csproj b/tests/Bw.VaultDigest.UnitTests/Bw.VaultDigest.UnitTests.csproj
@@ -29,7 +29,7 @@
     <ItemGroup>
         <ProjectReference Include="..\..\src\Bw.VaultDigest.Common\Bw.VaultDigest.Common.csproj"/>
         <ProjectReference Include="..\..\src\Bw.VaultDigest.Infrastructure\Bw.VaultDigest.Infrastructure.csproj"/>
-        <ProjectReference Include="..\..\src\Bw.VaultDigest.Web\Bw.VaultDigest.Web.csproj" />
+        <ProjectReference Include="..\..\src\Bw.VaultDigest.Bot\Bw.VaultDigest.Bot.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/tests/Bw.VaultDigest.UnitTests/Services/DigestServiceTests.cs b/tests/Bw.VaultDigest.UnitTests/Services/DigestServiceTests.cs
@@ -1,7 +1,7 @@
 using AutoFixture;
 using Bw.VaultDigest.Infrastructure.EmailNotifierClient;
 using Bw.VaultDigest.Model;
-using Bw.VaultDigest.Web.Handlers;
+using Bw.VaultDigest.Bot.Handlers;
 using ScottPlot;
 
 namespace Bw.VaultDigest.UnitTests.Services;