From 3af9cb10e0fa9d806f495ac21869f32d9838f8f4 Mon Sep 17 00:00:00 2001 From: "jozsef.b@aycode.com" <9Rj@D}fVwBaN> Date: Wed, 24 Apr 2024 06:50:53 +0200 Subject: [PATCH] refactoring, improvements... --- TIAM.Database.Test/AdminDalTest.cs | 46 -------------- TIAM.Database.Test/TIAM.Database.Test.csproj | 8 +-- TIAM.Database.Test/UserDalTests.cs | 62 +++++++++++++++++-- .../appsettings.Development.json | 17 ----- TIAM.Database/DataLayers/Admins/AdminDal.cs | 40 ++++++------ .../DbContexts/Users/UserDbContext.cs | 1 + .../Server/Controllers/UserAPIController.cs | 2 +- 7 files changed, 80 insertions(+), 96 deletions(-) delete mode 100644 TIAM.Database.Test/appsettings.Development.json diff --git a/TIAM.Database.Test/AdminDalTest.cs b/TIAM.Database.Test/AdminDalTest.cs index b11a561c..0f5c4de0 100644 --- a/TIAM.Database.Test/AdminDalTest.cs +++ b/TIAM.Database.Test/AdminDalTest.cs @@ -572,51 +572,5 @@ namespace TIAM.Database.Test } #endregion EmailMessage - - #region User - [DataTestMethod] - [DataRow(["e31044d7-1771-4a32-8dd9-6f9853ed53c6", "0a831191-70a3-4504-9ec4-c5902affaba7", "8eed080c-d2ce-4cc3-bcfe-2268c220bba7", "addUser_test9432@tiam.hu"])] - public async Task AddUserTest(string[] userIdProfileIdAddressIdEmailStrings) - { - var userId = Guid.Parse(userIdProfileIdAddressIdEmailStrings[0]); - var profileId = Guid.Parse(userIdProfileIdAddressIdEmailStrings[1]); - var addressId = Guid.Parse(userIdProfileIdAddressIdEmailStrings[2]); - var email = userIdProfileIdAddressIdEmailStrings[3]; - - var fromAddress = "Budapest, Liszt Ferenc tér"; - var toAddress = "1211 Budapest, Kossuth Lajos utca 145"; - //var userProductToCarId = Guid.Parse("97179a87-d99f-4f12-b7b2-75e21aaec6ab"); - - await Dal.RemoveUserAsync(userId); //kitöröljük a szemetet, ha korábbról bentmaradt - J. - - var user = new User(userId, email, "235664", "dsfglfjg45r34903t3kggvq"); - //user.ProfileId = profileId; - - var profile = new Profile(); - profile.Id = profileId;; - profile.Name = "Add user test name"; - - var address = new Address(); - address.Id = addressId; - address.Latitude = 5362.2341652256; - address.Longitude = 5362.2341333317; - address.AddressText = "1214 Kossuth Lajos utca 124."; - - user.Profile = profile; - user.Profile.Address = address; - - Assert.IsTrue(await Dal.AddUserAsync(user)); - user = Dal.GetUserById(userId); - - Assert.IsNotNull(user); - Assert.IsNotNull(user.Profile); - Assert.IsNotNull(user.Profile.Address); - - Assert.IsTrue(await Dal.RemoveUserAsync(userId)); //mielőbb kitöröljük, h ne maradjon szemét a db-ben - J. - - user = Dal.GetUserById(userId); - Assert.IsNull(user); //a korábbi törlés miatt NULL kell legyen - J. - } - #endregion } } diff --git a/TIAM.Database.Test/TIAM.Database.Test.csproj b/TIAM.Database.Test/TIAM.Database.Test.csproj index e871fda1..74121880 100644 --- a/TIAM.Database.Test/TIAM.Database.Test.csproj +++ b/TIAM.Database.Test/TIAM.Database.Test.csproj @@ -10,16 +10,10 @@ - - - PreserveNewest - true - PreserveNewest - PreserveNewest true @@ -32,6 +26,8 @@ + + diff --git a/TIAM.Database.Test/UserDalTests.cs b/TIAM.Database.Test/UserDalTests.cs index ae22e85e..152be2ee 100644 --- a/TIAM.Database.Test/UserDalTests.cs +++ b/TIAM.Database.Test/UserDalTests.cs @@ -24,15 +24,13 @@ namespace TIAM.Database.Test private const string LoginEmail = "asdfsdf@ggggg.hu"; private const string LoginPassword = "alad'r"; - private WebAssemblyHostConfiguration _configuration = new(); + //private WebAssemblyHostConfiguration _configuration = new(); //private Mock _mockContext; [TestInitialize] public void TestInitialize() { - _configuration = new WebAssemblyHostConfiguration(); - _configuration.Build(); - _configuration.Reload(); + //AppSettingsConfiguration = InitAppSettingsConfiguration(); //_configuration["JWT:Key"] = "Cee4400-rDMFkVvHPufyLDSzbfu2grgRhpepos299IhTLOXsljkcpt3yUR4RRjPQ"; //_configuration["JWT:Audience"] = "http://localhost:5000"; @@ -57,10 +55,18 @@ namespace TIAM.Database.Test await Dal.RemoveUserAsync(_registerUserId); //kitöröljük a szemetet, ha korábbról bentmaradt - J. - var loginService = new LoginService(Dal, _configuration); + var loginService = new LoginService(Dal, AppSettingsConfiguration); var errorCode = await loginService.RegistrationAsync(_registerUserId, RegisterEmail, RegisterPassword, null); Assert.IsTrue(errorCode == AcErrorCode.Unset); + + var user = Dal.GetUserByEmail(RegisterEmail); + + Assert.IsNotNull(user); + Assert.IsNotNull(user.Profile); + Assert.IsNotNull(user.Profile.Address); + + await Dal.RemoveUserAsync(user); //kitöröljük a szemetet - J. } [TestMethod] @@ -68,7 +74,7 @@ namespace TIAM.Database.Test { //var a = TiamConst.ProjectIdString; - var loginService = new LoginService(Dal, _configuration); + var loginService = new LoginService(Dal, AppSettingsConfiguration); #region Valid email+password test var loggedInModel = loginService.Login(LoginEmail, LoginPassword); @@ -161,6 +167,50 @@ namespace TIAM.Database.Test Assert.IsTrue(userModel.UserToServiceProviders.Count > 0); } + [DataTestMethod] + [DataRow(["e31044d7-1771-4a32-8dd9-6f9853ed53c6", "0a831191-70a3-4504-9ec4-c5902affaba7", "8eed080c-d2ce-4cc3-bcfe-2268c220bba7", "addUser_test9432@tiam.hu"])] + public async Task AddUserTest(string[] userIdProfileIdAddressIdEmailStrings) + { + var userId = Guid.Parse(userIdProfileIdAddressIdEmailStrings[0]); + var profileId = Guid.Parse(userIdProfileIdAddressIdEmailStrings[1]); + var addressId = Guid.Parse(userIdProfileIdAddressIdEmailStrings[2]); + var email = userIdProfileIdAddressIdEmailStrings[3]; + + var fromAddress = "Budapest, Liszt Ferenc tér"; + var toAddress = "1211 Budapest, Kossuth Lajos utca 145"; + //var userProductToCarId = Guid.Parse("97179a87-d99f-4f12-b7b2-75e21aaec6ab"); + + await Dal.RemoveUserAsync(userId); //kitöröljük a szemetet, ha korábbról bentmaradt - J. + + var user = new User(userId, email, "235664", "dsfglfjg45r34903t3kggvq"); + user.ProfileId = profileId; + + var profile = new Profile(); + profile.Id = profileId;; + profile.Name = "Add user test name"; + + var address = new Address(); + address.Id = addressId; + address.Latitude = 5362.2341652256; + address.Longitude = 5362.2341333317; + address.AddressText = "1214 Kossuth Lajos utca 124."; + + user.Profile = profile; + user.Profile.AddressId = addressId; + user.Profile.Address = address; + + Assert.IsTrue(await Dal.AddUserAsync(user)); + user = Dal.GetUserById(userId); + + Assert.IsNotNull(user); + Assert.IsNotNull(user.Profile); + Assert.IsNotNull(user.Profile.Address); + + Assert.IsTrue(await Dal.RemoveUserAsync(userId)); //mielőbb kitöröljük, h ne maradjon szemét a db-ben - J. + + user = Dal.GetUserById(userId); + Assert.IsNull(user); //a korábbi törlés miatt NULL kell legyen - J. + } //[TestMethod] //[DataRow("test@tiam.hu")] //public async Task GetUserByEmailAsync_ReturnsUser_WhenUserExists(string email) diff --git a/TIAM.Database.Test/appsettings.Development.json b/TIAM.Database.Test/appsettings.Development.json deleted file mode 100644 index 23ad61ca..00000000 --- a/TIAM.Database.Test/appsettings.Development.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "Logging": { - "LogLevel": { - "Default": "Information", - "Microsoft.AspNetCore": "Warning" - } - }, - "JWT": { - "Key": "Cee4400-rDMFkVvHPufyLDSzbfu2grgRhpepos299IhTLOXsljkcpt3yUR4RRjPQ", - "Issuer": "https://localhost:7116", - "Audience": "http://localhost:7116" - }, - "SendGrid": { - //"Key": "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" - "Key": "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" - } -} diff --git a/TIAM.Database/DataLayers/Admins/AdminDal.cs b/TIAM.Database/DataLayers/Admins/AdminDal.cs index 7435efcb..73663f9d 100644 --- a/TIAM.Database/DataLayers/Admins/AdminDal.cs +++ b/TIAM.Database/DataLayers/Admins/AdminDal.cs @@ -101,30 +101,30 @@ namespace TIAM.Database.DataLayers.Admins public string? GetUserJsonById(Guid userId) => Session(ctx => ctx.GetUserById(userId)?.ToJson()); public string GetUsersJson() => Session(ctx => ctx.Users.ToJson()); - public Task AddUserAsync(User user) => TransactionAsync(ctx => ctx.AddUser(user)); + //public Task AddUserAsync(User user) => TransactionAsync(ctx => ctx.AddUser(user)); - public Task AddUserAsync(User user, string profileName, Address address, string? firstName = null, string? lastName = null) - { - return TransactionAsync(ctx => - { - var profile = new Profile - { - Id = Guid.NewGuid(), - Name = profileName, - FirstName = firstName, - LastName = lastName, - Address = address, - AddressId = address.Id - }; + //public Task AddUserAsync(User user, string profileName, Address address, string? firstName = null, string? lastName = null) + //{ + // return TransactionAsync(ctx => + // { + // var profile = new Profile + // { + // Id = Guid.NewGuid(), + // Name = profileName, + // FirstName = firstName, + // LastName = lastName, + // Address = address, + // AddressId = address.Id + // }; - user.Profile= profile; + // user.Profile= profile; - return ctx.AddUser(user); - }); - } + // return ctx.AddUser(user); + // }); + //} - public Task RemoveUserAsync(User user) => TransactionAsync(ctx => ctx.RemoveUser(user)); - public Task RemoveUserAsync(Guid userId) => TransactionAsync(ctx => ctx.RemoveUser(userId)); + //public Task RemoveUserAsync(User user) => TransactionAsync(ctx => ctx.RemoveUser(user)); + //public Task RemoveUserAsync(Guid userId) => TransactionAsync(ctx => ctx.RemoveUser(userId)); public Product? GetProductById(Guid contextId, bool includeUsers = true) => Session(ctx => ctx.GetProductById(contextId, includeUsers)); diff --git a/TIAM.Database/DbContexts/Users/UserDbContext.cs b/TIAM.Database/DbContexts/Users/UserDbContext.cs index c75d88e5..3b99bf24 100644 --- a/TIAM.Database/DbContexts/Users/UserDbContext.cs +++ b/TIAM.Database/DbContexts/Users/UserDbContext.cs @@ -31,6 +31,7 @@ namespace TIAM.Database.DbContexts.Users public DbSet Users { get; set; } public DbSet UserTokens { get; set; } + public DbSet Profiles { get; set; } public DbSet
Addresses { get; set; } public DbSet Transfers { get; set; } diff --git a/TIAMWebApp/Server/Controllers/UserAPIController.cs b/TIAMWebApp/Server/Controllers/UserAPIController.cs index 1492aa17..26625471 100644 --- a/TIAMWebApp/Server/Controllers/UserAPIController.cs +++ b/TIAMWebApp/Server/Controllers/UserAPIController.cs @@ -277,7 +277,7 @@ namespace TIAMWebApp.Server.Controllers userToCreate.Profile.Address.AddressText = null; userToCreate.Profile.Address.Latitude = Math.Round(90 + rnd.NextDouble(), 8); userToCreate.Profile.Address.Longitude = Math.Round(180 + rnd.NextDouble(), 8); - result = await _adminDal.AddUserAsync(userToCreate); + result = await _userDal.AddUserAsync(userToCreate); guestUser = await _userDal.GetUserModelDtoDetailByIdAsync(userId); } }