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

Refactored and fixed errors

Browse Source
This commit is contained in:
prtsie
2024-08-15 23:42:18 +03:00
parent 72924fb037
commit 026a104131
21 changed files with 165 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
SchengenVisaApi/ApplicationLayer/Applicants/IApplicantsRepository.cs → SchengenVisaApi/ApplicationLayer/Applicants/NeededServices/IApplicantsRepository.cs
View File

@@ -1,7 +1,7 @@
using ApplicationLayer.Common;
using ApplicationLayer.GeneralNeededServices;
using Domains.ApplicantDomain;
namespace ApplicationLayer.Applicants;
namespace ApplicationLayer.Applicants.NeededServices;
/// Repository pattern for <see cref="Applicant"/>
public interface IApplicantsRepository : IGenericRepository<Applicant> { }

4
SchengenVisaApi/ApplicationLayer/ApplicationLayer.csproj
View File

@@ -10,4 +10,8 @@
<ProjectReference Include="..\Domains\Domains.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0-preview.7.24405.7" />
</ItemGroup>
</Project>

16
SchengenVisaApi/ApplicationLayer/DependencyInjection.cs Normal file
View File

@@ -0,0 +1,16 @@
using ApplicationLayer.VisaApplications.Handlers;
using Microsoft.Extensions.DependencyInjection;
namespace ApplicationLayer;
/// Provides methods to add services to DI-container
public static class DependencyInjection
{
/// Add services for Application layer
public static IServiceCollection AddApplicationLayer(this IServiceCollection services)
{
services.AddScoped<IVisaApplicationsRequestHandler, VisaApplicationRequestsHandler>();
return services;
}
}

4
SchengenVisaApi/ApplicationLayer/Common/IGenericRepository.cs → SchengenVisaApi/ApplicationLayer/GeneralNeededServices/IGenericRepository.cs
View File

@@ -1,6 +1,6 @@
using Domains;
namespace ApplicationLayer.Common;
namespace ApplicationLayer.GeneralNeededServices;
/// <summary>
/// Generic repository pattern
@@ -15,7 +15,7 @@ public interface IGenericRepository<T> where T : class, IEntity
/// Get one entity with specific id
/// <param name="id">Identifier of entity</param>
/// <param name="cancellationToken">Cancellation token</param>
Task<T> GetOneAsync(Guid id, CancellationToken cancellationToken);
Task<T> GetByIdAsync(Guid id, CancellationToken cancellationToken);
/// Add entity to storage
/// <param name="entity">Entity to add</param>

14
SchengenVisaApi/ApplicationLayer/Locations/ICitiesRepository.cs
View File

@@ -1,14 +0,0 @@
using ApplicationLayer.Common;
using Domains.LocationDomain;
namespace ApplicationLayer.Locations;
public interface ICitiesRepository : IGenericRepository<City>
{
/// Find the city by its name and its country name
/// <param name="name">City's name</param>
/// <param name="countryName">City's country name</param>
/// <param name="cancellationToken">Cancellation token</param>
/// <returns>City with specific name and country</returns>
Task<City> GetByNameAsync(string name, string countryName, CancellationToken cancellationToken);
}

6
SchengenVisaApi/ApplicationLayer/Locations/NeededServices/ICitiesRepository.cs Normal file
View File

@@ -0,0 +1,6 @@
using ApplicationLayer.GeneralNeededServices;
using Domains.LocationDomain;
namespace ApplicationLayer.Locations.NeededServices;
public interface ICitiesRepository : IGenericRepository<City> { }

4
SchengenVisaApi/ApplicationLayer/Locations/ICountriesRepository.cs → SchengenVisaApi/ApplicationLayer/Locations/NeededServices/ICountriesRepository.cs
View File

@@ -1,6 +1,6 @@
using ApplicationLayer.Common;
using ApplicationLayer.GeneralNeededServices;
using Domains.LocationDomain;
namespace ApplicationLayer.Locations;
namespace ApplicationLayer.Locations.NeededServices;
public interface ICountriesRepository : IGenericRepository<Country> { }

11
SchengenVisaApi/ApplicationLayer/VisaApplications/Handlers/IVisaApplicationsRequestHandler.cs Normal file
View File

@@ -0,0 +1,11 @@
using ApplicationLayer.VisaApplications.Requests;
using Domains.VisaApplicationDomain;
namespace ApplicationLayer.VisaApplications.Handlers;
public interface IVisaApplicationsRequestHandler
{
Task<List<VisaApplication>> Get(CancellationToken cancellationToken);
void HandleCreateRequest(VisaApplicationCreateRequest request, CancellationToken cancellationToken);
}

80
SchengenVisaApi/ApplicationLayer/VisaApplications/Handlers/VisaApplicationRequestsHandler.cs
View File

@@ -1,14 +1,78 @@
using ApplicationLayer.Applicants;
using ApplicationLayer.Locations.NeededServices;
using ApplicationLayer.VisaApplications.Models;
using ApplicationLayer.VisaApplications.NeededServices;
using ApplicationLayer.VisaApplications.Requests;
using Domains.ApplicantDomain;
using Domains.VisaApplicationDomain;
namespace ApplicationLayer.VisaApplications.Handlers
namespace ApplicationLayer.VisaApplications.Handlers;
/// Handles visa requests
public class VisaApplicationRequestsHandler(
IVisaApplicationsRepository applications,
ICitiesRepository cities,
ICountriesRepository countries) : IVisaApplicationsRequestHandler
{
/// Handles visa requests
public class VisaApplicationRequestsHandler(IApplicantsRepository)
{
public void HandleCreateRequest(CreateVisaApplicationRequest request)
{
public async Task<List<VisaApplication>> Get(CancellationToken cancellationToken) => await applications.GetAllAsync(cancellationToken);
}
public async void HandleCreateRequest(VisaApplicationCreateRequest request, CancellationToken cancellationToken)
{
//TODO mapper
var cityOfBirth = await cities.GetByIdAsync(request.BirthCityId, cancellationToken);
var cityOfWork = await cities.GetByIdAsync(request.PlaceOfWork.Address.CityId, cancellationToken);
var addressOfWork = new Address
{
City = cityOfWork,
Country = cityOfWork.Country,
Building = request.PlaceOfWork.Address.Building,
Street = request.PlaceOfWork.Address.Street
};
var applicant = new Applicant
{
MaritalStatus = request.MaritalStatus,
Name = request.FullName,
Passport = request.Passport,
Gender = request.Gender,
Citizenship = request.CitizenShip,
BirthDate = request.BirthDate,
FatherName = request.FatherName,
JobTitle = request.JobTitle,
MotherName = request.MotherName,
CitizenshipByBirth = request.CitizenshipByBirth,
CityOfBirth = cityOfBirth,
CountryOfBirth = cityOfBirth.Country,
IsNonResident = request.IsNonResident,
PlaceOfWork = new PlaceOfWork { Address = addressOfWork, Name = request.PlaceOfWork.Name, PhoneNum = request.PlaceOfWork.PhoneNum }
};
var pastVisits = request.PastVisits.Select(m => ConvertPastVisitModelToPastVisit(m, cancellationToken).Result).ToList();
var visaApplication = new VisaApplication
{
Applicant = applicant,
RequestedNumberOfEntries = request.RequestedNumberOfEntries,
ValidDaysRequested = request.ValidDaysRequested,
ReentryPermit = request.ReentryPermit,
VisaCategory = request.VisaCategory,
PermissionToDestCountry = request.PermissionToDestCountry,
DestinationCountry = await countries.GetByIdAsync(request.DestinationCountryId, cancellationToken),
PastVisas = request.PastVisas.ToList(),
PastVisits = pastVisits,
ForGroup = request.IsForGroup,
RequestDate = DateTime.Today
};
await applications.AddAsync(visaApplication, cancellationToken);
}
private async Task<PastVisit> ConvertPastVisitModelToPastVisit(PastVisitModel model, CancellationToken cancellationToken)
{
return new PastVisit
{
DestinationCountry = await countries.GetByIdAsync(model.DestinationCountryId, cancellationToken),
StartDate = model.StartDate,
EndDate = model.EndDate
};
}
}

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

@@ -1,6 +0,0 @@
using ApplicationLayer.Common;
using Domains.VisaApplicationDomain;
namespace ApplicationLayer.VisaApplications;
public interface IVisaApplicationsRepository : IGenericRepository<VisaApplication> { }

5
SchengenVisaApi/ApplicationLayer/VisaApplications/Models/AddressModel.cs
View File

@@ -2,11 +2,8 @@
public class AddressModel
{
/// Country part of address
public string Country { get; set; } = null!;
/// City part of address
public string City { get; set; } = null!;
public Guid CityId { get; set; }
/// Street part of address
public string Street { get; set; } = null!;

14
SchengenVisaApi/ApplicationLayer/VisaApplications/Models/PastVisitModel.cs Normal file
View File

@@ -0,0 +1,14 @@
namespace ApplicationLayer.VisaApplications.Models
{
public class PastVisitModel
{
/// First day of <see cref="PastVisitModel"/>
public DateTime StartDate { get; set; }
/// Last day of <see cref="PastVisitModel"/>
public DateTime EndDate { get; set; }
/// Identifier of destination country of <see cref="PastVisitModel"/>
public Guid DestinationCountryId { get; set; }
}
}

6
SchengenVisaApi/ApplicationLayer/VisaApplications/NeededServices/IVisaApplicationsRepository.cs Normal file
View File

@@ -0,0 +1,6 @@
using ApplicationLayer.GeneralNeededServices;
using Domains.VisaApplicationDomain;
namespace ApplicationLayer.VisaApplications.NeededServices;
public interface IVisaApplicationsRepository : IGenericRepository<VisaApplication> { }

9
SchengenVisaApi/ApplicationLayer/VisaApplications/Requests/CreateVisaApplicationRequest.cs → SchengenVisaApi/ApplicationLayer/VisaApplications/Requests/VisaApplicationCreateRequest.cs
View File

@@ -5,12 +5,11 @@ using Domains.VisaApplicationDomain;
namespace ApplicationLayer.VisaApplications.Requests;
/// Model of visa request from user
public record CreateVisaApplicationRequest(
public record VisaApplicationCreateRequest(
Name FullName,
Passport Passport,
DateTime BirthDate,
string BirthCity,
string BirthCountry,
Guid BirthCityId,
string CitizenShip,
string CitizenshipByBirth,
Gender Gender,
@@ -21,12 +20,12 @@ public record CreateVisaApplicationRequest(
ReentryPermit ReentryPermit,
string JobTitle,
PlaceOfWorkModel PlaceOfWork,
string DestinationCountry,
Guid DestinationCountryId,
VisaCategory VisaCategory,
bool IsForGroup,
RequestedNumberOfEntries RequestedNumberOfEntries,
int ValidDaysRequested,
PastVisa[] PastVisas,
PermissionToDestCountry? PermissionToDestCountry,
PastVisit[] PastVisits
PastVisitModel[] PastVisits
);

4
SchengenVisaApi/Domains/ApplicantDomain/Applicant.cs
View File

@@ -1,5 +1,4 @@
using Domains.LocationDomain;
using Domains.VisaApplicationDomain;
namespace Domains.ApplicantDomain;
@@ -50,7 +49,4 @@ public class Applicant : IEntity
/// Is <see cref="Applicant"/> a non-resident
public bool IsNonResident { get; set; }
/// List of <see cref="Applicant"/>'s applications
public List<VisaApplication> VisaApplications { get; set; } = null!;
}

4
SchengenVisaApi/Domains/VisaApplicationDomain/PastVisit.cs
View File

@@ -1,4 +1,5 @@
using Domains.ApplicantDomain;
using Domains.LocationDomain;
namespace Domains.VisaApplicationDomain;
@@ -11,4 +12,7 @@ public class PastVisit
/// Last day of <see cref="PastVisit"/>
public DateTime EndDate { get; set; }
/// Destination country of <see cref="PastVisit"/>
public Country DestinationCountry { get; set; } = null!;
}

8
SchengenVisaApi/Infrastructure/DependencyInjection.cs
View File

@@ -1,6 +1,6 @@
using ApplicationLayer.Applicants;
using ApplicationLayer.Locations;
using ApplicationLayer.VisaApplications;
using ApplicationLayer.Applicants.NeededServices;
using ApplicationLayer.Locations.NeededServices;
using ApplicationLayer.VisaApplications.NeededServices;
using Infrastructure.Database;
using Infrastructure.Database.Applicants.Repositories;
using Infrastructure.Database.Generic;
@@ -20,7 +20,7 @@ public static class DependencyInjection
public static IServiceCollection AddInfrastructure(this IServiceCollection services)
{
//TODO строка подключения
services.AddDbContext<DbContext>(opts =>
services.AddDbContextFactory<DbContext>(opts =>
opts.UseSqlServer("Data Source=(localdb)\\MSSQLLocalDB;Initial Catalog=visadb;Integrated Security=True;"));
services.AddScoped<IGenericReader>(serviceProvider => serviceProvider.GetRequiredService<DbContext>());

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

@@ -1,3 +1,4 @@
using ApplicationLayer.VisaApplications.Handlers;
using ApplicationLayer.VisaApplications.Requests;
using Microsoft.AspNetCore.Mvc;
@@ -5,17 +6,18 @@ namespace SchengenVisaApi.Controllers;
[ApiController]
[Route("[controller]")]
public class VisaApplicationController : ControllerBase
public class VisaApplicationController(IVisaApplicationsRequestHandler visaApplicationsRequestHandler) : ControllerBase
{
public VisaApplicationController()
[HttpGet]
public async Task<IActionResult> Get(CancellationToken cancellationToken)
{
}
var result = await visaApplicationsRequestHandler.Get(cancellationToken);
return Ok(result);
}
[HttpPost]
public void Create(CreateVisaApplicationRequest request)
public void Create(VisaApplicationCreateRequest request, CancellationToken cancellationToken)
{
throw new NotImplementedException();
}
visaApplicationsRequestHandler.HandleCreateRequest(request, cancellationToken);
}
}

2
SchengenVisaApi/SchengenVisaApi/DependencyInjection.cs
View File

@@ -1,4 +1,5 @@
using System.Reflection;
using ApplicationLayer;
using Infrastructure;
namespace SchengenVisaApi;
@@ -11,6 +12,7 @@ public static class DependencyInjection
{
services
.AddInfrastructure()
.AddApplicationLayer()
.AddPresentation();
return services;

1
SchengenVisaApi/SchengenVisaApi/SchengenVisaApi.csproj
View File

@@ -4,7 +4,6 @@
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<InvariantGlobalization>true</InvariantGlobalization>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>