From 604081e04733235875c6fa8d7ef894da968b687f Mon Sep 17 00:00:00 2001 From: prtsie Date: Thu, 15 Aug 2024 18:26:14 +0300 Subject: [PATCH] Moved interfaces, created new folders for visa requests and handlers --- .../IApplicantsRepository.cs | 5 +++-- .../Locations}/ICitiesRepository.cs | 2 +- .../Locations}/ICountriesRepository.cs | 2 +- .../Services/VisaApplicationRequestsHandler.cs | 11 ----------- .../Handlers/VisaApplicationRequestsHandler.cs | 14 ++++++++++++++ .../IVisaApplicationsRepository.cs | 2 +- .../Models/AddressModel.cs | 2 +- .../Models/PlaceOfWorkModel.cs | 2 +- .../Requests}/CreateVisaApplicationRequest.cs | 4 ++-- .../Repositories/ApplicantsRepository.cs | 3 ++- .../Repositories/Cities/CitiesRepository.cs | 3 ++- .../Repositories/Countries/CountriesRepository.cs | 3 ++- .../Repositories/VisaApplicationsRepository.cs | 3 ++- .../Infrastructure/DependencyInjection.cs | 5 ++++- .../Controllers/VisaApplicationController.cs | 2 +- 15 files changed, 37 insertions(+), 26 deletions(-) rename SchengenVisaApi/ApplicationLayer/{Common => Applicants}/IApplicantsRepository.cs (50%) rename SchengenVisaApi/{Infrastructure/Database/Locations/Repositories/Cities => ApplicationLayer/Locations}/ICitiesRepository.cs (67%) rename SchengenVisaApi/{Infrastructure/Database/Locations/Repositories/Countries => ApplicationLayer/Locations}/ICountriesRepository.cs (66%) delete mode 100644 SchengenVisaApi/ApplicationLayer/VisaApplication/Services/VisaApplicationRequestsHandler.cs create mode 100644 SchengenVisaApi/ApplicationLayer/VisaApplications/Handlers/VisaApplicationRequestsHandler.cs rename SchengenVisaApi/{Infrastructure/Database/VisaApplications/Repositories => ApplicationLayer/VisaApplications}/IVisaApplicationsRepository.cs (61%) rename SchengenVisaApi/ApplicationLayer/{VisaApplication => VisaApplications}/Models/AddressModel.cs (86%) rename SchengenVisaApi/ApplicationLayer/{VisaApplication => VisaApplications}/Models/PlaceOfWorkModel.cs (83%) rename SchengenVisaApi/ApplicationLayer/{VisaApplication => VisaApplications/Requests}/CreateVisaApplicationRequest.cs (88%) diff --git a/SchengenVisaApi/ApplicationLayer/Common/IApplicantsRepository.cs b/SchengenVisaApi/ApplicationLayer/Applicants/IApplicantsRepository.cs similarity index 50% rename from SchengenVisaApi/ApplicationLayer/Common/IApplicantsRepository.cs rename to SchengenVisaApi/ApplicationLayer/Applicants/IApplicantsRepository.cs index b7d1d6f..54266aa 100644 --- a/SchengenVisaApi/ApplicationLayer/Common/IApplicantsRepository.cs +++ b/SchengenVisaApi/ApplicationLayer/Applicants/IApplicantsRepository.cs @@ -1,6 +1,7 @@ -using Domains.ApplicantDomain; +using ApplicationLayer.Common; +using Domains.ApplicantDomain; -namespace ApplicationLayer.Common; +namespace ApplicationLayer.Applicants; /// Repository pattern for public interface IApplicantsRepository : IGenericRepository { } \ No newline at end of file diff --git a/SchengenVisaApi/Infrastructure/Database/Locations/Repositories/Cities/ICitiesRepository.cs b/SchengenVisaApi/ApplicationLayer/Locations/ICitiesRepository.cs similarity index 67% rename from SchengenVisaApi/Infrastructure/Database/Locations/Repositories/Cities/ICitiesRepository.cs rename to SchengenVisaApi/ApplicationLayer/Locations/ICitiesRepository.cs index 40092df..0631e5d 100644 --- a/SchengenVisaApi/Infrastructure/Database/Locations/Repositories/Cities/ICitiesRepository.cs +++ b/SchengenVisaApi/ApplicationLayer/Locations/ICitiesRepository.cs @@ -1,6 +1,6 @@ using ApplicationLayer.Common; using Domains.LocationDomain; -namespace Infrastructure.Database.Locations.Repositories.Cities; +namespace ApplicationLayer.Locations; public interface ICitiesRepository : IGenericRepository { } diff --git a/SchengenVisaApi/Infrastructure/Database/Locations/Repositories/Countries/ICountriesRepository.cs b/SchengenVisaApi/ApplicationLayer/Locations/ICountriesRepository.cs similarity index 66% rename from SchengenVisaApi/Infrastructure/Database/Locations/Repositories/Countries/ICountriesRepository.cs rename to SchengenVisaApi/ApplicationLayer/Locations/ICountriesRepository.cs index fc0c193..1811214 100644 --- a/SchengenVisaApi/Infrastructure/Database/Locations/Repositories/Countries/ICountriesRepository.cs +++ b/SchengenVisaApi/ApplicationLayer/Locations/ICountriesRepository.cs @@ -1,6 +1,6 @@ using ApplicationLayer.Common; using Domains.LocationDomain; -namespace Infrastructure.Database.Locations.Repositories.Countries; +namespace ApplicationLayer.Locations; public interface ICountriesRepository : IGenericRepository { } diff --git a/SchengenVisaApi/ApplicationLayer/VisaApplication/Services/VisaApplicationRequestsHandler.cs b/SchengenVisaApi/ApplicationLayer/VisaApplication/Services/VisaApplicationRequestsHandler.cs deleted file mode 100644 index 177f3e8..0000000 --- a/SchengenVisaApi/ApplicationLayer/VisaApplication/Services/VisaApplicationRequestsHandler.cs +++ /dev/null @@ -1,11 +0,0 @@ -namespace ApplicationLayer.VisaApplication.Services -{ - /// Handles visa requests - public class VisaApplicationRequestsHandler() - { - public void HandleCreateRequest(CreateVisaApplicationRequest request) - { - - } - } -} diff --git a/SchengenVisaApi/ApplicationLayer/VisaApplications/Handlers/VisaApplicationRequestsHandler.cs b/SchengenVisaApi/ApplicationLayer/VisaApplications/Handlers/VisaApplicationRequestsHandler.cs new file mode 100644 index 0000000..bde7e4a --- /dev/null +++ b/SchengenVisaApi/ApplicationLayer/VisaApplications/Handlers/VisaApplicationRequestsHandler.cs @@ -0,0 +1,14 @@ +using ApplicationLayer.Applicants; +using ApplicationLayer.VisaApplications.Requests; + +namespace ApplicationLayer.VisaApplications.Handlers +{ + /// Handles visa requests + public class VisaApplicationRequestsHandler(IApplicantsRepository) + { + public void HandleCreateRequest(CreateVisaApplicationRequest request) + { + + } + } +} diff --git a/SchengenVisaApi/Infrastructure/Database/VisaApplications/Repositories/IVisaApplicationsRepository.cs b/SchengenVisaApi/ApplicationLayer/VisaApplications/IVisaApplicationsRepository.cs similarity index 61% rename from SchengenVisaApi/Infrastructure/Database/VisaApplications/Repositories/IVisaApplicationsRepository.cs rename to SchengenVisaApi/ApplicationLayer/VisaApplications/IVisaApplicationsRepository.cs index ccfea31..2d620f7 100644 --- a/SchengenVisaApi/Infrastructure/Database/VisaApplications/Repositories/IVisaApplicationsRepository.cs +++ b/SchengenVisaApi/ApplicationLayer/VisaApplications/IVisaApplicationsRepository.cs @@ -1,6 +1,6 @@ using ApplicationLayer.Common; using Domains.VisaApplicationDomain; -namespace Infrastructure.Database.VisaApplications.Repositories; +namespace ApplicationLayer.VisaApplications; public interface IVisaApplicationsRepository : IGenericRepository { } \ No newline at end of file diff --git a/SchengenVisaApi/ApplicationLayer/VisaApplication/Models/AddressModel.cs b/SchengenVisaApi/ApplicationLayer/VisaApplications/Models/AddressModel.cs similarity index 86% rename from SchengenVisaApi/ApplicationLayer/VisaApplication/Models/AddressModel.cs rename to SchengenVisaApi/ApplicationLayer/VisaApplications/Models/AddressModel.cs index 3b1288a..c6afb8c 100644 --- a/SchengenVisaApi/ApplicationLayer/VisaApplication/Models/AddressModel.cs +++ b/SchengenVisaApi/ApplicationLayer/VisaApplications/Models/AddressModel.cs @@ -1,4 +1,4 @@ -namespace ApplicationLayer.VisaApplication.Models; +namespace ApplicationLayer.VisaApplications.Models; public class AddressModel { diff --git a/SchengenVisaApi/ApplicationLayer/VisaApplication/Models/PlaceOfWorkModel.cs b/SchengenVisaApi/ApplicationLayer/VisaApplications/Models/PlaceOfWorkModel.cs similarity index 83% rename from SchengenVisaApi/ApplicationLayer/VisaApplication/Models/PlaceOfWorkModel.cs rename to SchengenVisaApi/ApplicationLayer/VisaApplications/Models/PlaceOfWorkModel.cs index c436e32..6e76b1b 100644 --- a/SchengenVisaApi/ApplicationLayer/VisaApplication/Models/PlaceOfWorkModel.cs +++ b/SchengenVisaApi/ApplicationLayer/VisaApplications/Models/PlaceOfWorkModel.cs @@ -1,4 +1,4 @@ -namespace ApplicationLayer.VisaApplication.Models; +namespace ApplicationLayer.VisaApplications.Models; public class PlaceOfWorkModel { diff --git a/SchengenVisaApi/ApplicationLayer/VisaApplication/CreateVisaApplicationRequest.cs b/SchengenVisaApi/ApplicationLayer/VisaApplications/Requests/CreateVisaApplicationRequest.cs similarity index 88% rename from SchengenVisaApi/ApplicationLayer/VisaApplication/CreateVisaApplicationRequest.cs rename to SchengenVisaApi/ApplicationLayer/VisaApplications/Requests/CreateVisaApplicationRequest.cs index e280265..36f0c94 100644 --- a/SchengenVisaApi/ApplicationLayer/VisaApplication/CreateVisaApplicationRequest.cs +++ b/SchengenVisaApi/ApplicationLayer/VisaApplications/Requests/CreateVisaApplicationRequest.cs @@ -1,8 +1,8 @@ -using ApplicationLayer.VisaApplication.Models; +using ApplicationLayer.VisaApplications.Models; using Domains.ApplicantDomain; using Domains.VisaApplicationDomain; -namespace ApplicationLayer.VisaApplication; +namespace ApplicationLayer.VisaApplications.Requests; /// Model of visa request from user public record CreateVisaApplicationRequest( diff --git a/SchengenVisaApi/Infrastructure/Database/Applicants/Repositories/ApplicantsRepository.cs b/SchengenVisaApi/Infrastructure/Database/Applicants/Repositories/ApplicantsRepository.cs index b60aabe..d0c4763 100644 --- a/SchengenVisaApi/Infrastructure/Database/Applicants/Repositories/ApplicantsRepository.cs +++ b/SchengenVisaApi/Infrastructure/Database/Applicants/Repositories/ApplicantsRepository.cs @@ -1,4 +1,5 @@ -using ApplicationLayer.Common; +using ApplicationLayer.Applicants; +using ApplicationLayer.Common; using Domains.ApplicantDomain; using Infrastructure.Database.Generic; using Microsoft.EntityFrameworkCore; diff --git a/SchengenVisaApi/Infrastructure/Database/Locations/Repositories/Cities/CitiesRepository.cs b/SchengenVisaApi/Infrastructure/Database/Locations/Repositories/Cities/CitiesRepository.cs index cb42d8a..583764b 100644 --- a/SchengenVisaApi/Infrastructure/Database/Locations/Repositories/Cities/CitiesRepository.cs +++ b/SchengenVisaApi/Infrastructure/Database/Locations/Repositories/Cities/CitiesRepository.cs @@ -1,4 +1,5 @@ -using Domains.LocationDomain; +using ApplicationLayer.Locations; +using Domains.LocationDomain; using Infrastructure.Database.Generic; using Microsoft.EntityFrameworkCore; diff --git a/SchengenVisaApi/Infrastructure/Database/Locations/Repositories/Countries/CountriesRepository.cs b/SchengenVisaApi/Infrastructure/Database/Locations/Repositories/Countries/CountriesRepository.cs index 3616e3d..7c6159d 100644 --- a/SchengenVisaApi/Infrastructure/Database/Locations/Repositories/Countries/CountriesRepository.cs +++ b/SchengenVisaApi/Infrastructure/Database/Locations/Repositories/Countries/CountriesRepository.cs @@ -1,4 +1,5 @@ -using Domains.LocationDomain; +using ApplicationLayer.Locations; +using Domains.LocationDomain; using Infrastructure.Database.Generic; using Microsoft.EntityFrameworkCore; diff --git a/SchengenVisaApi/Infrastructure/Database/VisaApplications/Repositories/VisaApplicationsRepository.cs b/SchengenVisaApi/Infrastructure/Database/VisaApplications/Repositories/VisaApplicationsRepository.cs index 33ef5b2..f23217b 100644 --- a/SchengenVisaApi/Infrastructure/Database/VisaApplications/Repositories/VisaApplicationsRepository.cs +++ b/SchengenVisaApi/Infrastructure/Database/VisaApplications/Repositories/VisaApplicationsRepository.cs @@ -1,4 +1,5 @@ -using Domains.VisaApplicationDomain; +using ApplicationLayer.VisaApplications; +using Domains.VisaApplicationDomain; using Infrastructure.Database.Generic; using Microsoft.EntityFrameworkCore; diff --git a/SchengenVisaApi/Infrastructure/DependencyInjection.cs b/SchengenVisaApi/Infrastructure/DependencyInjection.cs index 40960ae..b3febe4 100644 --- a/SchengenVisaApi/Infrastructure/DependencyInjection.cs +++ b/SchengenVisaApi/Infrastructure/DependencyInjection.cs @@ -1,4 +1,7 @@ -using ApplicationLayer.Common; +using ApplicationLayer.Applicants; +using ApplicationLayer.Common; +using ApplicationLayer.Locations; +using ApplicationLayer.VisaApplications; using Infrastructure.Database; using Infrastructure.Database.Applicants.Repositories; using Infrastructure.Database.Generic; diff --git a/SchengenVisaApi/SchengenVisaApi/Controllers/VisaApplicationController.cs b/SchengenVisaApi/SchengenVisaApi/Controllers/VisaApplicationController.cs index 8fb8be7..b8c5be8 100644 --- a/SchengenVisaApi/SchengenVisaApi/Controllers/VisaApplicationController.cs +++ b/SchengenVisaApi/SchengenVisaApi/Controllers/VisaApplicationController.cs @@ -1,4 +1,4 @@ -using ApplicationLayer.VisaApplication; +using ApplicationLayer.VisaApplications.Requests; using Microsoft.AspNetCore.Mvc; namespace SchengenVisaApi.Controllers;