diff --git a/src/CMSMicroservice.Domain/Entities/Transactions.cs b/src/CMSMicroservice.Domain/Entities/Transactions.cs index 8550f75..18c68b9 100644 --- a/src/CMSMicroservice.Domain/Entities/Transactions.cs +++ b/src/CMSMicroservice.Domain/Entities/Transactions.cs @@ -1,5 +1,3 @@ -using CMSMicroservice.Domain.Enums; - namespace CMSMicroservice.Domain.Entities; //آدرس کاربر public class Transactions : BaseAuditableEntity @@ -11,4 +9,6 @@ public class Transactions : BaseAuditableEntity public DateTime? PaymentDate { get; set; } public string? RefId { get; set; } public TransactionType Type { get; set; } + //UserOrder Collection Navigation Reference + public virtual ICollection UserOrders { get; set; } } diff --git a/src/CMSMicroservice.Domain/Entities/UserOrder.cs b/src/CMSMicroservice.Domain/Entities/UserOrder.cs index 1b3374d..336ebf6 100644 --- a/src/CMSMicroservice.Domain/Entities/UserOrder.cs +++ b/src/CMSMicroservice.Domain/Entities/UserOrder.cs @@ -1,5 +1,3 @@ -using CMSMicroservice.Domain.Enums; - namespace CMSMicroservice.Domain.Entities; //سفارش کاربر public class UserOrder : BaseAuditableEntity @@ -12,6 +10,8 @@ public class UserOrder : BaseAuditableEntity public virtual Package? Package { get; set; } //شناسه تراکنش public long? TransactionId { get; set; } + //Transaction Navigation Property + public virtual Transactions? Transaction { get; set; } //وضعیت پرداخت public PaymentStatus PaymentStatus { get; set; } //تاریخ پرداخت @@ -27,6 +27,4 @@ public class UserOrder : BaseAuditableEntity public PaymentMethod? PaymentMethod { get; set; } //FactorDetails Collection Navigation Reference public virtual ICollection FactorDetailss { get; set; } - //Transactions Collection Navigation Reference - public virtual ICollection Transactionss { get; set; } } diff --git a/src/CMSMicroservice.Infrastructure/Persistence/Configurations/UserOrderConfiguration.cs b/src/CMSMicroservice.Infrastructure/Persistence/Configurations/UserOrderConfiguration.cs index aea2a4e..1cb31e7 100644 --- a/src/CMSMicroservice.Infrastructure/Persistence/Configurations/UserOrderConfiguration.cs +++ b/src/CMSMicroservice.Infrastructure/Persistence/Configurations/UserOrderConfiguration.cs @@ -17,7 +17,11 @@ public class UserOrderConfiguration : IEntityTypeConfiguration .WithMany(entity => entity.UserOrders) .HasForeignKey(entity => entity.PackageId) .IsRequired(false); - builder.Property(entity => entity.TransactionId).IsRequired(false); + builder + .HasOne(entity => entity.Transaction) + .WithMany(entity => entity.TransactionUserOrders) + .HasForeignKey(entity => entity.TransactionId) + .IsRequired(false); builder.Property(entity => entity.PaymentStatus).IsRequired(true); builder.Property(entity => entity.PaymentDate).IsRequired(false); builder