From 03a72c365dd15aead7a1b0c4504582e127619c08 Mon Sep 17 00:00:00 2001 From: quentin Date: Wed, 24 Apr 2024 16:04:15 -0500 Subject: [PATCH] Added update methods to models --- API/Services/ServiceBase.cs | 4 +++- DAL/Models/Color.cs | 9 ++++++++- DAL/Models/Event.cs | 11 ++++++++++- DAL/Models/Grant.cs | 7 ++++++- DAL/Models/Image.cs | 7 ++++++- DAL/Models/Model.cs | 4 +++- DAL/Models/Permission.cs | 6 +++++- DAL/Models/SavedEvent.cs | 9 ++++++++- DAL/Models/User.cs | 12 +++++++++++- 9 files changed, 60 insertions(+), 9 deletions(-) diff --git a/API/Services/ServiceBase.cs b/API/Services/ServiceBase.cs index 56f449e..fdc26c6 100644 --- a/API/Services/ServiceBase.cs +++ b/API/Services/ServiceBase.cs @@ -9,7 +9,7 @@ namespace API.Services { public class ServiceBase : IGenericService where TAuthentication : IGenericAuthentication - where TModel : Model + where TModel : Model where TAudit : class where TDTO : IAdaptable { @@ -77,6 +77,8 @@ namespace API.Services copyToAudit(origModel); + model.updateModel(ref origModel); + origModel.updated = DateTime.Now; origModel.updater = user.id; diff --git a/DAL/Models/Color.cs b/DAL/Models/Color.cs index de84420..6fc3619 100644 --- a/DAL/Models/Color.cs +++ b/DAL/Models/Color.cs @@ -7,7 +7,7 @@ namespace DAL.Models { [Table("colors")] [Index("updater", Name = "colors_users_id_fk")] - public class Color : Model + public class Color : Model { [Column("red")] public byte red { get; set; } @@ -35,5 +35,12 @@ namespace DAL.Models updater = updater }; } + public override void updateModel(ref Color dest) + { + dest.red = red; + dest.blue = blue; + dest.green = green; + dest.name = name; + } } } diff --git a/DAL/Models/Event.cs b/DAL/Models/Event.cs index 5756600..9e0323a 100644 --- a/DAL/Models/Event.cs +++ b/DAL/Models/Event.cs @@ -11,7 +11,7 @@ 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 : Model + public class Event : Model { [Column("savedEventId")] public ulong savedEventId { get; set; } @@ -52,5 +52,14 @@ namespace DAL.Models updater = updater }; } + public override void updateModel(ref Event dest) + { + dest.savedEventId = savedEventId; + dest.name = name; + dest.bgColorId = bgColorId; + dest.fgColorId = fgColorId; + dest.imageId = imageId; + dest.hidden = hidden; + } } } diff --git a/DAL/Models/Grant.cs b/DAL/Models/Grant.cs index 2185da3..693a268 100644 --- a/DAL/Models/Grant.cs +++ b/DAL/Models/Grant.cs @@ -9,7 +9,7 @@ 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 : Model + public class Grant : Model { [Column("name")] [MaxLength(128)] @@ -31,5 +31,10 @@ namespace DAL.Models updater = updater }; } + public override void updateModel(ref Grant dest) + { + dest.name = name; + dest.permissionId = permissionId; + } } } diff --git a/DAL/Models/Image.cs b/DAL/Models/Image.cs index e5a23b5..6402ee8 100644 --- a/DAL/Models/Image.cs +++ b/DAL/Models/Image.cs @@ -7,7 +7,7 @@ namespace DAL.Models { [Table("images")] [Index("updater", Name = "images_users_id_fk")] - public class Image : Model + public class Image : Model { [Column("name")] [MaxLength(64)] @@ -29,5 +29,10 @@ namespace DAL.Models updater = updater }; } + public override void updateModel(ref Image dest) + { + dest.name = name; + dest.filename = filename; + } } } diff --git a/DAL/Models/Model.cs b/DAL/Models/Model.cs index 8ec57c6..f796716 100644 --- a/DAL/Models/Model.cs +++ b/DAL/Models/Model.cs @@ -3,7 +3,7 @@ using System.ComponentModel.DataAnnotations.Schema; namespace DAL.Models { - public abstract class Model + public abstract class Model { [Key] [Column("id")] @@ -21,5 +21,7 @@ namespace DAL.Models public ICollection audits { get; set; } = new List(); public abstract TAudit adaptToAudit(); + + public abstract void updateModel(ref TBase dest); } } diff --git a/DAL/Models/Permission.cs b/DAL/Models/Permission.cs index bffc051..7f652ff 100644 --- a/DAL/Models/Permission.cs +++ b/DAL/Models/Permission.cs @@ -7,7 +7,7 @@ namespace DAL.Models { [Table("permissions")] [Index("updater", Name = "permissions_users_id_fk")] - public class Permission : Model + public class Permission : Model { [Column("name")] [MaxLength(64)] @@ -24,5 +24,9 @@ namespace DAL.Models updater = updater }; } + public override void updateModel(ref Permission dest) + { + dest.name = name; + } } } diff --git a/DAL/Models/SavedEvent.cs b/DAL/Models/SavedEvent.cs index 0ad41b3..ae4f82d 100644 --- a/DAL/Models/SavedEvent.cs +++ b/DAL/Models/SavedEvent.cs @@ -10,7 +10,7 @@ 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 : Model + public class SavedEvent : Model { [Column("name")] [MaxLength(64)] @@ -42,5 +42,12 @@ namespace DAL.Models updater = updater }; } + public override void updateModel(ref SavedEvent dest) + { + dest.name = name; + dest.bgColorId = bgColorId; + dest.fgColorId = fgColorId; + dest.imageId = imageId; + } } } diff --git a/DAL/Models/User.cs b/DAL/Models/User.cs index 4be31f3..fdbd035 100644 --- a/DAL/Models/User.cs +++ b/DAL/Models/User.cs @@ -15,7 +15,7 @@ namespace DAL.Models [Table("users")] [Index("updater", Name = "users_users_id_fk")] [Index("permissionId", Name = "users_permissions_id_fk")] - public class User : Model + public class User : Model { [Column("firstName")] [MaxLength(64)] @@ -56,5 +56,15 @@ namespace DAL.Models permissionId = permissionId }; } + public override void updateModel(ref User dest) + { + dest.firstName = firstName; + dest.lastName = lastName; + dest.phoneNumber = phoneNumber; + dest.password = password; + dest.salt = salt; + dest.hashingType = hashingType; + dest.permissionId = permissionId; + } } }