refactor: clean up of service registration

src/Mangarr.Backend/Configuration/AniListOptions.cs → src/Mangarr.Backend/AniList/AniListOptions.cs

@@ -1,4 +1,4 @@
-namespace Mangarr.Backend.Configuration;
+namespace Mangarr.Backend.AniList;
 
 public class AniListOptions
 {

src/Mangarr.Backend/Services/AniListService.cs → src/Mangarr.Backend/AniList/AniListService.cs

@@ -1,8 +1,9 @@
 using Anilist4Net;
 using Anilist4Net.Enums;
 using FluentResults;
+using Mangarr.Backend.Caching;
 
-namespace Mangarr.Backend.Services;
+namespace Mangarr.Backend.AniList;
 
 public class AniListService
 {

src/Mangarr.Backend/AniList/HostExtensions.cs

@@ -0,0 +1,10 @@
+namespace Mangarr.Backend.AniList;
+
+public static class HostExtensions
+{
+    public static void AddMangarrAniList(this WebApplicationBuilder builder)
+    {
+        builder.Services.Configure<AniListOptions>(builder.Configuration.GetSection(AniListOptions.SECTION));
+        builder.Services.AddSingleton<AniListService>();
+    }
+}

src/Mangarr.Backend/Services/CachingService.cs → src/Mangarr.Backend/Caching/CachingService.cs

@@ -2,7 +2,7 @@
 using Newtonsoft.Json;
 using StackExchange.Redis;
 
-namespace Mangarr.Backend.Services;
+namespace Mangarr.Backend.Caching;
 
 public class CachingService
 {

src/Mangarr.Backend/Caching/HostExtensions.cs

@@ -0,0 +1,21 @@
+using Microsoft.Extensions.Options;
+using StackExchange.Redis;
+
+namespace Mangarr.Backend.Caching;
+
+public static class HostExtensions
+{
+    public static void AddMangarrCaching(this WebApplicationBuilder builder)
+    {
+        builder.Services.Configure<RedisOptions>(builder.Configuration.GetSection(RedisOptions.SECTION));
+        builder.Services.AddSingleton<CachingService>();
+        builder.Services.AddSingleton<IConnectionMultiplexer>(provider =>
+        {
+            RedisOptions redisOptions = provider.GetRequiredService<IOptions<RedisOptions>>().Value;
+            return ConnectionMultiplexer.Connect(redisOptions.Host,
+                options => { options.Password = redisOptions.Password; });
+        });
+        builder.Services.AddTransient<IDatabase>(
+            provider => provider.GetRequiredService<IConnectionMultiplexer>().GetDatabase());
+    }
+}

src/Mangarr.Backend/Configuration/RedisOptions.cs → src/Mangarr.Backend/Caching/RedisOptions.cs

@@ -1,4 +1,4 @@
-namespace Mangarr.Backend.Configuration;
+namespace Mangarr.Backend.Caching;
 
 public class RedisOptions
 {

src/Mangarr.Backend/Configuration/NotificationOptions.cs

@@ -5,4 +5,5 @@ public class NotificationOptions
     public const string SECTION = "Notifications";
 
     public string Discord { get; set; } = string.Empty;
+    public bool IsDiscordEnabled => !string.IsNullOrEmpty(Discord);
 }

src/Mangarr.Backend/Database/HostExtensions.cs

@@ -0,0 +1,20 @@
+using Microsoft.Extensions.Options;
+using MongoDB.Driver;
+
+namespace Mangarr.Backend.Database;
+
+public static class HostExtensions
+{
+    public static void AddMangarrDatabase(this WebApplicationBuilder builder)
+    {
+        builder.Services.Configure<MongoOptions>(builder.Configuration.GetSection(MongoOptions.SECTION));
+        builder.Services.AddTransient<IMongoClient>(provider =>
+        {
+            MongoOptions mongoOptions = provider.GetRequiredService<IOptions<MongoOptions>>().Value;
+            return new MongoClient($"mongodb://{mongoOptions.Username}:{mongoOptions.Password}@{mongoOptions.Host}");
+        });
+
+        builder.Services.AddSingleton<CollectionFactory>();
+        builder.Services.AddSingleton(typeof(IMongoCollection<>), typeof(MongoCollection<>));
+    }
+}

src/Mangarr.Backend/Configuration/MongoOptions.cs → src/Mangarr.Backend/Database/MongoOptions.cs

@@ -1,4 +1,4 @@
-namespace Mangarr.Backend.Configuration;
+namespace Mangarr.Backend.Database;
 
 public class MongoOptions
 {

src/Mangarr.Backend/Endpoints/Manga/Details/MangaDetailsEndpoint.cs

@@ -1,6 +1,6 @@
 using Anilist4Net;
 using FluentResults;
-using Mangarr.Backend.Services;
+using Mangarr.Backend.AniList;
 using Mangarr.Backend.Sources;
 using Mangarr.Shared.Models;
 using Mangarr.Shared.Requests;

src/Mangarr.Backend/Endpoints/Manga/Request/MangaRequestEndpoint.cs

@@ -1,8 +1,8 @@
 using Anilist4Net;
 using FluentResults;
+using Mangarr.Backend.AniList;
 using Mangarr.Backend.Jobs;
-using Mangarr.Backend.Services;
-using Mangarr.Backend.Services.Notifications;
+using Mangarr.Backend.Notifications;
 using Mangarr.Shared.Requests;
 using Mangarr.Shared.Responses;
 using MongoDB.Driver;

src/Mangarr.Backend/Endpoints/Manga/Search/MangaSearchEndpoint.cs

@@ -1,8 +1,7 @@
 using Anilist4Net;
 using Anilist4Net.Enums;
 using FluentResults;
-using Mangarr.Backend.Configuration;
-using Mangarr.Backend.Services;
+using Mangarr.Backend.AniList;
 using Mangarr.Shared.Models;
 using Mangarr.Shared.Requests;
 using Mangarr.Shared.Responses;

src/Mangarr.Backend/Endpoints/Manga/Titles/MangaTitlesEndpoint.cs

@@ -1,6 +1,6 @@
 using Anilist4Net;
 using FluentResults;
-using Mangarr.Backend.Services;
+using Mangarr.Backend.AniList;
 using Mangarr.Shared.Models;
 using Mangarr.Shared.Requests;
 using Mangarr.Shared.Responses;

src/Mangarr.Backend/Jobs/DownloadChapterJob.cs

@@ -1,7 +1,7 @@
 using FluentResults;
 using Mangarr.Backend.Data;
+using Mangarr.Backend.Notifications;
 using Mangarr.Backend.Services;
-using Mangarr.Backend.Services.Notifications;
 using MongoDB.Driver;
 using Quartz;
 using ISource = Mangarr.Backend.Sources.ISource;

src/Mangarr.Backend/Jobs/HostExtensions.cs

@@ -0,0 +1,56 @@
+using Quartz;
+
+namespace Mangarr.Backend.Jobs;
+
+public static class HostExtensions
+{
+    public static void AddMangarrJobs(this WebApplicationBuilder builder) =>
+        builder.Services
+            .AddQuartzHostedService(options =>
+            {
+                options.AwaitApplicationStarted = true;
+                options.WaitForJobsToComplete = true;
+            })
+            .AddQuartz(options =>
+            {
+                options.AddJob<CacheSourceSchedulerJob>(CacheSourceSchedulerJob.JobKey);
+                options.AddJob<CacheSourceJob>(CacheSourceJob.JobKey, configure => configure.StoreDurably())
+                    .UseDefaultThreadPool(3);
+
+                options.AddJob<IndexMangaSchedulerJob>(IndexMangaSchedulerJob.JobKey);
+                options.AddJob<IndexMangaJob>(IndexMangaJob.JobKey, configure => configure.StoreDurably())
+                    .UseDefaultThreadPool(5);
+
+                options.AddJob<DownloadChapterSchedulerJob>(DownloadChapterSchedulerJob.JobKey);
+                options.AddJob<DownloadChapterJob>(DownloadChapterJob.JobKey, configure => configure.StoreDurably())
+                    .UseDefaultThreadPool(3);
+
+                options.AddTrigger(configure =>
+                {
+                    configure
+                        .WithIdentity("CacheSourceSchedulerJob")
+                        .WithDescription("Cache enabled sources")
+                        .ForJob(CacheSourceSchedulerJob.JobKey)
+                        .WithCronSchedule("0 0/30 0 ? * * *");
+                });
+
+                options.AddTrigger(configure =>
+                {
+                    configure
+                        .WithIdentity("IndexMangaSchedulerJob")
+                        .WithDescription("Check for new chapters")
+                        .ForJob(IndexMangaSchedulerJob.JobKey)
+                        .WithCronSchedule("0 0 * ? * * *");
+                });
+
+                options.AddTrigger(configure =>
+                {
+                    configure
+                        .WithIdentity("DownloadChapterSchedulerJob")
+                        .WithDescription("Download requested chapters")
+                        .ForJob(DownloadChapterSchedulerJob.JobKey)
+                        .StartNow()
+                        .WithCronSchedule("0 10 * ? * * *");
+                });
+            });
+}

src/Mangarr.Backend/Jobs/IndexMangaJob.cs

@@ -1,6 +1,6 @@
 using FluentResults;
+using Mangarr.Backend.Notifications;
 using Mangarr.Backend.Services;
-using Mangarr.Backend.Services.Notifications;
 using MongoDB.Driver;
 using Quartz;
 using ChapterList = Mangarr.Backend.Sources.Models.Chapter.ChapterList;

src/Mangarr.Backend/Logging/HostExtensions.cs

@@ -0,0 +1,31 @@
+using Mangarr.Backend.Configuration;
+using Microsoft.Extensions.Options;
+using Serilog;
+using Serilog.Events;
+
+namespace Mangarr.Backend.Logging;
+
+public static class HostExtensions
+{
+    public static void AddMangarrLogging(this WebApplicationBuilder builder)
+    {
+        builder.Services.Configure<SeqOptions>(builder.Configuration.GetSection(SeqOptions.SECTION));
+        builder.Services.AddSerilog((provider, configuration) =>
+        {
+            SeqOptions seqOptions = provider.GetRequiredService<IOptions<SeqOptions>>().Value;
+
+            if (!string.IsNullOrEmpty(seqOptions.Host))
+            {
+                configuration
+                    .Enrich.WithProperty("Application", "Mangarr")
+                    .Enrich.FromLogContext()
+                    .WriteTo.Seq(seqOptions.Host,
+                        apiKey: seqOptions.Key,
+                        restrictedToMinimumLevel: LogEventLevel.Information);
+            }
+
+            configuration
+                .WriteTo.Console(LogEventLevel.Debug);
+        });
+    }
+}

src/Mangarr.Backend/Configuration/SeqOptions.cs → src/Mangarr.Backend/Logging/SeqOptions.cs

@@ -1,4 +1,4 @@
-namespace Mangarr.Backend.Configuration;
+namespace Mangarr.Backend.Logging;
 
 public class SeqOptions
 {

src/Mangarr.Backend/Services/Notifications/DiscordNotificationProcessor.cs → src/Mangarr.Backend/Notifications/DiscordNotificationProcessor.cs

@@ -3,18 +3,19 @@
 using Discord;
 using Discord.Webhook;
 using FluentResults;
+using Mangarr.Backend.AniList;
 using MongoDB.Driver;
 
-namespace Mangarr.Backend.Services.Notifications;
+namespace Mangarr.Backend.Notifications;
 
 public class DiscordNotificationProcessor : INotificationProcessor
 {
     private readonly AniListService _aniListService;
-    private readonly DiscordWebhookClient _client;
+    private readonly DiscordWebhookClient? _client;
     private readonly IMongoCollection<SourceDocument> _sourceCollection;
 
     public DiscordNotificationProcessor(
-        DiscordWebhookClient client,
+        DiscordWebhookClient? client,
         AniListService aniListService,
         IMongoCollection<SourceDocument> sourceCollection
     )
@@ -26,6 +27,11 @@ IMongoCollection<SourceDocument> sourceCollection
 
     public async Task NotifyNewManga(RequestedMangaDocument requestedMangaDocument)
     {
+        if (_client == null)
+        {
+            return;
+        }
+
         Result<Media?> result = await _aniListService.GetMedia(requestedMangaDocument.SearchId);
         if (result.IsFailed)
         {
@@ -71,6 +77,11 @@ public Task NotifyNewChapters(
         IEnumerable<RequestedChapterDocument> newChapters
     )
     {
+        if (_client == null)
+        {
+            return Task.CompletedTask;
+        }
+
         Embed build = new EmbedBuilder()
             .WithTitle("New chapters have been added")
             .WithDescription($@"**Title**
@@ -91,6 +102,11 @@ public Task NotifyChapterDownloadFailed(
         RequestedChapterDocument requestedChapterDocument
     )
     {
+        if (_client == null)
+        {
+            return Task.CompletedTask;
+        }
+
         Embed build = new EmbedBuilder()
             .WithTitle("Failed to download a chapter")
             .WithDescription($@"**Title**
@@ -110,6 +126,11 @@ public Task NotifyChapterDownloadSucceeded(
         RequestedChapterDocument requestedChapterDocument
     )
     {
+        if (_client == null)
+        {
+            return Task.CompletedTask;
+        }
+
         Embed build = new EmbedBuilder()
             .WithTitle("Successfully downloaded a chapter")
             .WithDescription($@"**Title**

src/Mangarr.Backend/Notifications/HostExtensions.cs

@@ -0,0 +1,20 @@
+using Discord.Webhook;
+using Mangarr.Backend.Configuration;
+using Microsoft.Extensions.Options;
+
+namespace Mangarr.Backend.Notifications;
+
+public static class HostExtensions
+{
+    public static void AddMangarrNotifications(this WebApplicationBuilder builder)
+    {
+        builder.Services.Configure<NotificationOptions>(builder.Configuration.GetSection(NotificationOptions.SECTION));
+        builder.Services.AddSingleton<NotificationService>();
+        builder.Services.AddSingleton<INotificationProcessor, DiscordNotificationProcessor>();
+        builder.Services.AddSingleton<DiscordWebhookClient>(provider =>
+        {
+            IOptions<NotificationOptions> options = provider.GetRequiredService<IOptions<NotificationOptions>>();
+            return options.Value.IsDiscordEnabled ? new DiscordWebhookClient(options.Value.Discord) : null!;
+        });
+    }
+}

src/Mangarr.Backend/Services/Notifications/INotificationProcessor.cs → src/Mangarr.Backend/Notifications/INotificationProcessor.cs

@@ -1,4 +1,4 @@
-namespace Mangarr.Backend.Services.Notifications;
+namespace Mangarr.Backend.Notifications;
 
 public interface INotificationProcessor
 {

src/Mangarr.Backend/Services/Notifications/NotificationService.cs → src/Mangarr.Backend/Notifications/NotificationService.cs

@@ -1,7 +1,8 @@
-using RequestedChapterDocument = Mangarr.Backend.Database.Documents.RequestedChapterDocument;
+using Mangarr.Backend.AniList;
+using RequestedChapterDocument = Mangarr.Backend.Database.Documents.RequestedChapterDocument;
 using RequestedMangaDocument = Mangarr.Backend.Database.Documents.RequestedMangaDocument;
 
-namespace Mangarr.Backend.Services.Notifications;
+namespace Mangarr.Backend.Notifications;
 
 public class NotificationService
 {