cleanup

Author: HaikAsatryan

src/Pandatech.CleanArchitecture.Api/Configurations/Options/SwaggerOptions.cs

@@ -2,5 +2,5 @@
 
 public class SwaggerOptions
 {
-   public Dictionary<string, SwaggerVersionOptions> Versions { get; set; } = null!;
+   public required Dictionary<string, SwaggerVersionOptions> Versions { get; set; }
 }

src/Pandatech.CleanArchitecture.Api/Configurations/Options/SwaggerVersionOptions.cs

@@ -2,8 +2,8 @@
 
 public class SwaggerVersionOptions
 {
-   public string Title { get; set; } = null!;
-   public string Description { get; set; } = null!;
+   public required string Title { get; set; }
+   public required string Description { get; set; }
 
    public bool Separate { get; set; }
    public string? RoutePrefix { get; set; }

src/Pandatech.CleanArchitecture.Application/Features/Auth/Application/Auth/AuthQueryHandler.cs

@@ -38,7 +38,7 @@ public async Task Handle(AuthQuery request, CancellationToken cancellationToken)
       var tokenEntity = await unitOfWork.Tokens.GetTokenByAccessTokenAsync(accessTokenHash, cancellationToken);
 
       UnauthorizedException.ThrowIfNull(tokenEntity);
-      UnauthorizedException.ThrowIf(tokenEntity.User.Status is not UserStatus.Active);
+      UnauthorizedException.ThrowIf(tokenEntity.User!.Status is not UserStatus.Active);
       UnauthorizedException.ThrowIf(tokenEntity.AccessTokenExpiresAt <= DateTime.UtcNow,
          ErrorMessages.AccessTokenIsExpired);
 

src/Pandatech.CleanArchitecture.Application/Features/Auth/Application/RefreshToken/RefreshTokenCommandHandler.cs

@@ -48,7 +48,7 @@ private static void ValidateUserToken(Token? userToken, DateTime now)
    {
       NotFoundException.ThrowIfNull(userToken);
 
-      UnauthorizedException.ThrowIf(userToken.User.Status != UserStatus.Active,
+      UnauthorizedException.ThrowIf(userToken.User!.Status != UserStatus.Active,
          ErrorMessages.ThisUserIsNotAllowedToPerformThisAction);
 
       UnauthorizedException.ThrowIf(userToken.RefreshTokenExpiresAt < now, ErrorMessages.RefreshTokenExpired);

src/Pandatech.CleanArchitecture.Application/Features/Auth/Contracts/Auth/IdentityCookies.cs

@@ -2,8 +2,8 @@
 
 public class IdentityCookies
 {
-   public string AccessTokenSignature { get; set; } = null!;
-   public string RefreshTokenSignature { get; set; } = null!;
+   public required string AccessTokenSignature { get; set; }
+   public required string RefreshTokenSignature { get; set; }
    public DateTime AccessTokenExpiresAt { get; set; }
    public DateTime RefreshTokenExpiresAt { get; set; }
 }

src/Pandatech.CleanArchitecture.Application/Features/Auth/Contracts/Login/LoginCommandResponse.cs

@@ -10,9 +10,9 @@ public class LoginCommandResponse
 
    public bool ForcePasswordChange { get; set; }
    public UserRole UserRole { get; set; }
-   public string AccessTokenSignature { get; set; } = null!;
+   public required string AccessTokenSignature { get; set; }
    public DateTime AccessTokenExpiration { get; set; }
-   public string RefreshTokenSignature { get; set; } = null!;
+   public required string RefreshTokenSignature { get; set; }
    public DateTime RefreshTokenExpiration { get; set; }
 
    public static LoginCommandResponse MapFromEntity(CreateTokenCommandResponse token, UserRole userRole,

src/Pandatech.CleanArchitecture.Application/Features/Auth/Contracts/RefreshToken/RefreshTokenCommandResponse.cs

@@ -9,9 +9,9 @@ public class RefreshTokenCommandResponse
    [PropertyBaseConverter] public long UserId { get; set; }
    public bool ForcePasswordChange { get; set; }
    public UserRole UserRole { get; set; }
-   public string AccessTokenSignature { get; set; } = null!;
+   public required string AccessTokenSignature { get; set; }
    public DateTime AccessTokenExpiration { get; set; }
-   public string RefreshTokenSignature { get; set; } = null!;
+   public required string RefreshTokenSignature { get; set; }
    public DateTime RefreshTokenExpiration { get; set; }
 
    public static RefreshTokenCommandResponse MapFromTokenEntity(Token token,
@@ -20,7 +20,7 @@ public static RefreshTokenCommandResponse MapFromTokenEntity(Token token,
       return new RefreshTokenCommandResponse
       {
          UserId = token.UserId,
-         ForcePasswordChange = oldToken.User.ForcePasswordChange,
+         ForcePasswordChange = oldToken.User!.ForcePasswordChange,
          UserRole = oldToken.User.Role,
          AccessTokenSignature = accessTokenSignature,
          AccessTokenExpiration = token.AccessTokenExpiresAt,

src/Pandatech.CleanArchitecture.Application/Features/User/Application/Create/CreateUserCommandHandler.cs

@@ -24,7 +24,7 @@ public async Task Handle(CreateUserCommand request, CancellationToken cancellati
          FullName = request.FullName,
          PasswordHash = passwordHash,
          Role = request.UserRole,
-         Comment = request.Comment,
+         Comment = request.Comment ?? "",
          CreatedByUserId = requestContext.Identity.UserId
       };
       unitOfWork.Users.Add(user);

src/Pandatech.CleanArchitecture.Application/Features/User/Application/Delete/DeleteUsersCommand.cs

@@ -5,5 +5,5 @@ namespace Pandatech.CleanArchitecture.Application.Features.User.Application.Dele
 
 public class DeleteUsersCommand : ICommand
 {
-   [PropertyBaseConverter] public List<long> Ids { get; set; } = null!;
+   [PropertyBaseConverter] public required List<long> Ids { get; set; }
 }

src/Pandatech.CleanArchitecture.Application/Features/User/Application/Update/UpdateUserCommand.cs

@@ -8,8 +8,8 @@ public class UpdateUserCommand : ICommand
 {
    [JsonIgnore] public long Id { get; set; }
 
-   public string Username { get; set; } = null!;
-   public string FullName { get; set; } = null!;
+   public required string Username { get; set; }
+   public required string FullName { get; set; }
    public UserRole Role { get; set; }
    public string? Comment { get; set; }
 }