Исправил путь к Dockerfile в пайплайне

Reviewed-on: #1

.drone.yml

@@ -0,0 +1,33 @@
+kind: pipeline
+type: docker
+name: "Backend"
+
+steps:
+- name: test
+  image: mcr.microsoft.com/dotnet/sdk:8.0
+  commands:
+  - dotnet build
+  - dotnet test
+
+- name: publish
+  image: plugins/docker
+  settings:
+    username: prtsie
+    password:
+      from_secret: docker_pass
+    registry: git.prtsie.ru
+    repo: git.prtsie.ru/prtsie/schengen-visa-${DRONE_BRANCH}
+    tags:
+    - latest
+
+- name: deploy
+  image: appleboy/drone-ssh
+  settings:
+    script_stop: true
+    host: prtsie.ru:1337
+    username: deploy
+    key:
+      from_secret: ssh_key
+    script:
+      - cd /deploy
+      - ./deploy.sh ${DRONE_BRANCH}

.gitignore

@@ -33,3 +33,5 @@ _UpgradeReport_Files/
 Thumbs.db
 Desktop.ini
 .DS_Store
+
+.env

ApplicationLayer/Constants.cs

@@ -6,7 +6,7 @@ public static class Constants
 {
     public readonly static Regex EnglishWordRegex = new("^[a-zA-Z']*$");
 
-    public readonly static Regex EnglishPhraseRegex = new(@"^[a-zA-Z №0-9;,\-_+=#*']*$");
+    public readonly static Regex EnglishPhraseRegex = new("""^[a-zA-Z №0-9;,\-_+=#*'\"]*$""");
 
     public readonly static Regex PhoneNumRegex = new(@"^[\+]?[(]?[0-9]{3}[)]?[-\s\.]?[0-9]{3}[-\s\.]?[0-9]{4,6}$");
 }

ApplicationLayer/Services/VisaApplications/Handlers/VisaApplicationRequestsHandler.cs

@@ -35,7 +35,7 @@ public class VisaApplicationRequestsHandler(
         return mapper.Map<List<VisaApplicationPreview>>(visaApplications);
     }
 
-    /// <summary> <inheritdoc cref="IVisaApplicationRequestsHandler.GetApplicationForApplicantAsync"/> </summary>
+    /// <inheritdoc cref="IVisaApplicationRequestsHandler.GetApplicationForApplicantAsync"/>
     public async Task<VisaApplicationModel> GetApplicationForApplicantAsync(Guid id, CancellationToken cancellationToken)
     {
         var applicant = await applicants.FindByUserIdAsync(userIdProvider.GetUserId(), cancellationToken);

BlazorWebAssemblyVisaApiClient/App.razor

@@ -1,5 +1,4 @@
 @using BlazorWebAssemblyVisaApiClient.ErrorHandling
-
 <GlobalErrorHandler >
     <Router AppAssembly="@typeof(App).Assembly">
         <Found Context="routeData">

BlazorWebAssemblyVisaApiClient/Components/Auth/AuthComponent.razor

@@ -2,7 +2,6 @@
 @using BlazorWebAssemblyVisaApiClient.ErrorHandling
 @using BlazorWebAssemblyVisaApiClient.Infrastructure.Services.UserDataProvider
 @using VisaApiClient
-
 @code {
     public static AuthData? AuthData;
 

BlazorWebAssemblyVisaApiClient/Components/Base/VisaClientComponentBase.razor

@@ -1,6 +1,5 @@
 @using BlazorWebAssemblyVisaApiClient.ErrorHandling
 @using VisaApiClient
-
 @code
 {
     [CascadingParameter] protected GlobalErrorHandler ErrorHandler { get; set; } = null!;

BlazorWebAssemblyVisaApiClient/Components/FormComponents/Applicants/AddressInput.razor

@@ -1,5 +1,4 @@
 @using VisaApiClient
-
 <div>
     <div >
         <label >

BlazorWebAssemblyVisaApiClient/Components/FormComponents/Applicants/AuthDataInput.razor

@@ -1,5 +1,4 @@
 @using VisaApiClient
-
 <div>
     <div >
         <label >

BlazorWebAssemblyVisaApiClient/Components/FormComponents/Applicants/NameInput.razor

@@ -1,5 +1,4 @@
 @using VisaApiClient
-
 <div>
     <div >
         <label>

BlazorWebAssemblyVisaApiClient/Components/FormComponents/Applicants/PassportInput.razor

@@ -1,6 +1,5 @@
 @using BlazorWebAssemblyVisaApiClient.Infrastructure.Services.DateTimeProvider
 @using VisaApiClient
-
 <div>
     <div >
         <label>

BlazorWebAssemblyVisaApiClient/Components/FormComponents/EnumInputList.razor

@@ -1,7 +1,7 @@
-@using System.Linq.Expressions
+@typeparam TItem where TItem : class
+@using System.Linq.Expressions
 @using System.Reflection
 @using BlazorWebAssemblyVisaApiClient.Infrastructure.Helpers
-@typeparam TItem where TItem : class
 @typeparam TMember where TMember : struct, Enum
 
 <InputSelect TValue="TMember" @bind-Value="selected">

BlazorWebAssemblyVisaApiClient/Components/FormComponents/VisaApplications/PermissionToDestCountryInput.razor

@@ -1,6 +1,5 @@
 @using BlazorWebAssemblyVisaApiClient.Infrastructure.Services.DateTimeProvider
 @using VisaApiClient
-
 <div>
     <label>
         Issuer:<br/>

BlazorWebAssemblyVisaApiClient/Components/FormComponents/VisaApplications/ReentryPermitInput.razor

@@ -1,6 +1,5 @@
 @using BlazorWebAssemblyVisaApiClient.Infrastructure.Services.DateTimeProvider
 @using VisaApiClient
-
 <div>
     <label>
         Number:<br/>

BlazorWebAssemblyVisaApiClient/ErrorHandling/GlobalErrorHandler.razor

@@ -1,7 +1,6 @@
 @using System.Net
 @using BlazorWebAssemblyVisaApiClient.Common.Exceptions
 @using VisaApiClient
-
 <CascadingValue Value="this">
     <Modal @ref="modal">
         <BodyTemplate>

BlazorWebAssemblyVisaApiClient/Infrastructure/Helpers/EnumExtensions.cs

@@ -1,17 +1,17 @@
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
-
+
-namespace BlazorWebAssemblyVisaApiClient.Infrastructure.Helpers;
+namespace BlazorWebAssemblyVisaApiClient.Infrastructure.Helpers;
-
+
-public static class EnumExtensions
+public static class EnumExtensions
-{
+{
-    public static string GetDisplayName(this Enum value)
+    public static string GetDisplayName(this Enum value)
-    {
+    {
-            var enumMembers = value.GetType().GetMembers();
+            var enumMembers = value.GetType().GetMembers();
-            var member = enumMembers.First(info => info.Name == value.ToString());
+            var member = enumMembers.First(info => info.Name == value.ToString());
-            var displayAttribute = (DisplayAttribute?)member
+            var displayAttribute = (DisplayAttribute?)member
-                .GetCustomAttributes(typeof(DisplayAttribute), false)
+                .GetCustomAttributes(typeof(DisplayAttribute), false)
-                .FirstOrDefault();
+                .FirstOrDefault();
-            var displayName = displayAttribute?.Name ?? value.ToString();
+            var displayName = displayAttribute?.Name ?? value.ToString();
-            return displayName;
+            return displayName;
-        }
+        }
 }

BlazorWebAssemblyVisaApiClient/Pages/AddAuthority.razor

@@ -1,10 +1,10 @@
 @page "/authorities/add"
 @using AutoMapper
-@using BlazorWebAssemblyVisaApiClient.Validation.Applicants.Models
-@using VisaApiClient
 @using BlazorWebAssemblyVisaApiClient.Components
 @using BlazorWebAssemblyVisaApiClient.Infrastructure.Helpers
+@using BlazorWebAssemblyVisaApiClient.Validation.Applicants.Models
 @using FluentValidation
+@using VisaApiClient
 @inherits BlazorWebAssemblyVisaApiClient.Components.Base.VisaClientComponentBase
 
 <EditForm Model="requestModel" class="with-centered-content">

BlazorWebAssemblyVisaApiClient/Pages/Applications.razor

@@ -1,143 +1,143 @@
-@page "/applications"
+@page "/applications"
-@using BlazorWebAssemblyVisaApiClient.Common.Exceptions
+@using BlazorWebAssemblyVisaApiClient.Common.Exceptions
-@using BlazorWebAssemblyVisaApiClient.Infrastructure.Helpers
+@using BlazorWebAssemblyVisaApiClient.Infrastructure.Helpers
-@using BlazorWebAssemblyVisaApiClient.Infrastructure.Services.UserDataProvider
+@using BlazorWebAssemblyVisaApiClient.Infrastructure.Services.UserDataProvider
-@using BlazorWebAssemblyVisaApiClient.Validation.VisaApplications.Models
+@using BlazorWebAssemblyVisaApiClient.Validation.VisaApplications.Models
-@using VisaApiClient
+@using VisaApiClient
-@inherits BlazorWebAssemblyVisaApiClient.Components.Base.VisaClientComponentBase
+@inherits BlazorWebAssemblyVisaApiClient.Components.Base.VisaClientComponentBase
-
+
-<PageTitle>Applications</PageTitle>
+<PageTitle>Applications</PageTitle>
-
+
-<table class="table table-bordered table-hover">
+<table class="table table-bordered table-hover">
-    <thead>
+    <thead>
-    <tr>
+    <tr>
-        <th>Destination Country</th>
+        <th>Destination Country</th>
-        <th>Visa Category</th>
+        <th>Visa Category</th>
-        <th>Request date</th>
+        <th>Request date</th>
-        <th>Days requested</th>
+        <th>Days requested</th>
-        <th>Status</th>
+        <th>Status</th>
-        <th></th>
+        <th></th>
-    </tr>
+    </tr>
-    </thead>
+    </thead>
-
+
-    <tbody>
+    <tbody>
-    @foreach (var application in applications)
+    @foreach (var application in applications)
-    {
+    {
-        var rowClass = application.Status switch
+        var rowClass = application.Status switch
-        {
+        {
-            ApplicationStatus.Pending => "",
+            ApplicationStatus.Pending => "",
-            ApplicationStatus.Approved => "table-success",
+            ApplicationStatus.Approved => "table-success",
-            ApplicationStatus.Rejected => "table-danger",
+            ApplicationStatus.Rejected => "table-danger",
-            ApplicationStatus.Closed => "table-danger",
+            ApplicationStatus.Closed => "table-danger",
-            _ => throw new ArgumentOutOfRangeException()
+            _ => throw new ArgumentOutOfRangeException()
-        };
+        };
-
+
-        <tr class="@rowClass">
+        <tr class="@rowClass">
-            <td>@application.DestinationCountry</td>
+            <td>@application.DestinationCountry</td>
-            <td>@(((VisaCategoryModel)application.VisaCategory).GetDisplayName())</td>
+            <td>@(((VisaCategoryModel)application.VisaCategory).GetDisplayName())</td>
-            <td>@application.RequestDate.ToString("d")</td>
+            <td>@application.RequestDate.ToString("d")</td>
-            <td>@application.ValidDaysRequested</td>
+            <td>@application.ValidDaysRequested</td>
-            <td>@application.Status.GetDisplayName()</td>
+            <td>@application.Status.GetDisplayName()</td>
-            <td>
+            <td>
-                <NavLink href="@($"/applications/{application.Id}")">
+                <NavLink href="@($"/applications/{application.Id}")">
-                    <button class="btn-primary">See</button>
+                    <button class="btn-primary">See</button>
-                </NavLink>
+                </NavLink>
-                @if (currentRole == Constants.ApplicantRole)
+                @if (currentRole == Constants.ApplicantRole)
-                {
+                {
-                    <span> | </span>
+                    <span> | </span>
-                    <input type="button" class="btn-outline-primary" @onclick="() => DownloadApplication(application)" value="Download"/>
+                    <input type="button" class="btn-outline-primary" @onclick="() => DownloadApplication(application)" value="Download"/>
-                    if (application.Status is ApplicationStatus.Pending)
+                    if (application.Status is ApplicationStatus.Pending)
-                    {
+                    {
-                        <span> | </span>
+                        <span> | </span>
-                        <input type="button" class="border-danger" @onclick="() => CloseApplication(application)" value="Close"/>
+                        <input type="button" class="border-danger" @onclick="() => CloseApplication(application)" value="Close"/>
-                    }
+                    }
-                }
+                }
-            </td>
+            </td>
-        </tr>
+        </tr>
-    }
+    }
-    </tbody>
+    </tbody>
-</table >
+</table >
-
+
-<script>
+<script>
-    window.downloadFileFromStream = async (contentStreamReference) => {
+    window.downloadFileFromStream = async (contentStreamReference) => {
-        const arrayBuffer = await contentStreamReference.arrayBuffer();
+        const arrayBuffer = await contentStreamReference.arrayBuffer();
-        const blob = new Blob([arrayBuffer]);
+        const blob = new Blob([arrayBuffer]);
-        const url = URL.createObjectURL(blob);
+        const url = URL.createObjectURL(blob);
-        const anchorElement = document.createElement('a');
+        const anchorElement = document.createElement('a');
-        anchorElement.href = url;
+        anchorElement.href = url;
-        anchorElement.download = 'Application.xlsx';
+        anchorElement.download = 'Application.xlsx';
-        anchorElement.click();
+        anchorElement.click();
-        anchorElement.remove();
+        anchorElement.remove();
-        URL.revokeObjectURL(url);
+        URL.revokeObjectURL(url);
-    }
+    }
-</script>
+</script>
-
+
-@code {
+@code {
-    private string currentRole = null!;
+    private string currentRole = null!;
-    private List<VisaApplicationPreview> applications = [];
+    private List<VisaApplicationPreview> applications = [];
-
+
-    [Inject] private IUserDataProvider UserDataProvider { get; set; } = null!;
+    [Inject] private IUserDataProvider UserDataProvider { get; set; } = null!;
-
+
-    [Inject] private IJSRuntime JavaScriptInterop { get; set; } = null!;
+    [Inject] private IJSRuntime JavaScriptInterop { get; set; } = null!;
-
+
-    protected override async Task OnInitializedAsync()
+    protected override async Task OnInitializedAsync()
-    {
+    {
-        try
+        try
-        {
+        {
-            currentRole = UserDataProvider.CurrentRole ?? throw new NotLoggedInException();
+            currentRole = UserDataProvider.CurrentRole ?? throw new NotLoggedInException();
-        }
+        }
-        catch (Exception e)
+        catch (Exception e)
-        {
+        {
-            ErrorHandler.Handle(e);
+            ErrorHandler.Handle(e);
-        }
+        }
-
+
-        await Fetch();
+        await Fetch();
-    }
+    }
-
+
-    private async Task Fetch()
+    private async Task Fetch()
-    {
+    {
-        try
+        try
-        {
+        {
-            applications = currentRole switch
+            applications = currentRole switch
-            {
+            {
-                Constants.ApplicantRole => (await Client.GetApplicationsForApplicantAsync()).OrderByDescending(a => a.RequestDate).ToList(),
+                Constants.ApplicantRole => (await Client.GetApplicationsForApplicantAsync()).OrderByDescending(a => a.RequestDate).ToList(),
-                Constants.ApprovingAuthorityRole => (await Client.GetPendingAsync()).OrderByDescending(a => a.RequestDate).ToList(),
+                Constants.ApprovingAuthorityRole => (await Client.GetPendingAsync()).OrderByDescending(a => a.RequestDate).ToList(),
-                _ => throw new NotLoggedInException()
+                _ => throw new NotLoggedInException()
-            };
+            };
-        }
+        }
-        catch (Exception e)
+        catch (Exception e)
-        {
+        {
-            ErrorHandler.Handle(e);
+            ErrorHandler.Handle(e);
-        }
+        }
-    }
+    }
-
+
-    private async Task CloseApplication(VisaApplicationPreview application)
+    private async Task CloseApplication(VisaApplicationPreview application)
-    {
+    {
-        try
+        try
-        {
+        {
-            await Client.CloseApplicationAsync(application.Id);
+            await Client.CloseApplicationAsync(application.Id);
-            application.Status = ApplicationStatus.Closed;
+            application.Status = ApplicationStatus.Closed;
-            StateHasChanged();
+            StateHasChanged();
-        }
+        }
-        catch (Exception e)
+        catch (Exception e)
-        {
+        {
-            ErrorHandler.Handle(e);
+            ErrorHandler.Handle(e);
-        }
+        }
-    }
+    }
-
+
-    private async Task DownloadApplication(VisaApplicationPreview application)
+    private async Task DownloadApplication(VisaApplicationPreview application)
-    {
+    {
-        try
+        try
-        {
+        {
-            var response = await Client.DownloadApplicationForApplicantAsync(application.Id);
+            var response = await Client.DownloadApplicationForApplicantAsync(application.Id);
-            using var streamRef = new DotNetStreamReference(stream: response.Stream);
+            using var streamRef = new DotNetStreamReference(stream: response.Stream);
-
+
-            await JavaScriptInterop.InvokeVoidAsync("downloadFileFromStream", streamRef);
+            await JavaScriptInterop.InvokeVoidAsync("downloadFileFromStream", streamRef);
-        }
+        }
-        catch (Exception e)
+        catch (Exception e)
-        {
+        {
-            ErrorHandler.Handle(e);
+            ErrorHandler.Handle(e);
-        }
+        }
-    }
+    }
-
+
-}
+}

BlazorWebAssemblyVisaApiClient/Pages/Auth.razor

@@ -1,8 +1,8 @@
 @page "/"
-@using BlazorWebAssemblyVisaApiClient.Components.Auth
-@using VisaApiClient
-@using BlazorWebAssemblyVisaApiClient.Components.FormComponents.Applicants
 @using BlazorWebAssemblyVisaApiClient.Components
+@using BlazorWebAssemblyVisaApiClient.Components.Auth
+@using BlazorWebAssemblyVisaApiClient.Components.FormComponents.Applicants
+@using VisaApiClient
 @inherits BlazorWebAssemblyVisaApiClient.Components.Base.VisaClientComponentBase
 
 <PageTitle>Authentication</PageTitle>

BlazorWebAssemblyVisaApiClient/Pages/Authority.razor

@@ -1,11 +1,11 @@
 @page "/authorities/{authorityId}/{oldEmail}"
-@inherits BlazorWebAssemblyVisaApiClient.Components.Base.VisaClientComponentBase
 @using BlazorWebAssemblyVisaApiClient.Common.Exceptions
-@using BlazorWebAssemblyVisaApiClient.Infrastructure.Services.UserDataProvider
-@using VisaApiClient
 @using BlazorWebAssemblyVisaApiClient.Components
 @using BlazorWebAssemblyVisaApiClient.Infrastructure.Helpers
+@using BlazorWebAssemblyVisaApiClient.Infrastructure.Services.UserDataProvider
 @using FluentValidation
+@using VisaApiClient
+@inherits BlazorWebAssemblyVisaApiClient.Components.Base.VisaClientComponentBase
 
 <EditForm Model="model" class="with-centered-content">
     <div >

BlazorWebAssemblyVisaApiClient/Pages/CreateApplication.razor

@@ -1,17 +1,17 @@
 @page "/applications/new"
 @using System.Net
 @using AutoMapper
-@using BlazorWebAssemblyVisaApiClient.Validation.VisaApplications.Models
-@using VisaApiClient
 @using BlazorWebAssemblyVisaApiClient.Components
+@using BlazorWebAssemblyVisaApiClient.Components.FormComponents
 @using BlazorWebAssemblyVisaApiClient.Components.FormComponents.VisaApplications
 @using BlazorWebAssemblyVisaApiClient.Infrastructure.Helpers
 @using BlazorWebAssemblyVisaApiClient.Infrastructure.Services.DateTimeProvider
 @using BlazorWebAssemblyVisaApiClient.Infrastructure.Services.UserDataProvider
 @using BlazorWebAssemblyVisaApiClient.Validation
+@using BlazorWebAssemblyVisaApiClient.Validation.VisaApplications.Models
 @using FluentValidation
 @using Newtonsoft.Json.Linq
-@using BlazorWebAssemblyVisaApiClient.Components.FormComponents
+@using VisaApiClient
 @inherits BlazorWebAssemblyVisaApiClient.Components.Base.VisaClientComponentBase
 
 <PageTitle>New Application</PageTitle>