Compare commits
2 Commits
b3cda2dcce
...
7813c63f27
| Author | SHA1 | Date |
|---|---|---|
|
|
7813c63f27 | |
|
|
5f2bce7ed5 |
|
|
@ -24,15 +24,15 @@
|
||||||
<PrivateAssets>all</PrivateAssets>
|
<PrivateAssets>all</PrivateAssets>
|
||||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.5" />
|
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.6" />
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.5" />
|
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.6" />
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="8.0.5" />
|
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="8.0.6" />
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.5" />
|
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.6" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
|
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
|
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
|
||||||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
|
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
|
||||||
<PackageReference Include="MSTest.TestAdapter" Version="3.3.1" />
|
<PackageReference Include="MSTest.TestAdapter" Version="3.4.1" />
|
||||||
<PackageReference Include="MSTest.TestFramework" Version="3.3.1" />
|
<PackageReference Include="MSTest.TestFramework" Version="3.4.1" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|
|
||||||
|
|
@ -23,6 +23,11 @@ public class UserDalTests : AcUserDalTestBase<UserDal, UserDbContext, User, Prof
|
||||||
public override void AcBase_GetUserById_ReturnsUser_WhenUserExists(string userIdString)
|
public override void AcBase_GetUserById_ReturnsUser_WhenUserExists(string userIdString)
|
||||||
=> base.AcBase_GetUserById_ReturnsUser_WhenUserExists(userIdString);
|
=> base.AcBase_GetUserById_ReturnsUser_WhenUserExists(userIdString);
|
||||||
|
|
||||||
|
[DataTestMethod]
|
||||||
|
[DataRow("540271F6-C604-4C16-8160-D5A7CAFEDF00")]
|
||||||
|
public override void AcBase_GetUserModelDtoDetailById_ReturnsUser_WhenUserExists(string userIdString)
|
||||||
|
=> base.AcBase_GetUserModelDtoDetailById_ReturnsUser_WhenUserExists(userIdString);
|
||||||
|
|
||||||
[DataTestMethod]
|
[DataTestMethod]
|
||||||
[DataRow(["e31044d7-1771-4a32-8dd9-6f9853ed53c6", "0a831191-70a3-4504-9ec4-c5902affaba7", "8eed080c-d2ce-4cc3-bcfe-2268c220bba7", "addUser_test9432@tiam.hu"])]
|
[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)
|
public override async Task AcBase_AddUserTest(string[] userIdProfileIdAddressIdEmailStrings)
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,6 @@ using Mango.Entities.Users;
|
||||||
|
|
||||||
namespace Mango.Database.DbSets.Users;
|
namespace Mango.Database.DbSets.Users;
|
||||||
|
|
||||||
public interface IUserDbSet : IAcUserDbSet<User, Profile, Company, UserToCompany, Address>
|
public interface IUserDbSet : IAcUserDbSetBase<User, Profile, Company, UserToCompany, Address>
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
@ -53,9 +53,9 @@
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.5" />
|
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.6" />
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="8.0.5" />
|
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="8.0.6" />
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.5" />
|
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.6" />
|
||||||
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
|
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
using System.ComponentModel.DataAnnotations.Schema;
|
using System.ComponentModel.DataAnnotations.Schema;
|
||||||
using AyCode.Entities.ServiceProviders;
|
using AyCode.Entities.ServiceProviders;
|
||||||
|
using Mango.Entities.Addresses;
|
||||||
using Mango.Entities.Profiles;
|
using Mango.Entities.Profiles;
|
||||||
using Mango.Entities.Users;
|
using Mango.Entities.Users;
|
||||||
using Mango.Interfaces.Companies;
|
using Mango.Interfaces.Companies;
|
||||||
|
|
@ -7,7 +8,7 @@ using Mango.Interfaces.Companies;
|
||||||
namespace Mango.Entities.Companies;
|
namespace Mango.Entities.Companies;
|
||||||
|
|
||||||
[Table("ServiceProviders")]
|
[Table("ServiceProviders")]
|
||||||
public class Company : AcCompany<User, UserToCompany, Profile>, ICompany<User, UserToCompany, Profile>, ICompanyBase
|
public class Company : AcCompany<User, UserToCompany, Profile, Address>, ICompany<User, UserToCompany, Profile, Address>, ICompanyBase
|
||||||
{
|
{
|
||||||
public Company()
|
public Company()
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -1,14 +1,17 @@
|
||||||
using AyCode.Interfaces.ServiceProviders;
|
using AyCode.Interfaces.ServiceProviders;
|
||||||
using AyCode.Interfaces.Users;
|
using AyCode.Interfaces.Users;
|
||||||
using System;
|
using System;
|
||||||
|
using AyCode.Interfaces.Addresses;
|
||||||
|
using AyCode.Interfaces.Profiles;
|
||||||
using AyCode.Interfaces.Profiles.Dtos;
|
using AyCode.Interfaces.Profiles.Dtos;
|
||||||
using Mango.Interfaces.Users;
|
using Mango.Interfaces.Users;
|
||||||
using Mango.Interfaces.Profiles;
|
using Mango.Interfaces.Profiles;
|
||||||
|
|
||||||
namespace Mango.Interfaces.Companies;
|
namespace Mango.Interfaces.Companies;
|
||||||
|
|
||||||
public interface ICompany<TUser, TUserToCompany, TProfile> : IAcCompany<TUser, TUserToCompany, TProfile>
|
public interface ICompany<TUser, TUserToCompany, TProfile, TAddress> : IAcCompany<TUser, TUserToCompany, TProfile, TAddress>
|
||||||
where TUser : class, IUserBase
|
where TUser : class, IUserBase
|
||||||
where TUserToCompany : class, IUserToCompanyBase
|
where TUserToCompany : class, IUserToCompanyBase
|
||||||
where TProfile : class, IProfileDto
|
where TProfile : class, IAcProfile<TAddress>
|
||||||
|
where TAddress : class, IAcAddress
|
||||||
{}
|
{}
|
||||||
|
|
@ -5,10 +5,10 @@ using Mango.Interfaces.Profiles;
|
||||||
|
|
||||||
namespace Mango.Interfaces.Users;
|
namespace Mango.Interfaces.Users;
|
||||||
|
|
||||||
public interface IUser<TProfile, TCompany, TUserToCompany, TProfileAddress> : IAcUser<TProfile, TCompany, TUserToCompany, TProfileAddress>, IUserDto<TProfile, TCompany, TUserToCompany, TProfileAddress>, IUserBase
|
public interface IUser<TProfile, TCompany, TUserToCompany, TAddress> : IAcUser<TProfile, TCompany, TUserToCompany, TAddress>, IUserDto<TProfile, TCompany, TUserToCompany>, IUserBase
|
||||||
where TProfile : class, IProfile<TProfileAddress>
|
where TProfile : class, IProfile<TAddress>
|
||||||
where TCompany : class, ICompanyBase
|
where TCompany : class, ICompanyBase
|
||||||
where TUserToCompany : class, IUserToCompanyBase
|
where TUserToCompany : class, IUserToCompanyBase
|
||||||
where TProfileAddress : class, IAddress
|
where TAddress : class, IAddress
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
@ -1,13 +1,13 @@
|
||||||
using AyCode.Interfaces.Users.Dtos;
|
using AyCode.Interfaces.Profiles.Dtos;
|
||||||
|
using AyCode.Interfaces.Users.Dtos;
|
||||||
using Mango.Interfaces.Addresses;
|
using Mango.Interfaces.Addresses;
|
||||||
using Mango.Interfaces.Companies;
|
using Mango.Interfaces.Companies;
|
||||||
using Mango.Interfaces.Profiles;
|
using Mango.Interfaces.Profiles;
|
||||||
|
|
||||||
namespace Mango.Interfaces.Users;
|
namespace Mango.Interfaces.Users;
|
||||||
|
|
||||||
public interface IUserDto<TProfile, TCompany, TUserToCompany, TProfileAddress> : IAcUserDtoBase<TProfile, TCompany, TUserToCompany, TProfileAddress>
|
public interface IUserDto<TProfile, TCompany, TUserToCompany> : IAcUserDtoBase<TProfile, TCompany, TUserToCompany>
|
||||||
where TProfile : class, IProfile<TProfileAddress>
|
where TProfile : class, IAcProfileDtoBase
|
||||||
where TCompany : class, ICompanyBase
|
where TCompany : class, ICompanyBase
|
||||||
where TUserToCompany : class, IUserToCompanyBase
|
where TUserToCompany : class, IUserToCompanyBase
|
||||||
where TProfileAddress : class, IAddress
|
|
||||||
{ }
|
{ }
|
||||||
|
|
@ -24,10 +24,10 @@
|
||||||
<PrivateAssets>all</PrivateAssets>
|
<PrivateAssets>all</PrivateAssets>
|
||||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="8.0.5" />
|
<PackageReference Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="8.0.6" />
|
||||||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
|
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
|
||||||
<PackageReference Include="MSTest.TestAdapter" Version="3.3.1" />
|
<PackageReference Include="MSTest.TestAdapter" Version="3.4.1" />
|
||||||
<PackageReference Include="MSTest.TestFramework" Version="3.3.1" />
|
<PackageReference Include="MSTest.TestFramework" Version="3.4.1" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="8.0.5" />
|
<PackageReference Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="8.0.6" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|
|
||||||
|
|
@ -7,8 +7,8 @@
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.5" />
|
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.6" />
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.5" PrivateAssets="all" />
|
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.6" PrivateAssets="all" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
|
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,7 @@
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.5" />
|
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.6" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|
|
||||||
|
|
@ -12,8 +12,8 @@
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.5" />
|
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.6" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Localization" Version="8.0.5" />
|
<PackageReference Include="Microsoft.Extensions.Localization" Version="8.0.6" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue