diff --git a/AyCode.Models/Users/AcUserModelDtoBase.cs b/AyCode.Models/Users/AcUserModelDtoBase.cs index 467b222..f676d4f 100644 --- a/AyCode.Models/Users/AcUserModelDtoBase.cs +++ b/AyCode.Models/Users/AcUserModelDtoBase.cs @@ -7,26 +7,25 @@ using AyCode.Interfaces.Users.Dtos; namespace AyCode.Models.Users; -public abstract class AcUserModelDtoBase : AcUserModelDtoMinBase, IAcCompanyRelation - where TUserDto : class, IAcUserDtoBase - where TProfile : class, IAcProfile +public abstract class AcUserModelDtoBase : AcUserModelDtoMinBase, IAcCompanyRelation + where TUserDto : class, IAcUserDtoBase + where TProfile : class, IAcProfile where TProfileDto : class, IAcProfileDtoBase where TCompany : class, IAcCompanyBase where TUserToServiceProvider : class, IAcUserToCompanyBase - where TProfileAddress : class, IAcAddress + where TAddress : class, IAcAddress { public List ServiceProviders { get; set; } public List UserToServiceProviders { get; set; } protected AcUserModelDtoBase() {} - protected AcUserModelDtoBase(IAcUserDtoBase user) : base(user) + protected AcUserModelDtoBase(IAcUserDtoBase user) : base(user) { Profile.AddressId = user.Profile.AddressId; UserDto.AffiliateId = user.AffiliateId; if (user.ServiceProviders.Count == 0) return; - //így proxy error lesz... - J. //ServiceProviders = new List(user.ServiceProviders); //UserToServiceProviders = new List(user.UserToServiceProviders); diff --git a/AyCode.Models/Users/AcUserModelDtoDetailBase.cs b/AyCode.Models/Users/AcUserModelDtoDetailBase.cs index 96135ab..9b078ed 100644 --- a/AyCode.Models/Users/AcUserModelDtoDetailBase.cs +++ b/AyCode.Models/Users/AcUserModelDtoDetailBase.cs @@ -7,17 +7,21 @@ using AyCode.Interfaces.Users.Dtos; namespace AyCode.Models.Users; -public abstract class AcUserModelDtoDetailBase : AcUserModelDtoBase - where TUserDtoDetail : class, IAcUserDtoDetailBase - where TProfile : class, IAcProfile +public abstract class AcUserModelDtoDetailBase : AcUserModelDtoBase + where TUserDtoDetail : class, IAcUserDtoDetailBase + where TProfile : class, IAcProfile where TProfileDto : class, IAcProfileDtoBase where TCompany : class, IAcCompanyBase where TUserToServiceProvider : class, IAcUserToCompanyBase - where TProfileAddress : class, IAcAddress + where TAddress : class, IAcAddress { protected AcUserModelDtoDetailBase() {} - protected AcUserModelDtoDetailBase(IAcUserDtoDetailBase user) : base(user) + protected AcUserModelDtoDetailBase(IAcUserDtoDetailBase user) : base(user) { + Profile.Address = Activator.CreateInstance(); + Profile.Address.Id = user.Profile.AddressId; + + UserDto.EmailAddress = user.EmailAddress; UserDto.PhoneNumber = user.PhoneNumber; UserDto.Created = user.Created; diff --git a/AyCode.Models/Users/AcUserModelDtoMinBase.cs b/AyCode.Models/Users/AcUserModelDtoMinBase.cs index c5d055c..6c07af9 100644 --- a/AyCode.Models/Users/AcUserModelDtoMinBase.cs +++ b/AyCode.Models/Users/AcUserModelDtoMinBase.cs @@ -6,14 +6,14 @@ using AyCode.Interfaces.Users.Dtos; namespace AyCode.Models.Users; -public abstract class AcUserModelDtoMinBase : AcModelDtoBase, IAcUserModelDtoMinBase +public abstract class AcUserModelDtoMinBase : AcModelDtoBase, IAcUserModelDtoMinBase where TUserDtoMin : class, IAcUserDtoMinBase - where TProfile : class, IAcProfile + where TProfile : class, IAcProfile where TProfileDto : class, IAcProfileDtoBase - where TProfileAddress : class, IAcAddress + where TAddress : class, IAcAddress { public TUserDtoMin UserDto { get; set;} - public TProfileDto? Profile { get; set; } + public TProfile Profile { get; set; } protected AcUserModelDtoMinBase() {} protected AcUserModelDtoMinBase(IAcUserDtoMinBase user) : base(user.Id) @@ -24,7 +24,7 @@ public abstract class AcUserModelDtoMinBase(); + Profile = Activator.CreateInstance(); Profile.Id = user.Profile.Id; Profile.Name = user.Profile.Name; Profile.FirstName = user.Profile.FirstName;