diff --git a/TIAM.Database.Test/DatabaseTestBase.cs b/TIAM.Database.Test/DatabaseTestBase.cs index e73e9bb9..6e09d40c 100644 --- a/TIAM.Database.Test/DatabaseTestBase.cs +++ b/TIAM.Database.Test/DatabaseTestBase.cs @@ -1,3 +1,4 @@ +using AyCode.Database.DbContexts; using AyCode.Database.Tests; using Microsoft.EntityFrameworkCore; using TIAM.Database.DbContexts; @@ -8,6 +9,7 @@ namespace TIAM.Database.Test { [TestClass] public class DatabaseTestBase : AcDatabaseTestBase + { [TestInitialize] public void Setup() @@ -19,5 +21,8 @@ namespace TIAM.Database.Test public void TearDown() { } + + [TestMethod] + public override void DatabaseExistsTest() => base.DatabaseExistsTest(); } } \ No newline at end of file diff --git a/TIAM.Database.Test/UserDalTests.cs b/TIAM.Database.Test/UserDalTests.cs index 8970ad54..09c2cdcc 100644 --- a/TIAM.Database.Test/UserDalTests.cs +++ b/TIAM.Database.Test/UserDalTests.cs @@ -74,7 +74,7 @@ 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, AppSettingsConfiguration); + var loginService = new LoginService(Dal, AcEnv.AppConfiguration); var errorCode = await loginService.RegistrationAsync(_registerUserId, RegisterEmail, RegisterPassword, null); Assert.IsTrue(errorCode == AcErrorCode.Unset); @@ -93,7 +93,7 @@ namespace TIAM.Database.Test { //var a = TiamConst.ProjectIdString; - var loginService = new LoginService(Dal, AppSettingsConfiguration); + var loginService = new LoginService(Dal, AcEnv.AppConfiguration); #region Valid email+password test var loggedInModel = loginService.Login(LoginEmail, LoginPassword); @@ -124,17 +124,17 @@ namespace TIAM.Database.Test #endregion Wrong password test } - [TestMethod] + [DataTestMethod] [DataRow("540271F6-C604-4C16-8160-D5A7CAFEDF00")] - public void GetUserById_ReturnsUser_WhenUserAndRelationsExists(string userIdString) + public override void AcBase_GetUserById_ReturnsUser_WhenUserExists(string userIdString) { - var user = AcBase_GetUserById_ReturnsUser_WhenUserExists(userIdString); + var user = AcBase_GetUserById(userIdString); Assert.IsTrue(user.ServiceProviders.Count > 0); Assert.IsTrue(user.UserToServiceProviders.Count > 0); } - [TestMethod] + [DataTestMethod] [DataRow("test@tiam.hu")] public override void AcBase_GetUserByEmail_ReturnsUser_WhenUserExists(string email) { @@ -144,7 +144,7 @@ namespace TIAM.Database.Test Assert.IsTrue(user.UserToServiceProviders.Count > 0); } - [TestMethod] + [DataTestMethod] [DataRow("test@tiam.hu")] public async Task GetUserByEmailAsync_ReturnsUser_WhenUserAndRelationsExists(string email) { @@ -154,7 +154,7 @@ namespace TIAM.Database.Test Assert.IsTrue(user.UserToServiceProviders.Count > 0); } - [TestMethod] + [DataTestMethod] [DataRow("540271F6-C604-4C16-8160-D5A7CAFEDF00")] [DataRow("dcf451d2-cc4c-4ac2-8c1f-da00041be1fd")] [DataRow("ac612aa8-863b-4b4f-9d63-f5d261b5c5f9")] @@ -188,48 +188,10 @@ namespace TIAM.Database.Test [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]; + public override async Task AcBase_AddUserTest(string[] userIdProfileIdAddressIdEmailStrings) + => await base.AcBase_AddUserTest(userIdProfileIdAddressIdEmailStrings); - 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, false); - - 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, false); - 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.json b/TIAM.Database.Test/appsettings.json index 48d14a21..780df2ec 100644 --- a/TIAM.Database.Test/appsettings.json +++ b/TIAM.Database.Test/appsettings.json @@ -1,6 +1,6 @@ { "ConnectionStrings": { - "DeveloperDbConnection": "Data Source=185.51.190.197;Initial Catalog=TIAM_DEV;Trusted_Connection=False;Connect Timeout=200;User ID=Anata_Development_Team;Password=v6f_?xNfg9N1;MultipleActiveResultSets=true" + "DeveloperDbConnection": "Data Source=185.51.190.197;Initial Catalog=TIAM_DEV;Trusted_Connection=false;Encrypt=false;TrustServerCertificate=True;Connect Timeout=200;User ID=Anata_Development_Team;Password=v6f_?xNfg9N1;MultipleActiveResultSets=true" }, "Logging": { "LogLevel": { diff --git a/TIAM.Database/DbContexts/DbContextBase.cs b/TIAM.Database/DbContexts/DbContextBase.cs index ea346ee4..18bf05e9 100644 --- a/TIAM.Database/DbContexts/DbContextBase.cs +++ b/TIAM.Database/DbContexts/DbContextBase.cs @@ -33,8 +33,8 @@ namespace TIAM.Database.DbContexts optionsBuilder.EnableDetailedErrors(true); //optionsBuilder.UseSqlServer(Configuration.GetConnectionString("DeveloperDbConnection")); - var connString = "Data Source=185.51.190.197;Initial Catalog=TIAM_DEV;Trusted_Connection=false;Encrypt=false;TrustServerCertificate=True;Connect Timeout=200;User ID=Anata_Development_Team;Password=v6f_?xNfg9N1;MultipleActiveResultSets=true"; - optionsBuilder.UseSqlServer(connString); + //var connString = "Data Source=185.51.190.197;Initial Catalog=TIAM_DEV;Trusted_Connection=false;Encrypt=false;TrustServerCertificate=True;Connect Timeout=200;User ID=Anata_Development_Team;Password=v6f_?xNfg9N1;MultipleActiveResultSets=true"; + //optionsBuilder.UseSqlServer(connString); } } } diff --git a/TIAM.Database/ModelBuilders/Users/UserEntityTypeConfigurations.cs b/TIAM.Database/ModelBuilders/Users/UserEntityTypeConfigurations.cs index 5c04b666..9f33add3 100644 --- a/TIAM.Database/ModelBuilders/Users/UserEntityTypeConfigurations.cs +++ b/TIAM.Database/ModelBuilders/Users/UserEntityTypeConfigurations.cs @@ -1,4 +1,5 @@ using AyCode.Database.DbContexts; +using AyCode.Database.ModelBuilders.Profiles; using AyCode.Database.ModelBuilders.Users; using AyCode.Interfaces.Users; using Microsoft.EntityFrameworkCore; @@ -7,7 +8,6 @@ using TIAM.Entities.Addresses; using TIAM.Entities.Profiles; using TIAM.Entities.ServiceProviders; using TIAM.Entities.Users; -using static AyCode.Database.ModelBuilders.Profiles.AcProfileEntityTypeConfigurations; namespace TIAM.Database.ModelBuilders.Users; diff --git a/TIAMWebApp/Server/appsettings.json b/TIAMWebApp/Server/appsettings.json index 48d14a21..780df2ec 100644 --- a/TIAMWebApp/Server/appsettings.json +++ b/TIAMWebApp/Server/appsettings.json @@ -1,6 +1,6 @@ { "ConnectionStrings": { - "DeveloperDbConnection": "Data Source=185.51.190.197;Initial Catalog=TIAM_DEV;Trusted_Connection=False;Connect Timeout=200;User ID=Anata_Development_Team;Password=v6f_?xNfg9N1;MultipleActiveResultSets=true" + "DeveloperDbConnection": "Data Source=185.51.190.197;Initial Catalog=TIAM_DEV;Trusted_Connection=false;Encrypt=false;TrustServerCertificate=True;Connect Timeout=200;User ID=Anata_Development_Team;Password=v6f_?xNfg9N1;MultipleActiveResultSets=true" }, "Logging": { "LogLevel": {