Merge pull request #28 from lrodolfol/refactor/users

Refactor/users

Registration/src/Application/Registration.API/Controllers/Operations/MonthlyClosingController.cs

@@ -20,7 +20,7 @@ public MonthlyClosingController(OperationsHandler handler, CViewModel viewModel,
         _logger = logger;
     }
 
-    [Authorize(Roles = "MINISTERIO")]
+    [Authorize(Roles = "M-SCT, M-TRS")]
     [HttpPost("/api/v1/monthly-closing")]
     public async Task<IActionResult> BlockMonth([FromBody] EditMonthWorkDto editMonthWorkDto)
     {
@@ -35,7 +35,7 @@ public async Task<IActionResult> BlockMonth([FromBody] EditMonthWorkDto editMont
         return StatusCode(_handler.GetStatusCode(), _viewModel);
     }
 
-    [Authorize(Roles = "MINISTERIO")]
+    [Authorize(Roles = "M-SCT, M-TRS")]
     [HttpDelete("/api/v1/monthly-closing/{id:int}")]
     public async Task<IActionResult> UnblockMonth([FromRoute] int id)
     {
@@ -50,7 +50,7 @@ public async Task<IActionResult> UnblockMonth([FromRoute] int id)
         return StatusCode(_handler.GetStatusCode(), _viewModel);
     }
 
-    [Authorize(Roles = "MINISTERIO,LOCAL")]
+    [Authorize(Roles = "L-SCT, M-SCT, M-TRS, L-TRS")]
     [HttpGet("/api/v1/monthly-closing/{churchId:int}")]
     public async Task<IActionResult> MonthWorkAll([FromRoute] int churchId)
     {

Registration/src/Domain/Registration.DomainBase/Aggregate/Email.cs

@@ -0,0 +1,15 @@
+using System.Text.RegularExpressions;
+
+namespace Registration.DomainBase.Aggregate;
+public class Email
+{
+    public string Address { get; set; } = null!;
+
+    public Email(string? address)
+    {
+        if(address is not null)
+            Address = address;
+    }
+
+    public void Validate() => Regex.IsMatch(Address, @"^([\w\.\-]+)@([\w\-]+)((\.(\w){2,3})+)$");    
+}

Registration/src/Domain/Registration.DomainBase/Entities/Registrations/User.cs

@@ -1,4 +1,5 @@
-using SecureIdentity.Password;
+using Registration.DomainBase.Aggregate;
+using SecureIdentity.Password;
 
 namespace Registration.DomainBase.Entities.Registrations;
 public class User : Entitie
@@ -7,6 +8,7 @@ public class User : Entitie
     public string Name { get; private set; } = string.Empty;
     public string PasswordHash { get; private set; } = string.Empty;
     public int ChurchId { get; private set; }
+    public Email Email { get; private set; } = null!;
     public Church? Church { get; private set; }
 
     public List<UserRole>? UserRoles { get; set; }
@@ -18,6 +20,11 @@ public User(int id, string name, int churchId)
         Name = name;
     }
 
+    public void SetEmail(string? email)
+    {
+        Email = new Email(email);
+    }
+
     public void UpdateChanges(User editUser)
     {
         Name = editUser.Name;

Registration/src/Domain/Registration.DomainCore/EnvironmentConfiguration.cs

@@ -0,0 +1,18 @@
+using Microsoft.Extensions.Configuration;
+
+namespace Registration.DomainCore;
+public static class EnvironmentConfiguration
+{
+    public static readonly IConfigurationRoot ConfigurationRoot = DefineConfiguration();
+
+    private static IConfigurationRoot DefineConfiguration()
+    {
+        var environment = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") ??
+            Environment.GetEnvironmentVariable("DOTNET_ENVIRONMENT") ?? "Dev";
+
+        if (environment is null)
+            return new ConfigurationBuilder().AddJsonFile("appsettings.json", false, true).Build();
+
+        return new ConfigurationBuilder().AddJsonFile($"appsettings.{environment}.json", false, true).Build();
+    }
+}

Registration/src/Domain/Registration.DomainCore/Events/DomainBaseEvents.cs

@@ -0,0 +1,9 @@
+public abstract class DomainBaseEvents
+{
+    public DateTime OcurredOn { get; set; }
+
+    public DomainBaseEvents()
+    {
+        OcurredOn = DateTime.UtcNow;
+    }
+}

Registration/src/Domain/Registration.DomainCore/Events/UserCreatedEvent.cs

@@ -0,0 +1,12 @@
+namespace Registration.DomainCore.Events;
+public class UserCreatedEvent : DomainBaseEvents
+{
+    public int Id { get; set; }
+    public string EmailAddress { get; set; } = null!;
+
+    public UserCreatedEvent(int id, string emailAddress) : base()
+    {
+        Id = id;
+        EmailAddress = emailAddress;
+    }
+}

Registration/src/Infrastructure/Registration.Infrastructure/Config/EnvironmentConfiguration.cs

@@ -0,0 +1,18 @@
+using Microsoft.Extensions.Configuration;
+
+namespace Registration.Infrastructure.Config;
+public static class EnvironmentConfiguration
+{
+    public static readonly IConfigurationRoot ConfigurationRoot = DefineConfiguration();
+
+    private static IConfigurationRoot DefineConfiguration()
+    {
+        var environment = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") ?? 
+            Environment.GetEnvironmentVariable("DOTNET_ENVIRONMENT") ?? "Dev";
+
+        if(environment is null)
+            return new ConfigurationBuilder().AddJsonFile("appsettings.json", false, true).Build();
+
+        return new ConfigurationBuilder().AddJsonFile($"{environment}.json", false, true).Build();
+    }
+}

Registration/src/Infrastructure/Registration.Infrastructure/IOC/LoadContainersDI.cs

@@ -1,5 +1,4 @@
-using ChurchCashFlow.Profiles;
-using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Builder;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;

Registration/src/Repository/Registration.Repository/Mapping/UserMap.cs

@@ -1,6 +1,7 @@
 
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
+using Registration.DomainBase.Aggregate;
 using Registration.DomainBase.Entities.Registrations;
 using SecureIdentity.Password;
 
@@ -43,6 +44,15 @@ public void Configure(EntityTypeBuilder<User> builder)
             .HasConstraintName("Fk_User_Church")
             .OnDelete(DeleteBehavior.NoAction);
 
+        builder.OwnsOne(x => x.Email, emailBuilder =>
+        {
+            emailBuilder.Property(e => e.Address)
+                .IsRequired()
+                .HasColumnName("email")
+                .HasColumnType("VARCHAR")
+                .IsRequired(false)
+                .HasMaxLength(255);
+        });
 
         builder.HasIndex(x => x.Code, "IX_User_Code")
             .IsUnique();
@@ -64,12 +74,12 @@ private static void InsertDataTemp(EntityTypeBuilder<User> builder)
         user.GenerateCode();
         builder.HasData(user);
 
-        user = new User(3, "Flavia Maciel", 1);
+        user = new User(3, "Cintia Gomes", 1);
         user.GeneratePassWordHash(passWord);
         user.GenerateCode();
         builder.HasData(user);
 
-        user = new User(4, "Ricardo Groof", 1);
+        user = new User(4, "Fernando Groler", 1);
         user.GeneratePassWordHash(passWord);
         user.GenerateCode();
         builder.HasData(user);

Registration/src/Repository/Registration.Repository/MysqlBase.cs

@@ -12,8 +12,8 @@ public MysqlBase(IConfiguration configuration)
     {
         _configuration = configuration;
 
-        //var conStr = _configuration.GetConnectionString("DefaultConnectionMySQL");
-        var conStr = _configuration.GetValue<string>("DefaultConnectionMySQL");
+        var conStr = _configuration.GetConnectionString("DefaultConnectionMySQL");
+        //var conStr = _configuration.GetValue<string>("DefaultConnectionMySQL");
         _mysqlConnection = new MySqlConnection(conStr);
     }
 }

Registration/src/Service/MessageBroker/BaseMessageBrokerClient.cs

@@ -28,6 +28,7 @@ protected BaseMessageBrokerClient(IConfiguration configuration)
     public byte[] BodyMessage { get; protected set; } = new byte[0];
 
     protected abstract byte[] BuildMessage();
+    protected abstract void LoadConfig();
 
     public string CreateUrl()
     {

Registration/src/Service/MessageBroker/MessageBroker.csproj

@@ -11,4 +11,8 @@
     <PackageReference Include="RabbitMQ.Client" Version="6.8.1" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\..\Domain\Registration.DomainCore\Registration.DomainCore.csproj" />
+  </ItemGroup>
+
 </Project>

Registration/src/Service/MessageBroker/BlockMonthWorkMessage.cs → Registration/src/Service/MessageBroker/Messages/BlockMonthWorkMessage.cs

@@ -2,10 +2,10 @@
 using System.Text;
 using System.Text.Json;
 
-namespace MessageBroker;
+namespace MessageBroker.Messages;
 
 public class BlockMonthWorkMessage : BaseMessageBrokerClient
-{    
+{
     public BlockMonthWorkMessage(IConfiguration configuration, int churchId, string competence) : base(configuration)
     {
         ChurchId = churchId;
@@ -17,7 +17,7 @@ public BlockMonthWorkMessage(IConfiguration configuration, int churchId, string
     public int ChurchId { get; private set; }
     public string YearMonth { get; private set; }
 
-    private void LoadConfig()
+    protected override void LoadConfig()
     {
         Exchange = _configuration["MonthWorkMessageBroker:Exchange"]!;
         Host = _configuration["MonthWorkMessageBroker:Host"]!;
@@ -42,8 +42,8 @@ protected override byte[] BuildMessage()
     {
         var objBody = new
         {
-            ChurchId = ChurchId,
-            YearMonth = YearMonth
+            ChurchId,
+            YearMonth
         };
 
         var serialize = JsonSerializer.Serialize(objBody);

Registration/src/Service/MessageBroker/Messages/NewUserCreated.cs

@@ -0,0 +1,51 @@
+using Microsoft.Extensions.Configuration;
+using Registration.DomainCore.Events;
+using System.Text.Json;
+using System.Text;
+
+namespace MessageBroker.Messages;
+public class NewUserCreated : BaseMessageBrokerClient
+{
+    private readonly UserCreatedEvent _userCreated;
+
+    public NewUserCreated(IConfiguration configuration, UserCreatedEvent userCreated) : base(configuration)
+    {
+        _userCreated = userCreated;
+        LoadConfig();
+    }
+
+    public void PreparePublish()
+    {
+        IMessageBrokerClient rabbitClient = new RabbitMqClient<NewUserCreated>(this);
+
+        rabbitClient.Publish();
+    }
+
+    protected override byte[] BuildMessage()
+    {
+        var objBody = new
+        {
+            _userCreated.Id,
+            _userCreated.EmailAddress,
+            _userCreated.OcurredOn
+        };
+
+        var serialize = JsonSerializer.Serialize(objBody);
+        var body = Encoding.UTF8.GetBytes(serialize);
+
+        return body;
+    }
+    protected override void LoadConfig()
+    {
+        Host = _configuration["MessageBroker:Host"]!;
+        VirtualHost = _configuration["MessageBroker:VirtualHost"]!;
+        Port = _configuration["MessageBroker:Port"]!;
+        UserName = _configuration["MessageBroker:UserName"]!;
+        Password = _configuration["MessageBroker:Password"]!;
+        Exchange = _configuration["MessageBroker:UserCreated:Exchange"]!;
+        RoutingKey = _configuration["MessageBroker:UserCreated:RoutingKey"]!;
+        Queue = _configuration["MessageBroker:UserCreated:Queue"]!;
+
+        BodyMessage = BuildMessage();
+    }
+}

Registration/src/Service/Registration.Handlers/Handlers/Registrations/UserHandler.cs

@@ -10,6 +10,9 @@
 using Registration.Mapper.DTOs.Registration.User;
 using Registration.Mapper.DTOs.Registration.UserLogin;
 using Serilog;
+using MessageBroker.Messages;
+using Registration.DomainCore.Events;
+using Registration.DomainCore;
 
 namespace Registration.Handlers.Handlers.Registrations;
 public class UserHandler : BaseNormalHandler
@@ -28,6 +31,12 @@ public UserHandler(IUserRepository context, IMapper mapper, CViewModel viewModel
         _logger = logger;
     }
 
+    private void SendNewUserCreated(User user)
+    {
+        var @event = new NewUserCreated(EnvironmentConfiguration.ConfigurationRoot, new UserCreatedEvent(user.Id, user.Email.Address));
+        @event.PreparePublish();
+    }
+
     public async Task<CViewModel> GetAll(bool active = true)
     {
         try
@@ -99,6 +108,7 @@ public async Task<CViewModel> Create(EditUserCreateDto dto)
                 return _viewModel;
 
             var user = _mapper.Map<User>(dto);
+            user.SetEmail(dto.Email);
             user.GeneratePassWordHash(user.PasswordHash);
             user.GenerateCode();
 
@@ -113,6 +123,8 @@ public async Task<CViewModel> Create(EditUserCreateDto dto)
             _viewModel.SetData(userReadDto);
             _logger.Information("The user {userName} was successfully created", user.Name);
 
+            SendNewUserCreated(user);
+
             return _viewModel;
         }
         catch (DbUpdateException ex)

Registration/src/Service/Registration.Mapper/DTOs/Registration/UserLogin/EditUserCreateDto.cs

@@ -1,5 +1,6 @@
 using Flunt.Notifications;
 using Flunt.Validations;
+using Registration.DomainBase.Aggregate;
 using Registration.DomainBase.Entities;
 using System.ComponentModel.DataAnnotations;
 using System.Text.Json.Serialization;
@@ -15,6 +16,7 @@ public class EditUserCreateDto : ModelDto
     [StringLength(8, MinimumLength = 6, ErrorMessage = "Name must be between 6 and 8 characters")]
     public string PasswordHash { get; set; } = string.Empty;
     public int ChurchId { get; set; }
+    public string? Email { get; set; }
     public HashSet<int> RoleIds { get; set; }
 
     public void Validate()
@@ -24,6 +26,7 @@ public void Validate()
             .IsGreaterThan(Name, 2, "Name", "Name should have at least 3 chars")
             .IsNotNullOrEmpty(PasswordHash, "PassWord", "The password can not be empty")
             .IsNotNull(RoleIds, "RolesId", "User must have a role")
+            .IsEmailOrEmpty(Email, "Email", "Email is invalid")
         );
     }
 }

Registration/src/Service/Registration.Mapper/Profiles/AddressProfile.cs

@@ -3,7 +3,7 @@
 using Registration.Mapper.DTOs.Registration.Address;
 using Registration.Mapper.DTOs.Registration.ChurchAddress;
 
-namespace ChurchCashFlow.Profiles;
+namespace Registration.Mapper.Profiles;
 public class AddressProfile : Profile
 {
     public AddressProfile()

Registration/src/Service/Registration.Mapper/Profiles/ChurchProfile.cs

@@ -3,7 +3,7 @@
 using Registration.Mapper.DTOs.Registration.Church;
 using Registration.Mapper.DTOs.Registration.ChurchAddress;
 
-namespace ChurchCashFlow.Profiles;
+namespace Registration.Mapper.Profiles;
 public class ChurchProfile : Profile
 {
     public ChurchProfile()

Registration/src/Service/Registration.Mapper/Profiles/MeetingKindProfile.cs

@@ -2,7 +2,7 @@
 using Registration.DomainBase.Entities.Registrations;
 using Registration.Mapper.DTOs.Registration.MeetingKind;
 
-namespace ChurchCashFlow.Profiles;
+namespace Registration.Mapper.Profiles;
 public class MeetingKindProfile : Profile
 {
     public MeetingKindProfile()