From 2d7db3d91912a9a628d808b20abf5f44dfd35424 Mon Sep 17 00:00:00 2001
From: csimonapastore <c.simona.pastore@gmail.com>
Date: Thu, 19 Jun 2025 20:48:17 +0200
Subject: [PATCH] Minor fixes for model validation

---
 .../Models/Api/Common/User/AuthenticatedUser.cs        |  2 +-
 .../Models/Api/Data/Auth/AuthenticateRequestData.cs    | 10 ++++++----
 .../Models/Api/Request/Auth/AuthenticateRequest.cs     |  6 +++---
 .../Models/Api/Request/Role/CreateRoleRequest.cs       |  6 +++---
 .../Models/Api/Request/User/CreateUserRequest.cs       |  6 +++---
 .../Models/Api/Request/User/UpdateUserRequest.cs       |  6 +++---
 6 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/MainProject/Models/Api/Common/User/AuthenticatedUser.cs b/MainProject/Models/Api/Common/User/AuthenticatedUser.cs
index 1791717..e2b871a 100644
--- a/MainProject/Models/Api/Common/User/AuthenticatedUser.cs
+++ b/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!);
     }
 }
 
diff --git a/MainProject/Models/Api/Data/Auth/AuthenticateRequestData.cs b/MainProject/Models/Api/Data/Auth/AuthenticateRequestData.cs
index ef1c7c1..1e7801f 100644
--- a/MainProject/Models/Api/Data/Auth/AuthenticateRequestData.cs
+++ b/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
-    public string? Email { get; set; }
-    public string? Password { get; set; }
-#nullable disable
+    [Required(ErrorMessage = "Email is required")]
+    public required string Email { get; set; }
+    [Required(ErrorMessage = "Password is required")]
+    public required string Password { get; set; }
 }
 
 
diff --git a/MainProject/Models/Api/Request/Auth/AuthenticateRequest.cs b/MainProject/Models/Api/Request/Auth/AuthenticateRequest.cs
index f7a8e52..ecd9624 100644
--- a/MainProject/Models/Api/Request/Auth/AuthenticateRequest.cs
+++ b/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
-    public AuthenticateRequestData? Data { get; set; }
-#nullable disable
+    [Required(ErrorMessage = "Data is required")]
+    public required AuthenticateRequestData Data { get; set; }
 }
 
 
diff --git a/MainProject/Models/Api/Request/Role/CreateRoleRequest.cs b/MainProject/Models/Api/Request/Role/CreateRoleRequest.cs
index 3d2df0c..79c2c72 100644
--- a/MainProject/Models/Api/Request/Role/CreateRoleRequest.cs
+++ b/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
-    public CreateRoleRequestData? Data { get; set; }
-#nullable disable
+    [Required(ErrorMessage = "Data is required")]
+    public required CreateRoleRequestData? Data { get; set; }
 }
diff --git a/MainProject/Models/Api/Request/User/CreateUserRequest.cs b/MainProject/Models/Api/Request/User/CreateUserRequest.cs
index 36ba57c..09dfb41 100644
--- a/MainProject/Models/Api/Request/User/CreateUserRequest.cs
+++ b/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
-    public CreateUserRequestData? Data { get; set; }
-#nullable disable
+    [Required(ErrorMessage = "Data is required")]
+    public required CreateUserRequestData Data { get; set; }
 }
 
 
diff --git a/MainProject/Models/Api/Request/User/UpdateUserRequest.cs b/MainProject/Models/Api/Request/User/UpdateUserRequest.cs
index c2bf2df..7e9ee40 100644
--- a/MainProject/Models/Api/Request/User/UpdateUserRequest.cs
+++ b/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
-    public UpdateUserRequestData? Data { get; set; }
-#nullable disable
+    [Required(ErrorMessage = "Data is required")]
+    public required UpdateUserRequestData Data { get; set; }
 }