Move DatabaseContext to root

ChaosBot/ConfigHelpers/ConfigurationRepository.cs

@@ -17,7 +17,7 @@ namespace ChaosBot.ConfigHelpers
         
         public static T GetValue<T>(string key, ulong guildId, T defaultValue)
         {
-            using ChaosbotContext dbContext = new ChaosbotContext();
+            using DatabaseContext dbContext = new DatabaseContext();
             Models.Configuration config = dbContext.Configuration
                 .SingleOrDefault(c => c.DiscordGuildId == guildId && c.Key == key);
             if (config == null || string.IsNullOrEmpty(config.SerializedValue))
@@ -27,7 +27,7 @@ namespace ChaosBot.ConfigHelpers
 
         public static void SetValue<T>(string key, T value, ulong guildId)
         {
-            using ChaosbotContext dbContext = new ChaosbotContext();
+            using DatabaseContext dbContext = new DatabaseContext();
             Models.Configuration cnfSet = new Models.Configuration();
 
             cnfSet.Key = key;
@@ -41,7 +41,7 @@ namespace ChaosBot.ConfigHelpers
 
         public static void DeleteValue(string key, ulong guildId)
         {
-            using ChaosbotContext dbContext = new ChaosbotContext();
+            using DatabaseContext dbContext = new DatabaseContext();
             Models.Configuration config = dbContext.Configuration
                 .SingleOrDefault(c => c.DiscordGuildId == guildId && c.Key == key);
             if (config == null) return;

ChaosBot/DatabaseContext.cs

@@ -1,9 +1,10 @@
+using ChaosBot.Models;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 
-namespace ChaosBot.Models
+namespace ChaosBot
 {
-    public class ChaosbotContext : DbContext
+    public class DatabaseContext : DbContext
     {
         public DbSet<LodestoneCharacter> LodestoneCharacter { get; set; }
         public DbSet<LodestoneFreeCompany> LodestoneFreeCompany { get; set; }

ChaosBot/Discord/Modules/Admin/Role.cs

@@ -60,7 +60,7 @@ namespace ChaosBot.Discord.Modules.Admin
         {
             try
             {
-                await using (ChaosbotContext dbContext = new ChaosbotContext())
+                await using (DatabaseContext dbContext = new DatabaseContext())
                 {
                     string parameterString = String.Join("", parameters);
 
@@ -134,7 +134,7 @@ namespace ChaosBot.Discord.Modules.Admin
         {
             try
             {
-                await using (ChaosbotContext dbContext = new ChaosbotContext())
+                await using (DatabaseContext dbContext = new DatabaseContext())
                 {
                     string parameterString = String.Join("", parameters);
 

ChaosBot/Discord/Modules/User/Level.cs

@@ -26,7 +26,7 @@ namespace ChaosBot.Discord.Modules.User
                 embed.Title = $"Current Level Statistics";
                 sb.AppendLine();
 
-                using (ChaosbotContext dbContext = new ChaosbotContext())
+                using (DatabaseContext dbContext = new DatabaseContext())
                 {
                     IQueryable<Experience> ctxUser = dbContext.ExperiencePoints;
                     IQueryable<Experience> usrXp = ctxUser

ChaosBot/Discord/Modules/User/Lodestone.cs

@@ -165,7 +165,7 @@ namespace ChaosBot.Discord.Modules.User
                 }
 
                 bool linked;
-                using (ChaosbotContext dbContext = new ChaosbotContext())
+                using (DatabaseContext dbContext = new DatabaseContext())
                 {
                     IQueryable<LodestoneCharacter> ctxlsChars = dbContext.LodestoneCharacter;
                     IQueryable<LodestoneCharacter> lsChar = ctxlsChars.Where(p => p.DiscordGuildId.Equals(Context.Guild.Id)).Where(p => p.LodestoneId.Equals(Convert.ToUInt64(character.Character.ID)));
@@ -184,7 +184,7 @@ namespace ChaosBot.Discord.Modules.User
 
                     if (character.Character.Bio.Contains(b64))
                     {
-                        using (ChaosbotContext dbContext = new ChaosbotContext())
+                        using (DatabaseContext dbContext = new DatabaseContext())
                         {
                             LodestoneCharacter lsChar = new LodestoneCharacter();
 

ChaosBot/Discord/Modules/User/Points.cs

@@ -113,7 +113,7 @@ namespace ChaosBot.Discord.Modules.User
 
             try
             {
-                using (ChaosbotContext dbContext = new ChaosbotContext())
+                using (DatabaseContext dbContext = new DatabaseContext())
                 {
                     IQueryable<Point> points = dbContext.Points;
                     cur = points
@@ -135,7 +135,7 @@ namespace ChaosBot.Discord.Modules.User
             ulong cur = 0;
             try
             {
-                using (ChaosbotContext dbContext = new ChaosbotContext())
+                using (DatabaseContext dbContext = new DatabaseContext())
                 {
                     IQueryable<Point> ctxPoints = dbContext.Points;
 
@@ -180,7 +180,7 @@ namespace ChaosBot.Discord.Modules.User
             {
                 if (admin)
                 {
-                    using (ChaosbotContext dbContext = new ChaosbotContext())
+                    using (DatabaseContext dbContext = new DatabaseContext())
                     {
                         IQueryable<Point> ctxPoints = dbContext.Points;
 
@@ -211,7 +211,7 @@ namespace ChaosBot.Discord.Modules.User
                 }
                 else
                 {
-                    using (ChaosbotContext dbContext = new ChaosbotContext())
+                    using (DatabaseContext dbContext = new DatabaseContext())
                     {
                         IQueryable<Point> ctxPoints = dbContext.Points;
 
@@ -276,7 +276,7 @@ namespace ChaosBot.Discord.Modules.User
         {
             try
             {
-                using (ChaosbotContext dbContext = new ChaosbotContext())
+                using (DatabaseContext dbContext = new DatabaseContext())
                 {
                     Point usrPoint = new Point();
 

ChaosBot/Discord/Modules/User/RaffleCmd.cs

@@ -126,7 +126,7 @@ namespace ChaosBot.Discord.Modules.User
 
             try
             {
-                using (ChaosbotContext dbContext = new ChaosbotContext())
+                using (DatabaseContext dbContext = new DatabaseContext())
                 {
                     IQueryable<Raffle> ctxRaffles = dbContext.Raffles;
                     
@@ -150,7 +150,7 @@ namespace ChaosBot.Discord.Modules.User
             {
                 if (admin)
                 {
-                    using (ChaosbotContext dbContext = new ChaosbotContext())
+                    using (DatabaseContext dbContext = new DatabaseContext())
                     {
                         IQueryable<Raffle> ctxRaffles = dbContext.Raffles;
 
@@ -187,7 +187,7 @@ namespace ChaosBot.Discord.Modules.User
             int cur = 0;
             try
             {
-                using (ChaosbotContext dbContext = new ChaosbotContext())
+                using (DatabaseContext dbContext = new DatabaseContext())
                 {
                     IQueryable<Raffle> ctxRaffles = dbContext.Raffles;
 
@@ -224,7 +224,7 @@ namespace ChaosBot.Discord.Modules.User
         {
             try
             {
-                using (ChaosbotContext dbContext = new ChaosbotContext())
+                using (DatabaseContext dbContext = new DatabaseContext())
                 {
                     IQueryable<Raffle> ctxRaffles = dbContext.Raffles;
 
@@ -258,7 +258,7 @@ namespace ChaosBot.Discord.Modules.User
             {
                 if(confirm == "confirm")
                 {
-                    using (ChaosbotContext dbContext = new ChaosbotContext())
+                    using (DatabaseContext dbContext = new DatabaseContext())
                     {
                         IQueryable<Raffle> ctxRaffles = dbContext.Raffles;
 
@@ -293,7 +293,7 @@ namespace ChaosBot.Discord.Modules.User
         {
             try
             {
-                using (ChaosbotContext dbContext = new ChaosbotContext())
+                using (DatabaseContext dbContext = new DatabaseContext())
                 {
                     IQueryable<Raffle> ctxRaffles = dbContext.Raffles;
 

ChaosBot/Discord/Services/CommandHandler.cs

@@ -106,7 +106,7 @@ namespace ChaosBot.Discord.Services
         {
             try
             {
-                using (ChaosbotContext dbContext = new ChaosbotContext())
+                using (DatabaseContext dbContext = new DatabaseContext())
                 {
                     Experience newUser = new Experience();
                     newUser.Amount = 0;
@@ -131,7 +131,7 @@ namespace ChaosBot.Discord.Services
         {
             try
             {
-                using (ChaosbotContext dbContext = new ChaosbotContext())
+                using (DatabaseContext dbContext = new DatabaseContext())
                 {
                     IQueryable<Experience> ctxUser = dbContext.ExperiencePoints;
                     IQueryable<Experience> usrXp = ctxUser

ChaosBot/Discord/Services/CustomCommandHandler.cs

@@ -15,7 +15,7 @@ namespace ChaosBot.Discord.Services
         {
             try
             {
-                await using ChaosbotContext dbContext = new ChaosbotContext();
+                await using DatabaseContext dbContext = new DatabaseContext();
                 string command = context.Message.Content.Substring(argPos);
 
                 IQueryable<CustomCommand> customCommandQuery = dbContext.CustomCommands;

ChaosBot/Discord/Services/ExperienceHandler.cs

@@ -18,7 +18,7 @@ namespace ChaosBot.Discord.Services
             {
                 if (!CheckModuleEnabled.GetResult(context, "Experience")) return;
 
-                using (ChaosbotContext dbContext = new ChaosbotContext())
+                using (DatabaseContext dbContext = new DatabaseContext())
                 {
                     IQueryable<Experience> ctxUser = dbContext.ExperiencePoints;
                     IQueryable<Experience> usrXp = ctxUser

ChaosBot/Discord/Services/RoleReactionHandler.cs

@@ -17,7 +17,7 @@ namespace ChaosBot.Discord.Services
             if (!(optionalUser.Value is IGuildUser user)) return;
             if (!(socketMessageChannel is SocketGuildChannel channel)) return;
 
-            await using ChaosbotContext dbContext = new ChaosbotContext();
+            await using DatabaseContext dbContext = new DatabaseContext();
 
             IQueryable<RoleReaction> roleReactionsQueryable = dbContext.RoleReactions;
             List<RoleReaction> roleReactions = roleReactionsQueryable
@@ -47,7 +47,7 @@ namespace ChaosBot.Discord.Services
             if (!(optionalUser.Value is IGuildUser user)) return;
             if (!(socketMessageChannel is SocketGuildChannel channel)) return;
 
-            await using ChaosbotContext dbContext = new ChaosbotContext();
+            await using DatabaseContext dbContext = new DatabaseContext();
 
             IQueryable<RoleReaction> roleReactionsQueryable = dbContext.RoleReactions;
             List<RoleReaction> roleReactions = roleReactionsQueryable

ChaosBot/Migrations/20200804195804_LodestoneCharacter.Designer.cs

@@ -7,7 +7,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace ChaosBot.Migrations
 {
-    [DbContext(typeof(ChaosbotContext))]
+    [DbContext(typeof(DatabaseContext))]
     [Migration("20200804195804_LodestoneCharacter")]
     partial class LodestoneCharacter
     {

ChaosBot/Migrations/20200804202834_LodestoneFreeCompany.Designer.cs

@@ -7,7 +7,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace ChaosBot.Migrations
 {
-    [DbContext(typeof(ChaosbotContext))]
+    [DbContext(typeof(DatabaseContext))]
     [Migration("20200804202834_LodestoneFreeCompany")]
     partial class LodestoneFreeCompany
     {

ChaosBot/Migrations/20200804203214_Points.Designer.cs

@@ -7,7 +7,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace ChaosBot.Migrations
 {
-    [DbContext(typeof(ChaosbotContext))]
+    [DbContext(typeof(DatabaseContext))]
     [Migration("20200804203214_Points")]
     partial class Points
     {

ChaosBot/Migrations/20200804204404_Raffles.Designer.cs

@@ -7,7 +7,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace ChaosBot.Migrations
 {
-    [DbContext(typeof(ChaosbotContext))]
+    [DbContext(typeof(DatabaseContext))]
     [Migration("20200804204404_Raffles")]
     partial class Raffles
     {

ChaosBot/Migrations/20200804204734_CommandPermissions.Designer.cs

@@ -7,7 +7,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace ChaosBot.Migrations
 {
-    [DbContext(typeof(ChaosbotContext))]
+    [DbContext(typeof(DatabaseContext))]
     [Migration("20200804204734_CommandPermissions")]
     partial class CommandPermissions
     {

ChaosBot/Migrations/20200804205955_Configuration.Designer.cs

@@ -7,7 +7,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace ChaosBot.Migrations
 {
-    [DbContext(typeof(ChaosbotContext))]
+    [DbContext(typeof(DatabaseContext))]
     [Migration("20200804205955_Configuration")]
     partial class Configuration
     {

ChaosBot/Migrations/20200804213001_ExperiencePoints.Designer.cs

@@ -7,7 +7,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace ChaosBot.Migrations
 {
-    [DbContext(typeof(ChaosbotContext))]
+    [DbContext(typeof(DatabaseContext))]
     [Migration("20200804213001_ExperiencePoints")]
     partial class ExperiencePoints
     {

ChaosBot/Migrations/20200819203430_RoleReaction.Designer.cs

@@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace ChaosBot.Migrations
 {
-    [DbContext(typeof(ChaosbotContext))]
+    [DbContext(typeof(DatabaseContext))]
     [Migration("20200819203430_RoleReaction")]
     partial class RoleReaction
     {

ChaosBot/Migrations/20200824124830_CustomCommand.Designer.cs

@@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace ChaosBot.Migrations
 {
-    [DbContext(typeof(ChaosbotContext))]
+    [DbContext(typeof(DatabaseContext))]
     [Migration("20200824124830_CustomCommand")]
     partial class CustomCommand
     {

ChaosBot/Migrations/ChaosbotContextModelSnapshot.cs

@@ -7,7 +7,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace ChaosBot.Migrations
 {
-    [DbContext(typeof(ChaosbotContext))]
+    [DbContext(typeof(DatabaseContext))]
     partial class ChaosbotContextModelSnapshot : ModelSnapshot
     {
         protected override void BuildModel(ModelBuilder modelBuilder)

ChaosBot/Services/CheckPermissions.cs

@@ -18,7 +18,7 @@ namespace ChaosBot.Services
             
             // Get the possible permissions
             List<CommandPermission> commandPermissions;
-            using (ChaosbotContext dbContext = new ChaosbotContext())
+            using (DatabaseContext dbContext = new DatabaseContext())
             {
                 IQueryable<CommandPermission> permissions = dbContext.CommandPermissions;
                 commandPermissions = permissions.Where(p => p.Command.Equals(command))

ChaosBot/WebServer/App/ApiControllers/BaseApiController.cs

@@ -33,7 +33,7 @@ namespace ChaosBot.WebServer.App.ApiControllers
             if (!CheckPermissions.GetResult(AccessTokenCache, Request, guildId, out IActionResult result))
                 return result;
 
-            await using ChaosbotContext dbContext = new ChaosbotContext();
+            await using DatabaseContext dbContext = new DatabaseContext();
 
             IQueryable<T> query = GetBasicQuery(dbContext);
             List<T> list = ApplyFilterForCurrentGuild(query, guildId).ToList();
@@ -63,7 +63,7 @@ namespace ChaosBot.WebServer.App.ApiControllers
             if (!ValidationService.Validate(requestBody, GetValidationRules(), out string errors))
                 return BadRequest(errors);
             
-            await using ChaosbotContext dbContext = new ChaosbotContext();
+            await using DatabaseContext dbContext = new DatabaseContext();
 
             T databaseObject = SetDefaultFieldsForUpsert(new T(), guildId);
 
@@ -95,7 +95,7 @@ namespace ChaosBot.WebServer.App.ApiControllers
             if (!CheckPermissions.GetResult(AccessTokenCache, Request, guildId, out IActionResult result))
                 return result;
             
-            await using ChaosbotContext dbContext = new ChaosbotContext();
+            await using DatabaseContext dbContext = new DatabaseContext();
 
             List<T> toDelete = FilterQueryMultipleForDeletion(GetBasicQuery(dbContext), guildId, deleteParameter);
             toDelete.Add(FilterQueryForDeletion(GetBasicQuery(dbContext), guildId, deleteParameter));
@@ -112,7 +112,7 @@ namespace ChaosBot.WebServer.App.ApiControllers
             return NoContent();
         }
 
-        protected abstract DbSet<T> GetBasicQuery(ChaosbotContext context);
+        protected abstract DbSet<T> GetBasicQuery(DatabaseContext context);
         protected abstract IQueryable<T> ApplyFilterForCurrentGuild(IQueryable<T> query, ulong guildId);
         protected abstract List<string> GetIndexFields();
         protected abstract Dictionary<string, List<string>> GetValidationRules();

ChaosBot/WebServer/App/ApiControllers/CustomCommandController.cs

@@ -46,7 +46,7 @@ namespace ChaosBot.WebServer.App.ApiControllers
             return await Delete(guildId, command);
         }
 
-        protected override DbSet<CustomCommand> GetBasicQuery(ChaosbotContext context)
+        protected override DbSet<CustomCommand> GetBasicQuery(DatabaseContext context)
         {
             return context.CustomCommands;
         }