From a81739214cb0077f42824a768f1ab0f043a49b63 Mon Sep 17 00:00:00 2001 From: prtsie Date: Thu, 15 Aug 2024 14:35:55 +0300 Subject: [PATCH] DateTime instead of DateOnly, fixed warnings --- .../{ => VisaApplication}/CreateVisaApplicationRequest.cs | 4 ++-- SchengenVisaApi/Domains/ApplicantDomain/Applicant.cs | 2 +- SchengenVisaApi/Domains/ApplicantDomain/Passport.cs | 4 ++-- SchengenVisaApi/Domains/VisaApplicationDomain/PastVisa.cs | 4 ++-- SchengenVisaApi/Domains/VisaApplicationDomain/PastVisit.cs | 4 ++-- .../Domains/VisaApplicationDomain/PermissionToDestCountry.cs | 2 +- .../Domains/VisaApplicationDomain/ReentryPermit.cs | 2 +- .../Domains/VisaApplicationDomain/VisaApplication.cs | 2 +- SchengenVisaApi/Infrastructure/Database/DbContext.cs | 2 +- SchengenVisaApi/SchengenVisaApi/DependencyInjection.cs | 2 +- 10 files changed, 14 insertions(+), 14 deletions(-) rename SchengenVisaApi/ApplicationLayer/{ => VisaApplication}/CreateVisaApplicationRequest.cs (91%) diff --git a/SchengenVisaApi/ApplicationLayer/CreateVisaApplicationRequest.cs b/SchengenVisaApi/ApplicationLayer/VisaApplication/CreateVisaApplicationRequest.cs similarity index 91% rename from SchengenVisaApi/ApplicationLayer/CreateVisaApplicationRequest.cs rename to SchengenVisaApi/ApplicationLayer/VisaApplication/CreateVisaApplicationRequest.cs index 9885310..964f957 100644 --- a/SchengenVisaApi/ApplicationLayer/CreateVisaApplicationRequest.cs +++ b/SchengenVisaApi/ApplicationLayer/VisaApplication/CreateVisaApplicationRequest.cs @@ -1,13 +1,13 @@ using Domains.ApplicantDomain; using Domains.VisaApplicationDomain; -namespace ApplicationLayer; +namespace ApplicationLayer.VisaApplication; /// Model of visa request from user public record CreateVisaApplicationRequest( Name FullName, Passport Passport, - DateOnly BirthDate, + DateTime BirthDate, string BirthCity, string BirthCountry, string CitizenShip, diff --git a/SchengenVisaApi/Domains/ApplicantDomain/Applicant.cs b/SchengenVisaApi/Domains/ApplicantDomain/Applicant.cs index cc45700..c173803 100644 --- a/SchengenVisaApi/Domains/ApplicantDomain/Applicant.cs +++ b/SchengenVisaApi/Domains/ApplicantDomain/Applicant.cs @@ -16,7 +16,7 @@ namespace Domains.ApplicantDomain public Passport Passport { get; set; } = null!; /// Date of birth of the - public DateOnly BirthDate { get; set; } + public DateTime BirthDate { get; set; } /// of birth of the public Country CountryOfBirth { get; set; } = null!; diff --git a/SchengenVisaApi/Domains/ApplicantDomain/Passport.cs b/SchengenVisaApi/Domains/ApplicantDomain/Passport.cs index 2769c05..6a494b6 100644 --- a/SchengenVisaApi/Domains/ApplicantDomain/Passport.cs +++ b/SchengenVisaApi/Domains/ApplicantDomain/Passport.cs @@ -11,9 +11,9 @@ public string Issuer { get; set; } = null!; /// Date of issue - public DateOnly IssueDate { get; set; } + public DateTime IssueDate { get; set; } /// Date when the expires - public DateOnly ExpirationDate { get; set; } + public DateTime ExpirationDate { get; set; } } } diff --git a/SchengenVisaApi/Domains/VisaApplicationDomain/PastVisa.cs b/SchengenVisaApi/Domains/VisaApplicationDomain/PastVisa.cs index 077557d..1db3473 100644 --- a/SchengenVisaApi/Domains/VisaApplicationDomain/PastVisa.cs +++ b/SchengenVisaApi/Domains/VisaApplicationDomain/PastVisa.cs @@ -9,12 +9,12 @@ namespace Domains.VisaApplicationDomain public Guid Id { get; private set; } = Guid.NewGuid(); /// Date of issue - public DateOnly IssueDate { get; set; } + public DateTime IssueDate { get; set; } /// Name of visa public string Name { get; set; } = null!; /// Date when visa expires - public DateOnly ExpirationDate { get; set; } + public DateTime ExpirationDate { get; set; } } } diff --git a/SchengenVisaApi/Domains/VisaApplicationDomain/PastVisit.cs b/SchengenVisaApi/Domains/VisaApplicationDomain/PastVisit.cs index b6b2407..10c0e84 100644 --- a/SchengenVisaApi/Domains/VisaApplicationDomain/PastVisit.cs +++ b/SchengenVisaApi/Domains/VisaApplicationDomain/PastVisit.cs @@ -9,9 +9,9 @@ namespace Domains.VisaApplicationDomain public Guid Id { get; private set; } = Guid.NewGuid(); /// First day of - public DateOnly StartDate { get; set; } + public DateTime StartDate { get; set; } /// Last day of - public DateOnly EndDate { get; set; } + public DateTime EndDate { get; set; } } } diff --git a/SchengenVisaApi/Domains/VisaApplicationDomain/PermissionToDestCountry.cs b/SchengenVisaApi/Domains/VisaApplicationDomain/PermissionToDestCountry.cs index 93160cc..74e02ec 100644 --- a/SchengenVisaApi/Domains/VisaApplicationDomain/PermissionToDestCountry.cs +++ b/SchengenVisaApi/Domains/VisaApplicationDomain/PermissionToDestCountry.cs @@ -5,7 +5,7 @@ public class PermissionToDestCountry { /// Date when expires - public DateOnly ExpirationDate { get; set; } + public DateTime ExpirationDate { get; set; } /// Issuing authority public string Issuer { get; set; } = null!; diff --git a/SchengenVisaApi/Domains/VisaApplicationDomain/ReentryPermit.cs b/SchengenVisaApi/Domains/VisaApplicationDomain/ReentryPermit.cs index c842708..40164eb 100644 --- a/SchengenVisaApi/Domains/VisaApplicationDomain/ReentryPermit.cs +++ b/SchengenVisaApi/Domains/VisaApplicationDomain/ReentryPermit.cs @@ -8,6 +8,6 @@ public string Number { get; set; } = null!; /// Date when expires - public DateOnly ExpirationDate { get; set; } + public DateTime ExpirationDate { get; set; } } } diff --git a/SchengenVisaApi/Domains/VisaApplicationDomain/VisaApplication.cs b/SchengenVisaApi/Domains/VisaApplicationDomain/VisaApplication.cs index 3a51796..f133873 100644 --- a/SchengenVisaApi/Domains/VisaApplicationDomain/VisaApplication.cs +++ b/SchengenVisaApi/Domains/VisaApplicationDomain/VisaApplication.cs @@ -43,7 +43,7 @@ namespace Domains.VisaApplicationDomain public RequestedNumberOfEntries RequestedNumberOfEntries { get; set; } /// When application was created - public DateOnly RequestDate { get; set; } + public DateTime RequestDate { get; set; } /// Valid days requested public int ValidDaysRequested { get; set; } diff --git a/SchengenVisaApi/Infrastructure/Database/DbContext.cs b/SchengenVisaApi/Infrastructure/Database/DbContext.cs index 6ce2dd0..7d3a975 100644 --- a/SchengenVisaApi/Infrastructure/Database/DbContext.cs +++ b/SchengenVisaApi/Infrastructure/Database/DbContext.cs @@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore; namespace Infrastructure.Database { - public class DbContext(DbContextOptions opts) + public class DbContext(DbContextOptions opts) : Microsoft.EntityFrameworkCore.DbContext(opts), IGenericWriter, IGenericReader, IUnitOfWork { protected override void OnModelCreating(ModelBuilder modelBuilder) diff --git a/SchengenVisaApi/SchengenVisaApi/DependencyInjection.cs b/SchengenVisaApi/SchengenVisaApi/DependencyInjection.cs index 65f0b0b..5ecac50 100644 --- a/SchengenVisaApi/SchengenVisaApi/DependencyInjection.cs +++ b/SchengenVisaApi/SchengenVisaApi/DependencyInjection.cs @@ -17,7 +17,7 @@ namespace SchengenVisaApi } /// Add services needed for Presentation layer - private static IServiceCollection AddPresentation(this IServiceCollection services) + private static void AddPresentation(this IServiceCollection services) { services.AddControllers(); services.AddEndpointsApiExplorer();