From f356f15d3a7dce1669944d23ab395ec96d042293 Mon Sep 17 00:00:00 2001 From: ivar Date: Sun, 28 Apr 2024 22:37:48 +0200 Subject: Misc --- code/api/src/Models/Database/BaseWithOwner.cs | 59 ++++--- code/api/src/Models/Database/MainAppDatabase.cs | 200 ++++++++++++------------ code/api/src/Models/Misc/ApiSpecDocument.cs | 2 +- code/api/src/Models/Misc/AppConfiguration.cs | 2 +- code/api/src/Models/Misc/AppPath.cs | 2 +- code/api/src/Models/Misc/KnownProblemModel.cs | 2 +- code/api/src/Models/Misc/LoggedInUserModel.cs | 2 +- code/api/src/Models/Misc/RequestTimeZoneInfo.cs | 2 +- code/api/src/Models/Static/AppConstants.cs | 15 +- 9 files changed, 140 insertions(+), 146 deletions(-) (limited to 'code/api/src/Models') diff --git a/code/api/src/Models/Database/BaseWithOwner.cs b/code/api/src/Models/Database/BaseWithOwner.cs index 3c29c76..40789ee 100644 --- a/code/api/src/Models/Database/BaseWithOwner.cs +++ b/code/api/src/Models/Database/BaseWithOwner.cs @@ -5,41 +5,36 @@ namespace IOL.GreatOffice.Api.Models.Database; /// public abstract class BaseWithOwner : Base { - protected BaseWithOwner() { } + protected BaseWithOwner() { } - protected BaseWithOwner(Guid createdBy) - { - CreatedBy = createdBy; - } + protected BaseWithOwner(Guid createdBy) { + CreatedBy = createdBy; + } - protected BaseWithOwner(LoggedInUserModel loggedInUser) - { - CreatedBy = loggedInUser.Id; - } + protected BaseWithOwner(LoggedInUserModel loggedInUser) { + CreatedBy = loggedInUser.Id; + } - public Guid? UserId { get; private set; } - public Guid? TenantId { get; private set; } - public Guid? ModifiedBy { get; private set; } - public Guid? CreatedBy { get; private set; } - public Guid? DeletedBy { get; private set; } - public User OwningUser { get; set; } - public Tenant OwningTenant { get; set; } + public Guid? UserId { get; private set; } + public Guid? TenantId { get; private set; } + public Guid? ModifiedBy { get; private set; } + public Guid? CreatedBy { get; private set; } + public Guid? DeletedBy { get; private set; } + public User OwningUser { get; set; } + public Tenant OwningTenant { get; set; } - public void SetDeleted(Guid userId) - { - DeletedBy = userId; - base.SetDeleted(); - } + public void SetDeleted(Guid userId) { + DeletedBy = userId; + base.SetDeleted(); + } - public void SetModified(Guid userId) - { - ModifiedBy = userId; - base.SetModified(); - } + public void SetModified(Guid userId) { + ModifiedBy = userId; + base.SetModified(); + } - public void SetOwnerIds(Guid userId = default, Guid tenantId = default) - { - if (tenantId != default) TenantId = tenantId; - if (userId != default) UserId = userId; - } -} + public void SetOwnerIds(Guid userId = default, Guid tenantId = default) { + if (tenantId != default) TenantId = tenantId; + if (userId != default) UserId = userId; + } +} \ No newline at end of file diff --git a/code/api/src/Models/Database/MainAppDatabase.cs b/code/api/src/Models/Database/MainAppDatabase.cs index cba7269..18f534e 100644 --- a/code/api/src/Models/Database/MainAppDatabase.cs +++ b/code/api/src/Models/Database/MainAppDatabase.cs @@ -4,106 +4,106 @@ namespace IOL.GreatOffice.Api.Models.Database; public class MainAppDatabase : DbContext, IDataProtectionKeyContext { - public MainAppDatabase(DbContextOptions options) : base(options) { } - public DbSet Users { get; set; } - public DbSet PasswordResetRequests { get; set; } - public DbSet AccessTokens { get; set; } - public DbSet Tenants { get; set; } - public DbSet DataProtectionKeys { get; set; } - public DbSet Projects { get; set; } - public DbSet ProjectLabels { get; set; } - public DbSet Customers { get; set; } - public DbSet CustomersContacts { get; set; } - public DbSet CustomerEvents { get; set; } - public DbSet CustomerGroups { get; set; } - public DbSet TodoLabels { get; set; } - public DbSet TodoProjectAccessControls { get; set; } - public DbSet TodoProjects { get; set; } - public DbSet TodoComments { get; set; } - public DbSet Todos { get; set; } - public DbSet ValidationEmails { get; set; } + public MainAppDatabase(DbContextOptions options) : base(options) { } + public DbSet Users { get; set; } + public DbSet PasswordResetRequests { get; set; } + public DbSet AccessTokens { get; set; } + public DbSet Tenants { get; set; } + public DbSet DataProtectionKeys { get; set; } + public DbSet Projects { get; set; } + public DbSet ProjectLabels { get; set; } + public DbSet Customers { get; set; } + public DbSet CustomersContacts { get; set; } + public DbSet CustomerEvents { get; set; } + public DbSet CustomerGroups { get; set; } + public DbSet TodoLabels { get; set; } + public DbSet TodoProjectAccessControls { get; set; } + public DbSet TodoProjects { get; set; } + public DbSet TodoComments { get; set; } + public DbSet Todos { get; set; } + public DbSet ValidationEmails { get; set; } - protected override void OnModelCreating(ModelBuilder modelBuilder) { - modelBuilder.Entity(e => { - e.HasMany(n => n.Tenants); - e.ToTable("users"); - }); - modelBuilder.Entity(e => { - e.HasOne(c => c.User); - e.ToTable("password_reset_requests"); - }); - modelBuilder.Entity(e => { - e.HasOne(n => n.User); - e.ToTable("api_access_tokens"); - }); - modelBuilder.Entity(e => { - e.HasMany(n => n.Users); - e.ToTable("tenants"); - }); - modelBuilder.Entity(e => { - e.HasMany(n => n.Members); - e.HasMany(n => n.Customers); - e.ToTable("projects"); - }); - modelBuilder.Entity(e => { - e.HasOne(n => n.Project); - e.HasOne(n => n.User); - e.ToTable("project_members"); - }); - modelBuilder.Entity(e => { - e.HasOne(n => n.Project); - e.ToTable("project_labels"); - }); - modelBuilder.Entity(e => { - e.HasOne(n => n.Owner); - e.HasMany(n => n.Events); - e.HasMany(n => n.Contacts); - e.HasMany(n => n.Groups); - e.HasMany(n => n.Projects); - e.ToTable("customers"); - }); - modelBuilder.Entity(e => { - e.HasOne(n => n.Customer); - e.ToTable("customer_contacts"); - }); - modelBuilder.Entity(e => { - e.HasOne(n => n.Customer); - e.ToTable("customer_events"); - }); - modelBuilder.Entity(e => { - e.HasMany(n => n.Customers); - e.ToTable("customer_groups"); - }); - modelBuilder.Entity(e => { - e.HasOne(n => n.Collection); - e.HasOne(n => n.AssignedTo); - e.HasOne(n => n.ClosedBy); - e.HasMany(n => n.Labels); - e.HasMany(n => n.Comments); - e.ToTable("todos"); - }); - modelBuilder.Entity(e => { - e.HasOne(n => n.Project); - e.HasMany(n => n.AccessControls); - e.ToTable("todo_collections"); - }); - modelBuilder.Entity(e => { - e.HasOne(n => n.Todo); - e.ToTable("todo_comments"); - }); - modelBuilder.Entity(e => { - e.HasOne(n => n.Todo); - e.ToTable("todo_labels"); - }); - modelBuilder.Entity(e => { - e.HasOne(n => n.User); - e.HasOne(n => n.Collection); - e.ToTable("todo_collection_access_controls"); - }); - modelBuilder.Entity(e => { - e.ToTable("validation_emails"); - }); + protected override void OnModelCreating(ModelBuilder modelBuilder) { + modelBuilder.Entity(e => { + e.HasMany(n => n.Tenants); + e.ToTable("users"); + }); + modelBuilder.Entity(e => { + e.HasOne(c => c.User); + e.ToTable("password_reset_requests"); + }); + modelBuilder.Entity(e => { + e.HasOne(n => n.User); + e.ToTable("api_access_tokens"); + }); + modelBuilder.Entity(e => { + e.HasMany(n => n.Users); + e.ToTable("tenants"); + }); + modelBuilder.Entity(e => { + e.HasMany(n => n.Members); + e.HasMany(n => n.Customers); + e.ToTable("projects"); + }); + modelBuilder.Entity(e => { + e.HasOne(n => n.Project); + e.HasOne(n => n.User); + e.ToTable("project_members"); + }); + modelBuilder.Entity(e => { + e.HasOne(n => n.Project); + e.ToTable("project_labels"); + }); + modelBuilder.Entity(e => { + e.HasOne(n => n.Owner); + e.HasMany(n => n.Events); + e.HasMany(n => n.Contacts); + e.HasMany(n => n.Groups); + e.HasMany(n => n.Projects); + e.ToTable("customers"); + }); + modelBuilder.Entity(e => { + e.HasOne(n => n.Customer); + e.ToTable("customer_contacts"); + }); + modelBuilder.Entity(e => { + e.HasOne(n => n.Customer); + e.ToTable("customer_events"); + }); + modelBuilder.Entity(e => { + e.HasMany(n => n.Customers); + e.ToTable("customer_groups"); + }); + modelBuilder.Entity(e => { + e.HasOne(n => n.Collection); + e.HasOne(n => n.AssignedTo); + e.HasOne(n => n.ClosedBy); + e.HasMany(n => n.Labels); + e.HasMany(n => n.Comments); + e.ToTable("todos"); + }); + modelBuilder.Entity(e => { + e.HasOne(n => n.Project); + e.HasMany(n => n.AccessControls); + e.ToTable("todo_collections"); + }); + modelBuilder.Entity(e => { + e.HasOne(n => n.Todo); + e.ToTable("todo_comments"); + }); + modelBuilder.Entity(e => { + e.HasOne(n => n.Todo); + e.ToTable("todo_labels"); + }); + modelBuilder.Entity(e => { + e.HasOne(n => n.User); + e.HasOne(n => n.Collection); + e.ToTable("todo_collection_access_controls"); + }); + modelBuilder.Entity(e => { + e.ToTable("validation_emails"); + }); - base.OnModelCreating(modelBuilder); - } + base.OnModelCreating(modelBuilder); + } } diff --git a/code/api/src/Models/Misc/ApiSpecDocument.cs b/code/api/src/Models/Misc/ApiSpecDocument.cs index a515baf..8cf928d 100644 --- a/code/api/src/Models/Misc/ApiSpecDocument.cs +++ b/code/api/src/Models/Misc/ApiSpecDocument.cs @@ -1,4 +1,4 @@ -namespace IOL.GreatOffice.Api.Models.Models; +namespace IOL.GreatOffice.Api.Models.Misc; public class ApiSpecDocument { diff --git a/code/api/src/Models/Misc/AppConfiguration.cs b/code/api/src/Models/Misc/AppConfiguration.cs index a71970c..f7fc428 100644 --- a/code/api/src/Models/Misc/AppConfiguration.cs +++ b/code/api/src/Models/Misc/AppConfiguration.cs @@ -2,7 +2,7 @@ using System.Diagnostics; using System.Security.Cryptography.X509Certificates; using System.Text; -namespace IOL.GreatOffice.Api.Models.Models; +namespace IOL.GreatOffice.Api.Models.Misc; public class AppConfiguration { diff --git a/code/api/src/Models/Misc/AppPath.cs b/code/api/src/Models/Misc/AppPath.cs index 5a8c206..c020425 100644 --- a/code/api/src/Models/Misc/AppPath.cs +++ b/code/api/src/Models/Misc/AppPath.cs @@ -1,4 +1,4 @@ -namespace IOL.GreatOffice.Api.Models.Models; +namespace IOL.GreatOffice.Api.Models.Misc; public sealed record AppPath { diff --git a/code/api/src/Models/Misc/KnownProblemModel.cs b/code/api/src/Models/Misc/KnownProblemModel.cs index 5a9927f..1c948d8 100644 --- a/code/api/src/Models/Misc/KnownProblemModel.cs +++ b/code/api/src/Models/Misc/KnownProblemModel.cs @@ -1,4 +1,4 @@ -namespace IOL.GreatOffice.Api.Models.Models; +namespace IOL.GreatOffice.Api.Models.Misc; public class KnownProblemModel { diff --git a/code/api/src/Models/Misc/LoggedInUserModel.cs b/code/api/src/Models/Misc/LoggedInUserModel.cs index ce2b163..49d05d4 100644 --- a/code/api/src/Models/Misc/LoggedInUserModel.cs +++ b/code/api/src/Models/Misc/LoggedInUserModel.cs @@ -1,4 +1,4 @@ -namespace IOL.GreatOffice.Api.Models.Models; +namespace IOL.GreatOffice.Api.Models.Misc; public class LoggedInUserModel { diff --git a/code/api/src/Models/Misc/RequestTimeZoneInfo.cs b/code/api/src/Models/Misc/RequestTimeZoneInfo.cs index 4d9d8c1..9e7201c 100644 --- a/code/api/src/Models/Misc/RequestTimeZoneInfo.cs +++ b/code/api/src/Models/Misc/RequestTimeZoneInfo.cs @@ -1,4 +1,4 @@ -namespace IOL.GreatOffice.Api.Models.Models; +namespace IOL.GreatOffice.Api.Models.Misc; public class RequestTimeZoneInfo { diff --git a/code/api/src/Models/Static/AppConstants.cs b/code/api/src/Models/Static/AppConstants.cs index edd5bf0..85bf3db 100644 --- a/code/api/src/Models/Static/AppConstants.cs +++ b/code/api/src/Models/Static/AppConstants.cs @@ -2,11 +2,10 @@ namespace IOL.GreatOffice.Api.Models.Static; public static class AppConstants { - public const string API_NAME = "Greatoffice API"; - public const string BASIC_AUTH_SCHEME = "BasicAuthenticationScheme"; - public const string TOKEN_ALLOW_READ = "TOKEN_ALLOW_READ"; - public const string TOKEN_ALLOW_CREATE = "TOKEN_ALLOW_CREATE"; - public const string TOKEN_ALLOW_UPDATE = "TOKEN_ALLOW_UPDATE"; - public const string TOKEN_ALLOW_DELETE = "TOKEN_ALLOW_DELETE"; - public const string VAULT_CACHE_KEY = "VAULT_CACHE_KEY"; -} + public const string API_NAME = "Greatoffice API"; + public const string BASIC_AUTH_SCHEME = "BasicAuthenticationScheme"; + public const string TOKEN_ALLOW_READ = "TOKEN_ALLOW_READ"; + public const string TOKEN_ALLOW_CREATE = "TOKEN_ALLOW_CREATE"; + public const string TOKEN_ALLOW_UPDATE = "TOKEN_ALLOW_UPDATE"; + public const string TOKEN_ALLOW_DELETE = "TOKEN_ALLOW_DELETE"; +} \ No newline at end of file -- cgit v1.3