chore: Code Cleanup

CleanArchitecture.Api/Extensions/ServiceCollectionExtension.cs

@@ -62,7 +62,10 @@ public static class ServiceCollectionExtension
         services.AddAuthentication(
                 options => { options.DefaultScheme = JwtBearerDefaults.AuthenticationScheme; })
             .AddJwtBearer(
-            jwtOptions => { jwtOptions.TokenValidationParameters = CreateTokenValidationParameters(configuration); });
+                jwtOptions =>
+                {
+                    jwtOptions.TokenValidationParameters = CreateTokenValidationParameters(configuration);
+                });
 
         services
             .AddOptions<TokenSettings>()

CleanArchitecture.Api/Models/DetailedError.cs

@@ -4,9 +4,7 @@ namespace CleanArchitecture.Api.Models;
 
 public sealed class DetailedError
 {
-    [JsonPropertyName("code")]
+    [JsonPropertyName("code")] public string Code { get; init; } = string.Empty;
-    public string Code { get; init; } = string.Empty;
 
-    [JsonPropertyName("data")]
+    [JsonPropertyName("data")] public object? Data { get; init; }
-    public object? Data { get; init; }
 }

CleanArchitecture.Api/Models/ResponseMessage.cs

@@ -6,15 +6,12 @@ namespace CleanArchitecture.Api.Models;
 
 public sealed class ResponseMessage<T>
 {
-    [JsonPropertyName("success")]
+    [JsonPropertyName("success")] public bool Success { get; init; }
-    public bool Success { get; init; }
 
-    [JsonPropertyName("errors")]
+    [JsonPropertyName("errors")] public IEnumerable<string>? Errors { get; init; }
-    public IEnumerable<string>? Errors { get; init; }
 
     [JsonPropertyName("detailedErrors")]
     public IEnumerable<DetailedError> DetailedErrors { get; init; } = Enumerable.Empty<DetailedError>();
 
-    [JsonPropertyName("data")]
+    [JsonPropertyName("data")] public T? Data { get; init; }
-    public T? Data { get; init; }
 }

CleanArchitecture.Api/Program.cs

@@ -61,9 +61,9 @@ var app = builder.Build();
 using (var scope = app.Services.CreateScope())
 {
     var services = scope.ServiceProvider;
-    ApplicationDbContext appDbContext = services.GetRequiredService<ApplicationDbContext>();
+    var appDbContext = services.GetRequiredService<ApplicationDbContext>();
-    EventStoreDbContext storeDbContext = services.GetRequiredService<EventStoreDbContext>();
+    var storeDbContext = services.GetRequiredService<EventStoreDbContext>();
-    DomainNotificationStoreDbContext domainStoreDbContext = services.GetRequiredService<DomainNotificationStoreDbContext>();
+    var domainStoreDbContext = services.GetRequiredService<DomainNotificationStoreDbContext>();
 
     appDbContext.EnsureMigrationsApplied();
 

CleanArchitecture.Application.Tests/Fixtures/Queries/Tenants/GetAllTenantsTestFixture.cs

@@ -10,16 +10,16 @@ namespace CleanArchitecture.Application.Tests.Fixtures.Queries.Tenants;
 
 public sealed class GetAllTenantsTestFixture : QueryHandlerBaseFixture
 {
-    public GetAllTenantsQueryHandler QueryHandler { get; }
-    private ITenantRepository TenantRepository { get; }
-
     public GetAllTenantsTestFixture()
     {
         TenantRepository = Substitute.For<ITenantRepository>();
 
-        QueryHandler = new(TenantRepository);
+        QueryHandler = new GetAllTenantsQueryHandler(TenantRepository);
     }
 
+    public GetAllTenantsQueryHandler QueryHandler { get; }
+    private ITenantRepository TenantRepository { get; }
+
     public Tenant SetupTenant(bool deleted = false)
     {
         var tenant = new Tenant(Guid.NewGuid(), "Tenant 1");

CleanArchitecture.Application.Tests/Fixtures/Queries/Tenants/GetTenantByIdTestFixture.cs

@@ -10,18 +10,18 @@ namespace CleanArchitecture.Application.Tests.Fixtures.Queries.Tenants;
 
 public sealed class GetTenantByIdTestFixture : QueryHandlerBaseFixture
 {
-    public GetTenantByIdQueryHandler QueryHandler { get; }
-    private ITenantRepository TenantRepository { get; }
-
     public GetTenantByIdTestFixture()
     {
         TenantRepository = Substitute.For<ITenantRepository>();
 
-        QueryHandler = new(
+        QueryHandler = new GetTenantByIdQueryHandler(
             TenantRepository,
             Bus);
     }
 
+    public GetTenantByIdQueryHandler QueryHandler { get; }
+    private ITenantRepository TenantRepository { get; }
+
     public Tenant SetupTenant(bool deleted = false)
     {
         var tenant = new Tenant(Guid.NewGuid(), "Tenant 1");

CleanArchitecture.Application/CleanArchitecture.Application.csproj

@@ -15,5 +15,4 @@
     </ItemGroup>
 
 
-
 </Project>

CleanArchitecture.Application/Extensions/ServiceCollectionExtension.cs

@@ -30,7 +30,8 @@ public static class ServiceCollectionExtension
 
         // Tenant
         services.AddScoped<IRequestHandler<GetTenantByIdQuery, TenantViewModel?>, GetTenantByIdQueryHandler>();
-        services.AddScoped<IRequestHandler<GetAllTenantsQuery, IEnumerable<TenantViewModel>>, GetAllTenantsQueryHandler>();
+        services
+            .AddScoped<IRequestHandler<GetAllTenantsQuery, IEnumerable<TenantViewModel>>, GetAllTenantsQueryHandler>();
 
         return services;
     }

CleanArchitecture.Application/Queries/Tenants/GetAll/GetAllTenantsQuery.cs

@@ -4,4 +4,4 @@ using MediatR;
 
 namespace CleanArchitecture.Application.Queries.Tenants.GetAll;
 
-public sealed record GetAllTenantsQuery() : IRequest<IEnumerable<TenantViewModel>>;
+public sealed record GetAllTenantsQuery : IRequest<IEnumerable<TenantViewModel>>;

CleanArchitecture.Application/Queries/Tenants/GetTenantById/GetTenantByIdQueryHandler.cs

@@ -14,8 +14,8 @@ namespace CleanArchitecture.Application.Queries.Tenants.GetTenantById;
 public sealed class GetTenantByIdQueryHandler :
     IRequestHandler<GetTenantByIdQuery, TenantViewModel?>
 {
-    private readonly ITenantRepository _tenantRepository;
     private readonly IMediatorHandler _bus;
+    private readonly ITenantRepository _tenantRepository;
 
     public GetTenantByIdQueryHandler(ITenantRepository tenantRepository, IMediatorHandler bus)
     {

CleanArchitecture.Domain.Tests/CommandHandler/Tenant/CreateTenant/CreateTenantCommandTestFixture.cs

@@ -8,15 +8,11 @@ namespace CleanArchitecture.Domain.Tests.CommandHandler.Tenant.CreateTenant;
 
 public sealed class CreateTenantCommandTestFixture : CommandHandlerFixtureBase
 {
-    public CreateTenantCommandHandler CommandHandler { get;}
-    
-    private ITenantRepository TenantRepository { get; }
-
     public CreateTenantCommandTestFixture()
     {
         TenantRepository = Substitute.For<ITenantRepository>();
 
-        CommandHandler = new(
+        CommandHandler = new CreateTenantCommandHandler(
             Bus,
             UnitOfWork,
             NotificationHandler,
@@ -24,6 +20,10 @@ public sealed class CreateTenantCommandTestFixture : CommandHandlerFixtureBase
             User);
     }
 
+    public CreateTenantCommandHandler CommandHandler { get; }
+
+    private ITenantRepository TenantRepository { get; }
+
     public void SetupUser()
     {
         User.GetUserRole().Returns(UserRole.User);

CleanArchitecture.Domain.Tests/CommandHandler/Tenant/CreateTenant/CreateTenantCommandValidationTests.cs

@@ -46,7 +46,7 @@ public sealed class CreateTenantCommandValidationTests :
         Guid? id = null,
         string? name = null)
     {
-        return new(
+        return new CreateTenantCommand(
             id ?? Guid.NewGuid(),
             name ?? "Test Tenant");
     }

CleanArchitecture.Domain.Tests/CommandHandler/Tenant/DeleteTenant/DeleteTenantCommandTestFixture.cs

@@ -7,17 +7,12 @@ namespace CleanArchitecture.Domain.Tests.CommandHandler.Tenant.DeleteTenant;
 
 public sealed class DeleteTenantCommandTestFixture : CommandHandlerFixtureBase
 {
-    public DeleteTenantCommandHandler CommandHandler { get;}
-    
-    private ITenantRepository TenantRepository { get; }
-    private IUserRepository UserRepository { get; }
-
     public DeleteTenantCommandTestFixture()
     {
         TenantRepository = Substitute.For<ITenantRepository>();
         UserRepository = Substitute.For<IUserRepository>();
 
-        CommandHandler = new(
+        CommandHandler = new DeleteTenantCommandHandler(
             Bus,
             UnitOfWork,
             NotificationHandler,
@@ -26,6 +21,11 @@ public sealed class DeleteTenantCommandTestFixture : CommandHandlerFixtureBase
             User);
     }
 
+    public DeleteTenantCommandHandler CommandHandler { get; }
+
+    private ITenantRepository TenantRepository { get; }
+    private IUserRepository UserRepository { get; }
+
     public Entities.Tenant SetupTenant()
     {
         var tenant = new Entities.Tenant(Guid.NewGuid(), "TestTenant");

CleanArchitecture.Domain.Tests/CommandHandler/Tenant/DeleteTenant/DeleteTenantCommandValidationTests.cs

@@ -33,6 +33,6 @@ public sealed class DeleteTenantCommandValidationTests :
 
     private static DeleteTenantCommand CreateTestCommand(Guid? tenantId = null)
     {
-        return new(tenantId ?? Guid.NewGuid());
+        return new DeleteTenantCommand(tenantId ?? Guid.NewGuid());
     }
 }

CleanArchitecture.Domain.Tests/CommandHandler/Tenant/UpdateTenant/UpdateTenantCommandTestFixture.cs

@@ -1,7 +1,6 @@
 using System;
 using CleanArchitecture.Domain.Commands.Tenants.UpdateTenant;
 using CleanArchitecture.Domain.Enums;
-using CleanArchitecture.Domain.Interfaces;
 using CleanArchitecture.Domain.Interfaces.Repositories;
 using NSubstitute;
 
@@ -9,15 +8,11 @@ namespace CleanArchitecture.Domain.Tests.CommandHandler.Tenant.UpdateTenant;
 
 public sealed class UpdateTenantCommandTestFixture : CommandHandlerFixtureBase
 {
-    public UpdateTenantCommandHandler CommandHandler { get;}
-    
-    private ITenantRepository TenantRepository { get; }
-
     public UpdateTenantCommandTestFixture()
     {
         TenantRepository = Substitute.For<ITenantRepository>();
 
-        CommandHandler = new(
+        CommandHandler = new UpdateTenantCommandHandler(
             Bus,
             UnitOfWork,
             NotificationHandler,
@@ -25,6 +20,10 @@ public sealed class UpdateTenantCommandTestFixture : CommandHandlerFixtureBase
             User);
     }
 
+    public UpdateTenantCommandHandler CommandHandler { get; }
+
+    private ITenantRepository TenantRepository { get; }
+
     public void SetupUser()
     {
         User.GetUserRole().Returns(UserRole.User);

CleanArchitecture.Domain.Tests/CommandHandler/Tenant/UpdateTenant/UpdateTenantCommandValidationTests.cs

@@ -46,7 +46,7 @@ public sealed class UpdateTenantCommandValidationTests :
         Guid? id = null,
         string? name = null)
     {
-        return new(
+        return new UpdateTenantCommand(
             id ?? Guid.NewGuid(),
             name ?? "Test Tenant");
     }

CleanArchitecture.Domain.Tests/CommandHandler/User/ChangePassword/ChangePasswordCommandValidationTests.cs

@@ -90,7 +90,7 @@ public sealed class ChangePasswordCommandValidationTests :
     private static ChangePasswordCommand CreateTestCommand(
         string? password = null, string? newPassword = null)
     {
-        return new(
+        return new ChangePasswordCommand(
             password ?? "z8]tnayvd5FNLU9:]AQm",
             newPassword ?? "z8]tnayvd5FNLU9:]AQw");
     }

CleanArchitecture.Domain.Tests/CommandHandler/User/CreateUser/CreateUserCommandValidationTests.cs

@@ -193,7 +193,7 @@ public sealed class CreateUserCommandValidationTests :
         string? lastName = null,
         string? password = null)
     {
-        return new(
+        return new CreateUserCommand(
             userId ?? Guid.NewGuid(),
             tenantId ?? Guid.NewGuid(),
             email ?? "test@email.com",

CleanArchitecture.Domain.Tests/CommandHandler/User/DeleteUser/DeleteUserCommandValidationTests.cs

@@ -33,6 +33,6 @@ public sealed class DeleteUserCommandValidationTests :
 
     private static DeleteUserCommand CreateTestCommand(Guid? userId = null)
     {
-        return new(userId ?? Guid.NewGuid());
+        return new DeleteUserCommand(userId ?? Guid.NewGuid());
     }
 }

CleanArchitecture.Domain.Tests/CommandHandler/User/LoginUser/LoginUserCommandValidationTests.cs

@@ -125,7 +125,7 @@ public sealed class LoginUserCommandValidationTests :
         string? email = null,
         string? password = null)
     {
-        return new(
+        return new LoginUserCommand(
             email ?? "test@email.com",
             password ?? "Po=PF]PC6t.?8?ks)A6W");
     }

CleanArchitecture.Domain.Tests/CommandHandler/User/UpdateUser/UpdateUserCommandValidationTests.cs

@@ -129,7 +129,7 @@ public sealed class UpdateUserCommandValidationTests :
         string? lastName = null,
         UserRole? role = null)
     {
-        return new(
+        return new UpdateUserCommand(
             userId ?? Guid.NewGuid(),
             email ?? "test@email.com",
             firstName ?? "test",

CleanArchitecture.Domain/ApiUser.cs

@@ -59,17 +59,20 @@ public sealed class ApiUser : IUser
             {
                 return _name;
             }
+
             var identity = _httpContextAccessor.HttpContext?.User.Identity;
             if (identity is null)
             {
                 _name = string.Empty;
                 return string.Empty;
             }
+
             if (!string.IsNullOrWhiteSpace(identity.Name))
             {
                 _name = identity.Name;
                 return identity.Name;
             }
+
             var claim = _httpContextAccessor.HttpContext!.User.Claims
                 .FirstOrDefault(c => string.Equals(c.Type, ClaimTypes.Name, StringComparison.OrdinalIgnoreCase))?
                 .Value;

CleanArchitecture.Domain/Commands/CommandHandlerBase.cs

@@ -9,9 +9,9 @@ namespace CleanArchitecture.Domain.Commands;
 
 public abstract class CommandHandlerBase
 {
-    protected readonly IMediatorHandler Bus;
     private readonly DomainNotificationHandler _notifications;
     private readonly IUnitOfWork _unitOfWork;
+    protected readonly IMediatorHandler Bus;
 
     protected CommandHandlerBase(
         IMediatorHandler bus,

CleanArchitecture.Domain/Commands/Tenants/CreateTenant/CreateTenantCommand.cs

@@ -6,13 +6,13 @@ public sealed class CreateTenantCommand : CommandBase
 {
     private static readonly CreateTenantCommandValidation s_validation = new();
 
-    public string Name { get; }
-    
     public CreateTenantCommand(Guid tenantId, string name) : base(tenantId)
     {
         Name = name;
     }
 
+    public string Name { get; }
+
     public override bool IsValid()
     {
         ValidationResult = s_validation.Validate(this);

CleanArchitecture.Domain/Commands/Tenants/DeleteTenant/DeleteTenantCommandHandler.cs

@@ -15,8 +15,8 @@ public sealed class DeleteTenantCommandHandler : CommandHandlerBase,
     IRequestHandler<DeleteTenantCommand>
 {
     private readonly ITenantRepository _tenantRepository;
-    private readonly IUserRepository _userRepository;
     private readonly IUser _user;
+    private readonly IUserRepository _userRepository;
 
     public DeleteTenantCommandHandler(
         IMediatorHandler bus,

CleanArchitecture.Domain/Commands/Tenants/UpdateTenant/UpdateTenantCommand.cs

@@ -6,13 +6,13 @@ public sealed class UpdateTenantCommand : CommandBase
 {
     private static readonly UpdateTenantCommandValidation s_validation = new();
 
-    public string Name { get;  }
-    
     public UpdateTenantCommand(Guid tenantId, string name) : base(tenantId)
     {
         Name = name;
     }
 
+    public string Name { get; }
+
     public override bool IsValid()
     {
         ValidationResult = s_validation.Validate(this);

CleanArchitecture.Domain/Commands/Users/CreateUser/CreateUserCommandHandler.cs

@@ -15,9 +15,9 @@ namespace CleanArchitecture.Domain.Commands.Users.CreateUser;
 public sealed class CreateUserCommandHandler : CommandHandlerBase,
     IRequestHandler<CreateUserCommand>
 {
-    private readonly IUserRepository _userRepository;
     private readonly ITenantRepository _tenantRepository;
     private readonly IUser _user;
+    private readonly IUserRepository _userRepository;
 
     public CreateUserCommandHandler(
         IMediatorHandler bus,

CleanArchitecture.Domain/DomainEvents/StoredDomainEvent.cs

@@ -4,11 +4,6 @@ namespace CleanArchitecture.Domain.DomainEvents;
 
 public class StoredDomainEvent : DomainEvent
 {
-    public Guid Id { get; private set; }
-    public string Data { get; private set; } = string.Empty;
-    public string User { get; private set; } = string.Empty;
-    public string CorrelationId { get; private set; } = string.Empty;
-
     public StoredDomainEvent(
         DomainEvent domainEvent,
         string data,
@@ -24,5 +19,11 @@ public class StoredDomainEvent : DomainEvent
 
     // EF Constructor
     protected StoredDomainEvent() : base(Guid.NewGuid())
-    { }
+    {
+    }
+
+    public Guid Id { get; private set; }
+    public string Data { get; private set; } = string.Empty;
+    public string User { get; private set; } = string.Empty;
+    public string CorrelationId { get; private set; } = string.Empty;
 }

CleanArchitecture.Domain/DomainNotifications/StoredDomainNotification.cs

@@ -5,11 +5,6 @@ namespace CleanArchitecture.Domain.DomainNotifications;
 
 public class StoredDomainNotification : DomainNotification
 {
-    public Guid Id { get; private set; }
-    public string SerializedData { get; private set; } = string.Empty;
-    public string User { get; private set; } = string.Empty;
-    public string CorrelationId { get; private set; } = string.Empty;
-
     public StoredDomainNotification(
         DomainNotification domainNotification,
         string data,
@@ -31,5 +26,11 @@ public class StoredDomainNotification : DomainNotification
 
     // EF Constructor
     protected StoredDomainNotification() : base(string.Empty, string.Empty, string.Empty)
-    { }
+    {
+    }
+
+    public Guid Id { get; private set; }
+    public string SerializedData { get; private set; } = string.Empty;
+    public string User { get; private set; } = string.Empty;
+    public string CorrelationId { get; private set; } = string.Empty;
 }

CleanArchitecture.Domain/Entities/Tenant.cs

@@ -5,10 +5,6 @@ namespace CleanArchitecture.Domain.Entities;
 
 public class Tenant : Entity
 {
-    public string Name { get; private set; }
-
-    public virtual ICollection<User> Users { get; private set; } = new HashSet<User>();
-
     public Tenant(
         Guid id,
         string name) : base(id)
@@ -16,6 +12,10 @@ public class Tenant : Entity
         Name = name;
     }
 
+    public string Name { get; private set; }
+
+    public virtual ICollection<User> Users { get; private set; } = new HashSet<User>();
+
     public void SetName(string name)
     {
         Name = name;

CleanArchitecture.Domain/Entities/User.cs

@@ -1,22 +1,10 @@
 using System;
-using System.Diagnostics.CodeAnalysis;
 using CleanArchitecture.Domain.Enums;
 
 namespace CleanArchitecture.Domain.Entities;
 
 public class User : Entity
 {
-    public string Email { get; private set; }
-    public string FirstName { get; private set; }
-    public string LastName { get; private set; }
-    public string Password { get; private set; }
-    public UserRole Role { get; private set; }
-    
-    public string FullName => $"{FirstName}, {LastName}";
-
-    public Guid TenantId { get; private set; }
-    public virtual Tenant Tenant { get; private set; } = null!;
-
     public User(
         Guid id,
         Guid tenantId,
@@ -34,6 +22,17 @@ public class User : Entity
         Role = role;
     }
 
+    public string Email { get; private set; }
+    public string FirstName { get; private set; }
+    public string LastName { get; private set; }
+    public string Password { get; private set; }
+    public UserRole Role { get; private set; }
+
+    public string FullName => $"{FirstName}, {LastName}";
+
+    public Guid TenantId { get; private set; }
+    public virtual Tenant Tenant { get; private set; } = null!;
+
     public void SetEmail(string email)
     {
         Email = email;

CleanArchitecture.Domain/Events/Tenant/TenantCreatedEvent.cs

@@ -5,10 +5,10 @@ namespace CleanArchitecture.Domain.Events.Tenant;
 
 public sealed class TenantCreatedEvent : DomainEvent
 {
-    public string Name { get; set; }
-    
     public TenantCreatedEvent(Guid tenantId, string name) : base(tenantId)
     {
         Name = name;
     }
+
+    public string Name { get; set; }
 }

CleanArchitecture.Domain/Events/Tenant/TenantUpdatedEvent.cs

@@ -5,10 +5,10 @@ namespace CleanArchitecture.Domain.Events.Tenant;
 
 public sealed class TenantUpdatedEvent : DomainEvent
 {
-    public string Name { get; set; }
-    
     public TenantUpdatedEvent(Guid tenantId, string name) : base(tenantId)
     {
         Name = name;
     }
+
+    public string Name { get; set; }
 }

CleanArchitecture.Infrastructure/Configurations/UserConfiguration.cs

@@ -1,4 +1,3 @@
-using System;
 using CleanArchitecture.Domain.Constants;
 using CleanArchitecture.Domain.Entities;
 using CleanArchitecture.Domain.Enums;

CleanArchitecture.Infrastructure/EventSourcing/EventStore.cs

@@ -9,9 +9,9 @@ namespace CleanArchitecture.Infrastructure.EventSourcing;
 
 public sealed class DomainEventStore : IDomainEventStore
 {
-    private readonly EventStoreDbContext _eventStoreDbContext;
-    private readonly DomainNotificationStoreDbContext _domainNotificationStoreDbContext;
     private readonly IEventStoreContext _context;
+    private readonly DomainNotificationStoreDbContext _domainNotificationStoreDbContext;
+    private readonly EventStoreDbContext _eventStoreDbContext;
 
     public DomainEventStore(
         EventStoreDbContext eventStoreDbContext,

CleanArchitecture.Infrastructure/EventSourcing/EventStoreContext.cs

@@ -14,7 +14,8 @@ public sealed class EventStoreContext : IEventStoreContext
         _user = user;
 
         if (httpContextAccessor?.HttpContext is null ||
-            !httpContextAccessor.HttpContext.Request.Headers.TryGetValue("X-CLEAN-ARCHITECTURE-CORRELATION-ID", out var id))
+            !httpContextAccessor.HttpContext.Request.Headers.TryGetValue("X-CLEAN-ARCHITECTURE-CORRELATION-ID",
+                out var id))
         {
             _correlationId = $"internal - {Guid.NewGuid()}";
         }
@@ -24,7 +25,13 @@ public sealed class EventStoreContext : IEventStoreContext
         }
     }
 
-    public string GetCorrelationId() => _correlationId;
+    public string GetCorrelationId()
-
+    {
-    public string GetUserEmail() => _user?.GetUserEmail() ?? string.Empty;
+        return _correlationId;
+    }
+
+    public string GetUserEmail()
+    {
+        return _user?.GetUserEmail() ?? string.Empty;
+    }
 }

CleanArchitecture.Infrastructure/GlobalSuppressions.cs

@@ -5,6 +5,12 @@
 
 using System.Diagnostics.CodeAnalysis;
 
-[assembly: SuppressMessage("Style", "IDE0161:Convert to file-scoped namespace", Justification = "<Pending>", Scope = "namespace", Target = "~N:CleanArchitecture.Infrastructure.Migrations")]
+[assembly:
-[assembly: SuppressMessage("Style", "IDE0161:Convert to file-scoped namespace", Justification = "<Pending>", Scope = "namespace", Target = "~N:CleanArchitecture.Infrastructure.Migrations.EventStoreDb")]
+    SuppressMessage("Style", "IDE0161:Convert to file-scoped namespace", Justification = "<Pending>",
-[assembly: SuppressMessage("Style", "IDE0161:Convert to file-scoped namespace", Justification = "<Pending>", Scope = "namespace", Target = "~N:CleanArchitecture.Infrastructure.Migrations.DomainNotificationStoreDb")]
+        Scope = "namespace", Target = "~N:CleanArchitecture.Infrastructure.Migrations")]
+[assembly:
+    SuppressMessage("Style", "IDE0161:Convert to file-scoped namespace", Justification = "<Pending>",
+        Scope = "namespace", Target = "~N:CleanArchitecture.Infrastructure.Migrations.EventStoreDb")]
+[assembly:
+    SuppressMessage("Style", "IDE0161:Convert to file-scoped namespace", Justification = "<Pending>",
+        Scope = "namespace", Target = "~N:CleanArchitecture.Infrastructure.Migrations.DomainNotificationStoreDb")]

CleanArchitecture.Infrastructure/InMemoryBus.cs

@@ -8,8 +8,8 @@ namespace CleanArchitecture.Infrastructure;
 
 public sealed class InMemoryBus : IMediatorHandler
 {
-    private readonly IMediator _mediator;
     private readonly IDomainEventStore _domainEventStore;
+    private readonly IMediator _mediator;
 
     public InMemoryBus(
         IMediator mediator,

CleanArchitecture.Infrastructure/Migrations/DomainNotificationStoreDb/20230701135523_AddDomainNotificationStore.cs

@@ -1,10 +1,10 @@
-using System;
+#nullable disable
+
+using System;
 using Microsoft.EntityFrameworkCore.Migrations;
 
-#nullable disable
+namespace CleanArchitecture.Infrastructure.Migrations.DomainNotificationStoreDb;
 
-namespace CleanArchitecture.Infrastructure.Migrations.DomainNotificationStoreDb
-{
 /// <inheritdoc />
 public partial class AddDomainNotificationStore : Migration
 {
@@ -12,32 +12,28 @@ namespace CleanArchitecture.Infrastructure.Migrations.DomainNotificationStoreDb
     protected override void Up(MigrationBuilder migrationBuilder)
     {
         migrationBuilder.CreateTable(
-                name: "StoredDomainNotifications",
+            "StoredDomainNotifications",
-                columns: table => new
+            table => new
             {
-                    Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                Id = table.Column<Guid>("uniqueidentifier", nullable: false),
-                    Data = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                Data = table.Column<string>("nvarchar(max)", nullable: false),
-                    User = table.Column<string>(type: "nvarchar(100)", maxLength: 100, nullable: false),
+                User = table.Column<string>("nvarchar(100)", maxLength: 100, nullable: false),
-                    CorrelationId = table.Column<string>(type: "nvarchar(100)", maxLength: 100, nullable: false),
+                CorrelationId = table.Column<string>("nvarchar(100)", maxLength: 100, nullable: false),
-                    AggregateId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                AggregateId = table.Column<Guid>("uniqueidentifier", nullable: false),
-                    MessageType = table.Column<string>(type: "nvarchar(100)", maxLength: 100, nullable: false),
+                MessageType = table.Column<string>("nvarchar(100)", maxLength: 100, nullable: false),
-                    Timestamp = table.Column<DateTime>(type: "datetime2", nullable: false),
+                Timestamp = table.Column<DateTime>("datetime2", nullable: false),
-                    Key = table.Column<string>(type: "nvarchar(100)", maxLength: 100, nullable: false),
+                Key = table.Column<string>("nvarchar(100)", maxLength: 100, nullable: false),
-                    Value = table.Column<string>(type: "nvarchar(1024)", maxLength: 1024, nullable: false),
+                Value = table.Column<string>("nvarchar(1024)", maxLength: 1024, nullable: false),
-                    Code = table.Column<string>(type: "nvarchar(100)", maxLength: 100, nullable: false),
+                Code = table.Column<string>("nvarchar(100)", maxLength: 100, nullable: false),
-                    Version = table.Column<int>(type: "int", nullable: false)
+                Version = table.Column<int>("int", nullable: false)
             },
-                constraints: table =>
+            constraints: table => { table.PrimaryKey("PK_StoredDomainNotifications", x => x.Id); });
-                {
-                    table.PrimaryKey("PK_StoredDomainNotifications", x => x.Id);
-                });
     }
 
     /// <inheritdoc />
     protected override void Down(MigrationBuilder migrationBuilder)
     {
         migrationBuilder.DropTable(
-                name: "StoredDomainNotifications");
+            "StoredDomainNotifications");
-        }
     }
 }

CleanArchitecture.Infrastructure/Migrations/EventStoreDb/20230701135441_AddEventStore.cs

@@ -1,10 +1,10 @@
-using System;
+#nullable disable
+
+using System;
 using Microsoft.EntityFrameworkCore.Migrations;
 
-#nullable disable
+namespace CleanArchitecture.Infrastructure.Migrations.EventStoreDb;
 
-namespace CleanArchitecture.Infrastructure.Migrations.EventStoreDb
-{
 /// <inheritdoc />
 public partial class AddEventStore : Migration
 {
@@ -12,28 +12,24 @@ namespace CleanArchitecture.Infrastructure.Migrations.EventStoreDb
     protected override void Up(MigrationBuilder migrationBuilder)
     {
         migrationBuilder.CreateTable(
-                name: "StoredDomainEvents",
+            "StoredDomainEvents",
-                columns: table => new
+            table => new
             {
-                    Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                Id = table.Column<Guid>("uniqueidentifier", nullable: false),
-                    Data = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                Data = table.Column<string>("nvarchar(max)", nullable: false),
-                    User = table.Column<string>(type: "nvarchar(100)", maxLength: 100, nullable: false),
+                User = table.Column<string>("nvarchar(100)", maxLength: 100, nullable: false),
-                    CorrelationId = table.Column<string>(type: "nvarchar(100)", maxLength: 100, nullable: false),
+                CorrelationId = table.Column<string>("nvarchar(100)", maxLength: 100, nullable: false),
-                    AggregateId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                AggregateId = table.Column<Guid>("uniqueidentifier", nullable: false),
-                    Action = table.Column<string>(type: "varchar(100)", nullable: false),
+                Action = table.Column<string>("varchar(100)", nullable: false),
-                    CreationDate = table.Column<DateTime>(type: "datetime2", nullable: false)
+                CreationDate = table.Column<DateTime>("datetime2", nullable: false)
             },
-                constraints: table =>
+            constraints: table => { table.PrimaryKey("PK_StoredDomainEvents", x => x.Id); });
-                {
-                    table.PrimaryKey("PK_StoredDomainEvents", x => x.Id);
-                });
     }
 
     /// <inheritdoc />
     protected override void Down(MigrationBuilder migrationBuilder)
     {
         migrationBuilder.DropTable(
-                name: "StoredDomainEvents");
+            "StoredDomainEvents");
-        }
     }
 }

CleanArchitecture.IntegrationTests/Fixtures/TestFixtureBase.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
 using CleanArchitecture.Application.ViewModels.Users;

CleanArchitecture.IntegrationTests/Fixtures/gRPC/GetTenantsByIdsTestFixture.cs

@@ -7,9 +7,6 @@ namespace CleanArchitecture.IntegrationTests.Fixtures.gRPC;
 
 public sealed class GetTenantsByIdsTestFixture : TestFixtureBase
 {
-    public GrpcChannel GrpcChannel { get; }
-    public Guid CreatedTenantId { get; } = Guid.NewGuid();
-
     public GetTenantsByIdsTestFixture()
     {
         GrpcChannel = GrpcChannel.ForAddress("http://localhost", new GrpcChannelOptions
@@ -18,6 +15,9 @@ public sealed class GetTenantsByIdsTestFixture : TestFixtureBase
         });
     }
 
+    public GrpcChannel GrpcChannel { get; }
+    public Guid CreatedTenantId { get; } = Guid.NewGuid();
+
     protected override void SeedTestData(ApplicationDbContext context)
     {
         base.SeedTestData(context);
@@ -30,7 +30,7 @@ public sealed class GetTenantsByIdsTestFixture : TestFixtureBase
 
     public Tenant CreateTenant()
     {
-        return new(
+        return new Tenant(
             CreatedTenantId,
             "Test Tenant");
     }

CleanArchitecture.IntegrationTests/Fixtures/gRPC/GetUsersByIdsTestFixture.cs

@@ -9,9 +9,6 @@ namespace CleanArchitecture.IntegrationTests.Fixtures.gRPC;
 
 public sealed class GetUsersByIdsTestFixture : TestFixtureBase
 {
-    public GrpcChannel GrpcChannel { get; }
-    public Guid CreatedUserId { get; } = Guid.NewGuid();
-
     public GetUsersByIdsTestFixture()
     {
         GrpcChannel = GrpcChannel.ForAddress("http://localhost", new GrpcChannelOptions
@@ -20,6 +17,9 @@ public sealed class GetUsersByIdsTestFixture : TestFixtureBase
         });
     }
 
+    public GrpcChannel GrpcChannel { get; }
+    public Guid CreatedUserId { get; } = Guid.NewGuid();
+
     protected override void SeedTestData(ApplicationDbContext context)
     {
         base.SeedTestData(context);

CleanArchitecture.IntegrationTests/Infrastructure/CleanArchitectureWebApplicationFactory.cs

@@ -47,14 +47,14 @@ public sealed class CleanArchitectureWebApplicationFactory : WebApplicationFacto
             services.SetupTestDatabase<EventStoreDbContext>(_connection);
             services.SetupTestDatabase<DomainNotificationStoreDbContext>(_connection);
 
-            ServiceProvider sp = services.BuildServiceProvider();
+            var sp = services.BuildServiceProvider();
 
-            using IServiceScope scope = sp.CreateScope();
+            using var scope = sp.CreateScope();
-            IServiceProvider scopedServices = scope.ServiceProvider;
+            var scopedServices = scope.ServiceProvider;
 
-            ApplicationDbContext applicationDbContext = scopedServices.GetRequiredService<ApplicationDbContext>();
+            var applicationDbContext = scopedServices.GetRequiredService<ApplicationDbContext>();
-            EventStoreDbContext storeDbContext = scopedServices.GetRequiredService<EventStoreDbContext>();
+            var storeDbContext = scopedServices.GetRequiredService<EventStoreDbContext>();
-            DomainNotificationStoreDbContext domainStoreDbContext = scopedServices.GetRequiredService<DomainNotificationStoreDbContext>();
+            var domainStoreDbContext = scopedServices.GetRequiredService<DomainNotificationStoreDbContext>();
 
             applicationDbContext.EnsureMigrationsApplied();
 

CleanArchitecture.gRPC.Tests/Fixtures/TenantTestFixture.cs

@@ -10,24 +10,24 @@ namespace CleanArchitecture.gRPC.Tests.Fixtures;
 
 public sealed class TenantTestFixture
 {
-    public TenantsApiImplementation TenantsApiImplementation { get; }
-    private ITenantRepository TenantRepository { get; }
-    
-    public IEnumerable<Tenant> ExistingTenants { get; }
-
     public TenantTestFixture()
     {
         TenantRepository = Substitute.For<ITenantRepository>();
 
         ExistingTenants = new List<Tenant>
         {
-            new Tenant(Guid.NewGuid(), "Tenant 1"),
+            new(Guid.NewGuid(), "Tenant 1"),
-            new Tenant(Guid.NewGuid(), "Tenant 2"),
+            new(Guid.NewGuid(), "Tenant 2"),
-            new Tenant(Guid.NewGuid(), "Tenant 3"),
+            new(Guid.NewGuid(), "Tenant 3")
         };
 
         TenantRepository.GetAllNoTracking().Returns(ExistingTenants.BuildMock());
 
-        TenantsApiImplementation = new(TenantRepository);
+        TenantsApiImplementation = new TenantsApiImplementation(TenantRepository);
     }
+
+    public TenantsApiImplementation TenantsApiImplementation { get; }
+    private ITenantRepository TenantRepository { get; }
+
+    public IEnumerable<Tenant> ExistingTenants { get; }
 }

CleanArchitecture.gRPC/CleanArchitecture.cs

@@ -4,18 +4,15 @@ namespace CleanArchitecture.gRPC;
 
 public sealed class CleanArchitecture : ICleanArchitecture
 {
-    private readonly IUsersContext _users;
-    private readonly ITenantsContext _tenants;
-
-    public IUsersContext Users => _users;
-    public ITenantsContext Tenants => _tenants;
-
     public CleanArchitecture(
         IUsersContext users,
         ITenantsContext tenants)
     {
-        _users = users;
+        Users = users;
-        _tenants = tenants;
+        Tenants = tenants;
+    }
 
-    }
+    public IUsersContext Users { get; }
+
+    public ITenantsContext Tenants { get; }
 }