Add Profile to ServiceProvider; ServiceProvider to Company in progress...
This commit is contained in:
jozsef.b@aycode.com
parent
1c61c5d328
commit
0b315fd19d
|
|
@ -14,7 +14,7 @@ using TIAM.Entities.Emails;
|
|||
namespace TIAM.Database.Test
|
||||
{
|
||||
[TestClass]
|
||||
public class UserDalTests : AcUserDalTestBase<UserDal, UserDbContext, User, Profile, UserToken, TiamServiceProvider, UserToServiceProvider, Address, EmailMessage>
|
||||
public class UserDalTests : AcUserDalTestBase<UserDal, UserDbContext, User, Profile, UserToken, Company, UserToCompany, Address, EmailMessage>
|
||||
{
|
||||
//private Guid _registerUserId = Guid.Parse("1f7e0591-330b-463b-81ad-d01f2e65e23e");
|
||||
//private const string RegisterEmail = "qwerty@xxxxx.com";
|
||||
|
|
|
|||
|
|
@ -220,7 +220,7 @@ namespace TIAM.Database.DataLayers.Admins
|
|||
#endregion EmailMessage
|
||||
|
||||
//15. (IServiceProviderDataService) Create service provider
|
||||
public Task<bool> CreateServiceProviderAsync(TiamServiceProvider serviceProvider)
|
||||
public Task<bool> CreateServiceProviderAsync(Company serviceProvider)
|
||||
{
|
||||
Context.CreateServiceProvider(serviceProvider);
|
||||
return Context.SaveChangesAsync().ContinueWith(x => x.Result > 0);
|
||||
|
|
@ -234,12 +234,12 @@ namespace TIAM.Database.DataLayers.Admins
|
|||
return result.Result > 0;
|
||||
}
|
||||
|
||||
public Task<List<TiamServiceProvider>> GetServiceProvidersAsync()
|
||||
public Task<List<Company>> GetServiceProvidersAsync()
|
||||
{
|
||||
return Context.ServiceProviders.ToListAsync();
|
||||
}
|
||||
|
||||
public virtual Task<TiamServiceProvider?> GetServiceProviderByIdAsync(Guid id)
|
||||
public virtual Task<Company?> GetServiceProviderByIdAsync(Guid id)
|
||||
{
|
||||
GlobalLogger.Info($@"Getting serviceProvider from db {id}");
|
||||
return Context.ServiceProviders.SingleOrDefaultAsync(x => x.Id == id);
|
||||
|
|
@ -255,7 +255,7 @@ namespace TIAM.Database.DataLayers.Admins
|
|||
#region ServiceProviders
|
||||
|
||||
//14. (IserviceProviderDataService) Update service provider
|
||||
public Task<bool> UpdateServiceProviderAsync(TiamServiceProvider serviceProvider)
|
||||
public Task<bool> UpdateServiceProviderAsync(Company serviceProvider)
|
||||
{
|
||||
var dbServiceProvider = Context.ServiceProviders.FirstOrDefault(u => u.Id == serviceProvider.Id);
|
||||
if (dbServiceProvider != null)
|
||||
|
|
@ -315,7 +315,7 @@ namespace TIAM.Database.DataLayers.Admins
|
|||
}
|
||||
|
||||
//17. (IServiceProviderDataService) get service provider by ownerId
|
||||
public Task<List<TiamServiceProvider>> GetServiceProvidersByOwnerIdAsync()
|
||||
public Task<List<Company>> GetServiceProvidersByOwnerIdAsync()
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
|
||||
|
|
@ -495,7 +495,7 @@ namespace TIAM.Database.DataLayers.Admins
|
|||
}
|
||||
|
||||
//8. (IPermissionService) create permission group
|
||||
public Task<bool> CreatePermissionGroupAsync(PermissionGroup permissionGroup, TiamServiceProvider serviceProvider)
|
||||
public Task<bool> CreatePermissionGroupAsync(PermissionGroup permissionGroup, Company serviceProvider)
|
||||
{
|
||||
bool result = false;
|
||||
using (var transaction = Context.Database.BeginTransaction())
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ namespace TIAM.Database.DataLayers.ServiceProviders
|
|||
//// #region ServiceProviders
|
||||
|
||||
//// //14. (IserviceProviderDataService) Update service provider
|
||||
//// public Task<bool> UpdateServiceProviderAsync(TiamServiceProvider serviceProvider)
|
||||
//// public Task<bool> UpdateServiceProviderAsync(Company serviceProvider)
|
||||
//// {
|
||||
//// var dbServiceProvider = Context.ServiceProviders.FirstOrDefault(u => u.Id == serviceProvider.Id);
|
||||
//// if (dbServiceProvider != null)
|
||||
|
|
@ -95,7 +95,7 @@ namespace TIAM.Database.DataLayers.ServiceProviders
|
|||
//// }
|
||||
|
||||
//// //17. (IServiceProviderDataService) get service provider by ownerId
|
||||
//// public Task<List<TiamServiceProvider>> GetServiceProvidersByOwnerIdAsync()
|
||||
//// public Task<List<Company>> GetServiceProvidersByOwnerIdAsync()
|
||||
//// {
|
||||
//// throw new NotImplementedException();
|
||||
|
||||
|
|
@ -275,7 +275,7 @@ namespace TIAM.Database.DataLayers.ServiceProviders
|
|||
//// }
|
||||
|
||||
//// //8. (IPermissionService) create permission group
|
||||
//// public Task<bool> CreatePermissionGroupAsync(PermissionGroup permissionGroup, TiamServiceProvider serviceProvider)
|
||||
//// public Task<bool> CreatePermissionGroupAsync(PermissionGroup permissionGroup, Company serviceProvider)
|
||||
//// {
|
||||
//// bool result = false;
|
||||
//// using (var transaction = Context.Database.BeginTransaction())
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ using TIAM.Models.Dtos.Users;
|
|||
|
||||
namespace TIAM.Database.DataLayers.Users
|
||||
{
|
||||
public class UserDal : AcUserDalBase<UserDbContext, User, Profile, UserToken, TiamServiceProvider, UserToServiceProvider, Address, EmailMessage>, IDalBase<UserDbContext>
|
||||
public class UserDal : AcUserDalBase<UserDbContext, User, Profile, UserToken, Company, UserToCompany, Address, EmailMessage>, IDalBase<UserDbContext>
|
||||
{
|
||||
|
||||
public UserDal() : base()
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ namespace TIAM.Database.DbContexts.Admins
|
|||
public DbSet<TransferToDriver> TransferToDrivers { get; set; }
|
||||
public DbSet<Car> Cars { get; set; }
|
||||
|
||||
public DbSet<TiamServiceProvider> ServiceProviders { get; set; }
|
||||
public DbSet<Company> ServiceProviders { get; set; }
|
||||
public DbSet<Product> Products { get; set; }
|
||||
public DbSet<UserProductMapping> UserProductMappings { get; set; }
|
||||
public DbSet<PermissionGroup> PermissionGroups { get; set; }
|
||||
|
|
|
|||
|
|
@ -95,7 +95,7 @@ namespace TIAM.Database.DbContexts.Admins
|
|||
{
|
||||
if (myproduct == null) return false;
|
||||
//Automatically add assigneduser for owner
|
||||
TiamServiceProvider? productOwner = ctx.ServiceProviders.FirstOrDefault(x => x.Id == myproduct.ServiceProviderId);
|
||||
Company? productOwner = ctx.ServiceProviders.FirstOrDefault(x => x.Id == myproduct.ServiceProviderId);
|
||||
if (productOwner == null) return false;
|
||||
var userProductMapping = new UserProductMapping(myproduct.Id, productOwner.OwnerId);
|
||||
ctx.CreateAssignedUser(userProductMapping);
|
||||
|
|
@ -113,7 +113,7 @@ namespace TIAM.Database.DbContexts.Admins
|
|||
return true;
|
||||
}
|
||||
|
||||
public static TiamServiceProvider CreateServiceProvider(this IAdminDbContext ctx, TiamServiceProvider serviceProvider)
|
||||
public static Company CreateServiceProvider(this IAdminDbContext ctx, Company serviceProvider)
|
||||
{
|
||||
if (serviceProvider == null) return null;
|
||||
|
||||
|
|
@ -123,7 +123,7 @@ namespace TIAM.Database.DbContexts.Admins
|
|||
return serviceProvider;
|
||||
}
|
||||
|
||||
public static TiamServiceProvider UpdateServiceProvider(this IAdminDbContext ctx, TiamServiceProvider serviceProvider)
|
||||
public static Company UpdateServiceProvider(this IAdminDbContext ctx, Company serviceProvider)
|
||||
{
|
||||
if (serviceProvider == null) return null;
|
||||
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ namespace TIAM.Database.DbContexts.ServiceProviders
|
|||
public DbSet<UserProductMapping> UserProductMappings { get; set; }
|
||||
|
||||
public DbSet<Product> Products { get; set; }
|
||||
public DbSet<TiamServiceProvider> ServiceProviders { get; set; }
|
||||
public DbSet<Company> ServiceProviders { get; set; }
|
||||
|
||||
|
||||
public DbSet<PermissionsType> PermissionsTypes { get; set; }
|
||||
|
|
|
|||
|
|
@ -13,5 +13,5 @@ using TIAM.Entities.Users;
|
|||
namespace TIAM.Database.DbContexts.Users;
|
||||
|
||||
public interface IUserDbContext :
|
||||
IAcUserDbContextBase<User, Profile, UserToken, TiamServiceProvider, UserToServiceProvider, Address, EmailMessage>, IUserDbSet, IAddressDbSet, ITransferDestinationDbSet, ITransferDbSet, IEmailMessageDbSet
|
||||
IAcUserDbContextBase<User, Profile, UserToken, Company, UserToCompany, Address, EmailMessage>, IUserDbSet, IAddressDbSet, ITransferDestinationDbSet, ITransferDbSet, IEmailMessageDbSet
|
||||
{ }
|
||||
|
|
@ -28,7 +28,7 @@ using TIAM.Entities.Users;
|
|||
namespace TIAM.Database.DbContexts.Users
|
||||
{
|
||||
public class UserDbContext : DbContextBase, IUserDbContext
|
||||
//AcUserDbContextBase<User, Profile, UserToken, TiamServiceProvider, UserToServiceProvider, Address, EmailMessage>, IUserDbContext
|
||||
//AcUserDbContextBase<User, Profile, UserToken, Company, UserToServiceProvider, Address, EmailMessage>, IUserDbContext
|
||||
{
|
||||
public DbSet<User> Users { get; set; }
|
||||
public DbSet<UserToken> UserTokens { get; set; }
|
||||
|
|
|
|||
|
|
@ -5,5 +5,5 @@ namespace TIAM.Database.DbSets.ServiceProvider;
|
|||
|
||||
public interface IServiceProviderDbSet
|
||||
{
|
||||
public DbSet<TiamServiceProvider> ServiceProviders { get; set; }
|
||||
public DbSet<Company> ServiceProviders { get; set; }
|
||||
}
|
||||
|
|
@ -6,6 +6,6 @@ using TIAM.Entities.Users;
|
|||
|
||||
namespace TIAM.Database.DbSets.Users;
|
||||
|
||||
public interface IUserDbSet : IAcUserDbSet<User, Profile, TiamServiceProvider, UserToServiceProvider, Address>
|
||||
public interface IUserDbSet : IAcUserDbSet<User, Profile, Company, UserToCompany, Address>
|
||||
{
|
||||
}
|
||||
|
|
@ -27,7 +27,7 @@ public class UserProductMappingEntityTypeTransferConfiguration : IAcEntityTypeCo
|
|||
builder.BuildUserProductMappingToRelations(false);
|
||||
}
|
||||
}
|
||||
public class UserEntityTypeDefaultConfiguration : AcUserEntityTypeDefaultConfiguration<User, Profile, TiamServiceProvider, UserToServiceProvider, Address> //IAcEntityTypeConfiguration<User>//
|
||||
public class UserEntityTypeDefaultConfiguration : AcUserEntityTypeDefaultConfiguration<User, Profile, Company, UserToCompany, Address> //IAcEntityTypeConfiguration<User>//
|
||||
{
|
||||
public override void Configure(EntityTypeBuilder<User> builder)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ public class Product : ProductBase
|
|||
[Required]
|
||||
public Guid ServiceProviderId { get; set; }
|
||||
|
||||
public virtual TiamServiceProvider ServiceProvider { get; set; }
|
||||
public virtual Company ServiceProvider { get; set; }
|
||||
|
||||
public virtual List<User> Users { get; } = new();
|
||||
public virtual List<UserProductMapping> UserProductMappings { get; } = new();
|
||||
|
|
@ -26,8 +26,8 @@ public class Product : ProductBase
|
|||
{
|
||||
ServiceProviderId = serviceProviderId;
|
||||
}
|
||||
public Product(Guid ownerId, TiamServiceProvider serviceProvider, ProductType productType, string name, string description, float price, string jsonDetails) : this(Guid.NewGuid(), ownerId, serviceProvider, productType, name, description, price, jsonDetails) { }
|
||||
public Product(Guid id, Guid serviceProviderId, TiamServiceProvider serviceProvider, ProductType productType, string name, string description, float price, string jsonDetails) : base(id, productType, name, description, price, jsonDetails)
|
||||
public Product(Guid ownerId, Company serviceProvider, ProductType productType, string name, string description, float price, string jsonDetails) : this(Guid.NewGuid(), ownerId, serviceProvider, productType, name, description, price, jsonDetails) { }
|
||||
public Product(Guid id, Guid serviceProviderId, Company serviceProvider, ProductType productType, string name, string description, float price, string jsonDetails) : base(id, productType, name, description, price, jsonDetails)
|
||||
{
|
||||
ServiceProviderId = serviceProviderId;
|
||||
ServiceProvider = serviceProvider;
|
||||
|
|
|
|||
|
|
@ -6,28 +6,29 @@ using AyCode.Interfaces.Entities;
|
|||
using AyCode.Interfaces.TimeStampInfo;
|
||||
using AyCode.Interfaces.Users;
|
||||
using TIAM.Entities.Products;
|
||||
using TIAM.Entities.Profiles;
|
||||
using TIAM.Entities.Users;
|
||||
|
||||
namespace TIAM.Entities.ServiceProviders;
|
||||
|
||||
[Table("ServiceProviders")]
|
||||
public class TiamServiceProvider : AcServiceProvider<User, UserToServiceProvider>, ITiamServiceProvider<User, UserToServiceProvider>
|
||||
public class Company : AcCompany<User, UserToCompany, Profile>, ICompany<User, UserToCompany, Profile>
|
||||
{
|
||||
public virtual List<Product> Products { get; } = new();
|
||||
|
||||
public TiamServiceProvider()
|
||||
public Company()
|
||||
{
|
||||
}
|
||||
|
||||
public TiamServiceProvider(string name, Guid ownerId) : this(Guid.NewGuid(), name, ownerId)
|
||||
public Company(string name, Guid ownerId) : this(Guid.NewGuid(), name, ownerId)
|
||||
{
|
||||
}
|
||||
|
||||
public TiamServiceProvider(Guid id, string name, Guid ownerId) : this(id, name, ownerId, Guid.NewGuid())
|
||||
public Company(Guid id, string name, Guid ownerId) : this(id, name, ownerId, Guid.NewGuid())
|
||||
{
|
||||
}
|
||||
|
||||
public TiamServiceProvider(Guid id, string name, Guid ownerId, Guid affiliateId) : base(id, name, ownerId, affiliateId)
|
||||
public Company(Guid id, string name, Guid ownerId, Guid affiliateId) : base(id, name, ownerId, affiliateId)
|
||||
{
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
using AyCode.Interfaces.ServiceProviders;
|
||||
using TIAM.Entities.Products;
|
||||
using TIAM.Entities.Profiles;
|
||||
using TIAM.Entities.Users;
|
||||
|
||||
namespace TIAM.Entities.ServiceProviders;
|
||||
|
||||
public interface ICompany<TUser, TIUserToServiceProvider, TProfile> : IAcCompany<TUser, TIUserToServiceProvider, TProfile>, ICompanyBase
|
||||
where TUser : class, IUserBase
|
||||
where TIUserToServiceProvider : class, IUserToCompanyBase
|
||||
where TProfile : class, IProfileDto
|
||||
{
|
||||
public List<Product> Products { get; }
|
||||
}
|
||||
|
|
@ -2,6 +2,6 @@
|
|||
|
||||
namespace TIAM.Entities.ServiceProviders;
|
||||
|
||||
public interface ITiamServiceProviderBase : IAcServiceProviderBase
|
||||
public interface ICompanyBase : IAcCompanyBase
|
||||
{
|
||||
}
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
using AyCode.Interfaces.ServiceProviders;
|
||||
using TIAM.Entities.Products;
|
||||
using TIAM.Entities.Users;
|
||||
|
||||
namespace TIAM.Entities.ServiceProviders;
|
||||
|
||||
public interface ITiamServiceProvider<TUser, TIUserToServiceProvider> : IAcServiceProvider<TUser, TIUserToServiceProvider>, ITiamServiceProviderBase
|
||||
where TUser : class, IUserBase
|
||||
where TIUserToServiceProvider : class, IUserToServiceProviderBase
|
||||
{
|
||||
public List<Product> Products { get; }
|
||||
}
|
||||
|
|
@ -6,7 +6,7 @@ using TIAM.Entities.ServiceProviders;
|
|||
|
||||
namespace TIAM.Entities.Users;
|
||||
|
||||
public interface IUser : IAcUser<Profile, TiamServiceProvider, UserToServiceProvider, Address>, IUserDto<Profile, TiamServiceProvider, UserToServiceProvider, Address>, IUserBase
|
||||
public interface IUser : IAcUser<Profile, Company, UserToCompany, Address>, IUserDto<Profile, Company, UserToCompany, Address>, IUserBase
|
||||
{
|
||||
public List<Product> Products { get; }
|
||||
|
||||
|
|
|
|||
|
|
@ -10,9 +10,9 @@ using TIAM.Entities.ServiceProviders;
|
|||
|
||||
namespace TIAM.Entities.Users;
|
||||
|
||||
public interface IUserDto<TProfile, TServiceProvider, TUserToServiceProvider, TProfileAddress> : IAcUserDtoBase<TProfile, TServiceProvider, TUserToServiceProvider, TProfileAddress>
|
||||
public interface IUserDto<TProfile, TCompany, TUserToServiceProvider, TProfileAddress> : IAcUserDtoBase<TProfile, TCompany, TUserToServiceProvider, TProfileAddress>
|
||||
where TProfile : class, IProfile<TProfileAddress>
|
||||
where TServiceProvider : class, ITiamServiceProviderBase
|
||||
where TUserToServiceProvider : class, IUserToServiceProviderBase
|
||||
where TCompany : class, ICompanyBase
|
||||
where TUserToServiceProvider : class, IUserToCompanyBase
|
||||
where TProfileAddress : class, IAddress
|
||||
{ }
|
||||
|
|
@ -10,7 +10,7 @@ using TIAM.Entities.ServiceProviders;
|
|||
|
||||
namespace TIAM.Entities.Users
|
||||
{
|
||||
public interface IUserDtoDetail : IAcUserDtoDetailBase<Profile, TiamServiceProvider, UserToServiceProvider, Address>
|
||||
public interface IUserDtoDetail : IAcUserDtoDetailBase<Profile, Company, UserToCompany, Address>
|
||||
{
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,6 +10,6 @@ public interface IUserRelation : IAcUserRelation<User>, IUserForeignKey
|
|||
{
|
||||
}
|
||||
|
||||
public interface IUsersRelation : IAcUsersRelation<User, UserToServiceProvider>
|
||||
public interface IUsersRelation : IAcUsersRelation<User, UserToCompany>
|
||||
{
|
||||
}
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
using TIAM.Entities.ServiceProviders;
|
||||
|
||||
namespace TIAM.Entities.Users;
|
||||
|
||||
public interface IUserToCompany<TUser, TCompany> : IUserToCompanyBase
|
||||
where TUser : class, IUserBase
|
||||
where TCompany : class, ICompanyBase
|
||||
{
|
||||
public TUser User { get; set; }
|
||||
public TCompany Company { get; set; }
|
||||
}
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
using AyCode.Interfaces.Users;
|
||||
|
||||
namespace TIAM.Entities.Users;
|
||||
|
||||
public interface IUserToCompanyBase : IAcUserToCompanyBase
|
||||
{}
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
using TIAM.Entities.ServiceProviders;
|
||||
|
||||
namespace TIAM.Entities.Users;
|
||||
|
||||
public interface IUserToServiceProvider<TUser, TServiceProvider> : IUserToServiceProviderBase
|
||||
where TUser : class, IUserBase
|
||||
where TServiceProvider : class, ITiamServiceProviderBase
|
||||
{
|
||||
public TUser User { get; set; }
|
||||
public TServiceProvider ServiceProvider { get; set; }
|
||||
}
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
using AyCode.Interfaces.Users;
|
||||
|
||||
namespace TIAM.Entities.Users;
|
||||
|
||||
public interface IUserToServiceProviderBase : IAcUserToServiceProviderBase
|
||||
{}
|
||||
|
|
@ -14,7 +14,7 @@ using TIAM.Entities.ServiceProviders;
|
|||
namespace TIAM.Entities.Users
|
||||
{
|
||||
[Table("Users")]
|
||||
public class User : AcUser<Profile, TiamServiceProvider, UserToServiceProvider, Address>, IUser
|
||||
public class User : AcUser<Profile, Company, UserToCompany, Address>, IUser
|
||||
{
|
||||
public virtual List<Product> Products { get; } = new();
|
||||
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ namespace TIAM.Entities.Users;
|
|||
// public Guid ServiceProviderId { get; set; }
|
||||
|
||||
// public virtual User User { get; set; }
|
||||
// public virtual TiamServiceProvider ServiceProvider { get; set; }
|
||||
// public virtual Company ServiceProvider { get; set; }
|
||||
|
||||
// public DateTime Created { get; set; }
|
||||
// public DateTime Modified { get; set; }
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ using TIAM.Entities.ServiceProviders;
|
|||
|
||||
namespace TIAM.Entities.Users;
|
||||
|
||||
public class UserToServiceProvider : AcUserToServiceProvider<User, TiamServiceProvider>, IUserToServiceProvider<User, TiamServiceProvider>
|
||||
public class UserToCompany : AcUserToCompany<User, Company>, IUserToCompany<User, Company>
|
||||
{
|
||||
|
||||
}
|
||||
|
|
@ -6,5 +6,5 @@ using TIAM.Entities.Users;
|
|||
|
||||
namespace TIAM.Models.Server.Logins;
|
||||
|
||||
public interface ILoggedInModel : IAcLoggedInModelBase<User, UserToken, Profile, TiamServiceProvider, UserToServiceProvider, Address>
|
||||
public interface ILoggedInModel : IAcLoggedInModelBase<User, UserToken, Profile, Company, UserToCompany, Address>
|
||||
{}
|
||||
|
|
@ -6,6 +6,6 @@ using TIAM.Entities.Users;
|
|||
|
||||
namespace TIAM.Models.Server.Logins;
|
||||
|
||||
public class LoggedInModel : AcLoggedInModelServer<User, UserToken, Profile, TiamServiceProvider, UserToServiceProvider, Address>, ILoggedInModel
|
||||
public class LoggedInModel : AcLoggedInModelServer<User, UserToken, Profile, Company, UserToCompany, Address>, ILoggedInModel
|
||||
{
|
||||
}
|
||||
|
|
@ -6,7 +6,7 @@ using TIAM.Entities.Users;
|
|||
|
||||
namespace TIAM.Models.Dtos.Users;
|
||||
|
||||
public class UserDto : IUserDto<Profile, TiamServiceProvider, UserToServiceProvider, Address>
|
||||
public class UserDto : IUserDto<Profile, Company, UserToCompany, Address>
|
||||
{
|
||||
public Guid Id { get; set; }
|
||||
|
||||
|
|
@ -15,6 +15,6 @@ public class UserDto : IUserDto<Profile, TiamServiceProvider, UserToServiceProvi
|
|||
|
||||
public Guid AffiliateId { get; set; }
|
||||
|
||||
public List<TiamServiceProvider> ServiceProviders { get; set; }
|
||||
public List<UserToServiceProvider> UserToServiceProviders { get; set; }
|
||||
public List<Company> ServiceProviders { get; set; }
|
||||
public List<UserToCompany> UserToServiceProviders { get; set; }
|
||||
}
|
||||
|
|
@ -10,7 +10,7 @@ using TIAM.Models.Dtos.Profiles;
|
|||
|
||||
namespace TIAM.Models.Dtos.Users;
|
||||
|
||||
public class UserModelDto : AcUserModelDtoBase<UserDto, Profile, ProfileDto, TiamServiceProvider, UserToServiceProvider, Address>, IProductsRelation, IUserModelDtoMinBase
|
||||
public class UserModelDto : AcUserModelDtoBase<UserDto, Profile, ProfileDto, Company, UserToCompany, Address>, IProductsRelation, IUserModelDtoMinBase
|
||||
{
|
||||
public List<UserProductMapping> UserProductMappings { get; set; }
|
||||
public List<Product> Products { get; set; }
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ using TIAM.Models.Dtos.Profiles;
|
|||
|
||||
namespace TIAM.Models.Dtos.Users
|
||||
{
|
||||
public class UserModelDtoDetail : AcUserModelDtoDetailBase<UserDtoDetail, Profile, ProfileDto, TiamServiceProvider, UserToServiceProvider, Address>, IProductsRelation, IUserModelDtoMinBase
|
||||
public class UserModelDtoDetail : AcUserModelDtoDetailBase<UserDtoDetail, Profile, ProfileDto, Company, UserToCompany, Address>, IProductsRelation, IUserModelDtoMinBase
|
||||
{
|
||||
public List<UserProductMapping> UserProductMappings { get; set; }
|
||||
public List<Product> Products { get; set; }
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ using TIAM.Services.Server.Logins;
|
|||
namespace TIAM.Services.Server.Tests.LoginServices
|
||||
{
|
||||
[TestClass]
|
||||
public class LoginServiceServerTests : AcLoginServiceServerTestBase<UserDal, UserDbContext, LoginService, LoggedInModel, User, Profile, UserToken, TiamServiceProvider, UserToServiceProvider, Address, EmailMessage>
|
||||
public class LoginServiceServerTests : AcLoginServiceServerTestBase<UserDal, UserDbContext, LoginService, LoggedInModel, User, Profile, UserToken, Company, UserToCompany, Address, EmailMessage>
|
||||
{
|
||||
private const string RegisterEmail = "qwerty@xxxxx.com";
|
||||
private const string RegisterPassword = "elem'r";
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ using TIAM.Models.Server.Logins;
|
|||
|
||||
namespace TIAM.Services.Server.Logins;
|
||||
|
||||
public interface ILoginService : IAcLoginServiceServer<LoggedInModel, User, UserToken, Profile, TiamServiceProvider, UserToServiceProvider, Address>
|
||||
public interface ILoginService : IAcLoginServiceServer<LoggedInModel, User, UserToken, Profile, Company, UserToCompany, Address>
|
||||
{
|
||||
|
||||
}
|
||||
|
|
@ -12,7 +12,7 @@ using TIAM.Models.Server.Logins;
|
|||
|
||||
namespace TIAM.Services.Server.Logins;
|
||||
|
||||
public class LoginService(UserDal userDal, IConfiguration configuration) : AcLoginServiceServer<LoggedInModel, UserDal, UserDbContext, User, UserToken, Profile, TiamServiceProvider, UserToServiceProvider, Address, EmailMessage>(userDal, configuration), ILoginService
|
||||
public class LoginService(UserDal userDal, IConfiguration configuration) : AcLoginServiceServer<LoggedInModel, UserDal, UserDbContext, User, UserToken, Profile, Company, UserToCompany, Address, EmailMessage>(userDal, configuration), ILoginService
|
||||
|
||||
{
|
||||
public override LoggedInModel Login(string? email, string? password)
|
||||
|
|
|
|||
|
|
@ -145,7 +145,7 @@
|
|||
{
|
||||
if (e.IsNew)
|
||||
{
|
||||
var newEmployee = (TiamServiceProvider)e.EditModel;
|
||||
var newEmployee = (Company)e.EditModel;
|
||||
newEmployee.Name = "John";
|
||||
newEmployee.OwnerId = Guid.NewGuid();
|
||||
}
|
||||
|
|
@ -182,11 +182,11 @@
|
|||
protected override void OnInitialized()
|
||||
{
|
||||
base.OnInitialized();
|
||||
OrderData = new TiamServiceProvider[]
|
||||
OrderData = new Company[]
|
||||
{
|
||||
new TiamServiceProvider(Guid.NewGuid(), "BAT", Guid.NewGuid(), Guid.NewGuid()),
|
||||
new TiamServiceProvider(Guid.NewGuid(), "TIAM", Guid.NewGuid(), Guid.NewGuid()),
|
||||
new TiamServiceProvider(Guid.NewGuid(), "TestHotel", Guid.NewGuid(), Guid.NewGuid())
|
||||
new Company(Guid.NewGuid(), "BAT", Guid.NewGuid(), Guid.NewGuid()),
|
||||
new Company(Guid.NewGuid(), "TIAM", Guid.NewGuid(), Guid.NewGuid()),
|
||||
new Company(Guid.NewGuid(), "TestHotel", Guid.NewGuid(), Guid.NewGuid())
|
||||
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -39,9 +39,9 @@ namespace TIAMSharedUI.Pages.User.SysAdmins
|
|||
|
||||
//List<ProductWizardModel> _productArray =
|
||||
//[
|
||||
// new ProductWizardModel(new TiamServiceProvider(), ProductType.Hotel, "XY hotel", "XYHotel description is here ", 10.0f, ""),
|
||||
// new ProductWizardModel(new TiamServiceProvider(), ProductType.Hotel, "XY hotel", "XYHotel description is here ", 10.0f, ""),
|
||||
// new ProductWizardModel(new TiamServiceProvider(), ProductType.Hotel, "XY hotel", "XYHotel description is here ", 10.0f, "")
|
||||
// new ProductWizardModel(new Company(), ProductType.Hotel, "XY hotel", "XYHotel description is here ", 10.0f, ""),
|
||||
// new ProductWizardModel(new Company(), ProductType.Hotel, "XY hotel", "XYHotel description is here ", 10.0f, ""),
|
||||
// new ProductWizardModel(new Company(), ProductType.Hotel, "XY hotel", "XYHotel description is here ", 10.0f, "")
|
||||
//];
|
||||
|
||||
private readonly List<ProductWizardModel> _productWizardModels = [];
|
||||
|
|
|
|||
|
|
@ -61,9 +61,9 @@
|
|||
[Parameter]
|
||||
public UserModelDtoDetail UserModelDtoDetail { get; set; }
|
||||
|
||||
List<TiamServiceProvider> _detailGridData;
|
||||
List<Company> _detailGridData;
|
||||
|
||||
List<TiamServiceProvider> _availableServices;
|
||||
List<Company> _availableServices;
|
||||
|
||||
public UserModelDtoDetail UserInfo;
|
||||
|
||||
|
|
@ -73,7 +73,7 @@
|
|||
{
|
||||
_logger = new LoggerClient<UserGrid_MasterDetail_NestedGrid_ServiceProviders>(LogWriters.ToArray());
|
||||
|
||||
_detailGridData = UserModelDtoDetail.ServiceProviders ?? new List<TiamServiceProvider>();
|
||||
_detailGridData = UserModelDtoDetail.ServiceProviders ?? new List<Company>();
|
||||
_availableServices = await ServiceProviderDataService.GetServiceProvidersAsync();
|
||||
|
||||
_logger.Info($"DetailGridData: {_detailGridData.Count}");
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ namespace TIAMWebApp.Server.Controllers
|
|||
|
||||
GlobalLogger.Info($@"ServiceProvider to be created: {id}, {name}, {ownerId}");
|
||||
|
||||
await _adminDal.CreateServiceProviderAsync(new TiamServiceProvider(id, name, ownerId, Guid.NewGuid()));
|
||||
await _adminDal.CreateServiceProviderAsync(new Company(id, name, ownerId, Guid.NewGuid()));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -79,7 +79,7 @@ namespace TIAMWebApp.Server.Controllers
|
|||
[AllowAnonymous]
|
||||
[HttpGet]
|
||||
[Route(APIUrls.GetServiceProvidersRouteName)]
|
||||
public Task<List<TiamServiceProvider>> GetServiceProviders()
|
||||
public Task<List<Company>> GetServiceProviders()
|
||||
{
|
||||
//var users = await _serviceProviderDal.Ctx.Users.ToListAsync();//.GetUsersAsync();
|
||||
//return users;
|
||||
|
|
@ -90,7 +90,7 @@ namespace TIAMWebApp.Server.Controllers
|
|||
[AllowAnonymous]
|
||||
[HttpPost]
|
||||
[Route(APIUrls.GetServiceProviderByIdRouteName)]
|
||||
public async Task<TiamServiceProvider?> GetServiceProviderById([FromBody] Guid id)
|
||||
public async Task<Company?> GetServiceProviderById([FromBody] Guid id)
|
||||
{
|
||||
GlobalLogger.Info($@"GetServiceProviderById called with id: {id}");
|
||||
|
||||
|
|
@ -110,7 +110,7 @@ namespace TIAMWebApp.Server.Controllers
|
|||
|
||||
//return serviceProviders.Where(x => x.OwnerId == ownerId).ToList();
|
||||
var myServiceproviders = serviceProviders.Where(x => x.OwnerId == ownerId).ToDictionary(x => x.Id, x => x.Name);
|
||||
//put TiamServiceProvider id and name into a dictionary
|
||||
//put Company id and name into a dictionary
|
||||
|
||||
return myServiceproviders;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,9 +20,9 @@
|
|||
<PackageReference Include="SendGrid" Version="9.29.3" />
|
||||
<PackageReference Include="SkiaSharp" Version="2.88.8" />
|
||||
<PackageReference Include="SkiaSharp.Views.Desktop.Common" Version="2.88.8" />
|
||||
<PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="6.6.1" />
|
||||
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.6.1" />
|
||||
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.6.1" />
|
||||
<PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="6.6.2" />
|
||||
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.6.2" />
|
||||
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.6.2" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
|
|||
|
|
@ -20,16 +20,16 @@ namespace TIAMWebApp.Shared.Application.Interfaces
|
|||
public Task DeleteServiceProviderAsync(Guid serviceProviderId);
|
||||
|
||||
//14 Update service provider
|
||||
public Task<bool> UpdateServiceProviderAsync(TiamServiceProvider serviceProvider);
|
||||
public Task<bool> UpdateServiceProviderAsync(Company serviceProvider);
|
||||
|
||||
//15. Create service provider
|
||||
public Task<bool> CreateServiceProviderAsync(TiamServiceProvider serviceProvider);
|
||||
public Task<bool> CreateServiceProviderAsync(Company serviceProvider);
|
||||
|
||||
//16. (IServiceProviderDataService) get all service providers
|
||||
public Task<List<TiamServiceProvider>> GetServiceProvidersAsync();
|
||||
public Task<List<Company>> GetServiceProvidersAsync();
|
||||
|
||||
//18. (IServiceProviderDataService) get serviceProvider by Id
|
||||
public Task<TiamServiceProvider?> GetServiceProviderByIdAsync(Guid id);
|
||||
public Task<Company?> GetServiceProviderByIdAsync(Guid id);
|
||||
|
||||
//19. (IServiceProviderDataService) Create product
|
||||
public Task<bool> CreateProductAsync(Product product);
|
||||
|
|
|
|||
|
|
@ -31,16 +31,16 @@ namespace TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels
|
|||
public float Price { get; set; }
|
||||
public string? JsonDetails { get; set; }
|
||||
|
||||
public TiamServiceProvider TiamServiceProvider { get; set; }
|
||||
public Company Company { get; set; }
|
||||
|
||||
public ProductWizardModel() { }
|
||||
|
||||
public ProductWizardModel(TiamServiceProvider tiamServiceProvider, ProductType productType, string name, string description, float price, string? jsonDetails) : this(Guid.NewGuid(), tiamServiceProvider, productType, name, description, price, jsonDetails) { }
|
||||
public ProductWizardModel(Company company, ProductType productType, string name, string description, float price, string? jsonDetails) : this(Guid.NewGuid(), company, productType, name, description, price, jsonDetails) { }
|
||||
|
||||
public ProductWizardModel(Guid id, TiamServiceProvider tiamServiceProvider, ProductType productType, string name, string description, float price, string? jsonDetails)
|
||||
public ProductWizardModel(Guid id, Company company, ProductType productType, string name, string description, float price, string? jsonDetails)
|
||||
{
|
||||
Id = id;
|
||||
TiamServiceProvider = tiamServiceProvider;
|
||||
Company = company;
|
||||
ProductType = productType;
|
||||
Name = name;
|
||||
Description = description;
|
||||
|
|
@ -48,9 +48,9 @@ namespace TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels
|
|||
JsonDetails = jsonDetails;
|
||||
}
|
||||
|
||||
public Product SaveToProduct(TiamServiceProvider tiamServiceProvider)
|
||||
public Product SaveToProduct(Company company)
|
||||
{
|
||||
Product NewProduct = new(this.Id, tiamServiceProvider.Id, tiamServiceProvider, this.ProductType, this.Name, this.Description, this.Price, this.JsonDetails);
|
||||
Product NewProduct = new(this.Id, company.Id, company, this.ProductType, this.Name, this.Description, this.Price, this.JsonDetails);
|
||||
return NewProduct;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ namespace TIAMWebApp.Shared.Application.Services
|
|||
}
|
||||
|
||||
//15.
|
||||
public Task<bool> CreateServiceProviderAsync(TiamServiceProvider serviceProvider)
|
||||
public Task<bool> CreateServiceProviderAsync(Company serviceProvider)
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
|
@ -86,13 +86,13 @@ namespace TIAMWebApp.Shared.Application.Services
|
|||
}
|
||||
|
||||
//18.
|
||||
public Task<TiamServiceProvider?> GetServiceProviderByIdAsync(Guid id)
|
||||
public Task<Company?> GetServiceProviderByIdAsync(Guid id)
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
//16.
|
||||
public Task<List<TiamServiceProvider>> GetServiceProvidersAsync()
|
||||
public Task<List<Company>> GetServiceProvidersAsync()
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
|
@ -110,7 +110,7 @@ namespace TIAMWebApp.Shared.Application.Services
|
|||
}
|
||||
|
||||
//14.
|
||||
public Task<bool> UpdateServiceProviderAsync(TiamServiceProvider serviceProvider)
|
||||
public Task<bool> UpdateServiceProviderAsync(Company serviceProvider)
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue