Changed models, added Application layer models

SchengenVisaApi/ApplicationLayer/VisaApplication/CreateVisaApplicationRequest.cs

@@ -1,4 +1,5 @@
-using Domains.ApplicantDomain;
+using ApplicationLayer.VisaApplication.Models;
+using Domains.ApplicantDomain;
 using Domains.VisaApplicationDomain;
 
 namespace ApplicationLayer.VisaApplication;
@@ -19,7 +20,7 @@ public record CreateVisaApplicationRequest(
     bool IsNonResident,
     ReentryPermit ReentryPermit,
     string JobTitle,
-    PlaceOfWork PlaceOfWork,
+    PlaceOfWorkModel PlaceOfWork,
     string DestinationCountry,
     VisaCategory VisaCategory,
     bool IsForGroup,
@@ -28,4 +29,4 @@ public record CreateVisaApplicationRequest(
     PastVisa[] PastVisas,
     PermissionToDestCountry? PermissionToDestCountry,
     PastVisit[] PastVisits
-    );
+);

SchengenVisaApi/ApplicationLayer/VisaApplication/Models/AddressModel.cs

@@ -0,0 +1,16 @@
+namespace ApplicationLayer.VisaApplication.Models;
+
+public class AddressModel
+{
+    /// Country part of address
+    public string Country { get; set; } = null!;
+
+    /// City part of address
+    public string City { get; set; } = null!;
+
+    /// Street part of address
+    public string Street { get; set; } = null!;
+
+    /// Building part of address
+    public string Building { get; set; } = null!;
+}

SchengenVisaApi/ApplicationLayer/VisaApplication/Models/PlaceOfWorkModel.cs

@@ -0,0 +1,13 @@
+namespace ApplicationLayer.VisaApplication.Models;
+
+public class PlaceOfWorkModel
+{
+    /// Name of hirer
+    public string Name { get; set; } = null!;
+
+    /// <see cref="AddressModel"/> of hirer
+    public AddressModel Address { get; set; } = null!;
+
+    /// Phone number of hirer
+    public string PhoneNum { get; set; } = null!;
+}

SchengenVisaApi/Domains/ApplicantDomain/Address.cs

@@ -1,11 +1,11 @@
 using Domains.LocationDomain;
 
-namespace Domains.ApplicantDomain
+namespace Domains.ApplicantDomain;
+
+/// Model of address
+/// <remarks>Owned</remarks>
+public class Address
 {
-    /// Model of address
-    /// <remarks>Owned</remarks>
-    public class Address
-    {
     /// Country part of address
     public Country Country { get; set; } = null!;
 
@@ -17,5 +17,4 @@ namespace Domains.ApplicantDomain
 
     /// Building part of address
     public string Building { get; set; } = null!;
-    }
 }

SchengenVisaApi/Domains/ApplicantDomain/Applicant.cs

@@ -1,11 +1,11 @@
 using Domains.LocationDomain;
 using Domains.VisaApplicationDomain;
 
-namespace Domains.ApplicantDomain
+namespace Domains.ApplicantDomain;
+
+/// Model of an applicant
+public class Applicant : IEntity
 {
-    /// Model of an applicant
-    public class Applicant : IEntity
-    {
     /// Unique identifier of the <see cref="Applicant"/>
     public Guid Id { get; set; }
 
@@ -53,5 +53,4 @@ namespace Domains.ApplicantDomain
 
     /// List of <see cref="Applicant"/>'s applications
     public List<VisaApplication> VisaApplications { get; set; } = null!;
-    }
 }

SchengenVisaApi/Domains/ApplicantDomain/Gender.cs

@@ -1,10 +1,9 @@
-namespace Domains.ApplicantDomain
+namespace Domains.ApplicantDomain;
+
+public enum Gender
 {
-    public enum Gender
-    {
     Unknown,
     Male,
     Female,
     Turkish
-    }
 }

SchengenVisaApi/Domains/ApplicantDomain/MaritalStatus.cs

@@ -1,11 +1,10 @@
-namespace Domains.ApplicantDomain
+namespace Domains.ApplicantDomain;
+
+public enum MaritalStatus
 {
-    public enum MaritalStatus
-    {
     Other,
     Married,
     Unmarried,
     Separated,
     WidowOrWidower
-    }
 }

SchengenVisaApi/Domains/ApplicantDomain/Name.cs

@@ -1,13 +1,12 @@
-namespace Domains.ApplicantDomain
+namespace Domains.ApplicantDomain;
+
+/// Model of full name
+/// <remarks>Owned</remarks>
+public class Name
 {
-    /// Model of full name
-    /// <remarks>Owned</remarks>
-    public class Name
-    {
     public string FirstName { get; set; } = null!;
 
     public string Surname { get; set; } = null!;
 
     public string? Patronymic { get; set; }
-    }
 }

SchengenVisaApi/Domains/ApplicantDomain/Passport.cs

@@ -1,9 +1,9 @@
-namespace Domains.ApplicantDomain
+namespace Domains.ApplicantDomain;
+
+/// Model of passport
+/// <remarks>Owned</remarks>
+public class Passport
 {
-    /// Model of passport
-    /// <remarks>Owned</remarks>
-    public class Passport
-    {
     /// Number of <see cref="Passport"/>
     public string Number { get; set; } = null!;
 
@@ -15,5 +15,4 @@
 
     /// Date when the <see cref="Passport"/> expires
     public DateTime ExpirationDate { get; set; }
-    }
 }

SchengenVisaApi/Domains/ApplicantDomain/PlaceOfWork.cs

@@ -1,7 +1,7 @@
-namespace Domains.ApplicantDomain
+namespace Domains.ApplicantDomain;
+
+public class PlaceOfWork : IEntity
 {
-    public class PlaceOfWork : IEntity
-    {
     /// Unique identifier of <see cref="PlaceOfWork"/>
     public Guid Id { get; private set; } = Guid.NewGuid();
 
@@ -13,5 +13,4 @@
 
     /// Phone number of hirer
     public string PhoneNum { get; set; } = null!;
-    }
 }

SchengenVisaApi/Domains/IEntity.cs

@@ -1,8 +1,7 @@
-namespace Domains
+namespace Domains;
+
+/// Interface that every entity should inherit from
+public interface IEntity
 {
-    /// Interface that every entity should inherit from
-    public interface IEntity
-    {
     public Guid Id { get; }
-    }
 }

SchengenVisaApi/Domains/LocationDomain/City.cs

@@ -1,8 +1,8 @@
-namespace Domains.LocationDomain
+namespace Domains.LocationDomain;
+
+/// Model of a city
+public class City : IEntity
 {
-    /// Model of a city
-    public class City : IEntity
-    {
     /// Unique identifier of the <see cref="City"/>
     public Guid Id { get; private set; } = Guid.NewGuid();
 
@@ -11,5 +11,4 @@
 
     /// <see cref="LocationDomain.Country"/> in which the city is located
     public Country Country { get; set; } = null!;
-    }
 }

SchengenVisaApi/Domains/LocationDomain/Country.cs

@@ -1,8 +1,8 @@
-namespace Domains.LocationDomain
+namespace Domains.LocationDomain;
+
+/// Model of a country
+public class Country : IEntity
 {
-    /// Model of a country
-    public class Country : IEntity
-    {
     /// Unique identifier of the <see cref="Country"/>
     public Guid Id { get; private set; } = Guid.NewGuid();
 
@@ -14,5 +14,4 @@
 
     /// List of <see cref="City"/> that country have
     public List<City> Cities { get; set; } = null!;
-    }
 }

SchengenVisaApi/Domains/VisaApplicationDomain/PastVisa.cs

@@ -1,13 +1,11 @@
 using Domains.ApplicantDomain;
 
-namespace Domains.VisaApplicationDomain
+namespace Domains.VisaApplicationDomain;
-{
-    /// Visa that <see cref="Applicant"/> already had
-    public class PastVisa : IEntity
-    {
-        /// Unique identifier of <see cref="PastVisa"/>
-        public Guid Id { get; private set; } = Guid.NewGuid();
 
+/// Visa that <see cref="Applicant"/> already had
+/// <remarks>Owned</remarks>
+public class PastVisa
+{
     /// Date of issue
     public DateTime IssueDate { get; set; }
 
@@ -16,5 +14,4 @@ namespace Domains.VisaApplicationDomain
 
     /// Date when visa expires
     public DateTime ExpirationDate { get; set; }
-    }
 }

SchengenVisaApi/Domains/VisaApplicationDomain/PastVisit.cs

@@ -1,17 +1,14 @@
 using Domains.ApplicantDomain;
 
-namespace Domains.VisaApplicationDomain
+namespace Domains.VisaApplicationDomain;
-{
-    /// Visit in a Schengen country that <see cref="Applicant"/> already had
-    public class PastVisit : IEntity
-    {
-        /// Unique identifier of <see cref="PastVisit"/>
-        public Guid Id { get; private set; } = Guid.NewGuid();
 
+/// Visit in a Schengen country that <see cref="Applicant"/> already had
+/// <remarks>Owned</remarks>
+public class PastVisit
+{
     /// First day of <see cref="PastVisit"/>
     public DateTime StartDate { get; set; }
 
     /// Last day of <see cref="PastVisit"/>
     public DateTime EndDate { get; set; }
-    }
 }

SchengenVisaApi/Domains/VisaApplicationDomain/PermissionToDestCountry.cs

@@ -1,13 +1,12 @@
-namespace Domains.VisaApplicationDomain
+namespace Domains.VisaApplicationDomain;
+
+/// Permission to enter the destination country
+/// <remarks>Owned</remarks>
+public class PermissionToDestCountry
 {
-    /// Permission to enter the destination country
-    /// <remarks>Owned</remarks>
-    public class PermissionToDestCountry
-    {
     /// Date when <see cref="PermissionToDestCountry"/> expires
     public DateTime ExpirationDate { get; set; }
 
     /// Issuing authority
     public string Issuer { get; set; } = null!;
-    }
 }

SchengenVisaApi/Domains/VisaApplicationDomain/ReentryPermit.cs

@@ -1,13 +1,12 @@
-namespace Domains.VisaApplicationDomain
+namespace Domains.VisaApplicationDomain;
+
+/// Permission to enter a country the issuer wants to come from
+/// <remarks>Owned</remarks>
+public class ReentryPermit
 {
-    /// Permission to enter a country the issuer wants to come from
-    /// <remarks>Owned</remarks>
-    public class ReentryPermit
-    {
     /// Number of <see cref="ReentryPermit"/>
     public string Number { get; set; } = null!;
 
     /// Date when <see cref="ReentryPermit"/> expires
     public DateTime ExpirationDate { get; set; }
-    }
 }

SchengenVisaApi/Domains/VisaApplicationDomain/RequestedNumberOfEntries.cs

@@ -1,10 +1,9 @@
-namespace Domains.VisaApplicationDomain
+namespace Domains.VisaApplicationDomain;
+
+/// Requested number of entries
+public enum RequestedNumberOfEntries
 {
-    /// Requested number of entries
-    public enum RequestedNumberOfEntries
-    {
     Many,
     One,
     Two
-    }
 }

SchengenVisaApi/Domains/VisaApplicationDomain/VisaApplication.cs

@@ -1,11 +1,11 @@
 using Domains.ApplicantDomain;
 using Domains.LocationDomain;
 
-namespace Domains.VisaApplicationDomain
+namespace Domains.VisaApplicationDomain;
+
+/// Model of visit request
+public class VisaApplication : IEntity
 {
-    /// Model of visit request
-    public class VisaApplication : IEntity
-    {
     /// Unique identifier of <see cref="VisaApplication"/>
     public Guid Id { get; private set; } = Guid.NewGuid();
 
@@ -47,5 +47,4 @@ namespace Domains.VisaApplicationDomain
 
     /// Valid days requested
     public int ValidDaysRequested { get; set; }
-    }
 }

SchengenVisaApi/Domains/VisaApplicationDomain/VisaCategory.cs

@@ -1,9 +1,8 @@
-namespace Domains.VisaApplicationDomain
+namespace Domains.VisaApplicationDomain;
+
+/// Category of visa
+public enum VisaCategory
 {
-    /// Category of visa
-    public enum VisaCategory
-    {
     Transit,
     ShortDated
-    }
 }

SchengenVisaApi/Infrastructure/Database/Applicants/Configuration/AddressConfiguration.cs

@@ -2,10 +2,10 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
-namespace Infrastructure.Database.Applicants.Configuration
+namespace Infrastructure.Database.Applicants.Configuration;
+
+public class AddressConfiguration : IEntityTypeConfiguration<Address>
 {
-    public class AddressConfiguration : IEntityTypeConfiguration<Address>
-    {
     public void Configure(EntityTypeBuilder<Address> entity)
     {
         entity.Property(p => p.Street)
@@ -15,5 +15,4 @@ namespace Infrastructure.Database.Applicants.Configuration
             .IsUnicode(false)
             .HasMaxLength(10);
     }
-    }
 }

SchengenVisaApi/Infrastructure/Database/Applicants/Configuration/ApplicantConfiguration.cs

@@ -2,10 +2,10 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
-namespace Infrastructure.Database.Applicants.Configuration
+namespace Infrastructure.Database.Applicants.Configuration;
+
+public class ApplicantConfiguration : IEntityTypeConfiguration<Applicant>
 {
-    public class ApplicantConfiguration : IEntityTypeConfiguration<Applicant>
-    {
     public void Configure(EntityTypeBuilder<Applicant> entity)
     {
         entity.ToTable("Applicants");
@@ -23,5 +23,4 @@ namespace Infrastructure.Database.Applicants.Configuration
             .IsUnicode(false)
             .HasMaxLength(30);
     }
-    }
 }

SchengenVisaApi/Infrastructure/Database/Applicants/Configuration/NameConfiguration.cs

@@ -2,10 +2,10 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
-namespace Infrastructure.Database.Applicants.Configuration
+namespace Infrastructure.Database.Applicants.Configuration;
+
+public class NameConfiguration : IEntityTypeConfiguration<Name>
 {
-    public class NameConfiguration : IEntityTypeConfiguration<Name>
-    {
     public void Configure(EntityTypeBuilder<Name> entity)
     {
         entity.Property(p => p.FirstName)
@@ -20,5 +20,4 @@ namespace Infrastructure.Database.Applicants.Configuration
             .IsUnicode(false)
             .HasMaxLength(50);
     }
-    }
 }

SchengenVisaApi/Infrastructure/Database/Applicants/Configuration/PassportConfiguration.cs

@@ -2,10 +2,10 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
-namespace Infrastructure.Database.Applicants.Configuration
+namespace Infrastructure.Database.Applicants.Configuration;
+
+public class PassportConfiguration : IEntityTypeConfiguration<Passport>
 {
-    public class PassportConfiguration : IEntityTypeConfiguration<Passport>
-    {
     public void Configure(EntityTypeBuilder<Passport> entity)
     {
         entity.Property(p => p.Number)
@@ -16,5 +16,4 @@ namespace Infrastructure.Database.Applicants.Configuration
             .IsUnicode(false)
             .HasMaxLength(200);
     }
-    }
 }

SchengenVisaApi/Infrastructure/Database/Applicants/Configuration/PlaceOfWorkConfiguration.cs

@@ -2,10 +2,10 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
-namespace Infrastructure.Database.Applicants.Configuration
+namespace Infrastructure.Database.Applicants.Configuration;
+
+public class PlaceOfWorkConfiguration : IEntityTypeConfiguration<PlaceOfWork>
 {
-    public class PlaceOfWorkConfiguration : IEntityTypeConfiguration<PlaceOfWork>
-    {
     public void Configure(EntityTypeBuilder<PlaceOfWork> entity)
     {
         entity.OwnsOne(p => p.Address);
@@ -18,5 +18,4 @@ namespace Infrastructure.Database.Applicants.Configuration
             .IsUnicode(false)
             .HasMaxLength(20);
     }
-    }
 }

SchengenVisaApi/Infrastructure/Database/Applicants/Repositories/ApplicantsRepository.cs

@@ -2,15 +2,15 @@
 using Infrastructure.Database.Generic;
 using Microsoft.EntityFrameworkCore;
 
-namespace Infrastructure.Database.Applicants.Repositories
+namespace Infrastructure.Database.Applicants.Repositories;
-{
+
-    /// Repository pattern for <see cref="Applicant"/>
+/// Repository pattern for <see cref="Applicant"/>
-    /// <param name="reader"><inheritdoc cref="IGenericReader"/></param>
+/// <param name="reader"><inheritdoc cref="IGenericReader"/></param>
-    /// <param name="writer"><inheritdoc cref="IGenericWriter"/></param>
+/// <param name="writer"><inheritdoc cref="IGenericWriter"/></param>
-    /// <param name="unitOfWork"><inheritdoc cref="IUnitOfWork"/></param>
+/// <param name="unitOfWork"><inheritdoc cref="IUnitOfWork"/></param>
-    public sealed class ApplicantsRepository(IGenericReader reader, IGenericWriter writer, IUnitOfWork unitOfWork)
+public sealed class ApplicantsRepository(IGenericReader reader, IGenericWriter writer, IUnitOfWork unitOfWork)
     : GenericRepository<Applicant>(reader, writer, unitOfWork), IApplicantsRepository
-    {
+{
     protected override IQueryable<Applicant> LoadDomain()
     {
         return base.LoadDomain()
@@ -18,5 +18,4 @@ namespace Infrastructure.Database.Applicants.Repositories
             .Include(a => a.CityOfBirth)
             .Include(a => a.PlaceOfWork);
     }
-    }
 }

SchengenVisaApi/Infrastructure/Database/Applicants/Repositories/IApplicantsRepository.cs

@@ -1,8 +1,7 @@
 using Domains.ApplicantDomain;
 using Infrastructure.Database.Generic;
 
-namespace Infrastructure.Database.Applicants.Repositories
+namespace Infrastructure.Database.Applicants.Repositories;
-{
+
-    /// Repository pattern for <see cref="Applicant"/>
+/// Repository pattern for <see cref="Applicant"/>
-    public interface IApplicantsRepository : IGenericRepository<Applicant> { }
+public interface IApplicantsRepository : IGenericRepository<Applicant> { }
-}

SchengenVisaApi/Infrastructure/Database/DbContext.cs

@@ -2,11 +2,11 @@
 using Infrastructure.Database.Generic;
 using Microsoft.EntityFrameworkCore;
 
-namespace Infrastructure.Database
+namespace Infrastructure.Database;
-{
+
-    public class DbContext(DbContextOptions<DbContext> opts)
+public class DbContext(DbContextOptions<DbContext> opts)
     : Microsoft.EntityFrameworkCore.DbContext(opts), IGenericWriter, IGenericReader, IUnitOfWork
-    {
+{
     protected override void OnModelCreating(ModelBuilder modelBuilder)
     {
         modelBuilder.ApplyConfigurationsFromAssembly(Assembly.GetExecutingAssembly());
@@ -36,5 +36,4 @@ namespace Infrastructure.Database
     {
         await SaveChangesAsync(cancellationToken);
     }
-    }
 }

SchengenVisaApi/Infrastructure/Database/GeneralExceptions/EntityNotFoundException.cs

@@ -1,10 +1,9 @@
 using Domains;
 
-namespace Infrastructure.Database.GeneralExceptions
+namespace Infrastructure.Database.GeneralExceptions;
-{
+
-    /// Exception to throw when entity with specific id not found
+/// Exception to throw when entity with specific id not found
-    /// <param name="id">Identifier of entity</param>
+/// <param name="id">Identifier of entity</param>
-    /// <typeparam name="T">Not found entity type</typeparam>
+/// <typeparam name="T">Not found entity type</typeparam>
-    public class EntityNotFoundException<T>(Guid id) : Exception($"Entity {typeof(T).Name} with id '{id}' not found")
+public class EntityNotFoundException<T>(Guid id) : Exception($"Entity {typeof(T).Name} with id '{id}' not found")
     where T : class, IEntity;
-}

SchengenVisaApi/Infrastructure/Database/Generic/GenericRepository.cs

@@ -2,16 +2,16 @@
 using Infrastructure.Database.GeneralExceptions;
 using Microsoft.EntityFrameworkCore;
 
-namespace Infrastructure.Database.Generic
+namespace Infrastructure.Database.Generic;
-{
+
-    /// Generic repository pattern
+/// Generic repository pattern
-    /// <param name="writer"><inheritdoc cref="IGenericWriter"/></param>
+/// <param name="writer"><inheritdoc cref="IGenericWriter"/></param>
-    /// <param name="unitOfWork"><inheritdoc cref="IUnitOfWork"/></param>
+/// <param name="unitOfWork"><inheritdoc cref="IUnitOfWork"/></param>
-    /// <typeparam name="T">Type of entity</typeparam>
+/// <typeparam name="T">Type of entity</typeparam>
-    /// <remarks>Should be inherited to create typed repositories</remarks>
+/// <remarks>Should be inherited to create typed repositories</remarks>
-    public abstract class GenericRepository<T>(IGenericReader reader, IGenericWriter writer, IUnitOfWork unitOfWork) : IGenericRepository<T>
+public abstract class GenericRepository<T>(IGenericReader reader, IGenericWriter writer, IUnitOfWork unitOfWork) : IGenericRepository<T>
     where T : class, IEntity
-    {
+{
     /// <inheritdoc cref="IGenericRepository{T}.GetAllAsync"/>
     public async Task<List<T>> GetAllAsync(CancellationToken cancellationToken)
         => await LoadDomain().ToListAsync(cancellationToken);
@@ -49,5 +49,4 @@ namespace Infrastructure.Database.Generic
     {
         return reader.GetAll<T>();
     }
-    }
 }

SchengenVisaApi/Infrastructure/Database/Generic/IGenericReader.cs

@@ -1,12 +1,11 @@
 using Domains;
 
-namespace Infrastructure.Database.Generic
+namespace Infrastructure.Database.Generic;
+
+/// Reads from data storage
+public interface IGenericReader
 {
-    /// Reads from data storage
-    public interface IGenericReader
-    {
     /// Get all entities of type T stored in storage
     /// <typeparam name="T">Entity type to seek in storage</typeparam>
     IQueryable<T> GetAll<T>() where T : class, IEntity;
-    }
 }

SchengenVisaApi/Infrastructure/Database/Generic/IGenericRepository.cs

@@ -1,13 +1,13 @@
 using Domains;
 
-namespace Infrastructure.Database.Generic
+namespace Infrastructure.Database.Generic;
+
+/// <summary>
+/// Generic repository pattern
+/// </summary>
+/// <typeparam name="T">Entity type</typeparam>
+public interface IGenericRepository<T> where T : class, IEntity
 {
-    /// <summary>
-    /// Generic repository pattern
-    /// </summary>
-    /// <typeparam name="T">Entity type</typeparam>
-    public interface IGenericRepository<T> where T : class, IEntity
-    {
     /// Get all entities from data storage
     Task<List<T>> GetAllAsync(CancellationToken cancellationToken);
 
@@ -33,5 +33,4 @@ namespace Infrastructure.Database.Generic
 
     /// Save changes in storage
     Task SaveAsync(CancellationToken cancellationToken);
-    }
 }

SchengenVisaApi/Infrastructure/Database/Generic/IGenericWriter.cs

@@ -1,11 +1,11 @@
 using Domains;
 
-namespace Infrastructure.Database.Generic
+namespace Infrastructure.Database.Generic;
+
+/// Writes data to data storage
+/// <remarks><see cref="IUnitOfWork"/> should be used to save changes</remarks>
+public interface IGenericWriter
 {
-    /// Writes data to data storage
-    /// <remarks><see cref="IUnitOfWork"/> should be used to save changes</remarks>
-    public interface IGenericWriter
-    {
     /// Add entity to data storage
     /// <param name="entity">Entity to add</param>
     /// <param name="cancellationToken">Cancellation Token</param>
@@ -21,5 +21,4 @@ namespace Infrastructure.Database.Generic
     /// <param name="entity">Entity to remove</param>
     /// <typeparam name="T">Entity type</typeparam>
     void Remove<T>(T entity) where T : class, IEntity;
-    }
 }

SchengenVisaApi/Infrastructure/Database/IUnitOfWork.cs

@@ -1,9 +1,8 @@
-namespace Infrastructure.Database
+namespace Infrastructure.Database;
+
+public interface IUnitOfWork
 {
-    public interface IUnitOfWork
-    {
     /// Saves changes in data storage
     /// <param name="cancellationToken">Cancellation Token</param>
     Task SaveAsync(CancellationToken cancellationToken);
-    }
 }

SchengenVisaApi/Infrastructure/Database/Locations/Configuration/CityConfiguration.cs

@@ -2,15 +2,14 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
-namespace Infrastructure.Database.Locations.Configuration
+namespace Infrastructure.Database.Locations.Configuration;
+
+public class CityConfiguration : IEntityTypeConfiguration<City>
 {
-    public class CityConfiguration : IEntityTypeConfiguration<City>
-    {
     public void Configure(EntityTypeBuilder<City> entity)
     {
         entity.Property(p => p.Name)
             .IsUnicode(false)
             .HasMaxLength(70);
     }
-    }
 }

SchengenVisaApi/Infrastructure/Database/Locations/Configuration/CountryConfiguration.cs

@@ -2,15 +2,14 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
-namespace Infrastructure.Database.Locations.Configuration
+namespace Infrastructure.Database.Locations.Configuration;
+
+public class CountryConfiguration : IEntityTypeConfiguration<Country>
 {
-    public class CountryConfiguration : IEntityTypeConfiguration<Country>
-    {
     public void Configure(EntityTypeBuilder<Country> entity)
     {
         entity.Property(p => p.Name)
             .IsUnicode(false)
             .HasMaxLength(70);
     }
-    }
 }

SchengenVisaApi/Infrastructure/Database/Locations/Repositories/Cities/CitiesRepository.cs

@@ -2,14 +2,13 @@
 using Infrastructure.Database.Generic;
 using Microsoft.EntityFrameworkCore;
 
-namespace Infrastructure.Database.Locations.Repositories.Cities
+namespace Infrastructure.Database.Locations.Repositories.Cities;
-{
+
-    public sealed class CitiesRepository(IGenericReader reader, IGenericWriter writer, IUnitOfWork unitOfWork)
+public sealed class CitiesRepository(IGenericReader reader, IGenericWriter writer, IUnitOfWork unitOfWork)
     : GenericRepository<City>(reader, writer, unitOfWork), ICitiesRepository
-    {
+{
     protected override IQueryable<City> LoadDomain()
     {
         return base.LoadDomain().Include(c => c.Country);
     }
-    }
 }

SchengenVisaApi/Infrastructure/Database/Locations/Repositories/Cities/ICitiesRepository.cs

@@ -1,7 +1,6 @@
 using Domains.LocationDomain;
 using Infrastructure.Database.Generic;
 
-namespace Infrastructure.Database.Locations.Repositories.Cities
+namespace Infrastructure.Database.Locations.Repositories.Cities;
-{
+
-    public interface ICitiesRepository : IGenericRepository<City> { }
+public interface ICitiesRepository : IGenericRepository<City> { }
-}

SchengenVisaApi/Infrastructure/Database/Locations/Repositories/Countries/CountriesRepository.cs

@@ -2,14 +2,13 @@
 using Infrastructure.Database.Generic;
 using Microsoft.EntityFrameworkCore;
 
-namespace Infrastructure.Database.Locations.Repositories.Countries
+namespace Infrastructure.Database.Locations.Repositories.Countries;
-{
+
-    public sealed class CountriesRepository(IGenericReader reader, IGenericWriter writer, IUnitOfWork unitOfWork)
+public sealed class CountriesRepository(IGenericReader reader, IGenericWriter writer, IUnitOfWork unitOfWork)
     : GenericRepository<Country>(reader, writer, unitOfWork), ICountriesRepository
-    {
+{
     protected override IQueryable<Country> LoadDomain()
     {
         return base.LoadDomain().Include(c => c.Cities);
     }
-    }
 }

SchengenVisaApi/Infrastructure/Database/Locations/Repositories/Countries/ICountriesRepository.cs

@@ -1,7 +1,6 @@
 using Domains.LocationDomain;
 using Infrastructure.Database.Generic;
 
-namespace Infrastructure.Database.Locations.Repositories.Countries
+namespace Infrastructure.Database.Locations.Repositories.Countries;
-{
+
-    public interface ICountriesRepository : IGenericRepository<Country> { }
+public interface ICountriesRepository : IGenericRepository<Country> { }
-}

SchengenVisaApi/Infrastructure/Database/VisaApplications/Configuration/PastVisaConfiguration.cs

@@ -2,15 +2,14 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
-namespace Infrastructure.Database.VisaApplications.Configuration
+namespace Infrastructure.Database.VisaApplications.Configuration;
+
+public class PastVisaConfiguration : IEntityTypeConfiguration<PastVisa>
 {
-    public class PastVisaConfiguration : IEntityTypeConfiguration<PastVisa>
-    {
     public void Configure(EntityTypeBuilder<PastVisa> entity)
     {
         entity.Property(p => p.Name)
             .IsUnicode(false)
             .HasMaxLength(70);
     }
-    }
 }

SchengenVisaApi/Infrastructure/Database/VisaApplications/Configuration/PermissionToDestCountryConfiguration.cs

@@ -2,15 +2,14 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
-namespace Infrastructure.Database.VisaApplications.Configuration
+namespace Infrastructure.Database.VisaApplications.Configuration;
+
+public class PermissionToDestCountryConfiguration : IEntityTypeConfiguration<PermissionToDestCountry>
 {
-    public class PermissionToDestCountryConfiguration : IEntityTypeConfiguration<PermissionToDestCountry>
-    {
     public void Configure(EntityTypeBuilder<PermissionToDestCountry> entity)
     {
         entity.Property(p => p.Issuer)
             .IsUnicode(false)
             .HasMaxLength(200);
     }
-    }
 }

SchengenVisaApi/Infrastructure/Database/VisaApplications/Configuration/ReentryPermitConfiguration.cs

@@ -2,15 +2,14 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
-namespace Infrastructure.Database.VisaApplications.Configuration
+namespace Infrastructure.Database.VisaApplications.Configuration;
+
+public class ReentryPermitConfiguration : IEntityTypeConfiguration<ReentryPermit>
 {
-    public class ReentryPermitConfiguration : IEntityTypeConfiguration<ReentryPermit>
-    {
     public void Configure(EntityTypeBuilder<ReentryPermit> entity)
     {
         entity.Property(p => p.Number)
             .IsUnicode(false)
             .HasMaxLength(25);
     }
-    }
 }

SchengenVisaApi/Infrastructure/Database/VisaApplications/Configuration/VisaApplicationConfiguration.cs

@@ -2,10 +2,10 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
-namespace Infrastructure.Database.VisaApplications.Configuration
+namespace Infrastructure.Database.VisaApplications.Configuration;
+
+public class VisaApplicationConfiguration : IEntityTypeConfiguration<VisaApplication>
 {
-    public class VisaApplicationConfiguration : IEntityTypeConfiguration<VisaApplication>
-    {
     public void Configure(EntityTypeBuilder<VisaApplication> entity)
     {
         entity.ToTable("VisaApplications");
@@ -17,6 +17,7 @@ namespace Infrastructure.Database.VisaApplications.Configuration
 
         entity.OwnsOne(p => p.ReentryPermit);
         entity.OwnsOne(p => p.PermissionToDestCountry);
-        }
+        entity.OwnsMany(p => p.PastVisits).ToTable("PastVisits");
+        entity.OwnsMany(p => p.PastVisas).ToTable("PastVisas");
     }
 }

SchengenVisaApi/Infrastructure/Database/VisaApplications/Repositories/IVisaApplicationsRepository.cs

@@ -1,7 +1,6 @@
 using Domains.VisaApplicationDomain;
 using Infrastructure.Database.Generic;
 
-namespace Infrastructure.Database.VisaApplications.Repositories
+namespace Infrastructure.Database.VisaApplications.Repositories;
-{
+
-    public interface IVisaApplicationsRepository : IGenericRepository<VisaApplication> { }
+public interface IVisaApplicationsRepository : IGenericRepository<VisaApplication> { }
-}

SchengenVisaApi/Infrastructure/Database/VisaApplications/Repositories/VisaApplicationsRepository.cs

@@ -2,11 +2,11 @@
 using Infrastructure.Database.Generic;
 using Microsoft.EntityFrameworkCore;
 
-namespace Infrastructure.Database.VisaApplications.Repositories
+namespace Infrastructure.Database.VisaApplications.Repositories;
-{
+
-    public sealed class VisaApplicationsRepository(IGenericReader reader, IGenericWriter writer, IUnitOfWork unitOfWork)
+public sealed class VisaApplicationsRepository(IGenericReader reader, IGenericWriter writer, IUnitOfWork unitOfWork)
     : GenericRepository<VisaApplication>(reader, writer, unitOfWork), IVisaApplicationsRepository
-    {
+{
     protected override IQueryable<VisaApplication> LoadDomain()
     {
         return base.LoadDomain()
@@ -14,5 +14,4 @@ namespace Infrastructure.Database.VisaApplications.Repositories
             .Include(a => a.PastVisas)
             .Include(a => a.PastVisits);
     }
-    }
 }

SchengenVisaApi/Infrastructure/DependencyInjection.cs

@@ -8,11 +8,11 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 using DbContext = Infrastructure.Database.DbContext;
 
-namespace Infrastructure
+namespace Infrastructure;
+
+/// Provides methods to add services to DI-container
+public static class DependencyInjection
 {
-    /// Provides methods to add services to DI-container
-    public static class DependencyInjection
-    {
     /// Add services needed for Infrastructure layer
     public static IServiceCollection AddInfrastructure(this IServiceCollection services)
     {
@@ -31,5 +31,4 @@ namespace Infrastructure
 
         return services;
     }
-    }
 }

SchengenVisaApi/SchengenVisaApi/DependencyInjection.cs

@@ -1,11 +1,11 @@
 using System.Reflection;
 using Infrastructure;
 
-namespace SchengenVisaApi
+namespace SchengenVisaApi;
+
+/// Provides methods to add services to DI-container
+public static class DependencyInjection
 {
-    /// Provides methods to add services to DI-container
-    public static class DependencyInjection
-    {
     /// Add needed services
     public static IServiceCollection RegisterServices(this IServiceCollection services)
     {
@@ -27,5 +27,4 @@ namespace SchengenVisaApi
             options.IncludeXmlComments(Path.Combine(AppContext.BaseDirectory, xmlFilename));
         });
     }
-    }
 }

SchengenVisaApi/SchengenVisaApi/Program.cs

@@ -1,5 +1,4 @@
 namespace SchengenVisaApi;
-
 #pragma warning disable CS1591
 public class Program
 {

SchengenVisaApi/SchengenVisaApi/RequestPipeline.cs

@@ -1,8 +1,8 @@
-namespace SchengenVisaApi
+namespace SchengenVisaApi;
+
+/// Provides methods for configuring middleware
+public static class PipelineRequest
 {
-    /// Provides methods for configuring middleware
-    public static class PipelineRequest
-    {
     /// Configure middleware
     public static WebApplication ConfigurePipelineRequest(this WebApplication app)
     {
@@ -15,5 +15,4 @@
 
         return app;
     }
-    }
 }