From a883b368bfedffec7cfd0997012787dcda923024 Mon Sep 17 00:00:00 2001
From: "jozsef.b@aycode.com" <9Rj@D}fVwBaN>
Date: Mon, 3 Jun 2024 09:28:00 +0200
Subject: [PATCH] fixes, improvements

---
 AyCode.Entities/ServiceProviders/AcCompany.cs |  2 +-
 AyCode.Interfaces/IAcModelDtoBase.cs          |  5 +++++
 AyCode.Models/AcModelDtoBase.cs               | 12 ++++++++++++
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/AyCode.Entities/ServiceProviders/AcCompany.cs b/AyCode.Entities/ServiceProviders/AcCompany.cs
index c4f2a16..c5c7323 100644
--- a/AyCode.Entities/ServiceProviders/AcCompany.cs
+++ b/AyCode.Entities/ServiceProviders/AcCompany.cs
@@ -60,7 +60,7 @@ namespace AyCode.Entities.ServiceProviders
         {
             Id = id;
             Name = name;
-            OwnerId = ownerId;
+            OwnerId = ownerId == Guid.Empty ? null : ownerId;
 
             AffiliateId = affiliateId;
             CommissionPercent = commissionPercent;
diff --git a/AyCode.Interfaces/IAcModelDtoBase.cs b/AyCode.Interfaces/IAcModelDtoBase.cs
index 79a4926..904d382 100644
--- a/AyCode.Interfaces/IAcModelDtoBase.cs
+++ b/AyCode.Interfaces/IAcModelDtoBase.cs
@@ -4,4 +4,9 @@ namespace AyCode.Interfaces;
 
 public interface IAcModelDtoBase : IEntityGuid
 {
+}
+
+public interface IAcModelDtoBase<out TMainEntity> : IAcModelDtoBase where TMainEntity : IEntityGuid
+{
+    TMainEntity CreateMainEntity();
 }
\ No newline at end of file
diff --git a/AyCode.Models/AcModelDtoBase.cs b/AyCode.Models/AcModelDtoBase.cs
index 95f28dc..2efdb34 100644
--- a/AyCode.Models/AcModelDtoBase.cs
+++ b/AyCode.Models/AcModelDtoBase.cs
@@ -9,4 +9,16 @@ public abstract class AcModelDtoBase : IAcModelDtoBase
 
     protected AcModelDtoBase(){}
     protected AcModelDtoBase(Guid id) => Id = id;
+}
+
+public abstract class AcModelDtoBase<TMainEntity> : AcModelDtoBase, IAcModelDtoBase<TMainEntity> where TMainEntity : IEntityGuid
+{
+    protected AcModelDtoBase() { }
+    protected AcModelDtoBase(Guid id) : this() => Id = id;
+    protected AcModelDtoBase(TMainEntity mainEntity) : this(mainEntity.Id) { }
+    
+    public virtual TMainEntity CreateMainEntity()
+    {
+        throw new NotImplementedException();
+    }
 }
\ No newline at end of file