Added validation and fixed errors
This commit is contained in:
		| @@ -0,0 +1,28 @@ | ||||
| using ApplicationLayer.InfrastructureServicesInterfaces; | ||||
| using Domains.VisaApplicationDomain; | ||||
| using FluentValidation; | ||||
|  | ||||
| namespace ApplicationLayer.Services.VisaApplications.Requests.Validation | ||||
| { | ||||
|     public class PastVisaValidator : AbstractValidator<PastVisa> | ||||
|     { | ||||
|         public PastVisaValidator(IDateTimeProvider dateTimeProvider) | ||||
|         { | ||||
|             RuleFor(v => v.ExpirationDate) | ||||
|                 .NotEmpty() | ||||
|                 .WithMessage("Expiration date of past visa can not be empty") | ||||
|                 .GreaterThan(v => v.IssueDate) | ||||
|                 .WithMessage("Past visa expiration date can not be earlier than issue date"); | ||||
|  | ||||
|             RuleFor(v => v.IssueDate) | ||||
|                 .NotEmpty() | ||||
|                 .WithMessage("Issue date of past visa can not be empty") | ||||
|                 .LessThan(dateTimeProvider.Now()) | ||||
|                 .WithMessage("Issue date of past visa must be in past"); | ||||
|  | ||||
|             RuleFor(v => v.Name) | ||||
|                 .NotEmpty() | ||||
|                 .WithMessage("Name of past visa can not be empty"); | ||||
|         } | ||||
|     } | ||||
| } | ||||
| @@ -0,0 +1,31 @@ | ||||
| using ApplicationLayer.InfrastructureServicesInterfaces; | ||||
| using Domains; | ||||
| using Domains.VisaApplicationDomain; | ||||
| using FluentValidation; | ||||
|  | ||||
| namespace ApplicationLayer.Services.VisaApplications.Requests.Validation | ||||
| { | ||||
|     public class PastVisitValidator : AbstractValidator<PastVisit> | ||||
|     { | ||||
|         public PastVisitValidator(IDateTimeProvider dateTimeProvider) | ||||
|         { | ||||
|             RuleFor(v => v.StartDate) | ||||
|                 .NotEmpty() | ||||
|                 .WithMessage("Start date of past visit can not be empty") | ||||
|                 .LessThan(v => v.EndDate) | ||||
|                 .WithMessage("Start date of past visit must be earlier than end date") | ||||
|                 .LessThan(dateTimeProvider.Now()) | ||||
|                 .WithMessage("Start date of past visit must be in past"); | ||||
|  | ||||
|             RuleFor(v => v.EndDate) | ||||
|                 .NotEmpty() | ||||
|                 .WithMessage("End date of past visit can not be empty"); | ||||
|  | ||||
|             RuleFor(v => v.DestinationCountry) | ||||
|                 .NotEmpty() | ||||
|                 .WithMessage("Destination Country of past visit can not be null") | ||||
|                 .MaximumLength(ConfigurationConstraints.CountryNameLength) | ||||
|                 .WithMessage($"Destination Country of past visit length must be less than {ConfigurationConstraints.CountryNameLength}"); | ||||
|         } | ||||
|     } | ||||
| } | ||||
| @@ -0,0 +1,25 @@ | ||||
| using ApplicationLayer.InfrastructureServicesInterfaces; | ||||
| using Domains; | ||||
| using Domains.VisaApplicationDomain; | ||||
| using FluentValidation; | ||||
|  | ||||
| namespace ApplicationLayer.Services.VisaApplications.Requests.Validation | ||||
| { | ||||
|     public class PermissionToDestCountryValidator : AbstractValidator<PermissionToDestCountry?> | ||||
|     { | ||||
|         public PermissionToDestCountryValidator(IDateTimeProvider dateTimeProvider) | ||||
|         { | ||||
|             RuleFor(p => p!.ExpirationDate) | ||||
|                 .NotEmpty() | ||||
|                 .WithMessage("Expiration date of permission to destination Country can not be empty") | ||||
|                 .GreaterThan(dateTimeProvider.Now()) | ||||
|                 .WithMessage("Permission to destination Country must not be expired"); | ||||
|  | ||||
|             RuleFor(p => p!.Issuer) | ||||
|                 .NotEmpty() | ||||
|                 .WithMessage("Issuer of permission for destination Country can not be empty") | ||||
|                 .MaximumLength(ConfigurationConstraints.IssuerNameLength) | ||||
|                 .WithMessage($"Issuer of permission to destination Country length must be less than {ConfigurationConstraints.IssuerNameLength}"); | ||||
|         } | ||||
|     } | ||||
| } | ||||
| @@ -0,0 +1,25 @@ | ||||
| using ApplicationLayer.InfrastructureServicesInterfaces; | ||||
| using Domains; | ||||
| using Domains.VisaApplicationDomain; | ||||
| using FluentValidation; | ||||
|  | ||||
| namespace ApplicationLayer.Services.VisaApplications.Requests.Validation | ||||
| { | ||||
|     public class ReentryPermitValidator : AbstractValidator<ReentryPermit?> | ||||
|     { | ||||
|         public ReentryPermitValidator(IDateTimeProvider dateTimeProvider) | ||||
|         { | ||||
|             RuleFor(p => p!.Number) | ||||
|                 .NotEmpty() | ||||
|                 .WithMessage("Re-entry permit number can not be empty") | ||||
|                 .MaximumLength(ConfigurationConstraints.ReentryPermitNumberLength) | ||||
|                 .WithMessage($"Re-entry permit number length must be less than {ConfigurationConstraints.ReentryPermitNumberLength}"); | ||||
|  | ||||
|             RuleFor(p => p!.ExpirationDate) | ||||
|                 .NotEmpty() | ||||
|                 .WithMessage("Re-entry permit expiration date can not be empty") | ||||
|                 .GreaterThan(dateTimeProvider.Now()) | ||||
|                 .WithMessage("Re-entry permit must not be expired"); | ||||
|         } | ||||
|     } | ||||
| } | ||||
| @@ -0,0 +1,63 @@ | ||||
| using ApplicationLayer.InfrastructureServicesInterfaces; | ||||
| using ApplicationLayer.Services.Applicants.NeededServices; | ||||
| using Domains; | ||||
| using Domains.VisaApplicationDomain; | ||||
| using FluentValidation; | ||||
|  | ||||
| namespace ApplicationLayer.Services.VisaApplications.Requests.Validation | ||||
| { | ||||
|     public class VisaApplicationCreateRequestValidator : AbstractValidator<VisaApplicationCreateRequest> | ||||
|     { | ||||
|         public VisaApplicationCreateRequestValidator( | ||||
|             IValidator<ReentryPermit?> reentryPermitValidator, | ||||
|             IValidator<PastVisa> pastVisaValidator, | ||||
|             IValidator<PermissionToDestCountry?> permissionToDestCountryValidator, | ||||
|             IValidator<PastVisit> pastVisitValidator, | ||||
|             IApplicantsRepository applicants, | ||||
|             IUserIdProvider userIdProvider) | ||||
|         { | ||||
|             //todo fix | ||||
|             WhenAsync( | ||||
|                 async (_, ct) => | ||||
|                 { | ||||
|                     return await applicants.IsApplicantNonResidentByUserId(userIdProvider.GetUserId(), ct); | ||||
|                 }, | ||||
|                 () => | ||||
|                 { | ||||
|                     RuleFor(r => r.ReentryPermit) | ||||
|                         .NotEmpty() | ||||
|                         .WithMessage("Non-residents must provide re-entry permission") | ||||
|                         .SetValidator(reentryPermitValidator); | ||||
|                 }); | ||||
|  | ||||
|             RuleFor(r => r.DestinationCountry) | ||||
|                 .NotEmpty() | ||||
|                 .WithMessage("Destination country can not be empty"); | ||||
|  | ||||
|             RuleFor(r => r.VisaCategory) | ||||
|                 .IsInEnum(); | ||||
|  | ||||
|             RuleFor(r => r.RequestedNumberOfEntries) | ||||
|                 .IsInEnum(); | ||||
|  | ||||
|             RuleFor(r => r.ValidDaysRequested) | ||||
|                 .NotEmpty() | ||||
|                 .WithMessage("Valid days requested can not be empty") | ||||
|                 .GreaterThan(0) | ||||
|                 .WithMessage($"Valid days requested should be positive number and less than {ConfigurationConstraints.MaxValidDays}") | ||||
|                 .LessThanOrEqualTo(ConfigurationConstraints.MaxValidDays) | ||||
|                 .WithMessage($"Valid days requested must be less than or equal to {ConfigurationConstraints.MaxValidDays}"); | ||||
|  | ||||
|             RuleForEach(r => r.PastVisas) | ||||
|                 .SetValidator(pastVisaValidator); | ||||
|  | ||||
|             When(r => r.VisaCategory == VisaCategory.Transit, | ||||
|                 () => | ||||
|                     RuleFor(r => r.PermissionToDestCountry) | ||||
|                         .SetValidator(permissionToDestCountryValidator)); | ||||
|  | ||||
|             RuleForEach(r => r.PastVisits) | ||||
|                 .SetValidator(pastVisitValidator); | ||||
|         } | ||||
|     } | ||||
| } | ||||
		Reference in New Issue
	
	Block a user