Minor fixes for model validation

MainProject/Models/Api/Common/User/AuthenticatedUser.cs

@@ -19,7 +19,7 @@ public class AuthenticatedUser
         FirstName = user.FirstName;
         LastName = user.LastName;
         Email = user.Email;
-        Role = new UserRole();
+        Role = new UserRole(user.Role!);
     }
 }
 

MainProject/Models/Api/Data/Auth/AuthenticateRequestData.cs

@@ -1,11 +1,13 @@
+using System.ComponentModel.DataAnnotations;
+
 namespace BasicDotnetTemplate.MainProject.Models.Api.Data.Auth;
 
 public class AuthenticateRequestData
 {
-#nullable enable
+    [Required(ErrorMessage = "Email is required")]
-    public string? Email { get; set; }
+    public required string Email { get; set; }
-    public string? Password { get; set; }
+    [Required(ErrorMessage = "Password is required")]
-#nullable disable
+    public required string Password { get; set; }
 }
 
 

MainProject/Models/Api/Request/Auth/AuthenticateRequest.cs

@@ -1,12 +1,12 @@
+using System.ComponentModel.DataAnnotations;
 using BasicDotnetTemplate.MainProject.Models.Api.Data.Auth;
 
 namespace BasicDotnetTemplate.MainProject.Models.Api.Request.Auth;
 
 public class AuthenticateRequest
 {
-#nullable enable
+    [Required(ErrorMessage = "Data is required")]
-    public AuthenticateRequestData? Data { get; set; }
+    public required AuthenticateRequestData Data { get; set; }
-#nullable disable
 }
 
 

MainProject/Models/Api/Request/Role/CreateRoleRequest.cs

@@ -1,10 +1,10 @@
+using System.ComponentModel.DataAnnotations;
 using BasicDotnetTemplate.MainProject.Models.Api.Data.Role;
 
 namespace BasicDotnetTemplate.MainProject.Models.Api.Request.Role;
 
 public class CreateRoleRequest
 {
-#nullable enable
+    [Required(ErrorMessage = "Data is required")]
-    public CreateRoleRequestData? Data { get; set; }
+    public required CreateRoleRequestData? Data { get; set; }
-#nullable disable
 }

MainProject/Models/Api/Request/User/CreateUserRequest.cs

@@ -1,12 +1,12 @@
+using System.ComponentModel.DataAnnotations;
 using BasicDotnetTemplate.MainProject.Models.Api.Data.User;
 
 namespace BasicDotnetTemplate.MainProject.Models.Api.Request.User;
 
 public class CreateUserRequest
 {
-#nullable enable
+    [Required(ErrorMessage = "Data is required")]
-    public CreateUserRequestData? Data { get; set; }
+    public required CreateUserRequestData Data { get; set; }
-#nullable disable
 }
 
 

MainProject/Models/Api/Request/User/UpdateUserRequest.cs

@@ -1,12 +1,12 @@
+using System.ComponentModel.DataAnnotations;
 using BasicDotnetTemplate.MainProject.Models.Api.Data.User;
 
 namespace BasicDotnetTemplate.MainProject.Models.Api.Request.User;
 
 public class UpdateUserRequest
 {
-#nullable enable
+    [Required(ErrorMessage = "Data is required")]
-    public UpdateUserRequestData? Data { get; set; }
+    public required UpdateUserRequestData Data { get; set; }
-#nullable disable
 }