diff --git a/TIAM.Database.Test/AdminDalTest.cs b/TIAM.Database.Test/AdminDalTest.cs index b9e4c399..d808fc47 100644 --- a/TIAM.Database.Test/AdminDalTest.cs +++ b/TIAM.Database.Test/AdminDalTest.cs @@ -246,7 +246,7 @@ namespace TIAM.Database.Test Assert.IsNotNull(userModel); Assert.IsNotNull(userModel.UserDto); - Assert.IsNotNull(userModel.Profile); + Assert.IsNotNull(userModel.ProfileDto); Assert.IsTrue(userModel.Id == userId, "userModel.Id != userId"); diff --git a/TIAM.Database.Test/UserDalTests.cs b/TIAM.Database.Test/UserDalTests.cs index 9cfb682e..16943433 100644 --- a/TIAM.Database.Test/UserDalTests.cs +++ b/TIAM.Database.Test/UserDalTests.cs @@ -150,6 +150,11 @@ namespace TIAM.Database.Test Assert.IsTrue(user.UserToServiceProviders.Count > 0); } + [DataTestMethod] + [DataRow("540271F6-C604-4C16-8160-D5A7CAFEDF00")] + public override void AcBase_GetUserModelDtoDetailById_ReturnsUser_WhenUserExists(string userIdString) + => base.AcBase_GetUserModelDtoDetailById_ReturnsUser_WhenUserExists(userIdString); + [DataTestMethod] [DataRow("540271F6-C604-4C16-8160-D5A7CAFEDF00")] [DataRow("dcf451d2-cc4c-4ac2-8c1f-da00041be1fd")] @@ -171,7 +176,7 @@ namespace TIAM.Database.Test Assert.IsNotNull(userModel); Assert.IsNotNull(userModel.UserDto); - Assert.IsNotNull(userModel.Profile); + Assert.IsNotNull(userModel.ProfileDto); if (userId != Guid.Parse("540271F6-C604-4C16-8160-D5A7CAFEDF00")) return; //csak az "540271F6.."-nek van product-ja! - J. diff --git a/TIAM.Entities/Profiles/IProfile.cs b/TIAM.Entities/Profiles/IProfile.cs index 06ec1d3a..06abcc5a 100644 --- a/TIAM.Entities/Profiles/IProfile.cs +++ b/TIAM.Entities/Profiles/IProfile.cs @@ -4,7 +4,7 @@ using TIAM.Entities.Addresses; namespace TIAM.Entities.Profiles; -public interface IProfile : IAcProfile, IProfileDto where TAddress : class, IAddress +public interface IProfile : IAcProfile, IProfileDto where TAddress : class, IAddress { } \ No newline at end of file diff --git a/TIAM.Entities/Profiles/IProfileDto.cs b/TIAM.Entities/Profiles/IProfileDto.cs index 4e611827..f90edc9f 100644 --- a/TIAM.Entities/Profiles/IProfileDto.cs +++ b/TIAM.Entities/Profiles/IProfileDto.cs @@ -1,8 +1,13 @@ using AyCode.Interfaces.Profiles.Dtos; +using TIAM.Entities.Addresses; namespace TIAM.Entities.Profiles; public interface IProfileDto : IAcProfileDtoBase { +} + +public interface IProfileDto : IProfileDto, IAcProfileDtoBase where TAddress : class, IAddressDto +{ } \ No newline at end of file diff --git a/TIAM.Entities/Users/IUser.cs b/TIAM.Entities/Users/IUser.cs index b6b39d9f..be979b7a 100644 --- a/TIAM.Entities/Users/IUser.cs +++ b/TIAM.Entities/Users/IUser.cs @@ -6,7 +6,7 @@ using TIAM.Entities.ServiceProviders; namespace TIAM.Entities.Users; -public interface IUser : IAcUser, IUserDto, IUserBase +public interface IUser : IAcUser, IUserDto, IUserBase { public List Products { get; } diff --git a/TIAM.Entities/Users/IUserDto.cs b/TIAM.Entities/Users/IUserDto.cs index 83e0b6b2..8210de9e 100644 --- a/TIAM.Entities/Users/IUserDto.cs +++ b/TIAM.Entities/Users/IUserDto.cs @@ -10,9 +10,8 @@ using TIAM.Entities.ServiceProviders; namespace TIAM.Entities.Users; -public interface IUserDto : IAcUserDtoBase - where TProfile : class, IProfile +public interface IUserDto : IAcUserDtoBase + where TProfile : class, IProfileDto where TCompany : class, ICompanyBase where TUserToServiceProvider : class, IUserToCompanyBase - where TProfileAddress : class, IAddress { } \ No newline at end of file diff --git a/TIAM.Entities/Users/User.cs b/TIAM.Entities/Users/User.cs index 5e15aa8e..f9af2f84 100644 --- a/TIAM.Entities/Users/User.cs +++ b/TIAM.Entities/Users/User.cs @@ -14,7 +14,7 @@ using TIAM.Entities.ServiceProviders; namespace TIAM.Entities.Users { [Table("Users")] - public class User : AcUser, IUser + public class User : AcUser, IUser, IUserDtoDetail { public virtual List Products { get; } = new(); diff --git a/TIAM.Models/Dtos/Profiles/ProfileDto.cs b/TIAM.Models/Dtos/Profiles/ProfileDto.cs index fc81c162..44c7555a 100644 --- a/TIAM.Models/Dtos/Profiles/ProfileDto.cs +++ b/TIAM.Models/Dtos/Profiles/ProfileDto.cs @@ -1,7 +1,14 @@ -using TIAM.Entities.Profiles; +using AyCode.Interfaces.Profiles.Dtos; +using TIAM.Entities.Addresses; +using TIAM.Entities.Profiles; namespace TIAM.Models.Dtos.Profiles; +public class ProfileDto : ProfileDto, IProfileDto where TAddress : class, IAddressDto +{ + public TAddress Address { get; set; } +} + public class ProfileDto : IProfileDto //TODO: AcProfileDtoBase - J. { public Guid Id { get; set; } diff --git a/TIAM.Models/Dtos/Users/UserDto.cs b/TIAM.Models/Dtos/Users/UserDto.cs index 0593fa70..8b2fcf05 100644 --- a/TIAM.Models/Dtos/Users/UserDto.cs +++ b/TIAM.Models/Dtos/Users/UserDto.cs @@ -6,7 +6,7 @@ using TIAM.Entities.Users; namespace TIAM.Models.Dtos.Users; -public class UserDto : IUserDto +public class UserDto : IUserDto { public Guid Id { get; set; } diff --git a/TIAM.Models/Dtos/Users/UserModelDto.cs b/TIAM.Models/Dtos/Users/UserModelDto.cs index 7893f1ba..ad64e51f 100644 --- a/TIAM.Models/Dtos/Users/UserModelDto.cs +++ b/TIAM.Models/Dtos/Users/UserModelDto.cs @@ -10,7 +10,7 @@ using TIAM.Models.Dtos.Profiles; namespace TIAM.Models.Dtos.Users; -public class UserModelDto : AcUserModelDtoBase, IProductsRelation, IUserModelDtoMinBase +public class UserModelDto : AcUserModelDtoBase, IProductsRelation, IUserModelDtoMinBase { public List UserProductMappings { get; set; } public List Products { get; set; } diff --git a/TIAM.Models/Dtos/Users/UserModelDtoDetail.cs b/TIAM.Models/Dtos/Users/UserModelDtoDetail.cs index 820b18fc..cdc396b0 100644 --- a/TIAM.Models/Dtos/Users/UserModelDtoDetail.cs +++ b/TIAM.Models/Dtos/Users/UserModelDtoDetail.cs @@ -13,7 +13,7 @@ using TIAM.Models.Dtos.Profiles; namespace TIAM.Models.Dtos.Users { - public class UserModelDtoDetail : AcUserModelDtoDetailBase, IProductsRelation, IUserModelDtoMinBase + public class UserModelDtoDetail : AcUserModelDtoDetailBase, IProductsRelation, IUserModelDtoMinBase { public List UserProductMappings { get; set; } public List Products { get; set; } diff --git a/TIAMSharedUI/Pages/DbTestComponent.razor b/TIAMSharedUI/Pages/DbTestComponent.razor index b2220fc0..372ada07 100644 --- a/TIAMSharedUI/Pages/DbTestComponent.razor +++ b/TIAMSharedUI/Pages/DbTestComponent.razor @@ -14,7 +14,7 @@ else @foreach (var dest in Users) {

- @(dest.Profile.Name.IsNullOrWhiteSpace() ? dest.Id.ToString() : dest.Profile.Name) + @(dest.ProfileDto.Name.IsNullOrWhiteSpace() ? dest.Id.ToString() : dest.ProfileDto.Name)

} diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ManageUsers.razor b/TIAMSharedUI/Pages/User/SysAdmins/ManageUsers.razor index fe6a3a11..aa926650 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/ManageUsers.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageUsers.razor @@ -20,6 +20,7 @@ @using AyCode.Core.Loggers @using AyCode.Services.Loggers @using TIAM.Core.Loggers +@using TIAM.Entities.Addresses @layout AdminLayout @inject IEnumerable LogWriters @inject IStringLocalizer Localizer @@ -244,7 +245,7 @@ PhoneNumber = "" }; - userEditModel.Profile = new TIAM.Entities.Profiles.Profile + userEditModel.ProfileDto = new TIAM.Entities.Profiles.Profile { Name = "New user" }; @@ -311,7 +312,7 @@ async Task UpdateDataAsync() { //refresh grid - UserData = (await UserDataService.GetUsersWithDetailsAsync()).OrderBy(x => x.Profile?.Name).ToList(); + UserData = (await UserDataService.GetUsersWithDetailsAsync()).OrderBy(x => x.ProfileDto?.Name).ToList(); _logger.Info("orderData grid refreshed"); } @@ -319,7 +320,7 @@ { _logger = new LoggerClient(LogWriters.ToArray()); - UserData = (await UserDataService.GetUsersWithDetailsAsync()).OrderBy(x => x.Profile?.Name).ToList(); + UserData = (await UserDataService.GetUsersWithDetailsAsync()).OrderBy(x => x.ProfileDto?.Name).ToList(); base.OnInitialized(); } diff --git a/TIAMWebApp/Shared/Models/UserSessionModel.cs b/TIAMWebApp/Shared/Models/UserSessionModel.cs index 545fda70..bca5ef27 100644 --- a/TIAMWebApp/Shared/Models/UserSessionModel.cs +++ b/TIAMWebApp/Shared/Models/UserSessionModel.cs @@ -13,7 +13,7 @@ namespace TIAMWebApp.Shared.Application.Models public string Email => UserModelDto.UserDto.EmailAddress; public UserType UserType { get; set; } - public string? UserName => UserModelDto?.Profile?.Name; + public string? UserName => UserModelDto?.ProfileDto?.Name; public string DisplayName => string.IsNullOrWhiteSpace(UserName) ? UserId.ToString() : UserName; public Dictionary? HasProperties { get; set; }