From c5273f467e2f56da85e3d1236909e27d98a96d82 Mon Sep 17 00:00:00 2001 From: Adam Date: Sun, 10 Dec 2023 14:00:29 +0100 Subject: [PATCH] Small EFCore mapping fixes --- TIAM.Entities/Permissions/PermissionGroupUserMapping.cs | 9 ++++++--- TIAM.Entities/Products/Product.cs | 4 ++-- TIAM.Entities/Products/TiamProduct.cs | 8 ++++---- .../Server/Controllers/ServiceProviderAPIController.cs | 1 - 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/TIAM.Entities/Permissions/PermissionGroupUserMapping.cs b/TIAM.Entities/Permissions/PermissionGroupUserMapping.cs index bb9edbd7..e7ac9eda 100644 --- a/TIAM.Entities/Permissions/PermissionGroupUserMapping.cs +++ b/TIAM.Entities/Permissions/PermissionGroupUserMapping.cs @@ -16,14 +16,17 @@ public class PermissionGroupUserMapping : IEntityGuid, ITimeStampInfo public DateTime Created { get; set; } public DateTime Modified { get; set; } - public PermissionGroupUserMapping(Guid assignedUserId, Guid permissionContectMappingId) : this (Guid.NewGuid(), assignedUserId, permissionContectMappingId) + public PermissionGroupUserMapping(Guid assignedUserId, Guid permissionContextMappingId) : this (Guid.NewGuid(), assignedUserId, permissionContextMappingId) { } - public PermissionGroupUserMapping(Guid id, Guid assignedUserId, Guid permissionContectMappingId) + public PermissionGroupUserMapping(Guid id, Guid assignedUserId, Guid permissionContextMappingId) { Id = id; AssignedUserId = assignedUserId; - PermissionContextMappingId = permissionContectMappingId; + PermissionContextMappingId = permissionContextMappingId; + Created = DateTime.UtcNow; + Modified = DateTime.UtcNow; + } } \ No newline at end of file diff --git a/TIAM.Entities/Products/Product.cs b/TIAM.Entities/Products/Product.cs index bef6eb86..c1f81f2b 100644 --- a/TIAM.Entities/Products/Product.cs +++ b/TIAM.Entities/Products/Product.cs @@ -13,7 +13,7 @@ public class Product : IEntityGuid, ITimeStampInfo public Guid Id { get; set; } public ProductType ProductType { get; set; } - public Guid UsermediaId { get; set; } + public Guid UserMediaId { get; set; } public string Name { get; set; } public string Description { get; set; } @@ -27,7 +27,7 @@ public class Product : IEntityGuid, ITimeStampInfo { Id = id; ProductType = type; - UsermediaId = userMediaId; + UserMediaId = userMediaId; Name = name; Description = description; Price = price; diff --git a/TIAM.Entities/Products/TiamProduct.cs b/TIAM.Entities/Products/TiamProduct.cs index e7f4b46c..d781cf3b 100644 --- a/TIAM.Entities/Products/TiamProduct.cs +++ b/TIAM.Entities/Products/TiamProduct.cs @@ -9,16 +9,16 @@ namespace TIAM.Entities.Products; [Table("Products")] public class TiamProduct : Product { - [Key, DatabaseGenerated(DatabaseGeneratedOption.None)] - + public Guid OwnerId { get; set; } - public TiamProduct(Guid ownerId, ProductType type, Guid userMediaId, string name, string description, float price, string jsonDetails) : this(Guid.NewGuid(), ownerId, type, userMediaId, name, description, price, jsonDetails) { } - public TiamProduct(Guid id, Guid ownerId, ProductType type, Guid userMediaId, string name, string description, float price, string jsonDetails) : base(id, type, userMediaId, name, description, price, jsonDetails) + public TiamProduct(Guid ownerId, ProductType productType, Guid userMediaId, string name, string description, float price, string jsonDetails) : this(Guid.NewGuid(), ownerId, productType, userMediaId, name, description, price, jsonDetails) { } + public TiamProduct(Guid id, Guid ownerId, ProductType productType, Guid userMediaId, string name, string description, float price, string jsonDetails) : base(id, productType, userMediaId, name, description, price, jsonDetails) { OwnerId = ownerId; } + } \ No newline at end of file diff --git a/TIAMWebApp/Server/Controllers/ServiceProviderAPIController.cs b/TIAMWebApp/Server/Controllers/ServiceProviderAPIController.cs index 3b4df479..81bde2d1 100644 --- a/TIAMWebApp/Server/Controllers/ServiceProviderAPIController.cs +++ b/TIAMWebApp/Server/Controllers/ServiceProviderAPIController.cs @@ -48,7 +48,6 @@ namespace TIAMWebApp.Server.Controllers //Array.Resize(ref users, users.Length + 1); //users[users.Length - 1] = new UserModel(user.Email, user.PhoneNumber, user.Password); - var id = Guid.NewGuid(); string? name = SerializedServiceProviderModel?.Name; Guid ownerId = SerializedServiceProviderModel?.OwnerId ?? Guid.Empty;