diff --git a/Mango.Database.Test/DatabaseTestBase.cs b/Mango.Database.Test/DatabaseTestBase.cs index 75d2413..231d56c 100644 --- a/Mango.Database.Test/DatabaseTestBase.cs +++ b/Mango.Database.Test/DatabaseTestBase.cs @@ -1,6 +1,7 @@ using AyCode.Database.DbContexts; using AyCode.Database.Tests; using Mango.Database.DbContexts; +using Mango.Database.DbContexts.Users; namespace Mango.Database.Test { @@ -18,7 +19,7 @@ namespace Mango.Database.Test { } - [TestMethod] + [DataTestMethod] public override void DatabaseExistsTest() => base.DatabaseExistsTest(); } } \ No newline at end of file diff --git a/Mango.Database.Test/UserDalTests.cs b/Mango.Database.Test/UserDalTests.cs index 963e251..9609142 100644 --- a/Mango.Database.Test/UserDalTests.cs +++ b/Mango.Database.Test/UserDalTests.cs @@ -7,17 +7,24 @@ using Mango.Entities.Companies; using Mango.Entities.Messages.Emails; using Mango.Entities.Profiles; using Mango.Entities.Users; -using Microsoft.ApplicationInsights; namespace Mango.Database.Test; [TestClass] public class UserDalTests : AcUserDalTestBase { - [TestMethod] + [DataTestMethod] [DataRow("test@tiam.hu")] public override void AcBase_GetUserByEmail_ReturnsUser_WhenUserExists(string email) - { - base.AcBase_GetUserByEmail_ReturnsUser_WhenUserExists(email); - } + => base.AcBase_GetUserByEmail_ReturnsUser_WhenUserExists(email); + + [DataTestMethod] + [DataRow("540271F6-C604-4C16-8160-D5A7CAFEDF00")] + public override void AcBase_GetUserById_ReturnsUser_WhenUserExists(string userIdString) + => base.AcBase_GetUserById_ReturnsUser_WhenUserExists(userIdString); + + [DataTestMethod] + [DataRow(["e31044d7-1771-4a32-8dd9-6f9853ed53c6", "0a831191-70a3-4504-9ec4-c5902affaba7", "8eed080c-d2ce-4cc3-bcfe-2268c220bba7", "addUser_test9432@tiam.hu"])] + public override async Task AcBase_AddUserTest(string[] userIdProfileIdAddressIdEmailStrings) + => await base.AcBase_AddUserTest(userIdProfileIdAddressIdEmailStrings); } \ No newline at end of file diff --git a/Mango.Database.Test/appsettings.json b/Mango.Database.Test/appsettings.json index 48d14a2..780df2e 100644 --- a/Mango.Database.Test/appsettings.json +++ b/Mango.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/Mango.Database/DataLayers/IDalBase.cs b/Mango.Database/DataLayers/IDalBase.cs index 9670c5e..2cac8af 100644 --- a/Mango.Database/DataLayers/IDalBase.cs +++ b/Mango.Database/DataLayers/IDalBase.cs @@ -1,4 +1,5 @@ using AyCode.Database.DataLayers; +using AyCode.Database.DbContexts; using Mango.Database.DbContexts; namespace Mango.Database.DataLayers; @@ -6,5 +7,5 @@ namespace Mango.Database.DataLayers; public interface IDalBase : IAcDalBase { } -public interface IDalBase : IAcDalBase, IAcDalBase where TDbContext : DbContextBase +public interface IDalBase : IAcDalBase, IAcDalBase where TDbContext : AcDbContextBase { } \ No newline at end of file diff --git a/Mango.Database/DbContexts/DbContextBase.cs b/Mango.Database/DbContexts/DbContextBase.cs index 14d9e45..db73d2d 100644 --- a/Mango.Database/DbContexts/DbContextBase.cs +++ b/Mango.Database/DbContexts/DbContextBase.cs @@ -27,7 +27,7 @@ public class DbContextBase : AcDbContextBase //optionsBuilder.UseSqlServer(Configuration.GetConnectionString("DeveloperDbConnection")); //var connString = string.Empty;//"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"; - 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); } } \ No newline at end of file diff --git a/Mango.Database/DbContexts/Users/UserDbContext.cs b/Mango.Database/DbContexts/Users/UserDbContext.cs index 7f8af21..666c8e7 100644 --- a/Mango.Database/DbContexts/Users/UserDbContext.cs +++ b/Mango.Database/DbContexts/Users/UserDbContext.cs @@ -1,4 +1,6 @@ -using Mango.Entities.Addresses; +using AyCode.Database.DbContexts.Users; +using Mango.Entities.Addresses; +using Mango.Entities.Companies; using Mango.Entities.Messages.Emails; using Mango.Entities.Profiles; using Mango.Entities.Users; @@ -6,15 +8,15 @@ using Microsoft.EntityFrameworkCore; namespace Mango.Database.DbContexts.Users { - public class UserDbContext : DbContextBase, IUserDbContext + public class UserDbContext : AcUserDbContextBase, IUserDbContext { - public DbSet Users { get; set; } - public DbSet UserTokens { get; set; } + //public DbSet Users { get; set; } + //public DbSet UserTokens { get; set; } - public DbSet Profiles { get; set; } - public DbSet
Addresses { get; set; } + //public DbSet Profiles { get; set; } + //public DbSet
Addresses { get; set; } - public DbSet EmailMessages { get; set; } + //public DbSet EmailMessages { get; set; } public UserDbContext() //: this(string.Empty) {