prtsie/schengen-visa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed issues

Browse Source
This commit is contained in:
prtsie
2024-08-29 13:18:35 +03:00
parent 4a6b8c902f
commit 8884bac7fd
9 changed files with 79 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
SchengenVisaApi/ApplicationLayer/Services/Applicants/Models/ApplicantModel.cs
View File

@@ -2,15 +2,14 @@
namespace ApplicationLayer.Services.Applicants.Models;
/// Model of
/// <see cref="Applicant" />
/// Model of <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; }

5
SchengenVisaApi/ApplicationLayer/Services/Users/IUsersService.cs
View File

@@ -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>

16
SchengenVisaApi/ApplicationLayer/Services/Users/Models/UserModel.cs Normal file
View File

@@ -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!;
}
}

11
SchengenVisaApi/ApplicationLayer/Services/Users/UsersService.cs
View File

@@ -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) =>
await users.GetAllOfRoleAsync(Role.ApprovingAuthority, cancellationToken);
async Task<List<UserModel>> IUsersService.GetAuthoritiesAccountsAsync(CancellationToken cancellationToken)
{
var userList = await users.GetAllOfRoleAsync(Role.ApprovingAuthority, cancellationToken);
return mapper.Map<List<UserModel>>(userList);
}
async Task IUsersService.ChangeAuthorityAuthDataAsync(ChangeUserAuthDataRequest request, CancellationToken cancellationToken)
{

17
SchengenVisaApi/Infrastructure/Automapper/Profiles/ApplicantProfile.cs
View File

@@ -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)
.ForMember(a => a.UserId, opts => opts.Ignore())
.ForMember(a => a.Name,
opts => opts.MapFrom(r => r.ApplicantName));
}
}
CreateMap<RegisterApplicantRequest, Applicant>(MemberList.Destination)
.ForMember(a => a.UserId, opts => opts.Ignore())
.ForMember(a => a.Name,
opts => opts.MapFrom(r => r.ApplicantName));
CreateMap<NameModel, Name>().ReverseMap();
CreateMap<PassportModel, Passport>().ReverseMap();
}
}

13
SchengenVisaApi/Infrastructure/Automapper/Profiles/PlaceOfWorkProfile.cs
View File

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

13
SchengenVisaApi/Infrastructure/Automapper/Profiles/UserProfile.cs
View File

@@ -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)
.ForMember(u => u.Role,
opts => opts.Ignore());
}
}
CreateMap<AuthData, User>(MemberList.Destination)
.ForMember(u => u.Role,
opts => opts.Ignore());
CreateMap<User, UserModel>(MemberList.Destination);
}
}

27
SchengenVisaApi/Infrastructure/Automapper/Profiles/VisaApplicationProfile.cs
View File

@@ -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)
.ForMember(model => model.Applicant,
opts => opts.Ignore());
CreateMap<VisaApplicationCreateRequest, VisaApplication>(MemberList.Destination)
.ForMember(va => va.RequestDate,
opts => opts.Ignore())
.ForMember(va => va.ApplicantId,
CreateMap<VisaApplication, VisaApplicationModelForAuthority>(MemberList.Destination)
.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<PastVisaModel, PastVisa>().ReverseMap();
CreateMap<PastVisitModel, PastVisit>().ReverseMap();
CreateMap<ReentryPermitModel, ReentryPermit>().ReverseMap();
CreateMap<PermissionToDestCountryModel, PermissionToDestCountry>().ReverseMap();
}
}

7
SchengenVisaApi/SchengenVisaApi/Controllers/UsersController.cs
View File

@@ -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);