From f784000393dad9b3485654a1d01ab2d90441e3f6 Mon Sep 17 00:00:00 2001 From: max Date: Mon, 18 Aug 2025 00:46:40 +0200 Subject: [PATCH] [CHANGE] Reworked entities and contexts --- Manager.App/DependencyInjection.cs | 5 --- Manager.App/Manager.App.csproj | 5 +++ Manager.App/Program.cs | 3 ++ Manager.Data/Contexts/ApplicationDbContext.cs | 33 ------------------- Manager.Data/Contexts/LibraryDbContext.cs | 4 +-- Manager.Data/DataService.cs | 2 -- .../{Models => Entities}/DateTimeBase.cs | 2 +- .../LibraryContext/CaptionEntity.cs | 2 +- .../LibraryContext/ChannelEntity.cs | 2 +- .../LibraryContext/ClientAccountEntity.cs | 2 +- .../LibraryContext/HttpCookieEntity.cs | 2 +- .../LibraryContext/Join/PlaylistMedia.cs | 2 +- .../LibraryContext/MediaEntity.cs | 4 +-- .../LibraryContext/MediaFormatEntity.cs | 2 +- .../LibraryContext/PlaylistEntity.cs | 4 +-- Manager.Data/Manager.Data.csproj | 2 ++ .../ApplicationContext/SettingsGroupModel.cs | 7 ---- .../ApplicationContext/SettingsModel.cs | 18 ---------- 18 files changed, 23 insertions(+), 78 deletions(-) delete mode 100644 Manager.Data/Contexts/ApplicationDbContext.cs delete mode 100644 Manager.Data/DataService.cs rename Manager.Data/{Models => Entities}/DateTimeBase.cs (84%) rename Manager.Data/{Models => Entities}/LibraryContext/CaptionEntity.cs (89%) rename Manager.Data/{Models => Entities}/LibraryContext/ChannelEntity.cs (92%) rename Manager.Data/{Models => Entities}/LibraryContext/ClientAccountEntity.cs (88%) rename Manager.Data/{Models => Entities}/LibraryContext/HttpCookieEntity.cs (94%) rename Manager.Data/{Models => Entities}/LibraryContext/Join/PlaylistMedia.cs (88%) rename Manager.Data/{Models => Entities}/LibraryContext/MediaEntity.cs (92%) rename Manager.Data/{Models => Entities}/LibraryContext/MediaFormatEntity.cs (95%) rename Manager.Data/{Models => Entities}/LibraryContext/PlaylistEntity.cs (86%) delete mode 100644 Manager.Data/Models/ApplicationContext/SettingsGroupModel.cs delete mode 100644 Manager.Data/Models/ApplicationContext/SettingsModel.cs diff --git a/Manager.App/DependencyInjection.cs b/Manager.App/DependencyInjection.cs index 73d2ad9..04b0e1c 100644 --- a/Manager.App/DependencyInjection.cs +++ b/Manager.App/DependencyInjection.cs @@ -7,11 +7,6 @@ namespace Manager.App; public static class DependencyInjection { - public static WebApplicationBuilder InjectDependencies(this WebApplicationBuilder builder) - { - return builder; - } - public static void SetupLogging(this WebApplicationBuilder builder) { var isDevelopment = builder.Environment.IsDevelopment(); diff --git a/Manager.App/Manager.App.csproj b/Manager.App/Manager.App.csproj index 840fc84..c25e6ce 100644 --- a/Manager.App/Manager.App.csproj +++ b/Manager.App/Manager.App.csproj @@ -21,8 +21,13 @@ + + + + + diff --git a/Manager.App/Program.cs b/Manager.App/Program.cs index 52ef25f..f8f59b7 100644 --- a/Manager.App/Program.cs +++ b/Manager.App/Program.cs @@ -10,6 +10,9 @@ builder.Services.AddRazorComponents() builder.SetupLogging(); +/* App setup */ + + /* MudBlazor */ builder.Services.AddMudServices(); diff --git a/Manager.Data/Contexts/ApplicationDbContext.cs b/Manager.Data/Contexts/ApplicationDbContext.cs deleted file mode 100644 index 2f67707..0000000 --- a/Manager.Data/Contexts/ApplicationDbContext.cs +++ /dev/null @@ -1,33 +0,0 @@ -using Manager.Data.Models.ApplicationContext; -using Microsoft.EntityFrameworkCore; - -namespace Manager.Data.Contexts; - -public sealed class ApplicationDbContext : DbContext -{ - public ApplicationDbContext(DbContextOptions options) : base(options) - { - ChangeTracker.QueryTrackingBehavior = QueryTrackingBehavior.NoTracking; - ChangeTracker.LazyLoadingEnabled = false; - } - - public DbSet SettingsGroups { get; set; } - public DbSet Settings { get; set; } - - protected override void OnModelCreating(ModelBuilder modelBuilder) - { - modelBuilder.Entity(sg => - { - sg.ToTable("settings_groups"); - sg.HasKey(x => x.Id); - }); - - modelBuilder.Entity(settingsEntity => - { - settingsEntity.ToTable("settings"); - settingsEntity.HasKey(x => x.Key); - }); - - base.OnModelCreating(modelBuilder); - } -} \ No newline at end of file diff --git a/Manager.Data/Contexts/LibraryDbContext.cs b/Manager.Data/Contexts/LibraryDbContext.cs index 982536e..747e31b 100644 --- a/Manager.Data/Contexts/LibraryDbContext.cs +++ b/Manager.Data/Contexts/LibraryDbContext.cs @@ -1,5 +1,5 @@ -using Manager.Data.Models.LibraryContext; -using Manager.Data.Models.LibraryContext.Join; +using Manager.Data.Entities.LibraryContext; +using Manager.Data.Entities.LibraryContext.Join; using Microsoft.EntityFrameworkCore; namespace Manager.Data.Contexts; diff --git a/Manager.Data/DataService.cs b/Manager.Data/DataService.cs deleted file mode 100644 index 9712215..0000000 --- a/Manager.Data/DataService.cs +++ /dev/null @@ -1,2 +0,0 @@ -namespace Manager.Data; - diff --git a/Manager.Data/Models/DateTimeBase.cs b/Manager.Data/Entities/DateTimeBase.cs similarity index 84% rename from Manager.Data/Models/DateTimeBase.cs rename to Manager.Data/Entities/DateTimeBase.cs index ff02e2b..3638ed8 100644 --- a/Manager.Data/Models/DateTimeBase.cs +++ b/Manager.Data/Entities/DateTimeBase.cs @@ -1,4 +1,4 @@ -namespace Manager.Data.Models; +namespace Manager.Data.Entities; public abstract class DateTimeBase { diff --git a/Manager.Data/Models/LibraryContext/CaptionEntity.cs b/Manager.Data/Entities/LibraryContext/CaptionEntity.cs similarity index 89% rename from Manager.Data/Models/LibraryContext/CaptionEntity.cs rename to Manager.Data/Entities/LibraryContext/CaptionEntity.cs index 5b41bc3..206af06 100644 --- a/Manager.Data/Models/LibraryContext/CaptionEntity.cs +++ b/Manager.Data/Entities/LibraryContext/CaptionEntity.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace Manager.Data.Models.LibraryContext; +namespace Manager.Data.Entities.LibraryContext; public class CaptionEntity { diff --git a/Manager.Data/Models/LibraryContext/ChannelEntity.cs b/Manager.Data/Entities/LibraryContext/ChannelEntity.cs similarity index 92% rename from Manager.Data/Models/LibraryContext/ChannelEntity.cs rename to Manager.Data/Entities/LibraryContext/ChannelEntity.cs index 5a2e3b0..92f7df9 100644 --- a/Manager.Data/Models/LibraryContext/ChannelEntity.cs +++ b/Manager.Data/Entities/LibraryContext/ChannelEntity.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace Manager.Data.Models.LibraryContext; +namespace Manager.Data.Entities.LibraryContext; public class ChannelEntity : DateTimeBase { diff --git a/Manager.Data/Models/LibraryContext/ClientAccountEntity.cs b/Manager.Data/Entities/LibraryContext/ClientAccountEntity.cs similarity index 88% rename from Manager.Data/Models/LibraryContext/ClientAccountEntity.cs rename to Manager.Data/Entities/LibraryContext/ClientAccountEntity.cs index c794eb9..a05baf2 100644 --- a/Manager.Data/Models/LibraryContext/ClientAccountEntity.cs +++ b/Manager.Data/Entities/LibraryContext/ClientAccountEntity.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace Manager.Data.Models.LibraryContext; +namespace Manager.Data.Entities.LibraryContext; public class ClientAccountEntity : DateTimeBase { diff --git a/Manager.Data/Models/LibraryContext/HttpCookieEntity.cs b/Manager.Data/Entities/LibraryContext/HttpCookieEntity.cs similarity index 94% rename from Manager.Data/Models/LibraryContext/HttpCookieEntity.cs rename to Manager.Data/Entities/LibraryContext/HttpCookieEntity.cs index 41a9e10..af3c4a6 100644 --- a/Manager.Data/Models/LibraryContext/HttpCookieEntity.cs +++ b/Manager.Data/Entities/LibraryContext/HttpCookieEntity.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace Manager.Data.Models.LibraryContext; +namespace Manager.Data.Entities.LibraryContext; public class HttpCookieEntity : DateTimeBase { diff --git a/Manager.Data/Models/LibraryContext/Join/PlaylistMedia.cs b/Manager.Data/Entities/LibraryContext/Join/PlaylistMedia.cs similarity index 88% rename from Manager.Data/Models/LibraryContext/Join/PlaylistMedia.cs rename to Manager.Data/Entities/LibraryContext/Join/PlaylistMedia.cs index 0201196..18c67b0 100644 --- a/Manager.Data/Models/LibraryContext/Join/PlaylistMedia.cs +++ b/Manager.Data/Entities/LibraryContext/Join/PlaylistMedia.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace Manager.Data.Models.LibraryContext.Join; +namespace Manager.Data.Entities.LibraryContext.Join; public class PlaylistMedia { diff --git a/Manager.Data/Models/LibraryContext/MediaEntity.cs b/Manager.Data/Entities/LibraryContext/MediaEntity.cs similarity index 92% rename from Manager.Data/Models/LibraryContext/MediaEntity.cs rename to Manager.Data/Entities/LibraryContext/MediaEntity.cs index 7e9c417..7f6f13f 100644 --- a/Manager.Data/Models/LibraryContext/MediaEntity.cs +++ b/Manager.Data/Entities/LibraryContext/MediaEntity.cs @@ -1,7 +1,7 @@ using System.ComponentModel.DataAnnotations; -using Manager.Data.Models.LibraryContext.Join; +using Manager.Data.Entities.LibraryContext.Join; -namespace Manager.Data.Models.LibraryContext; +namespace Manager.Data.Entities.LibraryContext; public class MediaEntity : DateTimeBase { diff --git a/Manager.Data/Models/LibraryContext/MediaFormatEntity.cs b/Manager.Data/Entities/LibraryContext/MediaFormatEntity.cs similarity index 95% rename from Manager.Data/Models/LibraryContext/MediaFormatEntity.cs rename to Manager.Data/Entities/LibraryContext/MediaFormatEntity.cs index 59a44bb..30ba172 100644 --- a/Manager.Data/Models/LibraryContext/MediaFormatEntity.cs +++ b/Manager.Data/Entities/LibraryContext/MediaFormatEntity.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace Manager.Data.Models.LibraryContext; +namespace Manager.Data.Entities.LibraryContext; public class MediaFormatEntity { diff --git a/Manager.Data/Models/LibraryContext/PlaylistEntity.cs b/Manager.Data/Entities/LibraryContext/PlaylistEntity.cs similarity index 86% rename from Manager.Data/Models/LibraryContext/PlaylistEntity.cs rename to Manager.Data/Entities/LibraryContext/PlaylistEntity.cs index 94f77a8..8f09725 100644 --- a/Manager.Data/Models/LibraryContext/PlaylistEntity.cs +++ b/Manager.Data/Entities/LibraryContext/PlaylistEntity.cs @@ -1,7 +1,7 @@ using System.ComponentModel.DataAnnotations; -using Manager.Data.Models.LibraryContext.Join; +using Manager.Data.Entities.LibraryContext.Join; -namespace Manager.Data.Models.LibraryContext; +namespace Manager.Data.Entities.LibraryContext; public class PlaylistEntity : DateTimeBase { diff --git a/Manager.Data/Manager.Data.csproj b/Manager.Data/Manager.Data.csproj index 3b2f466..e749a16 100644 --- a/Manager.Data/Manager.Data.csproj +++ b/Manager.Data/Manager.Data.csproj @@ -17,6 +17,8 @@ + + diff --git a/Manager.Data/Models/ApplicationContext/SettingsGroupModel.cs b/Manager.Data/Models/ApplicationContext/SettingsGroupModel.cs deleted file mode 100644 index abaf1e2..0000000 --- a/Manager.Data/Models/ApplicationContext/SettingsGroupModel.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace Manager.Data.Models.ApplicationContext; - -public record SettingsGroupModel -{ - public required Guid Id { get; set; } - public required string Name { get; set; } -} \ No newline at end of file diff --git a/Manager.Data/Models/ApplicationContext/SettingsModel.cs b/Manager.Data/Models/ApplicationContext/SettingsModel.cs deleted file mode 100644 index 4a5dfcf..0000000 --- a/Manager.Data/Models/ApplicationContext/SettingsModel.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System.ComponentModel.DataAnnotations; - -namespace Manager.Data.Models.ApplicationContext; - -public class SettingsModel -{ - [MaxLength(DataConstants.DbContext.DefaultDbStringSize)] - public required string Key { get; set; } - [MaxLength(DataConstants.DbContext.DefaultDbStringSize)] - public required string Name { get; set; } - [MaxLength(DataConstants.DbContext.DefaultDbDescriptionStringSize)] - public required string Description { get; set; } - public Guid? GroupId { get; set; } - [MaxLength(DataConstants.DbContext.DefaultDbStringSize)] - public string ValueType { get; set; } = nameof(String); - public object? Value { get; set; } - public object? DefaultValue { get; set; } -} \ No newline at end of file