diff --git a/DAL/Models/Audits/AuditColor.cs b/DAL/Models/Audits/AuditColor.cs index d67f2f2..709199c 100644 --- a/DAL/Models/Audits/AuditColor.cs +++ b/DAL/Models/Audits/AuditColor.cs @@ -21,5 +21,19 @@ namespace DAL.Models.Audits [Column("name")] [MaxLength(64)] public string name { get; set; } = null!; + + public override Color adaptToModel() + { + return new Color + { + id = id, + red = red, + blue = blue, + green = green, + name = name, + updated = updated, + updater = updater + }; + } } } diff --git a/DAL/Models/Audits/AuditEvent.cs b/DAL/Models/Audits/AuditEvent.cs index 5530c96..65b796a 100644 --- a/DAL/Models/Audits/AuditEvent.cs +++ b/DAL/Models/Audits/AuditEvent.cs @@ -7,11 +7,8 @@ namespace DAL.Models.Audits [Table("audit_event")] [Index("id", Name = "audit_events_events_id_fk")] [Keyless] - public class AuditEvent + public class AuditEvent : AuditModel { - [Column("id")] - public ulong id { get; set; } - [Column("savedEventId")] public ulong savedEventId { get; set; } @@ -31,11 +28,20 @@ namespace DAL.Models.Audits [Column("hidden")] public bool hidden { get; set; } - [Column("updated")] - [DataType("datetime")] - public DateTime updated { get; set; } - - [Column("updater")] - public ulong updater { get; set; } + public override Event adaptToModel() + { + return new Event + { + id = id, + savedEventId = savedEventId, + name = name, + bgColorId = bgColorId, + fgColorId = fgColorId, + imageId = imageId, + hidden = hidden, + updated = updated, + updater = updater + }; + } } } diff --git a/DAL/Models/Audits/AuditGrant.cs b/DAL/Models/Audits/AuditGrant.cs index cc60037..890a440 100644 --- a/DAL/Models/Audits/AuditGrant.cs +++ b/DAL/Models/Audits/AuditGrant.cs @@ -7,11 +7,8 @@ namespace DAL.Models.Audits [Table("audit_grants")] [Index("id", Name = "audit_grants_grants_id_fk")] [Keyless] - public class AuditGrant + public class AuditGrant : AuditModel { - [Column("id")] - public ulong id { get; set; } - [Column("name")] [MaxLength(128)] public string name { get; set; } = null!; @@ -19,11 +16,16 @@ namespace DAL.Models.Audits [Column("permissionId")] public ulong permissionId { get; set; } - [Column("updated")] - [DataType("updated")] - public DateTime updated { get; set; } - - [Column("updater")] - public ulong updater { get; set; } + public override Grant adaptToModel() + { + return new Grant + { + id = id, + name = name, + permissionId = permissionId, + updated = updated, + updater = updater + }; + } } } diff --git a/DAL/Models/Audits/AuditImage.cs b/DAL/Models/Audits/AuditImage.cs index 190e094..e2580b5 100644 --- a/DAL/Models/Audits/AuditImage.cs +++ b/DAL/Models/Audits/AuditImage.cs @@ -7,12 +7,8 @@ namespace DAL.Models.Audits [Table("audit_images")] [Index("id", Name = "audit_images_images_id_fk")] [Keyless] - public class AuditImage + public class AuditImage : AuditModel { - [Key] - [Column("id")] - public ulong id { get; set; } - [Column("name")] [MaxLength(64)] public string name { get; set; } = null!; @@ -21,11 +17,16 @@ namespace DAL.Models.Audits [MaxLength(128)] public string filename { get; set; } = null!; - [Column("updated")] - [DataType("datetime")] - public DateTime updated { get; set; } - - [Column("updater")] - public ulong updater { get; set; } + public override Image adaptToModel() + { + return new Image + { + id = id, + name = name, + filename = filename, + updated = updated, + updater = updater + }; + } } } diff --git a/DAL/Models/Audits/AuditModel.cs b/DAL/Models/Audits/AuditModel.cs index 76b9479..65139fc 100644 --- a/DAL/Models/Audits/AuditModel.cs +++ b/DAL/Models/Audits/AuditModel.cs @@ -14,5 +14,7 @@ namespace DAL.Models.Audits [Column("updater")] public ulong updater { get; set; } + + public abstract TModel adaptToModel(); } } diff --git a/DAL/Models/Audits/AuditPermission.cs b/DAL/Models/Audits/AuditPermission.cs index 8e1754e..f6fdce7 100644 --- a/DAL/Models/Audits/AuditPermission.cs +++ b/DAL/Models/Audits/AuditPermission.cs @@ -7,20 +7,21 @@ namespace DAL.Models.Audits [Table("audit_permissions")] [Index("id", Name = "audit_permissions_permissions_id_fk")] [Keyless] - public class AuditPermission + public class AuditPermission : AuditModel { - [Column("id")] - public ulong id { get; set; } - [Column("name")] [MaxLength(64)] public string name { get; set; } = null!; - [Column("updated")] - [DataType("datetime")] - public DateTime updated { get; set; } - - [Column("updater")] - public ulong updater { get; set; } + public override Permission adaptToModel() + { + return new Permission + { + id = id, + name = name, + updated = updated, + updater = updater + }; + } } } diff --git a/DAL/Models/Audits/AuditSavedEvent.cs b/DAL/Models/Audits/AuditSavedEvent.cs index 7695c7d..4b17dec 100644 --- a/DAL/Models/Audits/AuditSavedEvent.cs +++ b/DAL/Models/Audits/AuditSavedEvent.cs @@ -7,11 +7,8 @@ namespace DAL.Models.Audits [Table("audit_savedEvents")] [Index("id", Name = "audit_savedEvents_savedEvents_id_fk")] [Keyless] - public class AuditSavedEvent + public class AuditSavedEvent : AuditModel { - [Column("id")] - public ulong id { get; set; } - [Column("name")] [MaxLength(64)] public string name { get; set; } = null!; @@ -25,11 +22,18 @@ namespace DAL.Models.Audits [Column("imageId")] public ulong? imageId { get; set; } - [Column("updated")] - [DataType("datetime")] - public DateTime updated { get; set; } - - [Column("updater")] - public ulong updater { get; set; } + public override SavedEvent adaptToModel() + { + return new SavedEvent + { + id = id, + name = name, + bgColorId = bgColorId, + fgColorId = fgColorId, + imageId = imageId, + updated = updated, + updater = updater + }; + } } } diff --git a/DAL/Models/Audits/AuditUser.cs b/DAL/Models/Audits/AuditUser.cs index 5bd0970..c3c31c9 100644 --- a/DAL/Models/Audits/AuditUser.cs +++ b/DAL/Models/Audits/AuditUser.cs @@ -7,11 +7,8 @@ namespace DAL.Models.Audits [Table("audit_users")] [Index("id", Name = "audit_users_users_id_fk")] [Keyless] - public class AuditUser + public class AuditUser : AuditModel { - [Column("id")] - public ulong id { get; set; } - [Column("firstName")] [MaxLength(64)] public string firstName { get; set; } = null!; @@ -30,11 +27,19 @@ namespace DAL.Models.Audits [Column("permissionId")] public ulong permissionId { get; set; } - [Column("updated")] - [DataType("datetime")] - public DateTime updated { get; set; } - - [Column("updater")] - public ulong updater { get; set; } + public override User adaptToModel() + { + return new User + { + id = id, + firstName = firstName, + lastName = lastName, + phoneNumber = phoneNumber, + hashingType = hashingType, + permissionId = permissionId, + updated = updated, + updater = updater + }; + } } } diff --git a/DAL/Models/Color.cs b/DAL/Models/Color.cs index 00a3c85..de84420 100644 --- a/DAL/Models/Color.cs +++ b/DAL/Models/Color.cs @@ -22,13 +22,18 @@ namespace DAL.Models [MaxLength(64)] public string name { get; set; } = null!; - public User updaterRelation { get; set; } = null!; - - public ICollection audits { get; set; } = new List(); - public override AuditColor adaptToAudit() { - throw new NotImplementedException(); + return new AuditColor + { + id = id, + red = red, + blue = blue, + green = green, + name = name, + updated = updated, + updater = updater + }; } } } diff --git a/DAL/Models/Event.cs b/DAL/Models/Event.cs index e0abbd5..5756600 100644 --- a/DAL/Models/Event.cs +++ b/DAL/Models/Event.cs @@ -11,12 +11,8 @@ namespace DAL.Models [Index("fgColorId", Name = "events_colors_id_fk_2")] [Index("imageId", Name = "events_images_id_fk")] [Index("savedEventId", Name = "events_savedEvents_id_fk")] - public class Event + public class Event : Model { - [Key] - [Column("id")] - public ulong id { get; set; } - [Column("savedEventId")] public ulong savedEventId { get; set; } @@ -36,19 +32,25 @@ namespace DAL.Models [Column("hidden")] public bool hidden { get; set; } - [Column("updated")] - [DataType("datetime")] - public DateTime updated { get; set; } - - [Column("updater")] - public ulong updater { get; set; } - - public User updaterRelation { get; set; } = null!; public SavedEvent savedEventRelation { get; set; } = null!; public Color? bgColorRelation { get; set; } public Color? fgColorRelation { get; set; } public Image? imageRelation { get; set; } - public ICollection audits { get; set; } = new List(); + public override AuditEvent adaptToAudit() + { + return new AuditEvent + { + id = id, + savedEventId = savedEventId, + name = name, + bgColorId = bgColorId, + fgColorId = fgColorId, + imageId = imageId, + hidden = hidden, + updated = updated, + updater = updater + }; + } } } diff --git a/DAL/Models/Grant.cs b/DAL/Models/Grant.cs index e09d7a7..2185da3 100644 --- a/DAL/Models/Grant.cs +++ b/DAL/Models/Grant.cs @@ -9,12 +9,8 @@ namespace DAL.Models [Index("updater", Name = "grants_users_id_fk")] [Index("permissionId", Name = "grants_permissions_id_fk")] [Index("updater", Name = "grants_users_id_fk")] - public class Grant + public class Grant : Model { - [Key] - [Column("id")] - public ulong id { get; set; } - [Column("name")] [MaxLength(128)] public string name { get; set; } = null!; @@ -22,16 +18,18 @@ namespace DAL.Models [Column("permissionId")] public ulong permissionId { get; set; } - [Column("updated")] - [DataType("updated")] - public DateTime updated { get; set; } - - [Column("updater")] - public ulong updater { get; set; } - - public virtual User updaterRelation { get; set; } = null!; public virtual Permission permissionRelation { get; set; } = null!; - public ICollection audits { get; set; } = new List(); + public override AuditGrant adaptToAudit() + { + return new AuditGrant + { + id = id, + name = name, + permissionId = permissionId, + updated = updated, + updater = updater + }; + } } } diff --git a/DAL/Models/Image.cs b/DAL/Models/Image.cs index 683c68a..e5a23b5 100644 --- a/DAL/Models/Image.cs +++ b/DAL/Models/Image.cs @@ -7,12 +7,8 @@ namespace DAL.Models { [Table("images")] [Index("updater", Name = "images_users_id_fk")] - public class Image + public class Image : Model { - [Key] - [Column("id")] - public ulong id { get; set; } - [Column("name")] [MaxLength(64)] public string name { get; set; } = null!; @@ -21,15 +17,17 @@ namespace DAL.Models [MaxLength(128)] public string filename { get; set; } = null!; - [Column("updated")] - [DataType("datetime")] - public DateTime updated { get; set; } - [Column("updater")] - public ulong updater { get; set; } - - public virtual User updaterRelation { get; set; } = null!; - - public ICollection audits { get; set; } = new List(); + public override AuditImage adaptToAudit() + { + return new AuditImage + { + id = id, + name = name, + filename = filename, + updated = updated, + updater = updater + }; + } } } diff --git a/DAL/Models/Model.cs b/DAL/Models/Model.cs index 90a67f6..8ec57c6 100644 --- a/DAL/Models/Model.cs +++ b/DAL/Models/Model.cs @@ -16,6 +16,10 @@ namespace DAL.Models [Column("updater")] public ulong updater { get; set; } + public User updaterRelation { get; set; } = null!; + + public ICollection audits { get; set; } = new List(); + public abstract TAudit adaptToAudit(); } } diff --git a/DAL/Models/Permission.cs b/DAL/Models/Permission.cs index 6cfdc2a..bffc051 100644 --- a/DAL/Models/Permission.cs +++ b/DAL/Models/Permission.cs @@ -7,25 +7,22 @@ namespace DAL.Models { [Table("permissions")] [Index("updater", Name = "permissions_users_id_fk")] - public class Permission + public class Permission : Model { - [Key] - [Column("id")] - public ulong id { get; set; } - [Column("name")] [MaxLength(64)] public string name { get; set; } = null!; - [Column("updated")] - [DataType("datetime")] - public DateTime updated { get; set; } - [Column("updater")] - public ulong updater { get; set; } - - public virtual User updaterRelation { get; set; } = null!; - - public ICollection audits { get; set; } = new List(); + public override AuditPermission adaptToAudit() + { + return new AuditPermission + { + id = id, + name = name, + updated = updated, + updater = updater + }; + } } } diff --git a/DAL/Models/SavedEvent.cs b/DAL/Models/SavedEvent.cs index 83e96c8..0ad41b3 100644 --- a/DAL/Models/SavedEvent.cs +++ b/DAL/Models/SavedEvent.cs @@ -10,12 +10,8 @@ namespace DAL.Models [Index("fgColorId", Name = "savedEvents_colors_id_fk")] [Index("bgColorId", Name = "savedEvents_colors_id_fk_2")] [Index("imageId", Name = "savedEvents_images_id_fk")] - public class SavedEvent + public class SavedEvent : Model { - [Key] - [Column("id")] - public ulong id { get; set; } - [Column("name")] [MaxLength(64)] public string name { get; set; } = null!; @@ -29,18 +25,22 @@ namespace DAL.Models [Column("imageId")] public ulong? imageId { get; set; } - [Column("updated")] - [DataType("datetime")] - public DateTime updated { get; set; } - - [Column("updater")] - public ulong updater { get; set; } - - public User updaterRelation { get; set; } = null!; public Color bgColorRelation { get; set; } = null!; public Color fgColorRelation { get; set; } = null!; public Image? imageRelation { get; set; } - public ICollection audits { get; set; } = new List(); + public override AuditSavedEvent adaptToAudit() + { + return new AuditSavedEvent + { + id = id, + name = name, + bgColorId = bgColorId, + fgColorId = fgColorId, + imageId = imageId, + updated = updated, + updater = updater + }; + } } } diff --git a/DAL/Models/User.cs b/DAL/Models/User.cs index 7db9777..4be31f3 100644 --- a/DAL/Models/User.cs +++ b/DAL/Models/User.cs @@ -15,12 +15,8 @@ namespace DAL.Models [Table("users")] [Index("updater", Name = "users_users_id_fk")] [Index("permissionId", Name = "users_permissions_id_fk")] - public class User + public class User : Model { - [Key] - [Column("id")] - public ulong id { get; set; } - [Column("firstName")] [MaxLength(64)] public string firstName { get; set; } = null!; @@ -47,15 +43,18 @@ namespace DAL.Models [Column("permissionId")] public ulong permissionId { get; set; } - [Column("updated")] - [DataType("datetime")] - public DateTime updated { get; set; } - [Column("updater")] - public ulong updater { get; set; } - - public virtual User updaterRelation { get; set; } = null!; - - public ICollection audits { get; set; } = new List(); + public override AuditUser adaptToAudit() + { + return new AuditUser + { + id = id, + firstName = firstName, + lastName = lastName, + phoneNumber = phoneNumber, + hashingType = hashingType, + permissionId = permissionId + }; + } } }