Fixed issues

SchengenVisaApi/ApplicationLayer/Services/Applicants/Models/ApplicantModel.cs

@@ -2,15 +2,14 @@
 
 namespace ApplicationLayer.Services.Applicants.Models;
 
-/// Model of
+/// Model of <see cref="Applicant" />
-/// <see cref="Applicant" />
 public class ApplicantModel
 {
     /// <inheritdoc cref="Applicant.Name" />
-    public Name Name { get; set; } = null!;
+    public NameModel Name { get; set; } = null!;
 
     /// <inheritdoc cref="Applicant.Passport" />
-    public Passport Passport { get; set; } = null!;
+    public PassportModel Passport { get; set; } = null!;
 
     /// <inheritdoc cref="Applicant.BirthDate" />
     public DateTime BirthDate { get; set; }
@@ -34,16 +33,16 @@ public class ApplicantModel
     public MaritalStatus MaritalStatus { get; set; }
 
     /// <inheritdoc cref="Applicant.FatherName" />
-    public Name FatherName { get; set; } = null!;
+    public NameModel FatherName { get; set; } = null!;
 
     /// <inheritdoc cref="Applicant.MotherName" />
-    public Name MotherName { get; set; } = null!;
+    public NameModel MotherName { get; set; } = null!;
 
     /// <inheritdoc cref="Applicant.JobTitle" />
     public string JobTitle { get; set; } = null!;
 
     /// <inheritdoc cref="Applicant.PlaceOfWork" />
-    public PlaceOfWork PlaceOfWork { get; set; } = null!;
+    public PlaceOfWorkModel PlaceOfWork { get; set; } = null!;
 
     /// <inheritdoc cref="Applicant.IsNonResident" />
     public bool IsNonResident { get; set; }

SchengenVisaApi/ApplicationLayer/Services/Users/IUsersService.cs

@@ -1,4 +1,5 @@
-using ApplicationLayer.Services.Users.Requests;
+using ApplicationLayer.Services.Users.Models;
+using ApplicationLayer.Services.Users.Requests;
 using Domains.Users;
 
 namespace ApplicationLayer.Services.Users;
@@ -8,7 +9,7 @@ public interface IUsersService
 {
     /// Returns all user accounts with role of approving authority
     /// <param name="cancellationToken">Cancellation token</param>
-    Task<List<User>> GetAuthoritiesAccountsAsync(CancellationToken cancellationToken);
+    Task<List<UserModel>> GetAuthoritiesAccountsAsync(CancellationToken cancellationToken);
 
     /// Changes authentication data for an authority account
     /// <param name="request"> Request object with identifier of user and new authentication data</param>

SchengenVisaApi/ApplicationLayer/Services/Users/Models/UserModel.cs

@@ -0,0 +1,16 @@
+using System.ComponentModel.DataAnnotations;
+using Domains;
+
+namespace ApplicationLayer.Services.Users.Models
+{
+    public class UserModel
+    {
+        /// Unique Identifier of user
+        [Required]
+        public Guid Id { get; private set; } = Guid.NewGuid();
+
+        [Required]
+        [MaxLength(ConfigurationConstraints.EmailLength)]
+        public string Email { get; set; } = null!;
+    }
+}

SchengenVisaApi/ApplicationLayer/Services/Users/UsersService.cs

@@ -2,15 +2,20 @@
 using ApplicationLayer.Services.AuthServices.Common;
 using ApplicationLayer.Services.AuthServices.NeededServices;
 using ApplicationLayer.Services.Users.Exceptions;
+using ApplicationLayer.Services.Users.Models;
 using ApplicationLayer.Services.Users.Requests;
+using AutoMapper;
 using Domains.Users;
 
 namespace ApplicationLayer.Services.Users;
 
-public class UsersService(IUsersRepository users, IUnitOfWork unitOfWork) : IUsersService
+public class UsersService(IMapper mapper, IUsersRepository users, IUnitOfWork unitOfWork) : IUsersService
 {
-    async Task<List<User>> IUsersService.GetAuthoritiesAccountsAsync(CancellationToken cancellationToken) =>
+    async Task<List<UserModel>> IUsersService.GetAuthoritiesAccountsAsync(CancellationToken cancellationToken)
-        await users.GetAllOfRoleAsync(Role.ApprovingAuthority, cancellationToken);
+    {
+        var userList = await users.GetAllOfRoleAsync(Role.ApprovingAuthority, cancellationToken);
+        return mapper.Map<List<UserModel>>(userList);
+    }
 
     async Task IUsersService.ChangeAuthorityAuthDataAsync(ChangeUserAuthDataRequest request, CancellationToken cancellationToken)
     {

SchengenVisaApi/Infrastructure/Automapper/Profiles/ApplicantProfile.cs

@@ -9,11 +9,14 @@ public class ApplicantProfile : Profile
 {
     public ApplicantProfile()
     {
-            CreateMap<Applicant, ApplicantModel>(MemberList.Destination);
+        CreateMap<Applicant, ApplicantModel>(MemberList.Destination).ReverseMap();
 
-            CreateMap<RegisterApplicantRequest, Applicant>(MemberList.Destination)
+        CreateMap<RegisterApplicantRequest, Applicant>(MemberList.Destination)
-                .ForMember(a => a.UserId, opts => opts.Ignore())
+            .ForMember(a => a.UserId, opts => opts.Ignore())
-                .ForMember(a => a.Name,
+            .ForMember(a => a.Name,
-                    opts => opts.MapFrom(r => r.ApplicantName));
+                opts => opts.MapFrom(r => r.ApplicantName));
-        }
+
-}
+        CreateMap<NameModel, Name>().ReverseMap();
+        CreateMap<PassportModel, Passport>().ReverseMap();
+    }
+}

SchengenVisaApi/Infrastructure/Automapper/Profiles/PlaceOfWorkProfile.cs

@@ -8,8 +8,11 @@ public class PlaceOfWorkProfile : Profile
 {
     public PlaceOfWorkProfile()
     {
-            CreateMap<PlaceOfWorkModel, PlaceOfWork>(MemberList.Destination)
+        CreateMap<PlaceOfWorkModel, PlaceOfWork>(MemberList.Destination)
-                .ForMember(p => p.Id,
+            .ForMember(p => p.Id,
-                    opts => opts.UseDestinationValue());
+                opts => opts.UseDestinationValue())
-        }
+            .ReverseMap();
-}
+
+        CreateMap<AddressModel, Address>().ReverseMap();
+    }
+}

SchengenVisaApi/Infrastructure/Automapper/Profiles/UserProfile.cs

@@ -1,4 +1,5 @@
 using ApplicationLayer.Services.AuthServices.Common;
+using ApplicationLayer.Services.Users.Models;
 using AutoMapper;
 using Domains.Users;
 
@@ -8,8 +9,10 @@ public class UserProfile : Profile
 {
     public UserProfile()
     {
-            CreateMap<AuthData, User>(MemberList.Destination)
+        CreateMap<AuthData, User>(MemberList.Destination)
-                .ForMember(u => u.Role,
+            .ForMember(u => u.Role,
-                    opts => opts.Ignore());
+                opts => opts.Ignore());
-        }
+
-}
+        CreateMap<User, UserModel>(MemberList.Destination);
+    }
+}

SchengenVisaApi/Infrastructure/Automapper/Profiles/VisaApplicationProfile.cs

@@ -9,16 +9,21 @@ public class VisaApplicationProfile : Profile
 {
     public VisaApplicationProfile()
     {
-            CreateMap<VisaApplication, VisaApplicationModelForApplicant>(MemberList.Destination);
+        CreateMap<VisaApplication, VisaApplicationModelForApplicant>(MemberList.Destination);
 
-            CreateMap<VisaApplication, VisaApplicationModelForAuthority>(MemberList.Destination)
+        CreateMap<VisaApplication, VisaApplicationModelForAuthority>(MemberList.Destination)
-                .ForMember(model => model.Applicant,
+            .ForMember(model => model.Applicant,
-                    opts => opts.Ignore());
-
-            CreateMap<VisaApplicationCreateRequest, VisaApplication>(MemberList.Destination)
-                .ForMember(va => va.RequestDate,
-                opts => opts.Ignore())
-                .ForMember(va => va.ApplicantId,
                 opts => opts.Ignore());
-        }
+
-}
+        CreateMap<VisaApplicationCreateRequest, VisaApplication>(MemberList.Destination)
+            .ForMember(va => va.RequestDate,
+                opts => opts.Ignore())
+            .ForMember(va => va.ApplicantId,
+                opts => opts.Ignore());
+
+        CreateMap<PastVisaModel, PastVisa>().ReverseMap();
+        CreateMap<PastVisitModel, PastVisit>().ReverseMap();
+        CreateMap<ReentryPermitModel, ReentryPermit>().ReverseMap();
+        CreateMap<PermissionToDestCountryModel, PermissionToDestCountry>().ReverseMap();
+    }
+}

SchengenVisaApi/SchengenVisaApi/Controllers/UsersController.cs

@@ -20,7 +20,8 @@ public class UsersController(
     ILoginService loginService,
     IUsersService usersService,
     IValidator<RegisterApplicantRequest> registerApplicantRequestValidator,
-    IValidator<AuthData> authDataValidator) : ControllerBase
+    IValidator<AuthData> authDataValidator,
+    IValidator<RegisterRequest> registerRequestValidator) : ControllerBase
 {
     /// <summary> Adds applicant with user account </summary>
     [HttpPost("register")]
@@ -46,7 +47,7 @@ public class UsersController(
     [Authorize(policy: PolicyConstants.AdminPolicy)]
     public async Task<IActionResult> RegisterAuthority(RegisterRequest request, CancellationToken cancellationToken)
     {
-        await authDataValidator.ValidateAndThrowAsync(request.AuthData, cancellationToken);
+        await registerRequestValidator.ValidateAndThrowAsync(request, cancellationToken);
 
         await registerService.RegisterAuthority(request, cancellationToken);
         return Ok();
@@ -56,7 +57,7 @@ public class UsersController(
     [HttpGet("login")]
     [ProducesResponseType<string>(StatusCodes.Status200OK)]
     [ProducesResponseType(StatusCodes.Status403Forbidden)]
-    public async Task<IActionResult> Login(LoginRequest request, CancellationToken cancellationToken)
+    public async Task<IActionResult> Login([FromQuery] LoginRequest request, CancellationToken cancellationToken)
     {
         var result = await loginService.LoginAsync(request, cancellationToken);
         return Ok(result);