diff --git a/PaydayBackend/Controllers/AdminController.cs b/PaydayBackend/Controllers/AdminController.cs index c3c03c8..8e0c12e 100644 --- a/PaydayBackend/Controllers/AdminController.cs +++ b/PaydayBackend/Controllers/AdminController.cs @@ -27,11 +27,20 @@ public class AdminController : ControllerBase return Ok(); } + /// + /// Получение всех банков + /// + [HttpGet("banks")] + public async Task GetBanks() + { + return Ok(await _adminService.GetAllBanks()); + } + /// /// Получение всех условий одного банка по id /// /// Банк не найден - [HttpGet("banks")] + [HttpGet("banks/{bankId}/loanterms")] public async Task GetAllLoanTermsByBankId(long bankId) { var result = await _adminService.GetAllLoanTermsByBankId(bankId); @@ -56,7 +65,7 @@ public class AdminController : ControllerBase /// Удаление ВСЕХ условий кредитования /// /// Банк не найден - [HttpGet("banks/{bank_id}/loanterms")] + [HttpDelete("banks/{bank_id}/loanterms")] public async Task AddLoanTerm(long bankId) { var result = await _adminService.RemoveAllLoanTermsByBankId(bankId); diff --git a/PaydayBackend/Dockerfile b/PaydayBackend/Dockerfile index 00d00bb..2a5a479 100644 --- a/PaydayBackend/Dockerfile +++ b/PaydayBackend/Dockerfile @@ -1,20 +1,22 @@ FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base WORKDIR /app EXPOSE 80 -EXPOSE 443 FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build WORKDIR /src -COPY ["PaydayBackend/PaydayBackend.csproj", "PaydayBackend/"] -RUN dotnet restore "PaydayBackend/PaydayBackend.csproj" +COPY ["PaydayBackend.csproj", "PaydayBackend.csproj"] +RUN dotnet restore "PaydayBackend.csproj" COPY . . -WORKDIR "/src/PaydayBackend" +WORKDIR "/src" RUN dotnet build "PaydayBackend.csproj" -c Release -o /app/build FROM build AS publish RUN dotnet publish "PaydayBackend.csproj" -c Release -o /app/publish /p:UseAppHost=false FROM base AS final +RUN apt-get update && apt-get install -y curl WORKDIR /app +HEALTHCHECK --interval=5s --timeout=10s --retries=3 CMD curl --fail http://localhost:80/health || exit 1 + COPY --from=publish /app/publish . ENTRYPOINT ["dotnet", "PaydayBackend.dll"] diff --git a/PaydayBackend/PaydayBackend.csproj b/PaydayBackend/PaydayBackend.csproj index 1c6a0d5..a576401 100644 --- a/PaydayBackend/PaydayBackend.csproj +++ b/PaydayBackend/PaydayBackend.csproj @@ -20,6 +20,10 @@ + + all + runtime; build; native; contentfiles; analyzers; buildtransitive +