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

request of applications for applicant

Browse Source
This commit is contained in:
prtsie
2024-08-20 16:28:43 +03:00
parent 57a69c09f3
commit d7921087ab
12 changed files with 136 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SchengenVisaApi/ApplicationLayer/GeneralNeededServices/IDateTimeProvider.cs
View File

@@ -1,7 +1,7 @@
namespace ApplicationLayer.GeneralNeededServices
{
public interface IDateTimeProvider
{
{//todo rename folder
/// Returns current date and time
DateTime Now();
}

3
SchengenVisaApi/ApplicationLayer/Services/Applicants/NeededServices/IApplicantsRepository.cs
View File

@@ -8,4 +8,7 @@ public interface IApplicantsRepository : IGenericRepository<Applicant>
{
/// Find <see cref="Applicant"/> by Identifier
Task<Applicant> FindByUserIdAsync(Guid userId, CancellationToken cancellationToken);
/// Get identifier of applicant by user identifier
Task<Guid> GetApplicantIdByUserId(Guid userId, CancellationToken cancellationToken);
}

6
SchengenVisaApi/ApplicationLayer/Services/VisaApplications/Handlers/IVisaApplicationRequestsHandler.cs
View File

@@ -1,4 +1,5 @@
using ApplicationLayer.Services.VisaApplications.Requests;
using ApplicationLayer.Services.VisaApplications.Models;
using ApplicationLayer.Services.VisaApplications.Requests;
using Domains.VisaApplicationDomain;
namespace ApplicationLayer.Services.VisaApplications.Handlers;
@@ -6,6 +7,7 @@ namespace ApplicationLayer.Services.VisaApplications.Handlers;
public interface IVisaApplicationRequestsHandler
{
Task<List<VisaApplication>> Get(CancellationToken cancellationToken);
Task<List<VisaApplicationModelForApplicant>> GetForApplicant(Guid userId, CancellationToken cancellationToken);
void HandleCreateRequest(Guid userId, VisaApplicationCreateRequest request, CancellationToken cancellationToken);
Task HandleCreateRequest(Guid userId, VisaApplicationCreateRequest request, CancellationToken cancellationToken);
}

31
SchengenVisaApi/ApplicationLayer/Services/VisaApplications/Handlers/VisaApplicationRequestsHandler.cs
View File

@@ -17,7 +17,28 @@ public class VisaApplicationRequestsHandler(
{
public async Task<List<VisaApplication>> Get(CancellationToken cancellationToken) => await applications.GetAllAsync(cancellationToken);
public async void HandleCreateRequest(Guid userId, VisaApplicationCreateRequest request, CancellationToken cancellationToken)
public async Task<List<VisaApplicationModelForApplicant>> GetForApplicant(Guid userId, CancellationToken cancellationToken)
{
//todo mapper
var applicantId = await applicants.GetApplicantIdByUserId(userId, cancellationToken);
var visaApplications = await applications.GetOfApplicantAsync(applicantId, cancellationToken);
return visaApplications.Select(va => new VisaApplicationModelForApplicant
{
DestinationCountry = va.DestinationCountry.Name,
ValidDaysRequested = va.ValidDaysRequested,
ReentryPermit = va.ReentryPermit,
VisaCategory = va.VisaCategory,
RequestedNumberOfEntries = va.RequestedNumberOfEntries,
PermissionToDestCountry = va.PermissionToDestCountry,
ForGroup = va.ForGroup,
PastVisas = va.PastVisas,
RequestDate = va.RequestDate,
PastVisits = va.PastVisits.Select(pv =>
new PastVisitModel { DestinationCountry = pv.DestinationCountry.Name, StartDate = pv.StartDate, EndDate = pv.EndDate }).ToList()
}).ToList();
}
public async Task HandleCreateRequest(Guid userId, VisaApplicationCreateRequest request, CancellationToken cancellationToken)
{
//TODO fix
//TODO mapper
@@ -45,13 +66,13 @@ public class VisaApplicationRequestsHandler(
await unitOfWork.SaveAsync(cancellationToken);
}
private async Task<PastVisit> ConvertPastVisitModelToPastVisit(PastVisitModel model, CancellationToken cancellationToken)
private async Task<PastVisit> ConvertPastVisitModelToPastVisit(PastVisitModelForRequest modelForRequest, CancellationToken cancellationToken)
{
return new PastVisit
{
DestinationCountry = await countries.GetByIdAsync(model.DestinationCountryId, cancellationToken),
StartDate = model.StartDate,
EndDate = model.EndDate
DestinationCountry = await countries.GetByIdAsync(modelForRequest.DestinationCountryId, cancellationToken),
StartDate = modelForRequest.StartDate,
EndDate = modelForRequest.EndDate
};
}
}

14
SchengenVisaApi/ApplicationLayer/Services/VisaApplications/Models/PastVisitModel.cs
View File

@@ -1,14 +1,18 @@
namespace ApplicationLayer.Services.VisaApplications.Models
using Domains.LocationDomain;
using Domains.VisaApplicationDomain;
namespace ApplicationLayer.Services.VisaApplications.Models
{
/// Model of <see cref="PastVisit"/> with only name of the destination country
public class PastVisitModel
{
/// First day of <see cref="PastVisitModel"/>
/// <inheritdoc cref="PastVisit.StartDate"/>
public DateTime StartDate { get; set; }
/// Last day of <see cref="PastVisitModel"/>
/// <inheritdoc cref="PastVisit.EndDate"/>
public DateTime EndDate { get; set; }
/// Identifier of destination country of <see cref="PastVisitModel"/>
public Guid DestinationCountryId { get; set; }
/// <inheritdoc cref="PastVisit.DestinationCountry"/>
public string DestinationCountry { get; set; } = null!;
}
}

17
SchengenVisaApi/ApplicationLayer/Services/VisaApplications/Models/PastVisitModelForRequest.cs Normal file
View File

@@ -0,0 +1,17 @@
using Domains.VisaApplicationDomain;
namespace ApplicationLayer.Services.VisaApplications.Models
{
/// Model of <see cref="PastVisit"/> with only identifier of country
public class PastVisitModelForRequest
{
/// First day of <see cref="PastVisitModelForRequest"/>
public DateTime StartDate { get; set; }
/// Last day of <see cref="PastVisitModelForRequest"/>
public DateTime EndDate { get; set; }
/// Identifier of destination country of <see cref="PastVisitModelForRequest"/>
public Guid DestinationCountryId { get; set; }
}
}

40
SchengenVisaApi/ApplicationLayer/Services/VisaApplications/Models/VisaApplicationModelForApplicant.cs Normal file
View File

@@ -0,0 +1,40 @@
using Domains.ApplicantDomain;
using Domains.LocationDomain;
using Domains.VisaApplicationDomain;
namespace ApplicationLayer.Services.VisaApplications.Models
{
/// Model of <see cref="VisaApplication"/>
public class VisaApplicationModelForApplicant
{
/// <inheritdoc cref="VisaApplication.ReentryPermit"/>
public ReentryPermit? ReentryPermit { get; set; }
/// <inheritdoc cref="VisaApplication.DestinationCountry"/>
public string DestinationCountry { get; set; } = null!;
/// <inheritdoc cref="VisaApplication.PastVisas"/>
public List<PastVisa> PastVisas { get; set; } = null!;
/// <inheritdoc cref="VisaApplication.PermissionToDestCountry"/>
public PermissionToDestCountry? PermissionToDestCountry { get; set; }
public List<PastVisitModel> PastVisits { get; set; } = null!;
/// <inheritdoc cref="VisaApplication.VisaCategory"/>
public VisaCategory VisaCategory { get; set; }
/// <inheritdoc cref="VisaApplication.ForGroup"/>
public bool ForGroup { get; set; }
/// <inheritdoc cref="VisaApplication.RequestedNumberOfEntries"/>
public RequestedNumberOfEntries RequestedNumberOfEntries { get; set; }
/// <inheritdoc cref="VisaApplication.RequestDate"/>
public DateTime RequestDate { get; set; }
/// <inheritdoc cref="VisaApplication.ValidDaysRequested"/>
public int ValidDaysRequested { get; set; }
}
}

6
SchengenVisaApi/ApplicationLayer/Services/VisaApplications/NeededServices/IVisaApplicationsRepository.cs
View File

@@ -3,4 +3,8 @@ using Domains.VisaApplicationDomain;
namespace ApplicationLayer.Services.VisaApplications.NeededServices;
public interface IVisaApplicationsRepository : IGenericRepository<VisaApplication>;
public interface IVisaApplicationsRepository : IGenericRepository<VisaApplication>
{
/// Get applications of one applicant
Task<List<VisaApplication>> GetOfApplicantAsync(Guid applicantId, CancellationToken cancellationToken);
}

2
SchengenVisaApi/ApplicationLayer/Services/VisaApplications/Requests/VisaApplicationCreateRequest.cs
View File

@@ -13,5 +13,5 @@ public record VisaApplicationCreateRequest(
int ValidDaysRequested,
PastVisa[] PastVisas,
PermissionToDestCountry? PermissionToDestCountry,
PastVisitModel[] PastVisits
PastVisitModelForRequest[] PastVisits
);

6
SchengenVisaApi/Infrastructure/Database/Applicants/Repositories/ApplicantsRepository.cs
View File

@@ -25,4 +25,10 @@ public sealed class ApplicantsRepository(IGenericReader reader, IGenericWriter w
var result = await LoadDomain().SingleOrDefaultAsync(a => a.UserId == userId, cancellationToken);
return result ?? throw new ApplicantNotFoundByUserIdException(userId);
}
async Task<Guid> IApplicantsRepository.GetApplicantIdByUserId(Guid userId, CancellationToken cancellationToken)
{
var result = await base.LoadDomain().SingleOrDefaultAsync(a => a.UserId == userId, cancellationToken);
return result?.Id ?? throw new ApplicantNotFoundByUserIdException(userId);
}
}

14
SchengenVisaApi/Infrastructure/Database/VisaApplications/Repositories/VisaApplicationsRepository.cs
View File

@@ -9,10 +9,12 @@ public sealed class VisaApplicationsRepository(IGenericReader reader, IGenericWr
: GenericRepository<VisaApplication>(reader, writer), IVisaApplicationsRepository
{
protected override IQueryable<VisaApplication> LoadDomain()
{
return base.LoadDomain()
.Include(a => a.DestinationCountry)
.Include(a => a.PastVisas)
.Include(a => a.PastVisits);
}
=> base.LoadDomain()
.Include(va => va.DestinationCountry)
.Include(va => va.PastVisas)
.Include(va => va.PastVisits);
async Task<List<VisaApplication>> IVisaApplicationsRepository.GetOfApplicantAsync(Guid applicantId, CancellationToken cancellationToken)
=> await LoadDomain().Where(va => va.ApplicantId == applicantId).ToListAsync(cancellationToken);
}

19
SchengenVisaApi/SchengenVisaApi/Controllers/VisaApplicationController.cs
View File

@@ -19,11 +19,24 @@ public class VisaApplicationController(IVisaApplicationRequestsHandler visaAppli
return Ok(result);
}
[HttpGet]
[Authorize(policy: PolicyConstants.ApplicantPolicy)]
[Route("OfApplicant")]
public async Task<IActionResult> GetForApplicant(CancellationToken cancellationToken)
{
var userId = GetUserId();
var result = await visaApplicationRequestsHandler.GetForApplicant(userId, cancellationToken);
return Ok(result);
}
[HttpPost]
[Authorize(policy: PolicyConstants.ApplicantPolicy)]
public void Create(VisaApplicationCreateRequest request, CancellationToken cancellationToken)
public async Task<IActionResult> Create(VisaApplicationCreateRequest request, CancellationToken cancellationToken)
{
var userId = Guid.Parse(HttpContext.User.Claims.First(c => c.Type == ClaimTypes.NameIdentifier).Value);
visaApplicationRequestsHandler.HandleCreateRequest(userId, request, cancellationToken);
var userId = GetUserId();
await visaApplicationRequestsHandler.HandleCreateRequest(userId, request, cancellationToken);
return Created();
}
private Guid GetUserId() => Guid.Parse(HttpContext.User.Claims.First(c => c.Type == ClaimTypes.NameIdentifier).Value);
}