Movin' more stuff

Webreaper · Aug 25, 2022 · ed7cc24 · ed7cc24
1 parent c5953b7
commit ed7cc24
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 31 deletions.
diff --git a/Damselfly.Core/DbAbstractions/BaseModel.cs b/Damselfly.Core/DbAbstractions/BaseModel.cs
@@ -4,14 +4,15 @@
 using System.Linq.Expressions;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
-using Damselfly.Core.DbModels.Interfaces;
+using Damselfly.Core.Interfaces;
 using Damselfly.Core.Utils;
 using Damselfly.Shared.Utils;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
 using Microsoft.AspNetCore.Identity;
+using Damselfly.Core.DbModels;
 
-namespace Damselfly.Core.DbModels.DBAbstractions
+namespace Damselfly.Core.DBAbstractions
 {
     /// <summary>
     /// Base model for DB interactions. Will be passed a model class instance with an

diff --git a/Damselfly.Core/DbAbstractions/IDataBase.cs b/Damselfly.Core/DbAbstractions/IDataBase.cs
@@ -3,10 +3,10 @@
 using System.Linq;
 using System.Linq.Expressions;
 using System;
-using Damselfly.Core.DbModels.DBAbstractions;
+using Damselfly.Core.DBAbstractions;
 using System.Threading.Tasks;
 
-namespace Damselfly.Core.DbModels.Interfaces
+namespace Damselfly.Core.Interfaces
 {
     /// <summary>
     /// Interface representing a type of DB (e.g., Sqlite, MySql or SQL Server.

diff --git a/Damselfly.Core/DbAbstractions/MySqlModel.cs b/Damselfly.Core/DbAbstractions/MySqlModel.cs
@@ -3,12 +3,12 @@
 using System.Linq;
 using System.Linq.Expressions;
 using Microsoft.EntityFrameworkCore;
-using Damselfly.Core.DbModels.Interfaces;
+using Damselfly.Core.Interfaces;
 using Damselfly.Core.Utils;
-using Damselfly.Core.DbModels.DBAbstractions;
+using Damselfly.Core.DBAbstractions;
 using System.Threading.Tasks;
 
-namespace Damselfly.Core.Models.DBAbstractions
+namespace Damselfly.Core.DBAbstractions
 {
     /// <summary>
     /// MySQL database specialisation. Pretty limited at present:

diff --git a/Damselfly.Core/Models/ImageContext.cs b/Damselfly.Core/Models/ImageContext.cs
@@ -6,7 +6,7 @@
 using System.IO;
 using Microsoft.EntityFrameworkCore;
 using System.Threading.Tasks;
-using Damselfly.Core.DbModels.DBAbstractions;
+using Damselfly.Core.DBAbstractions;
 using Humanizer;
 using Damselfly.Core.DbModels;
 using Microsoft.AspNetCore.DataProtection.EntityFrameworkCore;

diff --git a/Damselfly.Core/Utils/DBSetExtensions.cs b/Damselfly.Core/Utils/DBSetExtensions.cs
@@ -3,7 +3,7 @@
 using System.Linq;
 using System.Linq.Expressions;
 using System.Threading.Tasks;
-using Damselfly.Core.DbModels.DBAbstractions;
+using Damselfly.Core.DBAbstractions;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.ChangeTracking;
 using static Microsoft.EntityFrameworkCore.DbLoggerCategory;

diff --git a/Damselfly.Migrations.Postgres/PostgresModel.cs b/Damselfly.Migrations.Postgres/PostgresModel.cs
@@ -3,8 +3,8 @@
 using System.Linq;
 using System.Linq.Expressions;
 using Microsoft.EntityFrameworkCore;
-using Damselfly.Core.DbModels.Interfaces;
-using Damselfly.Core.DbModels.DBAbstractions;
+using Damselfly.Core.Interfaces;
+using Damselfly.Core.DBAbstractions;
 using Damselfly.Core.Models;
 using System.Text.Json;
 using System.IO;

diff --git a/Damselfly.Migrations.Sqlite/SqlLiteModel.cs b/Damselfly.Migrations.Sqlite/SqlLiteModel.cs
@@ -3,8 +3,8 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
-using Damselfly.Core.DbModels.Interfaces;
-using Damselfly.Core.DbModels.DBAbstractions;
+using Damselfly.Core.Interfaces;
+using Damselfly.Core.DBAbstractions;
 using System.Linq.Expressions;
 using System.IO;
 using Damselfly.Core.Utils;

diff --git a/Damselfly.Web.Server/Program.cs b/Damselfly.Web.Server/Program.cs
@@ -1,34 +1,33 @@
-using Microsoft.AspNetCore.Authentication;
+using System.Reflection;
+using System.Runtime.InteropServices;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Serilog;
+using CommandLine;
+using static Tensorflow.ApiDef.Types;
+using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.ResponseCompression;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Hosting.Internal;
 using Damselfly.Web.Server.Data;
 using Damselfly.Web.Server.Models;
-using Microsoft.Extensions.Hosting.Internal;
 using Damselfly.Core.Utils;
 using Damselfly.Core.ImageProcessing;
-using Serilog;
-using static Tensorflow.ApiDef.Types;
-using CommandLine;
-using Damselfly.Core.DbModels.DBAbstractions;
+using Damselfly.Core.DBAbstractions;
 using Damselfly.Core.Models;
 using Damselfly.Core.Services;
-using System.Reflection;
-using System.Runtime.InteropServices;
-using Damselfly.Core.DbModels.Interfaces;
+using Damselfly.Core.Interfaces;
+using Damselfly.Core.DbModels;
+using Damselfly.Web.Server;
+using Damselfly.Shared.Utils;
 using Damselfly.Migrations.Sqlite.Models;
 using Damselfly.Migrations.Postgres.Models;
 using Damselfly.Core.Constants;
-using Damselfly.Core.Interfaces;
 using Microsoft.Extensions.FileProviders;
-using Syncfusion.Licensing;
 using Microsoft.AspNetCore.Http.Json;
-using System.Text.Json.Serialization;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.ApiAuthorization.IdentityServer;
-using Damselfly.Core.DbModels;
-using Damselfly.Web.Server;
-using Damselfly.Shared.Utils;
-using System.Text.Json;
+using Syncfusion.Licensing;
 using Damselfly.Core.ScopedServices.ClientServices;
 
 namespace Damselfly.Web;

diff --git a/Damselfly.Web/Program.cs b/Damselfly.Web/Program.cs
@@ -10,10 +10,10 @@
 using Microsoft.Extensions.Hosting;
 using Damselfly.Core.Services;
 using Damselfly.Core.Models;
-using Damselfly.Core.DbModels.Interfaces;
+using Damselfly.Core.Interfaces;
+using Damselfly.Core.DBAbstractions;
 using Damselfly.Migrations.Sqlite.Models;
 using Damselfly.Migrations.Postgres.Models;
-using Damselfly.Core.DbModels.DBAbstractions;
 using Damselfly.Core.Utils;
 
 namespace Damselfly.Web