past visas

SchengenVisaApi/ApplicationLayer/Services/VisaApplications/Models/PastVisaModel.cs

@@ -11,7 +11,6 @@ public class PastVisaModel
     public DateTime IssueDate { get; set; }
 
     /// Name of visa
-    [Required]
     [MaxLength(ConfigurationConstraints.VisaNameLength)]
     public string Name { get; set; } = null!;
 

SchengenVisaApi/ApplicationLayer/Services/VisaApplications/Models/PastVisitModel.cs

@@ -15,7 +15,6 @@ public class PastVisitModel
     public DateTime EndDate { get; set; }
 
     /// Destination country of past visit
-    [Required]
     [MaxLength(ConfigurationConstraints.CountryNameLength)]
     public string DestinationCountry { get; set; } = null!;
 }

SchengenVisaApi/ApplicationLayer/Services/VisaApplications/Models/PermissionToDestCountryModel.cs

@@ -12,6 +12,5 @@ public class PermissionToDestCountryModel
 
     /// Issuing authority
     [MaxLength(ConfigurationConstraints.IssuerNameLength)]
-    [Required]
     public string Issuer { get; set; } = null!;
 }

SchengenVisaApi/BlazorWebAssemblyVisaApiClient/Components/FormComponents/VisaApplications/PermissionToDestCountryInput.razor

@@ -3,7 +3,7 @@
 
 <div>
     <label>
-        Destination Country:<br/>
+        Issuer:<br/>
         <InputText DisplayName="Issuer of permission to destination Country" class="rounded"
                    @bind-Value="PermissionToDestCountry.Issuer"/>
     </label><br/>

SchengenVisaApi/BlazorWebAssemblyVisaApiClient/Pages/CreateApplication.razor

@@ -9,8 +9,8 @@
 @using BlazorWebAssemblyVisaApiClient.Infrastructure.Helpers
 @using BlazorWebAssemblyVisaApiClient.Infrastructure.Services.DateTimeProvider
 @using BlazorWebAssemblyVisaApiClient.Infrastructure.Services.UserDataProvider
+@using BlazorWebAssemblyVisaApiClient.Validation
 @using FluentValidation
-@using Newtonsoft.Json
 @using Newtonsoft.Json.Linq
 @inherits BlazorWebAssemblyVisaApiClient.Components.Base.VisaClientComponentBase
 
@@ -54,6 +54,62 @@
             <ValidationMessage For="() => requestModel.ValidDaysRequested"></ValidationMessage><br/>
         </div>
 
+        <div class="form-block">
+            <h5>Past visas</h5>
+            @if (currentPastVisa > 0)
+            {
+                <table class="table table-bordered">
+                    <thead>
+                    <tr>
+                        <th>Name</th><th>Issue date</th><th>Expiration date</th><th></th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    @for (var i = 0; i < currentPastVisa; i++)
+                    {
+                        var visa = requestModel.PastVisas[i];
+                        <tr>
+                            <th>@visa.Name</th>
+                            <th>@visa.IssueDate.ToString("d.MM.yyyy")</th>
+                            <th>@visa.ExpirationDate.ToString("d.MM.yyyy")</th>
+                            <th>
+                                <input type="button" class="border-danger" @onclick="() => RemovePastVisa(visa)" value="X"/>
+                            </th>
+                        </tr>
+                    }
+                    </tbody>
+                </table>
+            }
+            <label>
+                Name:
+                <InputText DisplayName="Past visa name" @bind-Value="requestModel.PastVisas[currentPastVisa].Name"/>
+            </label><br/>
+            <ValidationMessage For="() => requestModel.PastVisas[currentPastVisa].Name"></ValidationMessage><br/>
+
+            <label>
+                Issue date:<br/>
+                <InputDate DisplayName="Past visa issue date"
+                           class="rounded"
+                           @bind-Value="requestModel.PastVisas[currentPastVisa].IssueDate"
+                           max="@formattedNow"/>
+            </label><br/>
+            <ValidationMessage For="() => requestModel.PastVisas[currentPastVisa].IssueDate"></ValidationMessage><br/>
+
+            <label>
+                Expiration date:<br/>
+                <InputDate DisplayName="Past visa expiration date"
+                           class="rounded"
+                           @bind-Value="requestModel.PastVisas[currentPastVisa].ExpirationDate"
+                           min="@formattedNow"/>
+            </label><br/>
+            <ValidationMessage For="() => requestModel.PastVisas[currentPastVisa].ExpirationDate"></ValidationMessage><br/>
+
+            <input type="button" class="btn-outline-primary"
+                   disabled="@(currentPastVisa == requestModel.PastVisas.Length - 1)"
+                   @onclick="AddPastVisa" value="Add"/>
+            <Status @ref="pastVisaStatus"/>
+        </div>
+
         @if (requestModel.VisaCategory is VisaCategory.Transit)
         {
             <div class="form-block">
@@ -61,12 +117,16 @@
                 <PermissionToDestCountryInput PermissionToDestCountry="requestModel.PermissionToDestCountry"/>
             </div>
         }
+        else
+        {
+            requestModel.PermissionToDestCountry = null;
+        }
 
         @if (isNonResident)
         {
             <div class="form-block">
                 <h5>Re-entry permission</h5>
-                <ReentryPermitInput ReentryPermit="requestModel.ReentryPermit" />
+                <ReentryPermitInput ReentryPermit="requestModel.ReentryPermit"/>
             </div>
             <br/>
         }
@@ -76,12 +136,17 @@
         <Status @ref="status"/>
     </EditForm>
 </div>
-//todo past visas and visits
 
 @code {
+
+//todo past visas and visits
     private VisaApplicationCreateRequestModel requestModel = new();
     private Status status = null!;
+    private Status pastVisaStatus = null!;
     private bool isNonResident;
+    private int currentPastVisa;
+    private int currentPastVisit;
+    private string formattedNow = null!;
 
     [Inject] IDateTimeProvider DateTimeProvider { get; set; } = null!;
 
@@ -89,10 +154,22 @@
 
     [Inject] IValidator<VisaApplicationCreateRequestModel> VisaApplicationCreateRequestValidator { get; set; } = null!;
 
+    [Inject] IValidator<PastVisaModel> PastVisaModelValidator { get; set; } = null!;
+
     [Inject] IMapper Mapper { get; set; } = null!;
 
     protected override async Task OnInitializedAsync()
     {
+        requestModel.PastVisas = new PastVisaModel[ConfigurationConstraints.MaxPastVisas];
+        for (var i = 0; i < requestModel.PastVisas.Length; i++)
+        {
+            requestModel.PastVisas[i] = new()
+            {
+                IssueDate = DateTimeProvider.Now(),
+                ExpirationDate = DateTimeProvider.Now()
+            };
+        }
+
         try
         {
             isNonResident = (await UserDataProvider.GetApplicant()).IsNonResident;
@@ -102,11 +179,15 @@
             ErrorHandler.Handle(e);
         }
 
+        formattedNow = DateTimeProvider.FormattedNow();
         requestModel.PermissionToDestCountry!.ExpirationDate = DateTimeProvider.Now();
     }
 
     private async Task TryCreate()
     {
+        requestModel.PastVisas = currentPastVisa == 0 ? [] : requestModel.PastVisas[..currentPastVisa];
+        requestModel.PastVisits = currentPastVisit == 0 ? [] : requestModel.PastVisits[..currentPastVisit];
+
         var validationResult = await VisaApplicationCreateRequestValidator.ValidateAsync(requestModel);
         if (!validationResult.IsValid)
         {
@@ -127,15 +208,16 @@
             if (e.StatusCode == (int)HttpStatusCode.BadRequest
                 && e.Result.AdditionalProperties.TryGetValue("errors", out var errors))
             {
-                var errorsList = ((JArray)errors).ToObject<List<string>>();
-                if (errorsList is null)
+                try
                 {
-                    ErrorHandler.Handle(new JsonException("Can't convert validation errors to list"));
-
-                    return;
+                    var errorsList = ((JArray)errors).ToObject<List<string>>();
+                    status.SetError(string.Join("<br/>", errorsList!));
+                }
+                catch (Exception inner)
+                {
+                    ErrorHandler.Handle(inner);
+                    status.SetError("Error occured");
                 }
-
-                status.SetError(string.Join("<br/>", errorsList));
             }
             else
             {
@@ -148,4 +230,49 @@
         }
     }
 
+    private void AddPastVisa()
+    {
+        var validationResult = PastVisaModelValidator.Validate(requestModel.PastVisas[currentPastVisa]);
+        if (!validationResult.IsValid)
+        {
+            pastVisaStatus.SetError(validationResult.ToErrorsString());
+            return;
+        }
+
+        if (currentPastVisa < requestModel.PastVisas.Length - 1)
+        {
+            currentPastVisa++;
+            pastVisaStatus.SetSucces("Added");
+        }
+        else
+        {
+            pastVisaStatus.SetError($"{requestModel.PastVisas.Length} past visas is maximum");
+        }
+    }
+
+    private void RemovePastVisa(PastVisaModel visa)
+    {
+        currentPastVisa--;
+        var found = false;
+
+        if (requestModel.PastVisas[^1] == visa)
+        {
+            requestModel.PastVisas[^1] = new();
+            return;
+        }
+
+        for (var i = 0; i < requestModel.PastVisas.Length - 1; i++)
+        {
+            if (requestModel.PastVisas[i] == visa)
+            {
+                found = true;
+            }
+
+            if (found)
+            {
+                requestModel.PastVisas[i] = requestModel.PastVisas[i + 1];
+            }
+        }
+    }
+
 }

SchengenVisaApi/BlazorWebAssemblyVisaApiClient/Validation/ConfigurationConstraints.cs

@@ -20,4 +20,6 @@ public static class ConfigurationConstraints
     public const int ApplicantMinAge = 14;
     public const int JobTitleLength = 50;
     public const int MaxValidDays = 90;
+    public const int MaxPastVisas = 10;
+    public const int MaxPastVisits = 10;
 }

SchengenVisaApi/BlazorWebAssemblyVisaApiClient/Validation/VisaApplications/Models/VisaApplicationCreateRequestModel.cs

@@ -26,13 +26,11 @@ namespace BlazorWebAssemblyVisaApiClient.Validation.VisaApplications.Models
         [Range(0, ConfigurationConstraints.MaxValidDays)]
         public int ValidDaysRequested { get; set; }
 
-        [ValidateComplexType]
-        public PastVisaModel[] PastVisas { get; set; } = default!;
+        [ValidateComplexType] public PastVisaModel[] PastVisas { get; set; } = default!;
 
         [ValidateComplexType]
         public PermissionToDestCountryModel? PermissionToDestCountry { get; set; } = new();
 
-        [ValidateComplexType]
-        public PastVisitModel[] PastVisits { get; set; } = default!;
+        [ValidateComplexType] public PastVisitModel[] PastVisits { get; set; } = default!;
     }
 }

SchengenVisaApi/VisaApiClient/Client.cs

@@ -1799,10 +1799,9 @@ namespace VisaApiClient
         [System.ComponentModel.DataAnnotations.Required(AllowEmptyStrings = true)]
         public System.DateTimeOffset IssueDate { get; set; } = default!;
 
-        [Newtonsoft.Json.JsonProperty("name", Required = Newtonsoft.Json.Required.Always)]
-        [System.ComponentModel.DataAnnotations.Required]
-        [System.ComponentModel.DataAnnotations.StringLength(70, MinimumLength = 1)]
-        public string Name { get; set; } = default!;
+        [Newtonsoft.Json.JsonProperty("name", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
+        [System.ComponentModel.DataAnnotations.StringLength(70)]
+        public string? Name { get; set; } = default!;
 
         [Newtonsoft.Json.JsonProperty("expirationDate", Required = Newtonsoft.Json.Required.Always)]
         [System.ComponentModel.DataAnnotations.Required(AllowEmptyStrings = true)]
@@ -1821,10 +1820,9 @@ namespace VisaApiClient
         [System.ComponentModel.DataAnnotations.Required(AllowEmptyStrings = true)]
         public System.DateTimeOffset EndDate { get; set; } = default!;
 
-        [Newtonsoft.Json.JsonProperty("destinationCountry", Required = Newtonsoft.Json.Required.Always)]
-        [System.ComponentModel.DataAnnotations.Required]
-        [System.ComponentModel.DataAnnotations.StringLength(70, MinimumLength = 1)]
-        public string DestinationCountry { get; set; } = default!;
+        [Newtonsoft.Json.JsonProperty("destinationCountry", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
+        [System.ComponentModel.DataAnnotations.StringLength(70)]
+        public string? DestinationCountry { get; set; } = default!;
 
     }
 
@@ -1835,10 +1833,9 @@ namespace VisaApiClient
         [System.ComponentModel.DataAnnotations.Required(AllowEmptyStrings = true)]
         public System.DateTimeOffset ExpirationDate { get; set; } = default!;
 
-        [Newtonsoft.Json.JsonProperty("issuer", Required = Newtonsoft.Json.Required.Always)]
-        [System.ComponentModel.DataAnnotations.Required]
-        [System.ComponentModel.DataAnnotations.StringLength(200, MinimumLength = 1)]
-        public string Issuer { get; set; } = default!;
+        [Newtonsoft.Json.JsonProperty("issuer", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
+        [System.ComponentModel.DataAnnotations.StringLength(200)]
+        public string? Issuer { get; set; } = default!;
 
     }