From ca17d28bfaf8091e2910d89bcac7259ee5598b73 Mon Sep 17 00:00:00 2001 From: "jozsef.b@aycode.com" <9Rj@D}fVwBaN> Date: Fri, 19 Jan 2024 07:34:52 +0100 Subject: [PATCH] Add ProductId to Transfer; Add IsAdmin to UserProductMapping; --- TIAM.Database.Test/AdminDalTest.cs | 1 + TIAM.Entities/Transfers/Transfer.cs | 5 +++-- TIAM.Entities/Users/UserProductMapping.cs | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/TIAM.Database.Test/AdminDalTest.cs b/TIAM.Database.Test/AdminDalTest.cs index df6319c7..5f173a6a 100644 --- a/TIAM.Database.Test/AdminDalTest.cs +++ b/TIAM.Database.Test/AdminDalTest.cs @@ -311,6 +311,7 @@ namespace TIAM.Database.Test { Id = transferId, ProductId = productId, + //ReferralProductId = productId, Appointment = DateTime.UtcNow.AddDays(3), FlightNumber = "GSD234", FromAddress = fromAddress, diff --git a/TIAM.Entities/Transfers/Transfer.cs b/TIAM.Entities/Transfers/Transfer.cs index d6ba2f81..4cd81105 100644 --- a/TIAM.Entities/Transfers/Transfer.cs +++ b/TIAM.Entities/Transfers/Transfer.cs @@ -10,11 +10,12 @@ using TIAM.Entities.Products; namespace TIAM.Entities.Transfers; [Table(nameof(Transfer))] -public class Transfer: IEntityGuid, ITimeStampInfo, IProductForeignKey +public class Transfer: IEntityGuid, ITimeStampInfo, IProductForeignKey { [Key, DatabaseGenerated(DatabaseGeneratedOption.None)] public Guid Id { get; set; } + public Guid ProductId { get; set; } public Guid? UserProductMappingId { get; set; } public Guid? UserProductToCarId { get; set; } [Required] public TransferStatusType TransferStatusType { get; set; } = TransferStatusType.OrderSubmitted; @@ -31,7 +32,7 @@ public class Transfer: IEntityGuid, ITimeStampInfo, IProductForeignKey [MaxLength(250)] public string? Comment { get; set; } [Column("ReferralProductId")] - public Guid? ProductId { get; set; } + public Guid? ReferralProductId { get; set; } public DateTime Created { get; set; } public DateTime Modified { get; set; } diff --git a/TIAM.Entities/Users/UserProductMapping.cs b/TIAM.Entities/Users/UserProductMapping.cs index e279903c..6652e0f8 100644 --- a/TIAM.Entities/Users/UserProductMapping.cs +++ b/TIAM.Entities/Users/UserProductMapping.cs @@ -22,6 +22,7 @@ public class UserProductMapping : IEntityGuid, IUserForeignKey, IProductForeignK public virtual Product Product { get; set; } public int Permissions { get; set; } = 1; + public bool IsAdmin { get; set; } //[JsonIgnore] //private string? JsonDetails { get; set; }