Merge pull request #113 from fluentcms/112-refactor-project-architect…

…ure-based-on-tech-meeting

Refactor project architecture based on tech meeting

src/FluentCMS.Application/Dtos/PagingRequest.cs

@@ -0,0 +1,6 @@
+namespace FluentCMS.Application.Dtos;
+public class PagingRequest
+{
+    public int PageIndex { get; set; }
+    public int PageSize { get; set; }
+}

src/FluentCMS.Application/Dtos/PagingResponse.cs

@@ -0,0 +1,6 @@
+namespace FluentCMS.Application.Dtos;
+public class PagingResponse<TData>
+{
+    public IEnumerable<TData> Data { get; set; } = new List<TData>();
+    public long Total { get; set; }
+}

src/FluentCMS.Application/Dtos/Sites/AddSiteUrlRequest.cs

@@ -0,0 +1,18 @@
+using FluentValidation;
+
+namespace FluentCMS.Application.Dtos.Sites;
+
+public class AddSiteUrlRequest
+{
+    public Guid SiteId { get; set; }
+    public string NewUrl { get; set; } = "";
+}
+
+public class AddSiteUrlRequestValidator : AbstractValidator<AddSiteUrlRequest>
+{
+    public AddSiteUrlRequestValidator()
+    {
+        RuleFor(x => x.SiteId).NotEmpty();
+        RuleFor(x => x.NewUrl).NotEmpty().MaximumLength(50);
+    }
+}

src/FluentCMS.Application/Dtos/Sites/CreateSiteRequest.cs

@@ -0,0 +1,21 @@
+using FluentValidation;
+
+namespace FluentCMS.Application.Dtos.Sites;
+
+public class CreateSiteRequest
+{
+    public string Name { get; set; } = "";
+    public string Description { get; set; } = "";
+    public string[] URLs { get; set; } = [];
+    public Guid RoleId { get; set; }
+}
+
+public class CreateSiteRequestValidator : AbstractValidator<CreateSiteRequest>
+{
+    public CreateSiteRequestValidator()
+    {
+        RuleFor(x => x.Name).NotEmpty().MaximumLength(64);
+        RuleFor(x => x.Description).MaximumLength(100).When(x => string.IsNullOrWhiteSpace(x.Description) == false);
+        RuleFor(x => x.URLs).NotNull().Must(x => x.Any());
+    }
+}

src/FluentCMS.Application/Dtos/Sites/DeleteSiteRequest.cs

@@ -0,0 +1,16 @@
+using FluentValidation;
+
+namespace FluentCMS.Application.Dtos.Sites;
+
+public class DeleteSiteRequest
+{
+    public Guid Id { get; set; }
+}
+
+public class DeleteSiteRequestValidator : AbstractValidator<DeleteSiteRequest>
+{
+    public DeleteSiteRequestValidator()
+    {
+        RuleFor(x => x.Id).NotEmpty();
+    }
+}

src/FluentCMS.Application/Dtos/Sites/EditSiteRequest.cs

@@ -0,0 +1,23 @@
+using FluentValidation;
+
+namespace FluentCMS.Application.Dtos.Sites;
+
+public class EditSiteRequest
+{
+    public Guid Id { get; set; }
+    public string Name { get; set; } = "";
+    public string Description { get; set; } = "";
+    public Guid RoleId { get; set; }
+    public ICollection<string> URLs { get; set; } = new List<string>();
+}
+
+public class EditSiteRequestValidator : AbstractValidator<EditSiteRequest>
+{
+    public EditSiteRequestValidator()
+    {
+        RuleFor(x => x.Id).NotEmpty();
+        RuleFor(x => x.Name).NotEmpty().MaximumLength(64);
+        RuleFor(x => x.Description).MaximumLength(100).When(x => string.IsNullOrWhiteSpace(x.Description) == false);
+        RuleFor(x => x.URLs).NotNull().Must(x => x.Any());
+    }
+}

src/FluentCMS.Application/Dtos/Sites/RemoveSiteUrlRequest.cs

@@ -0,0 +1,18 @@
+using FluentValidation;
+
+namespace FluentCMS.Application.Dtos.Sites;
+
+public class RemoveSiteUrlRequest
+{
+    public Guid SiteId { get; set; }
+    public string Url { get; set; } = "";
+}
+
+public class RemoveSiteUrlRequestValidator : AbstractValidator<RemoveSiteUrlRequest>
+{
+    public RemoveSiteUrlRequestValidator()
+    {
+        RuleFor(x => x.SiteId).NotEmpty();
+        RuleFor(x => x.Url).NotEmpty().MaximumLength(50);
+    }
+}

src/FluentCMS.Application/Dtos/Sites/SearchSiteRequest.cs

@@ -0,0 +1,4 @@
+namespace FluentCMS.Application.Dtos.Sites;
+public class SearchSiteRequest : PagingRequest
+{
+}

src/FluentCMS.Application/Dtos/Sites/SearchSiteResponse.cs

@@ -0,0 +1,4 @@
+namespace FluentCMS.Application.Dtos.Sites;
+public class SearchSiteResponse : PagingResponse<SiteDto>
+{
+}

src/FluentCMS.Application/Dtos/Sites/SiteDto.cs

@@ -0,0 +1,13 @@
+namespace FluentCMS.Application.Dtos.Sites;
+public class SiteDto
+{
+    public Guid Id { get; set; }
+    public string CreatedBy { get; set; } = "";
+    public DateTime CreatedAt { get; set; } = default;
+    public string LastUpdatedBy { get; set; } = "";
+    public DateTime LastUpdatedAt { get; set; } = default;
+    public string Name { get; set; } = "";
+    public string Description { get; set; } = "";
+    public List<string> Urls { get; set; } = [];
+    public Guid RoleId { get; set; }
+}

src/FluentCMS.Application/Dtos/Users/CreateRoleRequest.cs

@@ -0,0 +1,20 @@
+using FluentValidation;
+
+namespace FluentCMS.Application.Dtos.Users;
+
+public class CreateRoleRequest
+{
+    public string Name { get; set; } = string.Empty;
+    public string? Description { get; set; }
+    public bool AutoAssigned { get; set; }
+    public Guid? SiteId { get; set; }
+}
+
+public class CreateRoleRequestValidator : AbstractValidator<CreateRoleRequest>
+{
+    public CreateRoleRequestValidator()
+    {
+        RuleFor(x => x.Name).NotEmpty().MaximumLength(50);
+        RuleFor(x => x.Description).MaximumLength(100).When(x => string.IsNullOrWhiteSpace(x.Description) == false);
+    }
+}

src/FluentCMS.Application/Dtos/Users/CreateUserRequest.cs

@@ -0,0 +1,21 @@
+using FluentValidation;
+
+namespace FluentCMS.Application.Dtos.Users;
+
+public class CreateUserRequest
+{
+    public string Name { get; set; } = string.Empty;
+    public string Username { get; set; } = string.Empty;
+    public string Password { get; set; } = string.Empty;
+    public ICollection<Guid> Roles { get; set; } = new List<Guid>();
+}
+
+public class CreateUserRequestValidator : AbstractValidator<CreateUserRequest>
+{
+    public CreateUserRequestValidator()
+    {
+        RuleFor(x => x.Name).NotEmpty().MaximumLength(64);
+        RuleFor(x => x.Username).NotEmpty().MinimumLength(3).MaximumLength(50);
+        RuleFor(x => x.Password).NotEmpty().MinimumLength(3).MaximumLength(50);
+    }
+}

src/FluentCMS.Application/Dtos/Users/DeleteRoleRequest.cs

@@ -0,0 +1,16 @@
+using FluentValidation;
+
+namespace FluentCMS.Application.Dtos.Users;
+
+public class DeleteRoleRequest
+{
+    public required Guid Id { get; set; }
+}
+
+public class DeleteRoleRequestValidator : AbstractValidator<DeleteRoleRequest>
+{
+    public DeleteRoleRequestValidator()
+    {
+        RuleFor(x => x.Id).NotEmpty();
+    }
+}

src/FluentCMS.Application/Dtos/Users/DeleteUserRequest.cs

@@ -0,0 +1,16 @@
+using FluentValidation;
+
+namespace FluentCMS.Application.Dtos.Users;
+
+public class DeleteUserRequest
+{
+    public Guid Id { get; set; }
+}
+
+public class DeleteUserRequestValidator : AbstractValidator<DeleteUserRequest>
+{
+    public DeleteUserRequestValidator()
+    {
+        RuleFor(x => x.Id).NotEmpty();
+    }
+}

src/FluentCMS.Application/Dtos/Users/EditRoleRequest.cs

@@ -0,0 +1,22 @@
+using FluentValidation;
+
+namespace FluentCMS.Application.Dtos.Users;
+
+public class EditRoleRequest
+{
+    public required Guid Id { get; set; }
+    public required string Name { get; set; }
+    public string? Description { get; set; }
+    public required bool AutoAssigned { get; set; }
+    public Guid? SiteId { get; set; }
+}
+
+public class EditRoleRequestValidator : AbstractValidator<EditRoleRequest>
+{
+    public EditRoleRequestValidator()
+    {
+        RuleFor(x => x.Id).NotEmpty();
+        RuleFor(x => x.Name).NotEmpty().MaximumLength(50);
+        RuleFor(x => x.Description).MaximumLength(100).When(x => string.IsNullOrWhiteSpace(x.Description) == false);
+    }
+}

src/FluentCMS.Application/Dtos/Users/EditUserRequest.cs

@@ -0,0 +1,24 @@
+using FluentValidation;
+
+namespace FluentCMS.Application.Dtos.Users;
+
+public class EditUserRequest
+{
+    public Guid Id { get; set; }
+    public string Name { get; set; } = string.Empty;
+    public string Username { get; set; } = string.Empty;
+    public string Password { get; set; } = string.Empty;
+    public ICollection<Guid> Roles { get; set; } = new List<Guid>();
+}
+
+public class EditUserRequestValidator : AbstractValidator<EditUserRequest>
+{
+    public EditUserRequestValidator()
+    {
+        RuleFor(x => x.Id).NotEmpty();
+        RuleFor(x => x.Name).NotEmpty().MaximumLength(50);
+        RuleFor(x => x.Username).NotEmpty().MinimumLength(3).MaximumLength(50);
+        RuleFor(x => x.Password).MinimumLength(3).MaximumLength(50)
+            .When(x => string.IsNullOrWhiteSpace(x.Password) == false);
+    }
+}

src/FluentCMS.Application/Dtos/Users/RoleDto.cs

@@ -0,0 +1,15 @@
+namespace FluentCMS.Application.Dtos.Users;
+public class RoleDto
+{
+    public required Guid Id { get; set; }
+    public required string CreatedBy { get; set; }
+    public required DateTime CreatedAt { get; set; }
+    public required string LastUpdatedBy { get; set; }
+    public required DateTime LastUpdatedAt { get; set; }
+
+    public required string Name { get; set; }
+    public string? Description { get; set; }
+    public required bool AutoAssigned { get; set; }
+
+    public Guid? SiteId { get; set; }
+}

src/FluentCMS.Application/Dtos/Users/SearchRoleRequest.cs

@@ -0,0 +1,4 @@
+namespace FluentCMS.Application.Dtos.Users;
+public class SearchRoleRequest : PagingRequest
+{
+}

src/FluentCMS.Application/Dtos/Users/SearchRoleResponse.cs

@@ -0,0 +1,4 @@
+namespace FluentCMS.Application.Dtos.Users;
+public class SearchRoleResponse : PagingResponse<RoleDto>
+{
+}

src/FluentCMS.Application/Dtos/Users/SearchUserRequest.cs

@@ -0,0 +1,5 @@
+namespace FluentCMS.Application.Dtos.Users;
+public class SearchUserRequest : PagingRequest
+{
+    public string? Name { get; set; }
+}

src/FluentCMS.Application/Dtos/Users/SearchUserResponse.cs

@@ -0,0 +1,4 @@
+namespace FluentCMS.Application.Dtos.Users;
+public class SearchUserResponse : PagingResponse<UserDto>
+{
+}

src/FluentCMS.Application/Dtos/Users/UserDto.cs

@@ -0,0 +1,14 @@
+namespace FluentCMS.Application.Dtos.Users;
+public class UserDto
+{
+    public required Guid Id { get; set; }
+    public required string CreatedBy { get; set; }
+    public required DateTime CreatedAt { get; set; }
+    public required string LastUpdatedBy { get; set; }
+    public required DateTime LastUpdatedAt { get; set; }
+
+    public string Name { get; set; } = string.Empty;
+    public string Username { get; set; } = string.Empty;
+
+    public virtual IEnumerable<Guid> UserRoles { get; set; } = Enumerable.Empty<Guid>();
+}

src/FluentCMS.Application/Extensions.cs

@@ -1,4 +1,5 @@
-using FluentCMS.Repository;
+using FluentCMS.Application.Services;
+using FluentValidation;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace FluentCMS.Application;
@@ -7,7 +8,14 @@ public static class Extensions
     public static FluentCMSBuilder AddApplication(this FluentCMSBuilder fcBuilder)
     {
         // register mediatR
-        fcBuilder.Services.AddMediatR(c => c.RegisterServicesFromAssembly(typeof(Extensions).Assembly));
+        fcBuilder.Services.AddScoped<IUserService, UserService>();
+        fcBuilder.Services.AddScoped<IRoleService, RoleService>();
+        fcBuilder.Services.AddScoped<ISiteService, SiteService>();
+        fcBuilder.Services.AddScoped<IContentTypeService, ContentTypeService>();
+
+        // register automapper
+        fcBuilder.Services.AddAutoMapper(typeof(Extensions).Assembly);
+        fcBuilder.Services.AddValidatorsFromAssembly(typeof(Extensions).Assembly);
 
         return fcBuilder;
     }

src/FluentCMS.Application/FluentCMS.Application.csproj

@@ -7,7 +7,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MediatR" Version="12.1.1" />
+    <PackageReference Include="AutoMapper" Version="12.0.1" />
+    <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
+    <PackageReference Include="FluentValidation" Version="11.8.0" />
+    <PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="11.8.0" />
   </ItemGroup>
 
   <ItemGroup>

src/FluentCMS.Application/Mappings/SiteMappings.cs

@@ -0,0 +1,12 @@
+using AutoMapper;
+using FluentCMS.Application.Dtos.Sites;
+using FluentCMS.Entities.Sites;
+
+namespace FluentCMS.Application.Mappings;
+internal class SiteMappings : Profile
+{
+    public SiteMappings()
+    {
+        CreateMap<Site, SiteDto>();
+    }
+}

src/FluentCMS.Application/Mappings/UserMappingProfile.cs

@@ -0,0 +1,15 @@
+using AutoMapper;
+using FluentCMS.Application.Dtos.Users;
+using FluentCMS.Entities.Users;
+
+namespace FluentCMS.Application.Mappings;
+internal class UserMappingProfile : Profile
+{
+    public UserMappingProfile()
+    {
+        CreateMap<User, UserDto>()
+            .ForMember(x => x.UserRoles, cfg => cfg.MapFrom(y => y.UserRoles.Select(z => z.RoleId.ToString())));
+
+        CreateMap<Role, RoleDto>();
+    }
+}