Restructure database

Author: build

BaroBot/Bot.cs

@@ -7,7 +7,6 @@
 
 using BaroBot;
 using BaroBot.API;
-using BaroBot.Database;
 using BaroBot.Events;
 using BaroBot.Services;
 using Discord;
@@ -40,8 +39,8 @@ void ConfigureServices(IServiceCollection serviceCollection)
         serviceCollection.AddSingleton(client)
             .AddSingleton(new InteractionService(client))
             .AddSingleton<EnvironmentConfig>()
-            .AddSingleton<Database>()
             .AddSingleton<IEventDispatcher, EventDispatcher>()
+            .AddHostedService<DatabaseService>()
             .AddHostedService<MessageLoggingService>()
             .AddHostedService<RentGeneratorService>()
             .AddHostedService<SlashCommandService>()

BaroBot/Commands/CategoryCommands/ArchiveCommand.cs

@@ -7,7 +7,7 @@
 
 namespace BaroBot.Commands.CategoryCommands;
 
-using BaroBot.Database.Domain;
+using Services.Domain;
 using Discord;
 using Discord.Interactions;
 using Discord.WebSocket;

BaroBot/Commands/CategoryCommands/CategoryCommand.cs

@@ -7,8 +7,8 @@
 
 namespace BaroBot.Commands.CategoryCommands;
 
-using BaroBot.Database;
-using BaroBot.Database.Domain;
+using Services;
+using Services.Domain;
 using BaroBot.Events;
 using Discord;
 using Discord.Interactions;
@@ -21,17 +21,17 @@ namespace BaroBot.Commands.CategoryCommands;
 [Group("category", "Commands related to managing categories")]
 public partial class CategoryCommand : InteractionModuleBase<SocketInteractionContext>
 {
-    private readonly Database _database;
+    private readonly DatabaseService _database;
     private readonly DiscordSocketClient _client;
     private readonly IEventDispatcher _dispatcher;
 
     /// <summary>
     /// Initializes a new instance of the <see cref="CategoryCommand"/> class.
     /// </summary>
-    /// <param name="database">An instance of the <see cref="Database"/> class.</param>
+    /// <param name="database">An instance of the <see cref="DatabaseService"/> class.</param>
     /// <param name="client">An instance of the <see cref="DiscordSocketClient"/> class.</param>
     /// <param name="eventDispatcher">An instance of the <see cref="IEventDispatcher"/>.</param>
-    public CategoryCommand(Database database, DiscordSocketClient client, IEventDispatcher eventDispatcher)
+    public CategoryCommand(DatabaseService database, DiscordSocketClient client, IEventDispatcher eventDispatcher)
     {
         _database = database;
         _client = client;

BaroBot/Commands/CategoryCommands/CreateCommand.cs

@@ -7,7 +7,7 @@
 
 namespace BaroBot.Commands.CategoryCommands;
 
-using BaroBot.Database.Domain;
+using Services.Domain;
 using BaroBot.Events.Events;
 using Discord;
 using Discord.Interactions;

BaroBot/Commands/CategoryCommands/ImportCommand.cs

@@ -7,7 +7,7 @@
 
 namespace BaroBot.Commands.CategoryCommands;
 
-using BaroBot.Database.Domain;
+using Services.Domain;
 using Discord;
 using Discord.Interactions;
 using Discord.WebSocket;

BaroBot/Commands/CategoryCommands/IpCommand.cs

@@ -10,7 +10,7 @@ namespace BaroBot.Commands.CategoryCommands;
 using System.Net;
 using System.Net.Sockets;
 using System.Text.RegularExpressions;
-using BaroBot.Database.Domain;
+using Services.Domain;
 using Discord.Interactions;
 using Discord.WebSocket;
 

BaroBot/Commands/CategoryCommands/RemoveCommand.cs

@@ -7,7 +7,7 @@
 
 namespace BaroBot.Commands.CategoryCommands;
 
-using BaroBot.Database.Domain;
+using Services.Domain;
 using Discord.Interactions;
 using Discord.WebSocket;
 

BaroBot/Commands/CategoryCommands/SteamIdCommand.cs

@@ -7,7 +7,7 @@
 
 namespace BaroBot.Commands.CategoryCommands;
 
-using BaroBot.Database.Domain;
+using Services.Domain;
 using Discord.Interactions;
 using Discord.WebSocket;
 

BaroBot/Commands/IpCommand.cs

@@ -7,8 +7,8 @@
 
 namespace BaroBot.Commands;
 
-using BaroBot.Database;
-using BaroBot.Database.Domain;
+using Services;
+using Services.Domain;
 using Discord.Interactions;
 using Discord.WebSocket;
 
@@ -17,13 +17,13 @@ namespace BaroBot.Commands;
 /// </summary>
 public class IpCommand : InteractionModuleBase<SocketInteractionContext>
 {
-    private readonly Database _database;
+    private readonly DatabaseService _database;
 
     /// <summary>
     /// Initializes a new instance of the <see cref="IpCommand"/> class.
     /// </summary>
-    /// <param name="database">An instance of the <see cref="Database"/> class.</param>
-    public IpCommand(Database database)
+    /// <param name="database">An instance of the <see cref="DatabaseService"/> class.</param>
+    public IpCommand(DatabaseService database)
     {
         _database = database;
     }

BaroBot/Commands/RentGeneratorCommand.cs

@@ -7,8 +7,8 @@
 
 namespace BaroBot.Commands;
 
-using BaroBot.Database;
-using BaroBot.Database.Domain;
+using Services;
+using Services.Domain;
 using Discord.Interactions;
 using Discord.Rest;
 
@@ -17,13 +17,13 @@ namespace BaroBot.Commands;
 /// </summary>
 public class RentGeneratorCommand : InteractionModuleBase<SocketInteractionContext>
 {
-    private readonly Database _database;
+    private readonly DatabaseService _database;
 
     /// <summary>
     /// Initializes a new instance of the <see cref="RentGeneratorCommand"/> class.
     /// </summary>
-    /// <param name="database">An instance of the <see cref="Database"/> class.</param>
-    public RentGeneratorCommand(Database database)
+    /// <param name="database">An instance of the <see cref="DatabaseService"/> class.</param>
+    public RentGeneratorCommand(DatabaseService database)
     {
         _database = database;
     }