Adam
/
TourIAm
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

refactoring, improvements

This commit is contained in:
jozsef.b@aycode.com 2024-05-01 08:09:17 +02:00
parent d9f79bd474
commit 3a972178ad
5 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
TIAM.Database.Test/UserDalTests.cs
View File

@ -13,11 +13,13 @@ using TIAM.Entities.Addresses;
using TIAMWebApp.Server.Services.Logins; using TIAMWebApp.Server.Services.Logins;
using AyCode.Interfaces.Users; using AyCode.Interfaces.Users;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using SendGrid.Helpers.Mail;
using TIAM.Entities.Emails;
namespace TIAM.Database.Test namespace TIAM.Database.Test
{ {
[TestClass] [TestClass]
public class UserDalTests : AcUserDalTestBase<UserDal, UserDbContext, User, Profile, UserToken, TiamServiceProvider, UserToServiceProvider, Address> public class UserDalTests : AcUserDalTestBase<UserDal, UserDbContext, User, Profile, UserToken, TiamServiceProvider, UserToServiceProvider, Address, EmailMessage>
{ {
private Guid _registerUserId = Guid.Parse("1f7e0591-330b-463b-81ad-d01f2e65e23e"); private Guid _registerUserId = Guid.Parse("1f7e0591-330b-463b-81ad-d01f2e65e23e");
private const string RegisterEmail = "qwerty@xxxxx.com"; private const string RegisterEmail = "qwerty@xxxxx.com";
@ -134,9 +136,9 @@ namespace TIAM.Database.Test
[TestMethod] [TestMethod]
[DataRow("test@tiam.hu")] [DataRow("test@tiam.hu")]
public void GetUserByEmail_ReturnsUser_WhenUserAndRelationsExists(string email) public override void AcBase_GetUserByEmail_ReturnsUser_WhenUserExists(string email)
{ {
var user = AcBase_GetUserByEmail_ReturnsUser_WhenUserExists(email); var user = AcBase_GetUserByEmail(email);
Assert.IsTrue(user.ServiceProviders.Count > 0); Assert.IsTrue(user.ServiceProviders.Count > 0);
Assert.IsTrue(user.UserToServiceProviders.Count > 0); Assert.IsTrue(user.UserToServiceProviders.Count > 0);

3
TIAM.Database/DataLayers/Users/UserDal.cs
View File

@ -11,6 +11,7 @@ using Microsoft.EntityFrameworkCore;
using TIAM.Database.DbContexts.Users; using TIAM.Database.DbContexts.Users;
using TIAM.Database.DbSets.Users; using TIAM.Database.DbSets.Users;
using TIAM.Entities.Addresses; using TIAM.Entities.Addresses;
using TIAM.Entities.Emails;
using TIAM.Entities.Profiles; using TIAM.Entities.Profiles;
using TIAM.Entities.ServiceProviders; using TIAM.Entities.ServiceProviders;
using TIAM.Entities.Users; using TIAM.Entities.Users;
@ -18,7 +19,7 @@ using TIAM.Models.Dtos.Users;
namespace TIAM.Database.DataLayers.Users namespace TIAM.Database.DataLayers.Users
{ {
public class UserDal : AcUserDalBase<UserDbContext, User, Profile, UserToken, TiamServiceProvider, UserToServiceProvider, Address>, IDalBase<UserDbContext> public class UserDal : AcUserDalBase<UserDbContext, User, Profile, UserToken, TiamServiceProvider, UserToServiceProvider, Address, EmailMessage>, IDalBase<UserDbContext>
{ {
public UserDal() : base() public UserDal() : base()

3
TIAM.Database/DbContexts/Users/IUserDbContext.cs
View File

@ -5,6 +5,7 @@ using TIAM.Database.DbSets.Emails;
using TIAM.Database.DbSets.Transfers; using TIAM.Database.DbSets.Transfers;
using TIAM.Database.DbSets.Users; using TIAM.Database.DbSets.Users;
using TIAM.Entities.Addresses; using TIAM.Entities.Addresses;
using TIAM.Entities.Emails;
using TIAM.Entities.Profiles; using TIAM.Entities.Profiles;
using TIAM.Entities.ServiceProviders; using TIAM.Entities.ServiceProviders;
using TIAM.Entities.Users; using TIAM.Entities.Users;
@ -12,5 +13,5 @@ using TIAM.Entities.Users;
namespace TIAM.Database.DbContexts.Users; namespace TIAM.Database.DbContexts.Users;
public interface IUserDbContext : public interface IUserDbContext :
IAcUserDbContextBase<User, Profile, UserToken, TiamServiceProvider, UserToServiceProvider, Address>, IUserDbSet, IAddressDbSet, ITransferDestinationDbSet, ITransferDbSet, IEmailMessageDbSet IAcUserDbContextBase<User, Profile, UserToken, TiamServiceProvider, UserToServiceProvider, Address, EmailMessage>, IUserDbSet, IAddressDbSet, ITransferDestinationDbSet, ITransferDbSet, IEmailMessageDbSet
{ } { }

8
TIAM.Database/DbContexts/Users/UserDbContext.cs
View File

@ -21,24 +21,24 @@ using TIAM.Entities.Emails;
using TIAM.Entities.Permissions; using TIAM.Entities.Permissions;
using TIAM.Entities.Products; using TIAM.Entities.Products;
using TIAM.Entities.Profiles; using TIAM.Entities.Profiles;
using TIAM.Entities.ServiceProviders;
using TIAM.Entities.Transfers; using TIAM.Entities.Transfers;
using TIAM.Entities.Users; using TIAM.Entities.Users;
namespace TIAM.Database.DbContexts.Users namespace TIAM.Database.DbContexts.Users
{ {
public class UserDbContext : DbContextBase, IUserDbContext public class UserDbContext : DbContextBase, IUserDbContext
//AcUserDbContextBase<User, Profile, UserToken, TiamServiceProvider, UserToServiceProvider, Address, EmailMessage>, IUserDbContext
{ {
public DbSet<User> Users { get; set; } public DbSet<User> Users { get; set; }
public DbSet<UserToken> UserTokens { get; set; } public DbSet<UserToken> UserTokens { get; set; }
public DbSet<Profile> Profiles { get; set; }
public DbSet<Address> Addresses { get; set; } public DbSet<Address> Addresses { get; set; }
public DbSet<Profile> Profiles { get; set; }
public DbSet<EmailMessage> EmailMessages { get; set; }
public DbSet<Transfer> Transfers { get; set; } public DbSet<Transfer> Transfers { get; set; }
public DbSet<TransferDestinationToProduct> TransferDestinationToProducts { get; set; } public DbSet<TransferDestinationToProduct> TransferDestinationToProducts { get; set; }
public DbSet<EmailMessage> EmailMessages { get; set; }
public DbSet<TransferDestination> TransferDestinations { get; set; } public DbSet<TransferDestination> TransferDestinations { get; set; }
public UserDbContext() //: this(string.Empty) public UserDbContext() //: this(string.Empty)

3
TIAMWebApp/Server/Services/Logins/LoginService.cs
View File

@ -9,6 +9,7 @@ using TIAM.Database.DataLayers.Users;
using TIAM.Database.DbContexts.Admins; using TIAM.Database.DbContexts.Admins;
using TIAM.Database.DbContexts.Users; using TIAM.Database.DbContexts.Users;
using TIAM.Entities.Addresses; using TIAM.Entities.Addresses;
using TIAM.Entities.Emails;
using TIAM.Entities.Profiles; using TIAM.Entities.Profiles;
using TIAM.Entities.ServiceProviders; using TIAM.Entities.ServiceProviders;
using TIAM.Entities.Users; using TIAM.Entities.Users;
@ -16,7 +17,7 @@ using TIAMWebApp.Server.Models.Logins;
namespace TIAMWebApp.Server.Services.Logins; namespace TIAMWebApp.Server.Services.Logins;
public class LoginService(UserDal userDal, IConfiguration configuration) : AcLoginServiceServer<LoggedInModel, UserDal, UserDbContext, User, UserToken, Profile, TiamServiceProvider, UserToServiceProvider, Address>(userDal, configuration), ILoginService public class LoginService(UserDal userDal, IConfiguration configuration) : AcLoginServiceServer<LoggedInModel, UserDal, UserDbContext, User, UserToken, Profile, TiamServiceProvider, UserToServiceProvider, Address, EmailMessage>(userDal, configuration), ILoginService
{ {
public override LoggedInModel Login(string? email, string? password) public override LoggedInModel Login(string? email, string? password)