diff --git a/EventHub.sln b/EventHub.sln
index cae575c..9851ae4 100644
--- a/EventHub.sln
+++ b/EventHub.sln
@@ -15,8 +15,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{04DBDB01-7
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventHub.Application.Tests", "test\EventHub.Application.Tests\EventHub.Application.Tests.csproj", "{50B2631D-129C-47B3-A587-029CCD6099BC}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventHub.EntityFrameworkCore.DbMigrations", "src\EventHub.EntityFrameworkCore.DbMigrations\EventHub.EntityFrameworkCore.DbMigrations.csproj", "{0372FA84-C517-4EB3-9A9F-B9ACAC0CA5E0}"
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventHub.Domain.Shared", "src\EventHub.Domain.Shared\EventHub.Domain.Shared.csproj", "{42F719ED-8413-4895-B5B4-5AB56079BC66}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventHub.Application.Contracts", "src\EventHub.Application.Contracts\EventHub.Application.Contracts.csproj", "{520659C8-C734-4298-A3DA-B539DB9DFC0B}"
@@ -89,10 +87,6 @@ Global
{50B2631D-129C-47B3-A587-029CCD6099BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{50B2631D-129C-47B3-A587-029CCD6099BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{50B2631D-129C-47B3-A587-029CCD6099BC}.Release|Any CPU.Build.0 = Release|Any CPU
- {0372FA84-C517-4EB3-9A9F-B9ACAC0CA5E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {0372FA84-C517-4EB3-9A9F-B9ACAC0CA5E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {0372FA84-C517-4EB3-9A9F-B9ACAC0CA5E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {0372FA84-C517-4EB3-9A9F-B9ACAC0CA5E0}.Release|Any CPU.Build.0 = Release|Any CPU
{42F719ED-8413-4895-B5B4-5AB56079BC66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{42F719ED-8413-4895-B5B4-5AB56079BC66}.Debug|Any CPU.Build.0 = Debug|Any CPU
{42F719ED-8413-4895-B5B4-5AB56079BC66}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -182,7 +176,6 @@ Global
{554AD327-6DBA-4F8F-96F8-81CE7A0C863F} = {81F0EB50-4CF9-402D-B723-A07E95F8D7CB}
{42F719ED-8413-4895-B5B4-5AB56079BC66} = {81F0EB50-4CF9-402D-B723-A07E95F8D7CB}
{C956DD76-69C8-4A9C-83EA-D17DF83340FD} = {81F0EB50-4CF9-402D-B723-A07E95F8D7CB}
- {0372FA84-C517-4EB3-9A9F-B9ACAC0CA5E0} = {81F0EB50-4CF9-402D-B723-A07E95F8D7CB}
{BAA6ED88-6783-48EF-8691-46F4BED14023} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0}
{073C361E-B8F4-49F5-93CC-72A3FF49C026} = {BAA6ED88-6783-48EF-8691-46F4BED14023}
{F8CF0FE2-9F75-4940-92EC-3D021416DEBF} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0}
diff --git a/src/EventHub.Admin.HttpApi.Host/EventHub.Admin.HttpApi.Host.csproj b/src/EventHub.Admin.HttpApi.Host/EventHub.Admin.HttpApi.Host.csproj
index 0c57449..6fec7fc 100644
--- a/src/EventHub.Admin.HttpApi.Host/EventHub.Admin.HttpApi.Host.csproj
+++ b/src/EventHub.Admin.HttpApi.Host/EventHub.Admin.HttpApi.Host.csproj
@@ -25,7 +25,7 @@
-
+
diff --git a/src/EventHub.Admin.HttpApi.Host/EventHubAdminHttpApiHostModule.cs b/src/EventHub.Admin.HttpApi.Host/EventHubAdminHttpApiHostModule.cs
index ac40909..38ff481 100644
--- a/src/EventHub.Admin.HttpApi.Host/EventHubAdminHttpApiHostModule.cs
+++ b/src/EventHub.Admin.HttpApi.Host/EventHubAdminHttpApiHostModule.cs
@@ -32,7 +32,7 @@ namespace EventHub.Admin
[DependsOn(
typeof(EventHubAdminApplicationModule),
typeof(EventHubAdminHttpApiModule),
- typeof(EventHubEntityFrameworkCoreDbMigrationsModule),
+ typeof(EventHubEntityFrameworkCoreModule),
typeof(AbpAutofacModule),
typeof(AbpCachingStackExchangeRedisModule),
typeof(AbpAspNetCoreSerilogModule),
diff --git a/src/EventHub.Application/EventHubApplicationAutoMapperProfile.cs b/src/EventHub.Application/EventHubApplicationAutoMapperProfile.cs
index 135561c..64e9dc5 100644
--- a/src/EventHub.Application/EventHubApplicationAutoMapperProfile.cs
+++ b/src/EventHub.Application/EventHubApplicationAutoMapperProfile.cs
@@ -7,6 +7,7 @@ using EventHub.Organizations;
using EventHub.Organizations.Memberships;
using EventHub.Users;
using Volo.Abp.AutoMapper;
+using Volo.Abp.Identity;
namespace EventHub
{
@@ -17,7 +18,7 @@ namespace EventHub
CreateMap();
CreateMap();
- CreateMap();
+ CreateMap();
CreateMap();
CreateMap()
@@ -29,14 +30,14 @@ namespace EventHub
.Ignore(x => x.OrganizationName)
.Ignore(x => x.OrganizationDisplayName);
- CreateMap();
+ CreateMap();
CreateMap()
.Ignore(x => x.Country);
CreateMap();
- CreateMap();
+ CreateMap();
}
}
}
diff --git a/src/EventHub.Application/Events/EventAppService.cs b/src/EventHub.Application/Events/EventAppService.cs
index f6f9bcf..2bf29cb 100644
--- a/src/EventHub.Application/Events/EventAppService.cs
+++ b/src/EventHub.Application/Events/EventAppService.cs
@@ -11,6 +11,7 @@ using Volo.Abp.Application.Dtos;
using Volo.Abp.Authorization;
using Volo.Abp.BlobStoring;
using Volo.Abp.Domain.Repositories;
+using Volo.Abp.Identity;
using Volo.Abp.Users;
namespace EventHub.Events
@@ -22,7 +23,7 @@ namespace EventHub.Events
private readonly IRepository _eventRegistrationRepository;
private readonly IRepository _eventRepository;
private readonly IRepository _organizationRepository;
- private readonly IRepository _userRepository;
+ private readonly IRepository _userRepository;
private readonly IRepository _countriesRepository;
private readonly IBlobContainer _eventBlobContainer;
@@ -32,7 +33,7 @@ namespace EventHub.Events
IRepository eventRegistrationRepository,
IRepository eventRepository,
IRepository organizationRepository,
- IRepository userRepository,
+ IRepository userRepository,
IRepository countriesRepository,
IBlobContainer eventBlobContainer)
{
diff --git a/src/EventHub.Application/Events/Registrations/EventRegistrationAppService.cs b/src/EventHub.Application/Events/Registrations/EventRegistrationAppService.cs
index 367abea..1197a5a 100644
--- a/src/EventHub.Application/Events/Registrations/EventRegistrationAppService.cs
+++ b/src/EventHub.Application/Events/Registrations/EventRegistrationAppService.cs
@@ -2,25 +2,25 @@
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
-using EventHub.Users;
using Microsoft.AspNetCore.Authorization;
using Volo.Abp.Application.Dtos;
using Volo.Abp.Domain.Repositories;
using Volo.Abp.Users;
+using Volo.Abp.Identity;
namespace EventHub.Events.Registrations
{
public class EventRegistrationAppService : EventHubAppService, IEventRegistrationAppService
{
private readonly EventRegistrationManager _eventRegistrationManager;
- private readonly IRepository _userRepository;
+ private readonly IRepository _userRepository;
private readonly IRepository _eventRepository;
private readonly IRepository _eventRegistrationRepository;
private readonly EventRegistrationNotifier _eventRegistrationNotifier;
public EventRegistrationAppService(
EventRegistrationManager eventRegistrationManager,
- IRepository userRepository,
+ IRepository userRepository,
IRepository eventRepository,
IRepository eventRegistrationRepository,
EventRegistrationNotifier eventRegistrationNotifier)
@@ -77,7 +77,7 @@ namespace EventHub.Events.Registrations
return new PagedResultDto(
totalCount,
- ObjectMapper.Map, List>(users)
+ ObjectMapper.Map, List>(users)
);
}
diff --git a/src/EventHub.Application/Events/Registrations/EventRegistrationNotifier.cs b/src/EventHub.Application/Events/Registrations/EventRegistrationNotifier.cs
index 7413e96..baeca74 100644
--- a/src/EventHub.Application/Events/Registrations/EventRegistrationNotifier.cs
+++ b/src/EventHub.Application/Events/Registrations/EventRegistrationNotifier.cs
@@ -1,8 +1,8 @@
using System.Threading.Tasks;
using EventHub.Emailing;
-using EventHub.Users;
using Volo.Abp.DependencyInjection;
using Volo.Abp.Emailing;
+using Volo.Abp.Identity;
using Volo.Abp.TextTemplating;
namespace EventHub.Events.Registrations
@@ -22,7 +22,7 @@ namespace EventHub.Events.Registrations
public async Task NotifyAsync(
Event @event,
- AppUser user)
+ IdentityUser user)
{
if (user is null || @event is null)
{
diff --git a/src/EventHub.Application/Organizations/Memberships/OrganizationMembershipAppService.cs b/src/EventHub.Application/Organizations/Memberships/OrganizationMembershipAppService.cs
index a3d70dc..744d74d 100644
--- a/src/EventHub.Application/Organizations/Memberships/OrganizationMembershipAppService.cs
+++ b/src/EventHub.Application/Organizations/Memberships/OrganizationMembershipAppService.cs
@@ -6,6 +6,7 @@ using EventHub.Users;
using Microsoft.AspNetCore.Authorization;
using Volo.Abp.Application.Dtos;
using Volo.Abp.Domain.Repositories;
+using Volo.Abp.Identity;
using Volo.Abp.Users;
namespace EventHub.Organizations.Memberships
@@ -13,13 +14,13 @@ namespace EventHub.Organizations.Memberships
public class OrganizationMembershipAppService : EventHubAppService, IOrganizationMembershipAppService
{
private readonly OrganizationMembershipManager _organizationMembershipManager;
- private readonly IRepository _userRepository;
+ private readonly IRepository _userRepository;
private readonly IRepository _organizationRepository;
private readonly IRepository _organizationMembershipsRepository;
public OrganizationMembershipAppService(
OrganizationMembershipManager organizationMembershipManager,
- IRepository userRepository,
+ IRepository userRepository,
IRepository organizationRepository,
IRepository organizationMembershipsRepository)
{
@@ -72,7 +73,7 @@ namespace EventHub.Organizations.Memberships
return new PagedResultDto(
totalCount,
- ObjectMapper.Map, List>(users)
+ ObjectMapper.Map, List>(users)
);
}
}
diff --git a/src/EventHub.Application/Organizations/OrganizationAppService.cs b/src/EventHub.Application/Organizations/OrganizationAppService.cs
index ff4a958..a53573f 100644
--- a/src/EventHub.Application/Organizations/OrganizationAppService.cs
+++ b/src/EventHub.Application/Organizations/OrganizationAppService.cs
@@ -9,6 +9,7 @@ using Volo.Abp.Application.Dtos;
using Volo.Abp.Authorization;
using Volo.Abp.BlobStoring;
using Volo.Abp.Domain.Repositories;
+using Volo.Abp.Identity;
using Volo.Abp.Users;
namespace EventHub.Organizations
@@ -19,14 +20,14 @@ namespace EventHub.Organizations
private readonly IRepository _organizationMembershipsRepository;
private readonly OrganizationManager _organizationManager;
private readonly IBlobContainer _organizationBlobContainer;
- private readonly IRepository _userRepository;
+ private readonly IRepository _userRepository;
public OrganizationAppService(
IRepository organizationRepository,
IRepository organizationMembershipsRepository,
OrganizationManager organizationManager,
IBlobContainer organizationBlobContainer,
- IRepository userRepository)
+ IRepository userRepository)
{
_organizationRepository = organizationRepository;
_organizationMembershipsRepository = organizationMembershipsRepository;
diff --git a/src/EventHub.Application/Users/UserAppService.cs b/src/EventHub.Application/Users/UserAppService.cs
index b2aee9d..2481f18 100644
--- a/src/EventHub.Application/Users/UserAppService.cs
+++ b/src/EventHub.Application/Users/UserAppService.cs
@@ -2,14 +2,15 @@ using System;
using System.Threading.Tasks;
using EventHub.Members;
using Volo.Abp.Domain.Repositories;
+using Volo.Abp.Identity;
namespace EventHub.Users
{
public class UserAppService : EventHubAppService, IUserAppService
{
- private readonly IRepository _userRepository;
+ private readonly IRepository _userRepository;
- public UserAppService(IRepository userRepository)
+ public UserAppService(IRepository userRepository)
{
_userRepository = userRepository;
}
@@ -18,7 +19,7 @@ namespace EventHub.Users
{
var user = await _userRepository.FindAsync(x => x.UserName == username);
- return ObjectMapper.Map(user);
+ return ObjectMapper.Map(user);
}
}
}
\ No newline at end of file
diff --git a/src/EventHub.BackgroundServices/Events/EventReminderNotifier.cs b/src/EventHub.BackgroundServices/Events/EventReminderNotifier.cs
index e34e048..7ef1995 100644
--- a/src/EventHub.BackgroundServices/Events/EventReminderNotifier.cs
+++ b/src/EventHub.BackgroundServices/Events/EventReminderNotifier.cs
@@ -7,6 +7,7 @@ using EventHub.Users;
using Volo.Abp.DependencyInjection;
using Volo.Abp.Domain.Repositories;
using Volo.Abp.Emailing;
+using Volo.Abp.Identity;
using Volo.Abp.Linq;
using Volo.Abp.TextTemplating;
@@ -16,14 +17,14 @@ namespace EventHub.Events
{
private readonly IEmailSender _emailSender;
private readonly ITemplateRenderer _templateRenderer;
- private readonly IRepository _userRepository;
+ private readonly IRepository _userRepository;
private readonly IRepository _eventRegistrationRepository;
private readonly IAsyncQueryableExecuter _asyncExecuter;
public EventReminderNotifier(
IEmailSender emailSender,
ITemplateRenderer templateRenderer,
- IRepository userRepository,
+ IRepository userRepository,
IRepository eventRegistrationRepository,
IAsyncQueryableExecuter asyncExecuter)
{
diff --git a/src/EventHub.BackgroundServices/Events/EventTimingChangeNotifier.cs b/src/EventHub.BackgroundServices/Events/EventTimingChangeNotifier.cs
index c097c5c..e60b9f0 100644
--- a/src/EventHub.BackgroundServices/Events/EventTimingChangeNotifier.cs
+++ b/src/EventHub.BackgroundServices/Events/EventTimingChangeNotifier.cs
@@ -7,6 +7,7 @@ using EventHub.Users;
using Volo.Abp.DependencyInjection;
using Volo.Abp.Domain.Repositories;
using Volo.Abp.Emailing;
+using Volo.Abp.Identity;
using Volo.Abp.Linq;
using Volo.Abp.TextTemplating;
@@ -17,14 +18,14 @@ namespace EventHub.Events
private readonly IEmailSender _emailSender;
private readonly ITemplateRenderer _templateRenderer;
private readonly IAsyncQueryableExecuter _asyncExecuter;
- private readonly IRepository _userRepository;
+ private readonly IRepository _userRepository;
private readonly IRepository _eventRegistrationRepository;
public EventTimingChangeNotifier(
IEmailSender emailSender,
ITemplateRenderer templateRenderer,
IAsyncQueryableExecuter asyncExecuter,
- IRepository userRepository,
+ IRepository userRepository,
IRepository eventRegistrationRepository)
{
_emailSender = emailSender;
diff --git a/src/EventHub.BackgroundServices/Events/NewEventNotifier.cs b/src/EventHub.BackgroundServices/Events/NewEventNotifier.cs
index 8939071..64dcf02 100644
--- a/src/EventHub.BackgroundServices/Events/NewEventNotifier.cs
+++ b/src/EventHub.BackgroundServices/Events/NewEventNotifier.cs
@@ -7,6 +7,7 @@ using EventHub.Users;
using Volo.Abp.DependencyInjection;
using Volo.Abp.Domain.Repositories;
using Volo.Abp.Emailing;
+using Volo.Abp.Identity;
using Volo.Abp.Linq;
using Volo.Abp.TextTemplating;
@@ -17,14 +18,14 @@ namespace EventHub.Events
private readonly IEmailSender _emailSender;
private readonly ITemplateRenderer _templateRenderer;
private readonly IRepository _organizationMembershipsRepository;
- private readonly IRepository _userRepository;
+ private readonly IRepository _userRepository;
private readonly IAsyncQueryableExecuter _asyncExecuter;
public NewEventNotifier(
IEmailSender emailSender,
ITemplateRenderer templateRenderer,
IRepository organizationMembershipsRepository,
- IRepository userRepository,
+ IRepository userRepository,
IAsyncQueryableExecuter asyncExecuter)
{
_emailSender = emailSender;
diff --git a/src/EventHub.DbMigrator/Data/EventHubSampleDataSeedContributor.cs b/src/EventHub.DbMigrator/Data/EventHubSampleDataSeedContributor.cs
index 0f118b2..d33e59a 100644
--- a/src/EventHub.DbMigrator/Data/EventHubSampleDataSeedContributor.cs
+++ b/src/EventHub.DbMigrator/Data/EventHubSampleDataSeedContributor.cs
@@ -24,7 +24,7 @@ namespace EventHub.DbMigrator.Data
private readonly IRepository _eventRepository;
private readonly EventManager _eventManager;
private readonly EventRegistrationManager _eventRegistrationManager;
- private readonly IRepository _userRepository;
+ private readonly IRepository _userRepository;
private Guid _userSandraId;
private Guid _userSergeyId;
@@ -46,7 +46,7 @@ namespace EventHub.DbMigrator.Data
IRepository eventRepository,
EventManager eventManager,
EventRegistrationManager eventRegistrationManager,
- IRepository userRepository)
+ IRepository userRepository)
{
_guidGenerator = guidGenerator;
_identityUserManager = identityUserManager;
diff --git a/src/EventHub.DbMigrator/EventHub.DbMigrator.csproj b/src/EventHub.DbMigrator/EventHub.DbMigrator.csproj
index c3d8cb5..ebffe59 100644
--- a/src/EventHub.DbMigrator/EventHub.DbMigrator.csproj
+++ b/src/EventHub.DbMigrator/EventHub.DbMigrator.csproj
@@ -30,7 +30,7 @@
-
+
diff --git a/src/EventHub.DbMigrator/EventHubDbMigratorModule.cs b/src/EventHub.DbMigrator/EventHubDbMigratorModule.cs
index 588aecb..40f47fb 100644
--- a/src/EventHub.DbMigrator/EventHubDbMigratorModule.cs
+++ b/src/EventHub.DbMigrator/EventHubDbMigratorModule.cs
@@ -8,7 +8,7 @@ namespace EventHub.DbMigrator
{
[DependsOn(
typeof(AbpAutofacModule),
- typeof(EventHubEntityFrameworkCoreDbMigrationsModule),
+ typeof(EventHubEntityFrameworkCoreModule),
typeof(EventHubApplicationContractsModule),
typeof(EventHubAdminApplicationContractsModule)
)]
diff --git a/src/EventHub.Domain/Data/EventHubDbMigrationService.cs b/src/EventHub.Domain/Data/EventHubDbMigrationService.cs
index d993ac1..b29a92c 100644
--- a/src/EventHub.Domain/Data/EventHubDbMigrationService.cs
+++ b/src/EventHub.Domain/Data/EventHubDbMigrationService.cs
@@ -121,7 +121,7 @@ namespace EventHub.Data
var srcDirectoryPath = Path.Combine(slnDirectoryPath, "src");
return Directory.GetDirectories(srcDirectoryPath)
- .FirstOrDefault(d => d.EndsWith(".DbMigrations"));
+ .FirstOrDefault(d => d.EndsWith(".EntityFrameworkCore"));
}
private static string GetSolutionDirectoryPath()
diff --git a/src/EventHub.Domain/Events/Registrations/EventRegistrationManager.cs b/src/EventHub.Domain/Events/Registrations/EventRegistrationManager.cs
index 6a097f7..2938903 100644
--- a/src/EventHub.Domain/Events/Registrations/EventRegistrationManager.cs
+++ b/src/EventHub.Domain/Events/Registrations/EventRegistrationManager.cs
@@ -1,9 +1,9 @@
using System;
using System.Threading.Tasks;
-using EventHub.Users;
using Volo.Abp;
using Volo.Abp.Domain.Repositories;
using Volo.Abp.Domain.Services;
+using Volo.Abp.Identity;
namespace EventHub.Events.Registrations
{
@@ -18,7 +18,7 @@ namespace EventHub.Events.Registrations
public async Task RegisterAsync(
Event @event,
- AppUser user)
+ IdentityUser user)
{
if (IsPastEvent(@event))
{
@@ -49,7 +49,7 @@ namespace EventHub.Events.Registrations
public async Task UnregisterAsync(
Event @event,
- AppUser user)
+ IdentityUser user)
{
if (IsPastEvent(@event))
{
@@ -63,7 +63,7 @@ namespace EventHub.Events.Registrations
public async Task IsRegisteredAsync(
Event @event,
- AppUser user)
+ IdentityUser user)
{
return await _eventRegistrationRepository
.AnyAsync(x => x.EventId == @event.Id && x.UserId == user.Id);
diff --git a/src/EventHub.Domain/Organizations/Memberships/OrganizationMembershipManager.cs b/src/EventHub.Domain/Organizations/Memberships/OrganizationMembershipManager.cs
index 4121725..f1bb700 100644
--- a/src/EventHub.Domain/Organizations/Memberships/OrganizationMembershipManager.cs
+++ b/src/EventHub.Domain/Organizations/Memberships/OrganizationMembershipManager.cs
@@ -1,8 +1,8 @@
using System;
using System.Threading.Tasks;
-using EventHub.Users;
using Volo.Abp.Domain.Repositories;
using Volo.Abp.Domain.Services;
+using Volo.Abp.Identity;
namespace EventHub.Organizations.Memberships
{
@@ -17,7 +17,7 @@ namespace EventHub.Organizations.Memberships
public async Task JoinAsync(
Organization organization,
- AppUser user)
+ IdentityUser user)
{
if (await IsJoinedAsync(organization, user))
{
@@ -35,7 +35,7 @@ namespace EventHub.Organizations.Memberships
public async Task IsJoinedAsync(
Organization organization,
- AppUser user)
+ IdentityUser user)
{
return await _organizationMembershipsRepository
.AnyAsync(x => x.OrganizationId == organization.Id && x.UserId == user.Id);
diff --git a/src/EventHub.Domain/Users/AppUser.cs b/src/EventHub.Domain/Users/AppUser.cs
deleted file mode 100644
index 8a767e7..0000000
--- a/src/EventHub.Domain/Users/AppUser.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-using System;
-using Volo.Abp.Domain.Entities.Auditing;
-using Volo.Abp.Users;
-
-namespace EventHub.Users
-{
- /* This entity shares the same table/collection ("AbpUsers" by default) with the
- * IdentityUser entity of the Identity module.
- *
- * - You can define your custom properties into this class.
- * - You never create or delete this entity, because it is Identity module's job.
- * - You can query users from database with this entity.
- * - You can update values of your custom properties.
- */
- public class AppUser : FullAuditedAggregateRoot, IUser
- {
- #region Base properties
-
- /* These properties are shared with the IdentityUser entity of the Identity module.
- * Do not change these properties through this class. Instead, use Identity module
- * services (like IdentityUserManager) to change them.
- * So, this properties are designed as read only!
- */
-
- public virtual Guid? TenantId { get; private set; }
-
- public virtual string UserName { get; private set; }
-
- public virtual string Name { get; private set; }
-
- public virtual string Surname { get; private set; }
-
- public virtual string Email { get; private set; }
-
- public virtual bool EmailConfirmed { get; private set; }
-
- public virtual string PhoneNumber { get; private set; }
-
- public virtual bool PhoneNumberConfirmed { get; private set; }
-
- #endregion
-
- /* Add your own properties here. Example:
- *
- * public string MyProperty { get; set; }
- *
- * If you add a property and using the EF Core, remember these;
- *
- * 1. Update EventHubDbContext.OnModelCreating
- * to configure the mapping for your new property
- * 2. Update EventHubEfCoreEntityExtensionMappings to extend the IdentityUser entity
- * and add your new property to the migration.
- * 3. Use the Add-Migration to add a new database migration.
- * 4. Run the .DbMigrator project (or use the Update-Database command) to apply
- * schema change to the database.
- */
-
- private AppUser()
- {
-
- }
-
- public string GetFullNameOrUsername()
- {
- if (!string.IsNullOrWhiteSpace(Name) && !string.IsNullOrWhiteSpace(Surname))
- {
- return Name + " " + Surname;
- }
-
- if (!string.IsNullOrWhiteSpace(Name))
- {
- return Name;
- }
-
- return UserName;
- }
- }
-}
diff --git a/src/EventHub.Domain/Users/EventHubIdentityUserExtensions.cs b/src/EventHub.Domain/Users/EventHubIdentityUserExtensions.cs
new file mode 100644
index 0000000..98b3e9b
--- /dev/null
+++ b/src/EventHub.Domain/Users/EventHubIdentityUserExtensions.cs
@@ -0,0 +1,22 @@
+using Volo.Abp.Identity;
+
+namespace EventHub.Users
+{
+ public static class EventHubIdentityUserExtensions
+ {
+ public static string GetFullNameOrUsername(this IdentityUser user)
+ {
+ if (!string.IsNullOrWhiteSpace(user.Name) && !string.IsNullOrWhiteSpace(user.Surname))
+ {
+ return user.Name + " " + user.Surname;
+ }
+
+ if (!string.IsNullOrWhiteSpace(user.Name))
+ {
+ return user.Name;
+ }
+
+ return user.UserName;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/EventHub.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/EventHubEntityFrameworkCoreDbMigrationsModule.cs b/src/EventHub.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/EventHubEntityFrameworkCoreDbMigrationsModule.cs
deleted file mode 100644
index 65d9f49..0000000
--- a/src/EventHub.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/EventHubEntityFrameworkCoreDbMigrationsModule.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp.Modularity;
-
-namespace EventHub.EntityFrameworkCore
-{
- [DependsOn(
- typeof(EventHubEntityFrameworkCoreModule)
- )]
- public class EventHubEntityFrameworkCoreDbMigrationsModule : AbpModule
- {
- public override void ConfigureServices(ServiceConfigurationContext context)
- {
- context.Services.AddAbpDbContext();
- }
- }
-}
diff --git a/src/EventHub.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/EventHubMigrationsDbContext.cs b/src/EventHub.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/EventHubMigrationsDbContext.cs
deleted file mode 100644
index 16787c0..0000000
--- a/src/EventHub.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/EventHubMigrationsDbContext.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using EventHub.Events.Registrations;
-using Microsoft.EntityFrameworkCore;
-using Volo.Abp.AuditLogging.EntityFrameworkCore;
-using Volo.Abp.BackgroundJobs.EntityFrameworkCore;
-using Volo.Abp.EntityFrameworkCore;
-using Volo.Abp.Identity;
-using Volo.Abp.Identity.EntityFrameworkCore;
-using Volo.Abp.IdentityServer.EntityFrameworkCore;
-using Volo.Abp.PermissionManagement.EntityFrameworkCore;
-using Volo.Abp.SettingManagement.EntityFrameworkCore;
-using Volo.Abp.BlobStoring.Database.EntityFrameworkCore;
-
-namespace EventHub.EntityFrameworkCore
-{
- /* This DbContext is only used for database migrations.
- * It is not used on runtime. See EventHubDbContext for the runtime DbContext.
- * It is a unified model that includes configuration for
- * all used modules and your application.
- */
- public class EventHubMigrationsDbContext : AbpDbContext
- {
- public EventHubMigrationsDbContext(DbContextOptions options)
- : base(options)
- {
-
- }
-
- protected override void OnModelCreating(ModelBuilder builder)
- {
- base.OnModelCreating(builder);
-
- /* Include modules to your migration db context */
-
- builder.ConfigurePermissionManagement();
- builder.ConfigureSettingManagement();
- builder.ConfigureBackgroundJobs();
- builder.ConfigureAuditLogging();
- builder.ConfigureIdentity();
- builder.ConfigureIdentityServer();
-
- /* Configure your own tables/entities inside the ConfigureEventHub method */
-
- builder.ConfigureEventHub(true);
- builder.ConfigureBlobStoring();
- }
- }
-}
diff --git a/src/EventHub.EntityFrameworkCore.DbMigrations/EventHub.EntityFrameworkCore.DbMigrations.csproj b/src/EventHub.EntityFrameworkCore.DbMigrations/EventHub.EntityFrameworkCore.DbMigrations.csproj
deleted file mode 100644
index 811c40c..0000000
--- a/src/EventHub.EntityFrameworkCore.DbMigrations/EventHub.EntityFrameworkCore.DbMigrations.csproj
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
-
- net5.0
- EventHub
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/EventHub.EntityFrameworkCore.DbMigrations/Migrations/20210421100913_Initial.Designer.cs b/src/EventHub.EntityFrameworkCore.DbMigrations/Migrations/20210421100913_Initial.Designer.cs
deleted file mode 100644
index 953dfe2..0000000
--- a/src/EventHub.EntityFrameworkCore.DbMigrations/Migrations/20210421100913_Initial.Designer.cs
+++ /dev/null
@@ -1,2636 +0,0 @@
-//
-using System;
-using EventHub.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
-using Volo.Abp.EntityFrameworkCore;
-
-namespace EventHub.Migrations
-{
- [DbContext(typeof(EventHubMigrationsDbContext))]
- [Migration("20210421100913_Initial")]
- partial class Initial
- {
- protected override void BuildTargetModel(ModelBuilder modelBuilder)
- {
-#pragma warning disable 612, 618
- modelBuilder
- .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.PostgreSql)
- .HasAnnotation("Relational:MaxIdentifierLength", 63)
- .HasAnnotation("ProductVersion", "5.0.5")
- .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
-
- modelBuilder.Entity("EventHub.Countries.Country", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("uuid");
-
- b.Property("Name")
- .IsRequired()
- .HasMaxLength(64)
- .HasColumnType("character varying(64)");
-
- b.HasKey("Id");
-
- b.HasIndex("Name");
-
- b.ToTable("EhCountries");
- });
-
- modelBuilder.Entity("EventHub.Events.Event", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("uuid");
-
- b.Property("Capacity")
- .HasColumnType("integer");
-
- b.Property("City")
- .HasMaxLength(32)
- .HasColumnType("character varying(32)");
-
- b.Property("ConcurrencyStamp")
- .IsConcurrencyToken()
- .HasMaxLength(40)
- .HasColumnType("character varying(40)")
- .HasColumnName("ConcurrencyStamp");
-
- b.Property("CountryId")
- .HasColumnType("uuid");
-
- b.Property("CreationTime")
- .HasColumnType("timestamp without time zone")
- .HasColumnName("CreationTime");
-
- b.Property("CreatorId")
- .HasColumnType("uuid")
- .HasColumnName("CreatorId");
-
- b.Property("DeleterId")
- .HasColumnType("uuid")
- .HasColumnName("DeleterId");
-
- b.Property("DeletionTime")
- .HasColumnType("timestamp without time zone")
- .HasColumnName("DeletionTime");
-
- b.Property("Description")
- .IsRequired()
- .HasMaxLength(2000)
- .HasColumnType("character varying(2000)");
-
- b.Property("EndTime")
- .HasColumnType("timestamp without time zone");
-
- b.Property("ExtraProperties")
- .HasColumnType("text")
- .HasColumnName("ExtraProperties");
-
- b.Property("IsDeleted")
- .ValueGeneratedOnAdd()
- .HasColumnType("boolean")
- .HasDefaultValue(false)
- .HasColumnName("IsDeleted");
-
- b.Property("IsEmailSentToMembers")
- .HasColumnType("boolean");
-
- b.Property("IsOnline")
- .HasColumnType("boolean");
-
- b.Property("IsRemindingEmailSent")
- .HasColumnType("boolean");
-
- b.Property("Language")
- .HasMaxLength(16)
- .HasColumnType("character varying(16)");
-
- b.Property("LastModificationTime")
- .HasColumnType("timestamp without time zone")
- .HasColumnName("LastModificationTime");
-
- b.Property("LastModifierId")
- .HasColumnType("uuid")
- .HasColumnName("LastModifierId");
-
- b.Property("OnlineLink")
- .HasMaxLength(2000)
- .HasColumnType("character varying(2000)");
-
- b.Property("OrganizationId")
- .HasColumnType("uuid");
-
- b.Property("StartTime")
- .HasColumnType("timestamp without time zone");
-
- b.Property("TimingChangeCount")
- .HasColumnType("integer");
-
- b.Property("Title")
- .IsRequired()
- .HasMaxLength(128)
- .HasColumnType("character varying(128)");
-
- b.Property("Url")
- .IsRequired()
- .HasMaxLength(69)
- .HasColumnType("character varying(69)");
-
- b.Property("UrlCode")
- .IsRequired()
- .HasMaxLength(8)
- .HasColumnType("character varying(8)");
-
- b.HasKey("Id");
-
- b.HasIndex("CountryId");
-
- b.HasIndex("IsEmailSentToMembers");
-
- b.HasIndex("StartTime");
-
- b.HasIndex("UrlCode");
-
- b.HasIndex("IsRemindingEmailSent", "StartTime");
-
- b.HasIndex("OrganizationId", "StartTime");
-
- b.ToTable("EhEvents");
- });
-
- modelBuilder.Entity("EventHub.Events.Registrations.EventRegistration", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("uuid");
-
- b.Property("ConcurrencyStamp")
- .IsConcurrencyToken()
- .HasMaxLength(40)
- .HasColumnType("character varying(40)")
- .HasColumnName("ConcurrencyStamp");
-
- b.Property("CreationTime")
- .HasColumnType("timestamp without time zone")
- .HasColumnName("CreationTime");
-
- b.Property("CreatorId")
- .HasColumnType("uuid")
- .HasColumnName("CreatorId");
-
- b.Property("EventId")
- .HasColumnType("uuid");
-
- b.Property("ExtraProperties")
- .HasColumnType("text")
- .HasColumnName("ExtraProperties");
-
- b.Property("IsTimingChangeEmailSent")
- .ValueGeneratedOnAdd()
- .HasColumnType("boolean")
- .HasDefaultValue(true)
- .HasColumnName("IsTimingChangeEmailSent");
-
- b.Property("UserId")
- .HasColumnType("uuid");
-
- b.HasKey("Id");
-
- b.HasIndex("UserId");
-
- b.HasIndex("EventId", "UserId");
-
- b.ToTable("EhEventRegistrations");
- });
-
- modelBuilder.Entity("EventHub.Organizations.Memberships.OrganizationMembership", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("uuid");
-
- b.Property("ConcurrencyStamp")
- .IsConcurrencyToken()
- .HasMaxLength(40)
- .HasColumnType("character varying(40)")
- .HasColumnName("ConcurrencyStamp");
-
- b.Property("CreationTime")
- .HasColumnType("timestamp without time zone")
- .HasColumnName("CreationTime");
-
- b.Property("CreatorId")
- .HasColumnType("uuid")
- .HasColumnName("CreatorId");
-
- b.Property("ExtraProperties")
- .HasColumnType("text")
- .HasColumnName("ExtraProperties");
-
- b.Property("OrganizationId")
- .HasColumnType("uuid");
-
- b.Property("UserId")
- .HasColumnType("uuid");
-
- b.HasKey("Id");
-
- b.HasIndex("UserId");
-
- b.HasIndex("OrganizationId", "UserId");
-
- b.ToTable("EhOrganizationMemberships");
- });
-
- modelBuilder.Entity("EventHub.Organizations.Organization", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("uuid");
-
- b.Property("ConcurrencyStamp")
- .IsConcurrencyToken()
- .HasMaxLength(40)
- .HasColumnType("character varying(40)")
- .HasColumnName("ConcurrencyStamp");
-
- b.Property("CreationTime")
- .HasColumnType("timestamp without time zone")
- .HasColumnName("CreationTime");
-
- b.Property("CreatorId")
- .HasColumnType("uuid")
- .HasColumnName("CreatorId");
-
- b.Property("DeleterId")
- .HasColumnType("uuid")
- .HasColumnName("DeleterId");
-
- b.Property("DeletionTime")
- .HasColumnType("timestamp without time zone")
- .HasColumnName("DeletionTime");
-
- b.Property("Description")
- .IsRequired()
- .HasMaxLength(1000)
- .HasColumnType("character varying(1000)");
-
- b.Property("DisplayName")
- .IsRequired()
- .HasMaxLength(128)
- .HasColumnType("character varying(128)");
-
- b.Property("ExtraProperties")
- .HasColumnType("text")
- .HasColumnName("ExtraProperties");
-
- b.Property("FacebookUsername")
- .HasColumnType("text");
-
- b.Property("GitHubUsername")
- .HasColumnType("text");
-
- b.Property("InstagramUsername")
- .HasColumnType("text");
-
- b.Property("IsDeleted")
- .ValueGeneratedOnAdd()
- .HasColumnType("boolean")
- .HasDefaultValue(false)
- .HasColumnName("IsDeleted");
-
- b.Property("LastModificationTime")
- .HasColumnType("timestamp without time zone")
- .HasColumnName("LastModificationTime");
-
- b.Property("LastModifierId")
- .HasColumnType("uuid")
- .HasColumnName("LastModifierId");
-
- b.Property("MediumUsername")
- .HasColumnType("text");
-
- b.Property("Name")
- .IsRequired()
- .HasMaxLength(32)
- .HasColumnType("character varying(32)");
-
- b.Property("OwnerUserId")
- .HasColumnType("uuid");
-
- b.Property("TwitterUsername")
- .HasColumnType("text");
-
- b.Property("Website")
- .HasColumnType("text");
-
- b.HasKey("Id");
-
- b.HasIndex("DisplayName");
-
- b.HasIndex("Name");
-
- b.HasIndex("OwnerUserId");
-
- b.ToTable("EhOrganizations");
- });
-
- modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLog", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("uuid");
-
- b.Property("ApplicationName")
- .HasMaxLength(96)
- .HasColumnType("character varying(96)")
- .HasColumnName("ApplicationName");
-
- b.Property("BrowserInfo")
- .HasMaxLength(512)
- .HasColumnType("character varying(512)")
- .HasColumnName("BrowserInfo");
-
- b.Property("ClientId")
- .HasMaxLength(64)
- .HasColumnType("character varying(64)")
- .HasColumnName("ClientId");
-
- b.Property("ClientIpAddress")
- .HasMaxLength(64)
- .HasColumnType("character varying(64)")
- .HasColumnName("ClientIpAddress");
-
- b.Property("ClientName")
- .HasMaxLength(128)
- .HasColumnType("character varying(128)")
- .HasColumnName("ClientName");
-
- b.Property("Comments")
- .HasMaxLength(256)
- .HasColumnType("character varying(256)")
- .HasColumnName("Comments");
-
- b.Property("ConcurrencyStamp")
- .IsConcurrencyToken()
- .HasMaxLength(40)
- .HasColumnType("character varying(40)")
- .HasColumnName("ConcurrencyStamp");
-
- b.Property("CorrelationId")
- .HasMaxLength(64)
- .HasColumnType("character varying(64)")
- .HasColumnName("CorrelationId");
-
- b.Property("Exceptions")
- .HasMaxLength(4000)
- .HasColumnType("character varying(4000)")
- .HasColumnName("Exceptions");
-
- b.Property("ExecutionDuration")
- .HasColumnType("integer")
- .HasColumnName("ExecutionDuration");
-
- b.Property("ExecutionTime")
- .HasColumnType("timestamp without time zone");
-
- b.Property("ExtraProperties")
- .HasColumnType("text")
- .HasColumnName("ExtraProperties");
-
- b.Property("HttpMethod")
- .HasMaxLength(16)
- .HasColumnType("character varying(16)")
- .HasColumnName("HttpMethod");
-
- b.Property("HttpStatusCode")
- .HasColumnType("integer")
- .HasColumnName("HttpStatusCode");
-
- b.Property("ImpersonatorTenantId")
- .HasColumnType("uuid")
- .HasColumnName("ImpersonatorTenantId");
-
- b.Property("ImpersonatorUserId")
- .HasColumnType("uuid")
- .HasColumnName("ImpersonatorUserId");
-
- b.Property("TenantId")
- .HasColumnType("uuid")
- .HasColumnName("TenantId");
-
- b.Property("TenantName")
- .HasColumnType("text");
-
- b.Property("Url")
- .HasMaxLength(256)
- .HasColumnType("character varying(256)")
- .HasColumnName("Url");
-
- b.Property("UserId")
- .HasColumnType("uuid")
- .HasColumnName("UserId");
-
- b.Property("UserName")
- .HasMaxLength(256)
- .HasColumnType("character varying(256)")
- .HasColumnName("UserName");
-
- b.HasKey("Id");
-
- b.HasIndex("TenantId", "ExecutionTime");
-
- b.HasIndex("TenantId", "UserId", "ExecutionTime");
-
- b.ToTable("AbpAuditLogs");
- });
-
- modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogAction", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("uuid");
-
- b.Property("AuditLogId")
- .HasColumnType("uuid")
- .HasColumnName("AuditLogId");
-
- b.Property("ExecutionDuration")
- .HasColumnType("integer")
- .HasColumnName("ExecutionDuration");
-
- b.Property("ExecutionTime")
- .HasColumnType("timestamp without time zone")
- .HasColumnName("ExecutionTime");
-
- b.Property("ExtraProperties")
- .HasColumnType("text")
- .HasColumnName("ExtraProperties");
-
- b.Property("MethodName")
- .HasMaxLength(128)
- .HasColumnType("character varying(128)")
- .HasColumnName("MethodName");
-
- b.Property("Parameters")
- .HasMaxLength(2000)
- .HasColumnType("character varying(2000)")
- .HasColumnName("Parameters");
-
- b.Property("ServiceName")
- .HasMaxLength(256)
- .HasColumnType("character varying(256)")
- .HasColumnName("ServiceName");
-
- b.Property("TenantId")
- .HasColumnType("uuid")
- .HasColumnName("TenantId");
-
- b.HasKey("Id");
-
- b.HasIndex("AuditLogId");
-
- b.HasIndex("TenantId", "ServiceName", "MethodName", "ExecutionTime");
-
- b.ToTable("AbpAuditLogActions");
- });
-
- modelBuilder.Entity("Volo.Abp.AuditLogging.EntityChange", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("uuid");
-
- b.Property("AuditLogId")
- .HasColumnType("uuid")
- .HasColumnName("AuditLogId");
-
- b.Property("ChangeTime")
- .HasColumnType("timestamp without time zone")
- .HasColumnName("ChangeTime");
-
- b.Property("ChangeType")
- .HasColumnType("smallint")
- .HasColumnName("ChangeType");
-
- b.Property("EntityId")
- .IsRequired()
- .HasMaxLength(128)
- .HasColumnType("character varying(128)")
- .HasColumnName("EntityId");
-
- b.Property("EntityTenantId")
- .HasColumnType("uuid");
-
- b.Property("EntityTypeFullName")
- .IsRequired()
- .HasMaxLength(128)
- .HasColumnType("character varying(128)")
- .HasColumnName("EntityTypeFullName");
-
- b.Property("ExtraProperties")
- .HasColumnType("text")
- .HasColumnName("ExtraProperties");
-
- b.Property("TenantId")
- .HasColumnType("uuid")
- .HasColumnName("TenantId");
-
- b.HasKey("Id");
-
- b.HasIndex("AuditLogId");
-
- b.HasIndex("TenantId", "EntityTypeFullName", "EntityId");
-
- b.ToTable("AbpEntityChanges");
- });
-
- modelBuilder.Entity("Volo.Abp.AuditLogging.EntityPropertyChange", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("uuid");
-
- b.Property("EntityChangeId")
- .HasColumnType("uuid");
-
- b.Property("NewValue")
- .HasMaxLength(512)
- .HasColumnType("character varying(512)")
- .HasColumnName("NewValue");
-
- b.Property("OriginalValue")
- .HasMaxLength(512)
- .HasColumnType("character varying(512)")
- .HasColumnName("OriginalValue");
-
- b.Property("PropertyName")
- .IsRequired()
- .HasMaxLength(128)
- .HasColumnType("character varying(128)")
- .HasColumnName("PropertyName");
-
- b.Property("PropertyTypeFullName")
- .IsRequired()
- .HasMaxLength(64)
- .HasColumnType("character varying(64)")
- .HasColumnName("PropertyTypeFullName");
-
- b.Property("TenantId")
- .HasColumnType("uuid")
- .HasColumnName("TenantId");
-
- b.HasKey("Id");
-
- b.HasIndex("EntityChangeId");
-
- b.ToTable("AbpEntityPropertyChanges");
- });
-
- modelBuilder.Entity("Volo.Abp.BackgroundJobs.BackgroundJobRecord", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("uuid");
-
- b.Property("ConcurrencyStamp")
- .IsConcurrencyToken()
- .HasMaxLength(40)
- .HasColumnType("character varying(40)")
- .HasColumnName("ConcurrencyStamp");
-
- b.Property("CreationTime")
- .HasColumnType("timestamp without time zone")
- .HasColumnName("CreationTime");
-
- b.Property("ExtraProperties")
- .HasColumnType("text")
- .HasColumnName("ExtraProperties");
-
- b.Property("IsAbandoned")
- .ValueGeneratedOnAdd()
- .HasColumnType("boolean")
- .HasDefaultValue(false);
-
- b.Property("JobArgs")
- .IsRequired()
- .HasMaxLength(1048576)
- .HasColumnType("character varying(1048576)");
-
- b.Property("JobName")
- .IsRequired()
- .HasMaxLength(128)
- .HasColumnType("character varying(128)");
-
- b.Property("LastTryTime")
- .HasColumnType("timestamp without time zone");
-
- b.Property("NextTryTime")
- .HasColumnType("timestamp without time zone");
-
- b.Property("Priority")
- .ValueGeneratedOnAdd()
- .HasColumnType("smallint")
- .HasDefaultValue((byte)15);
-
- b.Property("TryCount")
- .ValueGeneratedOnAdd()
- .HasColumnType("smallint")
- .HasDefaultValue((short)0);
-
- b.HasKey("Id");
-
- b.HasIndex("IsAbandoned", "NextTryTime");
-
- b.ToTable("AbpBackgroundJobs");
- });
-
- modelBuilder.Entity("Volo.Abp.BlobStoring.Database.DatabaseBlob", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("uuid");
-
- b.Property("ConcurrencyStamp")
- .IsConcurrencyToken()
- .HasMaxLength(40)
- .HasColumnType("character varying(40)")
- .HasColumnName("ConcurrencyStamp");
-
- b.Property("ContainerId")
- .HasColumnType("uuid");
-
- b.Property("Content")
- .HasMaxLength(2147483647)
- .HasColumnType("bytea");
-
- b.Property("ExtraProperties")
- .HasColumnType("text")
- .HasColumnName("ExtraProperties");
-
- b.Property("Name")
- .IsRequired()
- .HasMaxLength(256)
- .HasColumnType("character varying(256)");
-
- b.Property("TenantId")
- .HasColumnType("uuid")
- .HasColumnName("TenantId");
-
- b.HasKey("Id");
-
- b.HasIndex("ContainerId");
-
- b.HasIndex("TenantId", "ContainerId", "Name");
-
- b.ToTable("AbpBlobs");
- });
-
- modelBuilder.Entity("Volo.Abp.BlobStoring.Database.DatabaseBlobContainer", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("uuid");
-
- b.Property("ConcurrencyStamp")
- .IsConcurrencyToken()
- .HasMaxLength(40)
- .HasColumnType("character varying(40)")
- .HasColumnName("ConcurrencyStamp");
-
- b.Property("ExtraProperties")
- .HasColumnType("text")
- .HasColumnName("ExtraProperties");
-
- b.Property("Name")
- .IsRequired()
- .HasMaxLength(128)
- .HasColumnType("character varying(128)");
-
- b.Property("TenantId")
- .HasColumnType("uuid")
- .HasColumnName("TenantId");
-
- b.HasKey("Id");
-
- b.HasIndex("TenantId", "Name");
-
- b.ToTable("AbpBlobContainers");
- });
-
- modelBuilder.Entity("Volo.Abp.Identity.IdentityClaimType", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("uuid");
-
- b.Property("ConcurrencyStamp")
- .IsConcurrencyToken()
- .HasMaxLength(40)
- .HasColumnType("character varying(40)")
- .HasColumnName("ConcurrencyStamp");
-
- b.Property("Description")
- .HasMaxLength(256)
- .HasColumnType("character varying(256)");
-
- b.Property("ExtraProperties")
- .HasColumnType("text")
- .HasColumnName("ExtraProperties");
-
- b.Property("IsStatic")
- .HasColumnType("boolean");
-
- b.Property("Name")
- .IsRequired()
- .HasMaxLength(256)
- .HasColumnType("character varying(256)");
-
- b.Property("Regex")
- .HasMaxLength(512)
- .HasColumnType("character varying(512)");
-
- b.Property("RegexDescription")
- .HasMaxLength(128)
- .HasColumnType("character varying(128)");
-
- b.Property("Required")
- .HasColumnType("boolean");
-
- b.Property("ValueType")
- .HasColumnType("integer");
-
- b.HasKey("Id");
-
- b.ToTable("AbpClaimTypes");
- });
-
- modelBuilder.Entity("Volo.Abp.Identity.IdentityLinkUser", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("uuid");
-
- b.Property("SourceTenantId")
- .HasColumnType("uuid");
-
- b.Property("SourceUserId")
- .HasColumnType("uuid");
-
- b.Property("TargetTenantId")
- .HasColumnType("uuid");
-
- b.Property("TargetUserId")
- .HasColumnType("uuid");
-
- b.HasKey("Id");
-
- b.HasIndex("SourceUserId", "SourceTenantId", "TargetUserId", "TargetTenantId")
- .IsUnique();
-
- b.ToTable("AbpLinkUsers");
- });
-
- modelBuilder.Entity("Volo.Abp.Identity.IdentityRole", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("uuid");
-
- b.Property("ConcurrencyStamp")
- .IsConcurrencyToken()
- .HasMaxLength(40)
- .HasColumnType("character varying(40)")
- .HasColumnName("ConcurrencyStamp");
-
- b.Property("ExtraProperties")
- .HasColumnType("text")
- .HasColumnName("ExtraProperties");
-
- b.Property("IsDefault")
- .HasColumnType("boolean")
- .HasColumnName("IsDefault");
-
- b.Property("IsPublic")
- .HasColumnType("boolean")
- .HasColumnName("IsPublic");
-
- b.Property("IsStatic")
- .HasColumnType("boolean")
- .HasColumnName("IsStatic");
-
- b.Property("Name")
- .IsRequired()
- .HasMaxLength(256)
- .HasColumnType("character varying(256)");
-
- b.Property("NormalizedName")
- .IsRequired()
- .HasMaxLength(256)
- .HasColumnType("character varying(256)");
-
- b.Property("TenantId")
- .HasColumnType("uuid")
- .HasColumnName("TenantId");
-
- b.HasKey("Id");
-
- b.HasIndex("NormalizedName");
-
- b.ToTable("AbpRoles");
- });
-
- modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b =>
- {
- b.Property("Id")
- .HasColumnType("uuid");
-
- b.Property("ClaimType")
- .IsRequired()
- .HasMaxLength(256)
- .HasColumnType("character varying(256)");
-
- b.Property("ClaimValue")
- .HasMaxLength(1024)
- .HasColumnType("character varying(1024)");
-
- b.Property("RoleId")
- .HasColumnType("uuid");
-
- b.Property("TenantId")
- .HasColumnType("uuid")
- .HasColumnName("TenantId");
-
- b.HasKey("Id");
-
- b.HasIndex("RoleId");
-
- b.ToTable("AbpRoleClaims");
- });
-
- modelBuilder.Entity("Volo.Abp.Identity.IdentitySecurityLog", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("uuid");
-
- b.Property("Action")
- .HasMaxLength(96)
- .HasColumnType("character varying(96)");
-
- b.Property("ApplicationName")
- .HasMaxLength(96)
- .HasColumnType("character varying(96)");
-
- b.Property("BrowserInfo")
- .HasMaxLength(512)
- .HasColumnType("character varying(512)");
-
- b.Property("ClientId")
- .HasMaxLength(64)
- .HasColumnType("character varying(64)");
-
- b.Property("ClientIpAddress")
- .HasMaxLength(64)
- .HasColumnType("character varying(64)");
-
- b.Property("ConcurrencyStamp")
- .IsConcurrencyToken()
- .HasMaxLength(40)
- .HasColumnType("character varying(40)")
- .HasColumnName("ConcurrencyStamp");
-
- b.Property("CorrelationId")
- .HasMaxLength(64)
- .HasColumnType("character varying(64)");
-
- b.Property("CreationTime")
- .HasColumnType("timestamp without time zone");
-
- b.Property("ExtraProperties")
- .HasColumnType("text")
- .HasColumnName("ExtraProperties");
-
- b.Property("Identity")
- .HasMaxLength(96)
- .HasColumnType("character varying(96)");
-
- b.Property("TenantId")
- .HasColumnType("uuid")
- .HasColumnName("TenantId");
-
- b.Property("TenantName")
- .HasMaxLength(64)
- .HasColumnType("character varying(64)");
-
- b.Property("UserId")
- .HasColumnType("uuid");
-
- b.Property("UserName")
- .HasMaxLength(256)
- .HasColumnType("character varying(256)");
-
- b.HasKey("Id");
-
- b.HasIndex("TenantId", "Action");
-
- b.HasIndex("TenantId", "ApplicationName");
-
- b.HasIndex("TenantId", "Identity");
-
- b.HasIndex("TenantId", "UserId");
-
- b.ToTable("AbpSecurityLogs");
- });
-
- modelBuilder.Entity("Volo.Abp.Identity.IdentityUser", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("uuid");
-
- b.Property("AccessFailedCount")
- .ValueGeneratedOnAdd()
- .HasColumnType("integer")
- .HasDefaultValue(0)
- .HasColumnName("AccessFailedCount");
-
- b.Property("ConcurrencyStamp")
- .IsConcurrencyToken()
- .HasMaxLength(40)
- .HasColumnType("character varying(40)")
- .HasColumnName("ConcurrencyStamp");
-
- b.Property("CreationTime")
- .HasColumnType("timestamp without time zone")
- .HasColumnName("CreationTime");
-
- b.Property("CreatorId")
- .HasColumnType("uuid")
- .HasColumnName("CreatorId");
-
- b.Property("DeleterId")
- .HasColumnType("uuid")
- .HasColumnName("DeleterId");
-
- b.Property("DeletionTime")
- .HasColumnType("timestamp without time zone")
- .HasColumnName("DeletionTime");
-
- b.Property("Email")
- .IsRequired()
- .HasMaxLength(256)
- .HasColumnType("character varying(256)")
- .HasColumnName("Email");
-
- b.Property("EmailConfirmed")
- .ValueGeneratedOnAdd()
- .HasColumnType("boolean")
- .HasDefaultValue(false)
- .HasColumnName("EmailConfirmed");
-
- b.Property("ExtraProperties")
- .HasColumnType("text")
- .HasColumnName("ExtraProperties");
-
- b.Property("IsDeleted")
- .ValueGeneratedOnAdd()
- .HasColumnType("boolean")
- .HasDefaultValue(false)
- .HasColumnName("IsDeleted");
-
- b.Property("IsExternal")
- .ValueGeneratedOnAdd()
- .HasColumnType("boolean")
- .HasDefaultValue(false)
- .HasColumnName("IsExternal");
-
- b.Property("LastModificationTime")
- .HasColumnType("timestamp without time zone")
- .HasColumnName("LastModificationTime");
-
- b.Property("LastModifierId")
- .HasColumnType("uuid")
- .HasColumnName("LastModifierId");
-
- b.Property("LockoutEnabled")
- .ValueGeneratedOnAdd()
- .HasColumnType("boolean")
- .HasDefaultValue(false)
- .HasColumnName("LockoutEnabled");
-
- b.Property("LockoutEnd")
- .HasColumnType("timestamp with time zone");
-
- b.Property("Name")
- .HasMaxLength(64)
- .HasColumnType("character varying(64)")
- .HasColumnName("Name");
-
- b.Property("NormalizedEmail")
- .IsRequired()
- .HasMaxLength(256)
- .HasColumnType("character varying(256)")
- .HasColumnName("NormalizedEmail");
-
- b.Property("NormalizedUserName")
- .IsRequired()
- .HasMaxLength(256)
- .HasColumnType("character varying(256)")
- .HasColumnName("NormalizedUserName");
-
- b.Property("PasswordHash")
- .HasMaxLength(256)
- .HasColumnType("character varying(256)")
- .HasColumnName("PasswordHash");
-
- b.Property("PhoneNumber")
- .HasMaxLength(16)
- .HasColumnType("character varying(16)")
- .HasColumnName("PhoneNumber");
-
- b.Property("PhoneNumberConfirmed")
- .ValueGeneratedOnAdd()
- .HasColumnType("boolean")
- .HasDefaultValue(false)
- .HasColumnName("PhoneNumberConfirmed");
-
- b.Property("SecurityStamp")
- .IsRequired()
- .HasMaxLength(256)
- .HasColumnType("character varying(256)")
- .HasColumnName("SecurityStamp");
-
- b.Property("Surname")
- .HasMaxLength(64)
- .HasColumnType("character varying(64)")
- .HasColumnName("Surname");
-
- b.Property("TenantId")
- .HasColumnType("uuid")
- .HasColumnName("TenantId");
-
- b.Property("TwoFactorEnabled")
- .ValueGeneratedOnAdd()
- .HasColumnType("boolean")
- .HasDefaultValue(false)
- .HasColumnName("TwoFactorEnabled");
-
- b.Property("UserName")
- .IsRequired()
- .HasMaxLength(256)
- .HasColumnType("character varying(256)")
- .HasColumnName("UserName");
-
- b.HasKey("Id");
-
- b.HasIndex("Email");
-
- b.HasIndex("NormalizedEmail");
-
- b.HasIndex("NormalizedUserName");
-
- b.HasIndex("UserName");
-
- b.ToTable("AbpUsers");
- });
-
- modelBuilder.Entity("Volo.Abp.Identity.IdentityUserClaim", b =>
- {
- b.Property("Id")
- .HasColumnType("uuid");
-
- b.Property("ClaimType")
- .IsRequired()
- .HasMaxLength(256)
- .HasColumnType("character varying(256)");
-
- b.Property("ClaimValue")
- .HasMaxLength(1024)
- .HasColumnType("character varying(1024)");
-
- b.Property("TenantId")
- .HasColumnType("uuid")
- .HasColumnName("TenantId");
-
- b.Property("UserId")
- .HasColumnType("uuid");
-
- b.HasKey("Id");
-
- b.HasIndex("UserId");
-
- b.ToTable("AbpUserClaims");
- });
-
- modelBuilder.Entity("Volo.Abp.Identity.IdentityUserLogin", b =>
- {
- b.Property("UserId")
- .HasColumnType("uuid");
-
- b.Property("LoginProvider")
- .HasMaxLength(64)
- .HasColumnType("character varying(64)");
-
- b.Property("ProviderDisplayName")
- .HasMaxLength(128)
- .HasColumnType("character varying(128)");
-
- b.Property("ProviderKey")
- .IsRequired()
- .HasMaxLength(196)
- .HasColumnType("character varying(196)");
-
- b.Property("TenantId")
- .HasColumnType("uuid")
- .HasColumnName("TenantId");
-
- b.HasKey("UserId", "LoginProvider");
-
- b.HasIndex("LoginProvider", "ProviderKey");
-
- b.ToTable("AbpUserLogins");
- });
-
- modelBuilder.Entity("Volo.Abp.Identity.IdentityUserOrganizationUnit", b =>
- {
- b.Property("OrganizationUnitId")
- .HasColumnType("uuid");
-
- b.Property("UserId")
- .HasColumnType("uuid");
-
- b.Property("CreationTime")
- .HasColumnType("timestamp without time zone")
- .HasColumnName("CreationTime");
-
- b.Property("CreatorId")
- .HasColumnType("uuid")
- .HasColumnName("CreatorId");
-
- b.Property("TenantId")
- .HasColumnType("uuid")
- .HasColumnName("TenantId");
-
- b.HasKey("OrganizationUnitId", "UserId");
-
- b.HasIndex("UserId", "OrganizationUnitId");
-
- b.ToTable("AbpUserOrganizationUnits");
- });
-
- modelBuilder.Entity("Volo.Abp.Identity.IdentityUserRole", b =>
- {
- b.Property("UserId")
- .HasColumnType("uuid");
-
- b.Property("RoleId")
- .HasColumnType("uuid");
-
- b.Property("TenantId")
- .HasColumnType("uuid")
- .HasColumnName("TenantId");
-
- b.HasKey("UserId", "RoleId");
-
- b.HasIndex("RoleId", "UserId");
-
- b.ToTable("AbpUserRoles");
- });
-
- modelBuilder.Entity("Volo.Abp.Identity.IdentityUserToken", b =>
- {
- b.Property("UserId")
- .HasColumnType("uuid");
-
- b.Property("LoginProvider")
- .HasMaxLength(64)
- .HasColumnType("character varying(64)");
-
- b.Property("Name")
- .HasMaxLength(128)
- .HasColumnType("character varying(128)");
-
- b.Property("TenantId")
- .HasColumnType("uuid")
- .HasColumnName("TenantId");
-
- b.Property("Value")
- .HasColumnType("text");
-
- b.HasKey("UserId", "LoginProvider", "Name");
-
- b.ToTable("AbpUserTokens");
- });
-
- modelBuilder.Entity("Volo.Abp.Identity.OrganizationUnit", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("uuid");
-
- b.Property("Code")
- .IsRequired()
- .HasMaxLength(95)
- .HasColumnType("character varying(95)")
- .HasColumnName("Code");
-
- b.Property("ConcurrencyStamp")
- .IsConcurrencyToken()
- .HasMaxLength(40)
- .HasColumnType("character varying(40)")
- .HasColumnName("ConcurrencyStamp");
-
- b.Property("CreationTime")
- .HasColumnType("timestamp without time zone")
- .HasColumnName("CreationTime");
-
- b.Property("CreatorId")
- .HasColumnType("uuid")
- .HasColumnName("CreatorId");
-
- b.Property("DeleterId")
- .HasColumnType("uuid")
- .HasColumnName("DeleterId");
-
- b.Property("DeletionTime")
- .HasColumnType("timestamp without time zone")
- .HasColumnName("DeletionTime");
-
- b.Property("DisplayName")
- .IsRequired()
- .HasMaxLength(128)
- .HasColumnType("character varying(128)")
- .HasColumnName("DisplayName");
-
- b.Property("ExtraProperties")
- .HasColumnType("text")
- .HasColumnName("ExtraProperties");
-
- b.Property("IsDeleted")
- .ValueGeneratedOnAdd()
- .HasColumnType("boolean")
- .HasDefaultValue(false)
- .HasColumnName("IsDeleted");
-
- b.Property("LastModificationTime")
- .HasColumnType("timestamp without time zone")
- .HasColumnName("LastModificationTime");
-
- b.Property("LastModifierId")
- .HasColumnType("uuid")
- .HasColumnName("LastModifierId");
-
- b.Property("ParentId")
- .HasColumnType("uuid");
-
- b.Property("TenantId")
- .HasColumnType("uuid")
- .HasColumnName("TenantId");
-
- b.HasKey("Id");
-
- b.HasIndex("Code");
-
- b.HasIndex("ParentId");
-
- b.ToTable("AbpOrganizationUnits");
- });
-
- modelBuilder.Entity("Volo.Abp.Identity.OrganizationUnitRole", b =>
- {
- b.Property("OrganizationUnitId")
- .HasColumnType("uuid");
-
- b.Property("RoleId")
- .HasColumnType("uuid");
-
- b.Property("CreationTime")
- .HasColumnType("timestamp without time zone")
- .HasColumnName("CreationTime");
-
- b.Property("CreatorId")
- .HasColumnType("uuid")
- .HasColumnName("CreatorId");
-
- b.Property("TenantId")
- .HasColumnType("uuid")
- .HasColumnName("TenantId");
-
- b.HasKey("OrganizationUnitId", "RoleId");
-
- b.HasIndex("RoleId", "OrganizationUnitId");
-
- b.ToTable("AbpOrganizationUnitRoles");
- });
-
- modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiResource", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("uuid");
-
- b.Property