CmsKit: Created CmsUser

6 years ago · 345adb41f8
13 changed files with 211 additions and 5 deletions
--- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo.CmsKit.Domain.csproj
+++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo.CmsKit.Domain.csproj
@ -11,6 +11,7 @@
  <ItemGroup>
    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Ddd.Domain\Volo.Abp.Ddd.Domain.csproj" />
    <ProjectReference Include="..\Volo.CmsKit.Domain.Shared\Volo.CmsKit.Domain.Shared.csproj" />
+    <ProjectReference Include="..\..\..\..\modules\users\src\Volo.Abp.Users.Domain\Volo.Abp.Users.Domain.csproj" />
  </ItemGroup>

 </Project>
--- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/CmsKitDomainModule.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/CmsKitDomainModule.cs
@ -1,11 +1,13 @@
 using Volo.Abp.Domain;
 using Volo.Abp.Modularity;
+using Volo.Abp.Users;
 using Volo.CmsKit.Reactions;

 namespace Volo.CmsKit
 {
    [DependsOn(
        typeof(CmsKitDomainSharedModule),
+        typeof(AbpUsersDomainModule),
        typeof(AbpDddDomainModule)
    )]
    public class CmsKitDomainModule : AbpModule
--- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Users/CmsUser.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Users/CmsUser.cs
@ -0,0 +1,82 @@
+using System;
+using Volo.Abp.Domain.Entities;
+using Volo.Abp.Users;
+
+namespace Volo.CmsKit.Users
+{
+    public class CmsUser : AggregateRoot<Guid>, IUser, IUpdateUserData
+    {
+        public virtual Guid? TenantId { get; protected set; }
+
+        public virtual string UserName { get; protected set; }
+
+        public virtual string Email { get; protected set; }
+
+        public virtual string Name { get; set; }
+
+        public virtual string Surname { get; set; }
+
+        public virtual bool EmailConfirmed { get; protected set; }
+
+        public virtual string PhoneNumber { get; protected set; }
+
+        public virtual bool PhoneNumberConfirmed { get; protected set; }
+
+        protected CmsUser()
+        {
+
+        }
+
+        public CmsUser(IUserData user)
+            : base(user.Id)
+        {
+            TenantId = user.TenantId;
+            UpdateInternal(user);
+        }
+
+        public virtual bool Update(IUserData user)
+        {
+            if (Id != user.Id)
+            {
+                throw new ArgumentException($"Given User's Id '{user.Id}' does not match to this User's Id '{Id}'");
+            }
+
+            if (TenantId != user.TenantId)
+            {
+                throw new ArgumentException($"Given User's TenantId '{user.TenantId}' does not match to this User's TenantId '{TenantId}'");
+            }
+
+            if (Equals(user))
+            {
+                return false;
+            }
+
+            UpdateInternal(user);
+            return true;
+        }
+
+        protected virtual bool Equals(IUserData user)
+        {
+            return Id == user.Id &&
+                   TenantId == user.TenantId &&
+                   UserName == user.UserName &&
+                   Name == user.Name &&
+                   Surname == user.Surname &&
+                   Email == user.Email &&
+                   EmailConfirmed == user.EmailConfirmed &&
+                   PhoneNumber == user.PhoneNumber &&
+                   PhoneNumberConfirmed == user.PhoneNumberConfirmed;
+        }
+
+        protected virtual void UpdateInternal(IUserData user)
+        {
+            Email = user.Email;
+            Name = user.Name;
+            Surname = user.Surname;
+            EmailConfirmed = user.EmailConfirmed;
+            PhoneNumber = user.PhoneNumber;
+            PhoneNumberConfirmed = user.PhoneNumberConfirmed;
+            UserName = user.UserName;
+        }
+    }
+}
--- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Users/CmsUserLookupService.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Users/CmsUserLookupService.cs
@ -0,0 +1,24 @@
+using Volo.Abp.Uow;
+using Volo.Abp.Users;
+
+namespace Volo.CmsKit.Users
+{
+    public class CmsUserLookupService: UserLookupService<CmsUser, ICmsUserRepository>, ICmsUserLookupService
+    {
+        public CmsUserLookupService(
+            ICmsUserRepository userRepository,
+            IUnitOfWorkManager unitOfWorkManager)
+            : base(
+                userRepository,
+                unitOfWorkManager)
+        {
+
+        }
+
+        protected override CmsUser CreateUser(IUserData externalUser)
+        {
+            return new CmsUser(externalUser);
+        }
+
+    }
+}
--- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Users/CmsUserSynchronizer.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Users/CmsUserSynchronizer.cs
@ -0,0 +1,43 @@
+using System.Threading.Tasks;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Domain.Entities.Events.Distributed;
+using Volo.Abp.EventBus.Distributed;
+using Volo.Abp.Users;
+
+namespace Volo.CmsKit.Users
+{
+    public class CmsUserSynchronizer :
+        IDistributedEventHandler<EntityUpdatedEto<UserEto>>,
+        ITransientDependency
+    {
+        protected ICmsUserRepository UserRepository { get; }
+
+        protected ICmsUserLookupService UserLookupService { get; }
+
+        public CmsUserSynchronizer(
+            ICmsUserRepository userRepository,
+            ICmsUserLookupService userLookupService)
+        {
+            UserRepository = userRepository;
+            UserLookupService = userLookupService;
+        }
+
+        public virtual async Task HandleEventAsync(EntityUpdatedEto<UserEto> eventData)
+        {
+            var user = await UserRepository.FindAsync(eventData.Entity.Id);
+            if (user == null)
+            {
+                user = await UserLookupService.FindByIdAsync(eventData.Entity.Id);
+                if (user == null)
+                {
+                    return;
+                }
+            }
+
+            if (user.Update(eventData.Entity))
+            {
+                await UserRepository.UpdateAsync(user);
+            }
+        }
+    }
+}
--- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Users/ICmsUserLookupService.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Users/ICmsUserLookupService.cs
@ -0,0 +1,9 @@
+using Volo.Abp.Users;
+
+namespace Volo.CmsKit.Users
+{
+    public interface ICmsUserLookupService : IUserLookupService<CmsUser>
+    {
+
+    }
+}
--- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Users/ICmsUserRepository.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Users/ICmsUserRepository.cs
@ -0,0 +1,9 @@
+using Volo.Abp.Users;
+
+namespace Volo.CmsKit.Users
+{
+    public interface ICmsUserRepository: IUserRepository<CmsUser>
+    {
+
+    }
+}
--- a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo.CmsKit.EntityFrameworkCore.csproj
+++ b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo.CmsKit.EntityFrameworkCore.csproj
@ -10,7 +10,8 @@

  <ItemGroup>
    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.EntityFrameworkCore\Volo.Abp.EntityFrameworkCore.csproj" />
-    <ProjectReference Include="..\Volo.CmsKit.Domain\Volo.CmsKit.Domain.csproj" />
+    <ProjectReference Include="..\Volo.CmsKit.Domain\Volo.CmsKit.Domain.csproj" />  
+    <ProjectReference Include="..\..\..\..\modules\users\src\Volo.Abp.Users.EntityFrameworkCore\Volo.Abp.Users.EntityFrameworkCore.csproj" />
  </ItemGroup>
  
 </Project>
--- a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/CmsKitDbContext.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/CmsKitDbContext.cs
@ -3,6 +3,7 @@ using Volo.Abp.Data;
 using Volo.Abp.EntityFrameworkCore;
 using Volo.CmsKit.Comments;
 using Volo.CmsKit.Reactions;
+using Volo.CmsKit.Users;

 namespace Volo.CmsKit.EntityFrameworkCore
 {
@ -13,6 +14,8 @@ namespace Volo.CmsKit.EntityFrameworkCore

        public DbSet<Comment> Comments { get; set; }

+        public DbSet<CmsUser> CmsUsers { get; set; }
+
        public CmsKitDbContext(DbContextOptions<CmsKitDbContext> options)
            : base(options)
        {
--- a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/CmsKitDbContextModelCreatingExtensions.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/CmsKitDbContextModelCreatingExtensions.cs
@ -4,6 +4,8 @@ using Volo.Abp;
 using Volo.Abp.EntityFrameworkCore.Modeling;
 using Volo.CmsKit.Comments;
 using Volo.CmsKit.Reactions;
+using Volo.CmsKit.Users;
+using Volo.Abp.Users.EntityFrameworkCore;

 namespace Volo.CmsKit.EntityFrameworkCore
 {
@ -22,6 +24,14 @@ namespace Volo.CmsKit.EntityFrameworkCore

            optionsAction?.Invoke(options);

+            builder.Entity<CmsUser>(b =>
+            {
+                b.ToTable(options.TablePrefix + "Users", options.Schema);
+
+                b.ConfigureByConvention();
+                b.ConfigureAbpUser();
+            });
+
            builder.Entity<UserReaction>(b =>
            {
                b.ToTable(options.TablePrefix + "UserReactions", options.Schema);
--- a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/CmsKitEntityFrameworkCoreModule.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/CmsKitEntityFrameworkCoreModule.cs
@ -1,11 +1,16 @@
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.EntityFrameworkCore;
 using Volo.Abp.Modularity;
+using Volo.Abp.Users.EntityFrameworkCore;
+using Volo.CmsKit.Comments;
+using Volo.CmsKit.Reactions;
+using Volo.CmsKit.Users;

 namespace Volo.CmsKit.EntityFrameworkCore
 {
    [DependsOn(
        typeof(CmsKitDomainModule),
+        typeof(AbpUsersEntityFrameworkCoreModule),
        typeof(AbpEntityFrameworkCoreModule)
    )]
    public class CmsKitEntityFrameworkCoreModule : AbpModule
@ -14,10 +19,10 @@ namespace Volo.CmsKit.EntityFrameworkCore
        {
            context.Services.AddAbpDbContext<CmsKitDbContext>(options =>
            {
-                /* Add custom repositories here. Example:
-                 * options.AddRepository<Question, EfCoreQuestionRepository>();
-                 */
+                options.AddRepository<UserReaction, EfCoreUserReactionRepository>();
+                options.AddRepository<Comment, EfCoreCommentRepository>();
+                options.AddRepository<CmsUser, EfCoreCmsUserRepository>();
            });
        }
    }
-}
+}
--- a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/ICmsKitDbContext.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/ICmsKitDbContext.cs
@ -3,6 +3,7 @@ using Volo.Abp.Data;
 using Volo.Abp.EntityFrameworkCore;
 using Volo.CmsKit.Comments;
 using Volo.CmsKit.Reactions;
+using Volo.CmsKit.Users;

 namespace Volo.CmsKit.EntityFrameworkCore
 {
@ -12,5 +13,7 @@ namespace Volo.CmsKit.EntityFrameworkCore
         DbSet<UserReaction> UserReactions { get; }

         DbSet<Comment> Comments { get; }
+
+         DbSet<CmsUser> CmsUsers { get; set; }
    }
 }
--- a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Users/EfCoreCmsUserRepository.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Users/EfCoreCmsUserRepository.cs
@ -0,0 +1,14 @@
+using Volo.Abp.EntityFrameworkCore;
+using Volo.Abp.Users.EntityFrameworkCore;
+using Volo.CmsKit.EntityFrameworkCore;
+
+namespace Volo.CmsKit.Users
+{
+    public class EfCoreCmsUserRepository: EfCoreUserRepositoryBase<ICmsKitDbContext, CmsUser>, ICmsUserRepository
+    {
+        public EfCoreCmsUserRepository(IDbContextProvider<ICmsKitDbContext> dbContextProvider)
+            : base(dbContextProvider)
+        {
+        }
+    }
+}