From 048453ed2ff8390465fcf6266ee9d959feb73a2c Mon Sep 17 00:00:00 2001 From: mfnefd Date: Sun, 3 Nov 2024 19:18:40 +0400 Subject: [PATCH 01/16] =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B2=D0=B0=D1=8F=20?= =?UTF-8?q?=D0=BF=D0=BE=D0=BF=D1=8B=D1=82=D0=BA=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ApiRestaurant/.gitignore | 484 +++++++++++ .../ApiRestaurant/ApiRestaurant.csproj | 14 + .../ApiRestaurant/ApiRestaurant.http | 6 + .../Controllers/RestaurantController.cs | 59 ++ .../ApiRestaurant/Dockerfile | 14 + .../ApiRestaurant/Models/Restaurant.cs | 8 + .../ApiRestaurant/Models/RestaurantContext.cs | 13 + .../ApiRestaurant/Models/Waiter.cs | 7 + .../ApiRestaurant/Program.cs | 35 + .../Properties/launchSettings.json | 41 + .../ApiRestaurant/WaiterApiClient.cs | 26 + .../appsettings.Development.json | 8 + .../ApiRestaurant/appsettings.json | 9 + balakhonov_danila_lab_3/ApiWaiter/.gitignore | 1 + balakhonov_danila_lab_3/ApiWaiter/Dockerfile | 11 + balakhonov_danila_lab_3/ApiWaiter/db.json | 4 + balakhonov_danila_lab_3/ApiWaiter/index.js | 82 ++ .../ApiWaiter/package-lock.json | 789 ++++++++++++++++++ .../ApiWaiter/package.json | 17 + balakhonov_danila_lab_3/docker-compose.yaml | 23 + 20 files changed, 1651 insertions(+) create mode 100644 balakhonov_danila_lab_3/ApiRestaurant/.gitignore create mode 100644 balakhonov_danila_lab_3/ApiRestaurant/ApiRestaurant.csproj create mode 100644 balakhonov_danila_lab_3/ApiRestaurant/ApiRestaurant.http create mode 100644 balakhonov_danila_lab_3/ApiRestaurant/Controllers/RestaurantController.cs create mode 100644 balakhonov_danila_lab_3/ApiRestaurant/Dockerfile create mode 100644 balakhonov_danila_lab_3/ApiRestaurant/Models/Restaurant.cs create mode 100644 balakhonov_danila_lab_3/ApiRestaurant/Models/RestaurantContext.cs create mode 100644 balakhonov_danila_lab_3/ApiRestaurant/Models/Waiter.cs create mode 100644 balakhonov_danila_lab_3/ApiRestaurant/Program.cs create mode 100644 balakhonov_danila_lab_3/ApiRestaurant/Properties/launchSettings.json create mode 100644 balakhonov_danila_lab_3/ApiRestaurant/WaiterApiClient.cs create mode 100644 balakhonov_danila_lab_3/ApiRestaurant/appsettings.Development.json create mode 100644 balakhonov_danila_lab_3/ApiRestaurant/appsettings.json create mode 100644 balakhonov_danila_lab_3/ApiWaiter/.gitignore create mode 100644 balakhonov_danila_lab_3/ApiWaiter/Dockerfile create mode 100644 balakhonov_danila_lab_3/ApiWaiter/db.json create mode 100644 balakhonov_danila_lab_3/ApiWaiter/index.js create mode 100644 balakhonov_danila_lab_3/ApiWaiter/package-lock.json create mode 100644 balakhonov_danila_lab_3/ApiWaiter/package.json create mode 100644 balakhonov_danila_lab_3/docker-compose.yaml diff --git a/balakhonov_danila_lab_3/ApiRestaurant/.gitignore b/balakhonov_danila_lab_3/ApiRestaurant/.gitignore new file mode 100644 index 0000000..104b544 --- /dev/null +++ b/balakhonov_danila_lab_3/ApiRestaurant/.gitignore @@ -0,0 +1,484 @@ +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from `dotnet new gitignore` + +# dotenv files +.env + +# User-specific files +*.rsuser +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Mono auto generated files +mono_crash.* + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +[Ww][Ii][Nn]32/ +[Aa][Rr][Mm]/ +[Aa][Rr][Mm]64/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ +[Ll]ogs/ + +# Visual Studio 2015/2017 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUnit +*.VisualState.xml +TestResult.xml +nunit-*.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET +project.lock.json +project.fragment.lock.json +artifacts/ + +# Tye +.tye/ + +# ASP.NET Scaffolding +ScaffoldingReadMe.txt + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio +*_i.c +*_p.c +*_h.h +*.ilk +*.meta +*.obj +*.iobj +*.pch +*.pdb +*.ipdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*_wpftmp.csproj +*.log +*.tlog +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Coverlet is a free, cross platform Code Coverage Tool +coverage*.json +coverage*.xml +coverage*.info + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# NuGet Symbol Packages +*.snupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx +*.appxbundle +*.appxupload + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!?*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser +*- [Bb]ackup.rdl +*- [Bb]ackup ([0-9]).rdl +*- [Bb]ackup ([0-9][0-9]).rdl + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio 6 auto-generated project file (contains which files were open etc.) +*.vbp + +# Visual Studio 6 workspace and project file (working project files containing files to include in project) +*.dsw +*.dsp + +# Visual Studio 6 technical files +*.ncb +*.aps + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# CodeRush personal settings +.cr/personal + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ + +# Local History for Visual Studio +.localhistory/ + +# Visual Studio History (VSHistory) files +.vshistory/ + +# BeatPulse healthcheck temp database +healthchecksdb + +# Backup folder for Package Reference Convert tool in Visual Studio 2017 +MigrationBackup/ + +# Ionide (cross platform F# VS Code tools) working folder +.ionide/ + +# Fody - auto-generated XML schema +FodyWeavers.xsd + +# VS Code files for those working on multiple tools +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json +*.code-workspace + +# Local History for Visual Studio Code +.history/ + +# Windows Installer files from build outputs +*.cab +*.msi +*.msix +*.msm +*.msp + +# JetBrains Rider +*.sln.iml +.idea + +## +## Visual studio for Mac +## + + +# globs +Makefile.in +*.userprefs +*.usertasks +config.make +config.status +aclocal.m4 +install-sh +autom4te.cache/ +*.tar.gz +tarballs/ +test-results/ + +# Mac bundle stuff +*.dmg +*.app + +# content below from: https://github.com/github/gitignore/blob/master/Global/macOS.gitignore +# General +.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.com.apple.timemachine.donotpresent + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + +# content below from: https://github.com/github/gitignore/blob/master/Global/Windows.gitignore +# Windows thumbnail cache files +Thumbs.db +ehthumbs.db +ehthumbs_vista.db + +# Dump file +*.stackdump + +# Folder config file +[Dd]esktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Windows Installer files +*.cab +*.msi +*.msix +*.msm +*.msp + +# Windows shortcuts +*.lnk + +# Vim temporary swap files +*.swp diff --git a/balakhonov_danila_lab_3/ApiRestaurant/ApiRestaurant.csproj b/balakhonov_danila_lab_3/ApiRestaurant/ApiRestaurant.csproj new file mode 100644 index 0000000..2242827 --- /dev/null +++ b/balakhonov_danila_lab_3/ApiRestaurant/ApiRestaurant.csproj @@ -0,0 +1,14 @@ + + + + net8.0 + enable + enable + + + + + + + + diff --git a/balakhonov_danila_lab_3/ApiRestaurant/ApiRestaurant.http b/balakhonov_danila_lab_3/ApiRestaurant/ApiRestaurant.http new file mode 100644 index 0000000..2d63141 --- /dev/null +++ b/balakhonov_danila_lab_3/ApiRestaurant/ApiRestaurant.http @@ -0,0 +1,6 @@ +@ApiRestaurant_HostAddress = http://localhost:5089 + +GET {{ApiRestaurant_HostAddress}}/weatherforecast/ +Accept: application/json + +### diff --git a/balakhonov_danila_lab_3/ApiRestaurant/Controllers/RestaurantController.cs b/balakhonov_danila_lab_3/ApiRestaurant/Controllers/RestaurantController.cs new file mode 100644 index 0000000..0d1a6de --- /dev/null +++ b/balakhonov_danila_lab_3/ApiRestaurant/Controllers/RestaurantController.cs @@ -0,0 +1,59 @@ +using ApiRestaurant.Models; +using Microsoft.AspNetCore.Mvc; +using Microsoft.EntityFrameworkCore; + +namespace ApiRestaurant.Controllers; + +[Route("api/[controller]")] +[ApiController] +public class RestaurantController : ControllerBase +{ + private RestaurantContext _context; + public RestaurantController(RestaurantContext context) + { + _context = context; + } + + [HttpGet] + public Task> GetAll() { + return _context.Restaurants.ToListAsync(); + } + + [HttpGet("{id}")] + public async Task> GetOne(Guid id) { + var restaurant = await _context.Restaurants.FindAsync(id); + if (restaurant == null) return NotFound(); + var waiters = await WaiterApiClient.GetAllForRestaurant(id); + restaurant.Waiters = waiters; + return restaurant; + } + + [HttpPost] + public ActionResult Create(RestaurantDTO restaurant) { + var newRestaurant = new Restaurant { Name = restaurant.Name }; + var res = _context.Restaurants.Add(newRestaurant); + _context.SaveChanges(); + return res.Entity; + } + + [HttpPut("{id}")] + public ActionResult Update(Guid id, RestaurantDTO restaurant) { + var oldRestaurant = _context.Restaurants.FirstOrDefault(r => r.Id == id); + if (oldRestaurant == null) return NotFound(); + oldRestaurant.Name = restaurant.Name; + var res = _context.Restaurants.Update(oldRestaurant); + _context.SaveChangesAsync(); + return res.Entity; + } + + [HttpDelete] + public ActionResult Delete(Guid id) { + var restaurant = _context.Restaurants.FirstOrDefault(r => r.Id == id); + if (restaurant is null) return NotFound(); + _context.Restaurants.Remove(restaurant); + _context.SaveChangesAsync(); + return Ok(); + } +} + +public record RestaurantDTO(string Name); \ No newline at end of file diff --git a/balakhonov_danila_lab_3/ApiRestaurant/Dockerfile b/balakhonov_danila_lab_3/ApiRestaurant/Dockerfile new file mode 100644 index 0000000..5809cb3 --- /dev/null +++ b/balakhonov_danila_lab_3/ApiRestaurant/Dockerfile @@ -0,0 +1,14 @@ +FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build +WORKDIR /App + +# Copy everything +COPY . ./ +# Restore as distinct layers +RUN dotnet restore +# Build and publish a release +RUN dotnet publish -c Release -o out + +FROM mcr.microsoft.com/dotnet/runtime:8.0 AS runtime +WORKDIR /App +COPY --from=build /App/out . +ENTRYPOINT ["dotnet", "ApiRestaurant.dll"] \ No newline at end of file diff --git a/balakhonov_danila_lab_3/ApiRestaurant/Models/Restaurant.cs b/balakhonov_danila_lab_3/ApiRestaurant/Models/Restaurant.cs new file mode 100644 index 0000000..06d8ea6 --- /dev/null +++ b/balakhonov_danila_lab_3/ApiRestaurant/Models/Restaurant.cs @@ -0,0 +1,8 @@ +namespace ApiRestaurant.Models; + +public class Restaurant +{ + public Guid Id { get; set; } + public string Name { get; set; } = string.Empty; + public List? Waiters { get; set; } +} \ No newline at end of file diff --git a/balakhonov_danila_lab_3/ApiRestaurant/Models/RestaurantContext.cs b/balakhonov_danila_lab_3/ApiRestaurant/Models/RestaurantContext.cs new file mode 100644 index 0000000..a110db6 --- /dev/null +++ b/balakhonov_danila_lab_3/ApiRestaurant/Models/RestaurantContext.cs @@ -0,0 +1,13 @@ +using Microsoft.EntityFrameworkCore; + +namespace ApiRestaurant.Models; + +public class RestaurantContext : DbContext +{ + public RestaurantContext(DbContextOptions options) + : base(options) + { + } + + public DbSet Restaurants { get; set; } = null!; +} \ No newline at end of file diff --git a/balakhonov_danila_lab_3/ApiRestaurant/Models/Waiter.cs b/balakhonov_danila_lab_3/ApiRestaurant/Models/Waiter.cs new file mode 100644 index 0000000..aeb6800 --- /dev/null +++ b/balakhonov_danila_lab_3/ApiRestaurant/Models/Waiter.cs @@ -0,0 +1,7 @@ +namespace ApiRestaurant.Models; + +public class Waiter +{ + public Guid Id { get; set; } + public string Name { get; set; } = string.Empty; +} \ No newline at end of file diff --git a/balakhonov_danila_lab_3/ApiRestaurant/Program.cs b/balakhonov_danila_lab_3/ApiRestaurant/Program.cs new file mode 100644 index 0000000..8eeab39 --- /dev/null +++ b/balakhonov_danila_lab_3/ApiRestaurant/Program.cs @@ -0,0 +1,35 @@ +using Microsoft.EntityFrameworkCore; +using ApiRestaurant.Models; +using ApiRestaurant; + +var builder = WebApplication.CreateBuilder(args); + +var waiterApiAddress = + Environment.GetEnvironmentVariable("WAITER_API_URL") + ?? "http://localhost:4000/waiters/"; +WaiterApiClient.Setup(waiterApiAddress); + +// Add services to the container. +builder.Services.AddControllers(); +builder.Services.AddDbContext(opt => + opt.UseInMemoryDatabase("ApiRestaurant")); + +builder.Services.AddEndpointsApiExplorer(); +builder.Services.AddSwaggerGen(); + +var app = builder.Build(); + +// Configure the HTTP request pipeline. +if (app.Environment.IsDevelopment()) +{ + app.UseSwagger(); + app.UseSwaggerUI(); +} + +app.UseHttpsRedirection(); + +app.UseAuthorization(); + +app.MapControllers(); + +app.Run(); diff --git a/balakhonov_danila_lab_3/ApiRestaurant/Properties/launchSettings.json b/balakhonov_danila_lab_3/ApiRestaurant/Properties/launchSettings.json new file mode 100644 index 0000000..4e89f9f --- /dev/null +++ b/balakhonov_danila_lab_3/ApiRestaurant/Properties/launchSettings.json @@ -0,0 +1,41 @@ +{ + "$schema": "http://json.schemastore.org/launchsettings.json", + "iisSettings": { + "windowsAuthentication": false, + "anonymousAuthentication": true, + "iisExpress": { + "applicationUrl": "http://localhost:57319", + "sslPort": 44369 + } + }, + "profiles": { + "http": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": true, + "launchUrl": "swagger", + "applicationUrl": "http://localhost:5089", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + "https": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": true, + "launchUrl": "swagger", + "applicationUrl": "https://localhost:7269;http://localhost:5089", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + "IIS Express": { + "commandName": "IISExpress", + "launchBrowser": true, + "launchUrl": "swagger", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + } + } +} diff --git a/balakhonov_danila_lab_3/ApiRestaurant/WaiterApiClient.cs b/balakhonov_danila_lab_3/ApiRestaurant/WaiterApiClient.cs new file mode 100644 index 0000000..288c76d --- /dev/null +++ b/balakhonov_danila_lab_3/ApiRestaurant/WaiterApiClient.cs @@ -0,0 +1,26 @@ +using ApiRestaurant.Models; + +namespace ApiRestaurant; + +public static class WaiterApiClient +{ + public static string WaiterApiAddress { get; private set; } = string.Empty; + private static readonly HttpClient client = new(); + + public static void Setup(string waiterApiAddress) + { + WaiterApiAddress = waiterApiAddress; + } + public static async Task> GetAllForRestaurant(Guid restaurantId) { + try + { + var waiters = await client.GetFromJsonAsync>(WaiterApiAddress + $"from-restaurant/{restaurantId}"); + return waiters ?? []; + } + catch (HttpRequestException ex) + { + Console.WriteLine($"Error fetching waiters: {ex.Message}"); + throw; + } + } +} \ No newline at end of file diff --git a/balakhonov_danila_lab_3/ApiRestaurant/appsettings.Development.json b/balakhonov_danila_lab_3/ApiRestaurant/appsettings.Development.json new file mode 100644 index 0000000..0c208ae --- /dev/null +++ b/balakhonov_danila_lab_3/ApiRestaurant/appsettings.Development.json @@ -0,0 +1,8 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning" + } + } +} diff --git a/balakhonov_danila_lab_3/ApiRestaurant/appsettings.json b/balakhonov_danila_lab_3/ApiRestaurant/appsettings.json new file mode 100644 index 0000000..10f68b8 --- /dev/null +++ b/balakhonov_danila_lab_3/ApiRestaurant/appsettings.json @@ -0,0 +1,9 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning" + } + }, + "AllowedHosts": "*" +} diff --git a/balakhonov_danila_lab_3/ApiWaiter/.gitignore b/balakhonov_danila_lab_3/ApiWaiter/.gitignore new file mode 100644 index 0000000..b512c09 --- /dev/null +++ b/balakhonov_danila_lab_3/ApiWaiter/.gitignore @@ -0,0 +1 @@ +node_modules \ No newline at end of file diff --git a/balakhonov_danila_lab_3/ApiWaiter/Dockerfile b/balakhonov_danila_lab_3/ApiWaiter/Dockerfile new file mode 100644 index 0000000..3172346 --- /dev/null +++ b/balakhonov_danila_lab_3/ApiWaiter/Dockerfile @@ -0,0 +1,11 @@ +FROM node:23-alpine +WORKDIR /app + +COPY package*.json . +RUN npm i + +COPY . . + +EXPOSE 4000 + +ENTRYPOINT ["npm", "run", "start"] \ No newline at end of file diff --git a/balakhonov_danila_lab_3/ApiWaiter/db.json b/balakhonov_danila_lab_3/ApiWaiter/db.json new file mode 100644 index 0000000..6230ab8 --- /dev/null +++ b/balakhonov_danila_lab_3/ApiWaiter/db.json @@ -0,0 +1,4 @@ +{ + "waiters": { + } +} \ No newline at end of file diff --git a/balakhonov_danila_lab_3/ApiWaiter/index.js b/balakhonov_danila_lab_3/ApiWaiter/index.js new file mode 100644 index 0000000..ade7fc9 --- /dev/null +++ b/balakhonov_danila_lab_3/ApiWaiter/index.js @@ -0,0 +1,82 @@ +import express from 'express'; +import { JsonDB, Config } from 'node-json-db'; + +const app = express(); + +const db = new JsonDB(new Config("db", true, true, '/')); +const port = process.env.PORT || 4000; + +app.use(express.json()); + +// CORS settings +app.use((req, res, next) => { + res.setHeader('Access-Control-Allow-Origin', '*'); + res.setHeader('Access-Control-Allow-Methods', 'GET, POST, PUT, DELETE'); + res.setHeader('Access-Control-Allow-Headers', 'Content-Type'); + next(); +}); + +// Get all +app.get('/waiters', async (req, res) => { + res.send(await db.getData('/waiters')); +}); + +// Create one +app.post('/waiters', async (req, res) => { + let newWaiter = req.body; + // Generate id + newWaiter.id = crypto.randomUUID(); + await db.push("/waiters/" + newWaiter.id, newWaiter); + res.send(newWaiter); +}); + +// Get one +app.get('/waiters/:id', async (req, res) => { + const id = req.params.id; + const waiter = await db.getData('/waiters/' + id); + if (!waiter) { + res.status(404).json({ message: 'Waiter not found' }); + return; + } + res.send(waiter); +}); + +// Get all for one restaurant +app.get('/waiters/from-restaurant/:id', async (req, res) => { + const restaurantId = req.params.id; + const waiters = await db.filter('/waiters', w => w.restaurant_id === restaurantId); + res.send(waiters ?? []); +}); + +// Update one +app.put('/waiters/:id', async (req, res) => { + const id = req.params.id; + const updatedWaiter = req.body; + const waiterExists = await db.exists('/waiters/' + id); + + if (!waiterExists) { + res.status(404).json({ message: 'Waiter not found' }); + return; + } + + updatedWaiter.id = id; + + await db.push('/waiters/' + id, updatedWaiter, true); + res.send(updatedWaiter); +}); + +// Delete one +app.delete('/waiters/:id', async (req, res) => { + const id = req.params.id; + const waiterExists = await db.exists('/waiters/' + id); + + if (!waiterExists) { + res.status(404).json({ message: 'Waiter not found' }); + return; + } + + await db.delete('/waiters/' + id); + res.status(200); +}); + +app.listen(port) \ No newline at end of file diff --git a/balakhonov_danila_lab_3/ApiWaiter/package-lock.json b/balakhonov_danila_lab_3/ApiWaiter/package-lock.json new file mode 100644 index 0000000..03bb36d --- /dev/null +++ b/balakhonov_danila_lab_3/ApiWaiter/package-lock.json @@ -0,0 +1,789 @@ +{ + "name": "apiwaiter", + "version": "1.0.0", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "apiwaiter", + "version": "1.0.0", + "license": "ISC", + "dependencies": { + "express": "^4.21.1", + "node-json-db": "^2.3.0" + } + }, + "node_modules/accepts": { + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz", + "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==", + "license": "MIT", + "dependencies": { + "mime-types": "~2.1.34", + "negotiator": "0.6.3" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/array-flatten": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", + "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==", + "license": "MIT" + }, + "node_modules/body-parser": { + "version": "1.20.3", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz", + "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==", + "license": "MIT", + "dependencies": { + "bytes": "3.1.2", + "content-type": "~1.0.5", + "debug": "2.6.9", + "depd": "2.0.0", + "destroy": "1.2.0", + "http-errors": "2.0.0", + "iconv-lite": "0.4.24", + "on-finished": "2.4.1", + "qs": "6.13.0", + "raw-body": "2.5.2", + "type-is": "~1.6.18", + "unpipe": "1.0.0" + }, + "engines": { + "node": ">= 0.8", + "npm": "1.2.8000 || >= 1.4.16" + } + }, + "node_modules/bytes": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", + "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/call-bind": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz", + "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==", + "license": "MIT", + "dependencies": { + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", + "set-function-length": "^1.2.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/content-disposition": { + "version": "0.5.4", + "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", + "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==", + "license": "MIT", + "dependencies": { + "safe-buffer": "5.2.1" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/content-type": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz", + "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/cookie": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz", + "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/cookie-signature": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", + "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==", + "license": "MIT" + }, + "node_modules/debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "license": "MIT", + "dependencies": { + "ms": "2.0.0" + } + }, + "node_modules/define-data-property": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", + "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", + "license": "MIT", + "dependencies": { + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "gopd": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/depd": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", + "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/destroy": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", + "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==", + "license": "MIT", + "engines": { + "node": ">= 0.8", + "npm": "1.2.8000 || >= 1.4.16" + } + }, + "node_modules/ee-first": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", + "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==", + "license": "MIT" + }, + "node_modules/encodeurl": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", + "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/es-define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz", + "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==", + "license": "MIT", + "dependencies": { + "get-intrinsic": "^1.2.4" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-errors": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", + "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/escape-html": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", + "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==", + "license": "MIT" + }, + "node_modules/etag": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", + "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/express": { + "version": "4.21.1", + "resolved": "https://registry.npmjs.org/express/-/express-4.21.1.tgz", + "integrity": "sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==", + "license": "MIT", + "dependencies": { + "accepts": "~1.3.8", + "array-flatten": "1.1.1", + "body-parser": "1.20.3", + "content-disposition": "0.5.4", + "content-type": "~1.0.4", + "cookie": "0.7.1", + "cookie-signature": "1.0.6", + "debug": "2.6.9", + "depd": "2.0.0", + "encodeurl": "~2.0.0", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "finalhandler": "1.3.1", + "fresh": "0.5.2", + "http-errors": "2.0.0", + "merge-descriptors": "1.0.3", + "methods": "~1.1.2", + "on-finished": "2.4.1", + "parseurl": "~1.3.3", + "path-to-regexp": "0.1.10", + "proxy-addr": "~2.0.7", + "qs": "6.13.0", + "range-parser": "~1.2.1", + "safe-buffer": "5.2.1", + "send": "0.19.0", + "serve-static": "1.16.2", + "setprototypeof": "1.2.0", + "statuses": "2.0.1", + "type-is": "~1.6.18", + "utils-merge": "1.0.1", + "vary": "~1.1.2" + }, + "engines": { + "node": ">= 0.10.0" + } + }, + "node_modules/finalhandler": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz", + "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==", + "license": "MIT", + "dependencies": { + "debug": "2.6.9", + "encodeurl": "~2.0.0", + "escape-html": "~1.0.3", + "on-finished": "2.4.1", + "parseurl": "~1.3.3", + "statuses": "2.0.1", + "unpipe": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/forwarded": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", + "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/fresh": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", + "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/function-bind": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/get-intrinsic": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz", + "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==", + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "has-proto": "^1.0.1", + "has-symbols": "^1.0.3", + "hasown": "^2.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/gopd": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", + "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", + "license": "MIT", + "dependencies": { + "get-intrinsic": "^1.1.3" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-property-descriptors": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", + "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", + "license": "MIT", + "dependencies": { + "es-define-property": "^1.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-proto": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz", + "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-symbols": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", + "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/hasown": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", + "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", + "license": "MIT", + "dependencies": { + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/http-errors": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", + "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==", + "license": "MIT", + "dependencies": { + "depd": "2.0.0", + "inherits": "2.0.4", + "setprototypeof": "1.2.0", + "statuses": "2.0.1", + "toidentifier": "1.0.1" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "license": "MIT", + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "license": "ISC" + }, + "node_modules/ipaddr.js": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", + "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==", + "license": "MIT", + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/media-typer": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", + "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/merge-descriptors": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz", + "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==", + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/methods": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", + "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", + "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", + "license": "MIT", + "bin": { + "mime": "cli.js" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/mime-db": { + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", + "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime-types": { + "version": "2.1.35", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", + "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", + "license": "MIT", + "dependencies": { + "mime-db": "1.52.0" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "license": "MIT" + }, + "node_modules/negotiator": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", + "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/node-json-db": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/node-json-db/-/node-json-db-2.3.0.tgz", + "integrity": "sha512-B8T+w4q6zXZ20YcfQINLSjMGgImRKzkvR0ShYYoNRdLxtMhVvbzaMBzNdEaRcCjilW/lKS+g9CwVXNoK5uTncw==", + "license": "MIT", + "dependencies": { + "rwlock": "^5.0.0" + } + }, + "node_modules/object-inspect": { + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz", + "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/on-finished": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", + "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", + "license": "MIT", + "dependencies": { + "ee-first": "1.1.1" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/parseurl": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", + "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/path-to-regexp": { + "version": "0.1.10", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz", + "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==", + "license": "MIT" + }, + "node_modules/proxy-addr": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", + "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==", + "license": "MIT", + "dependencies": { + "forwarded": "0.2.0", + "ipaddr.js": "1.9.1" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/qs": { + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz", + "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==", + "license": "BSD-3-Clause", + "dependencies": { + "side-channel": "^1.0.6" + }, + "engines": { + "node": ">=0.6" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/range-parser": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", + "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/raw-body": { + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz", + "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==", + "license": "MIT", + "dependencies": { + "bytes": "3.1.2", + "http-errors": "2.0.0", + "iconv-lite": "0.4.24", + "unpipe": "1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/rwlock": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/rwlock/-/rwlock-5.0.0.tgz", + "integrity": "sha512-XgzRqLMfCcm9QfZuPav9cV3Xin5TRcIlp4X/SH3CvB+x5D2AakdlEepfJKDd8ByncvfpcxNWdRZVUl38PS6ZJg==", + "license": "MIT" + }, + "node_modules/safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT" + }, + "node_modules/safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", + "license": "MIT" + }, + "node_modules/send": { + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz", + "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==", + "license": "MIT", + "dependencies": { + "debug": "2.6.9", + "depd": "2.0.0", + "destroy": "1.2.0", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "fresh": "0.5.2", + "http-errors": "2.0.0", + "mime": "1.6.0", + "ms": "2.1.3", + "on-finished": "2.4.1", + "range-parser": "~1.2.1", + "statuses": "2.0.1" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/send/node_modules/encodeurl": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", + "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/send/node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "license": "MIT" + }, + "node_modules/serve-static": { + "version": "1.16.2", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz", + "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==", + "license": "MIT", + "dependencies": { + "encodeurl": "~2.0.0", + "escape-html": "~1.0.3", + "parseurl": "~1.3.3", + "send": "0.19.0" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/set-function-length": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", + "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==", + "license": "MIT", + "dependencies": { + "define-data-property": "^1.1.4", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/setprototypeof": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", + "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==", + "license": "ISC" + }, + "node_modules/side-channel": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz", + "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==", + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.7", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.4", + "object-inspect": "^1.13.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/statuses": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", + "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/toidentifier": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", + "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", + "license": "MIT", + "engines": { + "node": ">=0.6" + } + }, + "node_modules/type-is": { + "version": "1.6.18", + "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", + "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", + "license": "MIT", + "dependencies": { + "media-typer": "0.3.0", + "mime-types": "~2.1.24" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/unpipe": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", + "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/utils-merge": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", + "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==", + "license": "MIT", + "engines": { + "node": ">= 0.4.0" + } + }, + "node_modules/vary": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", + "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + } + } +} diff --git a/balakhonov_danila_lab_3/ApiWaiter/package.json b/balakhonov_danila_lab_3/ApiWaiter/package.json new file mode 100644 index 0000000..ba48855 --- /dev/null +++ b/balakhonov_danila_lab_3/ApiWaiter/package.json @@ -0,0 +1,17 @@ +{ + "name": "apiwaiter", + "version": "1.0.0", + "description": "api for waiters", + "type": "module", + "main": "index.js", + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1", + "start": "node index.js" + }, + "author": "", + "license": "ISC", + "dependencies": { + "express": "^4.21.1", + "node-json-db": "^2.3.0" + } +} diff --git a/balakhonov_danila_lab_3/docker-compose.yaml b/balakhonov_danila_lab_3/docker-compose.yaml new file mode 100644 index 0000000..8ae73ee --- /dev/null +++ b/balakhonov_danila_lab_3/docker-compose.yaml @@ -0,0 +1,23 @@ +services: + restaurant-service: + build: ./restaurant-service/ + environment: + WAITER_API_URL: http://waiter-service:4000 + depends_on: + - waiter-service + waiter-service: + build: ./waiter-service/ + environment: + PORT: 4000 + ports: + - "4000:4000" + + nginx: + image: nginx + depends_on: + - restaurant-service + - waiter-service + ports: + - "80:80" + volumes: + - ./nginx.conf:/etc/nginx/nginx.conf \ No newline at end of file From c46ade29f969ea7ecbba122c67be4c34bd53ec0a Mon Sep 17 00:00:00 2001 From: mfnefd Date: Sun, 3 Nov 2024 19:22:37 +0400 Subject: [PATCH 02/16] =?UTF-8?q?=D0=B6=D0=B5=D1=81=D1=82=D1=8C=20=D0=BF?= =?UTF-8?q?=D0=BE=D0=B7=D0=BE=D1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- balakhonov_danila_lab_3/docker-compose.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/balakhonov_danila_lab_3/docker-compose.yaml b/balakhonov_danila_lab_3/docker-compose.yaml index 8ae73ee..f640e48 100644 --- a/balakhonov_danila_lab_3/docker-compose.yaml +++ b/balakhonov_danila_lab_3/docker-compose.yaml @@ -1,12 +1,13 @@ services: restaurant-service: - build: ./restaurant-service/ + build: ./ApiRestaurant/ environment: WAITER_API_URL: http://waiter-service:4000 depends_on: - waiter-service + waiter-service: - build: ./waiter-service/ + build: ./ApiWaiter/ environment: PORT: 4000 ports: From e8cf19d932705be62b6f64d3cd36c0395143a115 Mon Sep 17 00:00:00 2001 From: mfnefd Date: Sun, 3 Nov 2024 19:31:46 +0400 Subject: [PATCH 03/16] =?UTF-8?q?=D0=BE=D0=B9=20=D0=B1=D0=B5=D0=B4=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- balakhonov_danila_lab_3/ApiWaiter/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/balakhonov_danila_lab_3/ApiWaiter/Dockerfile b/balakhonov_danila_lab_3/ApiWaiter/Dockerfile index 3172346..6a34796 100644 --- a/balakhonov_danila_lab_3/ApiWaiter/Dockerfile +++ b/balakhonov_danila_lab_3/ApiWaiter/Dockerfile @@ -1,7 +1,7 @@ FROM node:23-alpine WORKDIR /app -COPY package*.json . +COPY package*.json ./ RUN npm i COPY . . From 4fc879212eb37dc5d11fc486682b62202bd059cf Mon Sep 17 00:00:00 2001 From: mfnefd Date: Sun, 3 Nov 2024 20:15:43 +0400 Subject: [PATCH 04/16] =?UTF-8?q?=D1=8D=D1=8D=D1=8D...?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- balakhonov_danila_lab_3/ApiWaiter/Dockerfile | 2 -- balakhonov_danila_lab_3/docker-compose.yaml | 7 +++++-- balakhonov_danila_lab_3/nginx.conf | 21 ++++++++++++++++++++ 3 files changed, 26 insertions(+), 4 deletions(-) create mode 100644 balakhonov_danila_lab_3/nginx.conf diff --git a/balakhonov_danila_lab_3/ApiWaiter/Dockerfile b/balakhonov_danila_lab_3/ApiWaiter/Dockerfile index 6a34796..dcfed5e 100644 --- a/balakhonov_danila_lab_3/ApiWaiter/Dockerfile +++ b/balakhonov_danila_lab_3/ApiWaiter/Dockerfile @@ -6,6 +6,4 @@ RUN npm i COPY . . -EXPOSE 4000 - ENTRYPOINT ["npm", "run", "start"] \ No newline at end of file diff --git a/balakhonov_danila_lab_3/docker-compose.yaml b/balakhonov_danila_lab_3/docker-compose.yaml index f640e48..94f2127 100644 --- a/balakhonov_danila_lab_3/docker-compose.yaml +++ b/balakhonov_danila_lab_3/docker-compose.yaml @@ -3,6 +3,8 @@ services: build: ./ApiRestaurant/ environment: WAITER_API_URL: http://waiter-service:4000 + expose: + - 6666 depends_on: - waiter-service @@ -10,8 +12,9 @@ services: build: ./ApiWaiter/ environment: PORT: 4000 - ports: - - "4000:4000" + expose: + - 4000 + nginx: image: nginx diff --git a/balakhonov_danila_lab_3/nginx.conf b/balakhonov_danila_lab_3/nginx.conf new file mode 100644 index 0000000..bdb46d0 --- /dev/null +++ b/balakhonov_danila_lab_3/nginx.conf @@ -0,0 +1,21 @@ +server { + listen 80; + listen [::]:80; + server_name restawaiters; + + location /waiters/ { + proxy_pass http://waiter-service:4000/; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_set_header X-Forwarded-Prefix /test; + } + + location /restaurants/ { + proxy_pass http://restaurant-service:6666/; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_set_header X-Forwarded-Prefix /admin; + } +} From 74e61987dc5b99971d4615de1bafb6ca56abee9a Mon Sep 17 00:00:00 2001 From: mfnefd Date: Sun, 3 Nov 2024 20:30:29 +0400 Subject: [PATCH 05/16] =?UTF-8?q?=D0=B5=D1=89=D0=B5=20=D1=80=D0=B0=D0=B7?= =?UTF-8?q?=D0=BE=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- balakhonov_danila_lab_3/docker-compose.yaml | 3 +-- balakhonov_danila_lab_3/nginx.conf | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/balakhonov_danila_lab_3/docker-compose.yaml b/balakhonov_danila_lab_3/docker-compose.yaml index 94f2127..cffaa51 100644 --- a/balakhonov_danila_lab_3/docker-compose.yaml +++ b/balakhonov_danila_lab_3/docker-compose.yaml @@ -4,7 +4,7 @@ services: environment: WAITER_API_URL: http://waiter-service:4000 expose: - - 6666 + - 5089 depends_on: - waiter-service @@ -14,7 +14,6 @@ services: PORT: 4000 expose: - 4000 - nginx: image: nginx diff --git a/balakhonov_danila_lab_3/nginx.conf b/balakhonov_danila_lab_3/nginx.conf index bdb46d0..6580d1c 100644 --- a/balakhonov_danila_lab_3/nginx.conf +++ b/balakhonov_danila_lab_3/nginx.conf @@ -1,7 +1,7 @@ server { listen 80; listen [::]:80; - server_name restawaiters; + server_name localhost; location /waiters/ { proxy_pass http://waiter-service:4000/; @@ -12,7 +12,7 @@ server { } location /restaurants/ { - proxy_pass http://restaurant-service:6666/; + proxy_pass http://restaurant-service:5089/; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-Proto $scheme; From 14338ff5ac0e6d6405e739cc8d75572854092b4d Mon Sep 17 00:00:00 2001 From: mfnefd Date: Sun, 3 Nov 2024 20:51:32 +0400 Subject: [PATCH 06/16] =?UTF-8?q?=D0=B5=D1=89=D0=B5=20=D1=80=D0=B0=D0=B7?= =?UTF-8?q?=D0=BE=D0=BA=20=D0=BF=D0=BE=D0=BF=D1=8B=D1=82=D0=B0=D0=B5=D0=BC?= =?UTF-8?q?=20=D1=83=D0=B4=D0=B0=D1=87=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ApiRestaurant/Dockerfile | 3 +- balakhonov_danila_lab_3/nginx.conf | 36 ++++++++++--------- 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/balakhonov_danila_lab_3/ApiRestaurant/Dockerfile b/balakhonov_danila_lab_3/ApiRestaurant/Dockerfile index 5809cb3..b11051a 100644 --- a/balakhonov_danila_lab_3/ApiRestaurant/Dockerfile +++ b/balakhonov_danila_lab_3/ApiRestaurant/Dockerfile @@ -8,7 +8,8 @@ RUN dotnet restore # Build and publish a release RUN dotnet publish -c Release -o out -FROM mcr.microsoft.com/dotnet/runtime:8.0 AS runtime +FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS app +ENV ASPNETCORE_URLS=http://*:5089 WORKDIR /App COPY --from=build /App/out . ENTRYPOINT ["dotnet", "ApiRestaurant.dll"] \ No newline at end of file diff --git a/balakhonov_danila_lab_3/nginx.conf b/balakhonov_danila_lab_3/nginx.conf index 6580d1c..7c83869 100644 --- a/balakhonov_danila_lab_3/nginx.conf +++ b/balakhonov_danila_lab_3/nginx.conf @@ -1,21 +1,23 @@ -server { - listen 80; - listen [::]:80; - server_name localhost; +http { + server { + listen 80; + listen [::]:80; + server_name localhost; - location /waiters/ { - proxy_pass http://waiter-service:4000/; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header X-Forwarded-Prefix /test; - } + location /waiters/ { + proxy_pass http://waiter-service:4000/; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_set_header X-Forwarded-Prefix /test; + } - location /restaurants/ { - proxy_pass http://restaurant-service:5089/; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header X-Forwarded-Prefix /admin; + location /restaurants/ { + proxy_pass http://restaurant-service:5089/; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_set_header X-Forwarded-Prefix /admin; + } } } From df3af5e2cd4bb94ab51d54c73661d034634f9c0c Mon Sep 17 00:00:00 2001 From: mfnefd Date: Sun, 3 Nov 2024 21:41:01 +0400 Subject: [PATCH 07/16] =?UTF-8?q?=D1=81=D0=B4=D0=B0=D1=8E=D1=81=D1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ApiRestaurant/.dockerignore | 30 +++++++++++++ .../ApiRestaurant/ApiRestaurant.csproj | 4 ++ .../ApiRestaurant/ApiRestaurant.sln | 25 +++++++++++ .../ApiRestaurant/Dockerfile | 37 ++++++++++----- .../Properties/launchSettings.json | 45 ++++++++++++------- 5 files changed, 113 insertions(+), 28 deletions(-) create mode 100644 balakhonov_danila_lab_3/ApiRestaurant/.dockerignore create mode 100644 balakhonov_danila_lab_3/ApiRestaurant/ApiRestaurant.sln diff --git a/balakhonov_danila_lab_3/ApiRestaurant/.dockerignore b/balakhonov_danila_lab_3/ApiRestaurant/.dockerignore new file mode 100644 index 0000000..fe1152b --- /dev/null +++ b/balakhonov_danila_lab_3/ApiRestaurant/.dockerignore @@ -0,0 +1,30 @@ +**/.classpath +**/.dockerignore +**/.env +**/.git +**/.gitignore +**/.project +**/.settings +**/.toolstarget +**/.vs +**/.vscode +**/*.*proj.user +**/*.dbmdl +**/*.jfm +**/azds.yaml +**/bin +**/charts +**/docker-compose* +**/Dockerfile* +**/node_modules +**/npm-debug.log +**/obj +**/secrets.dev.yaml +**/values.dev.yaml +LICENSE +README.md +!**/.gitignore +!.git/HEAD +!.git/config +!.git/packed-refs +!.git/refs/heads/** \ No newline at end of file diff --git a/balakhonov_danila_lab_3/ApiRestaurant/ApiRestaurant.csproj b/balakhonov_danila_lab_3/ApiRestaurant/ApiRestaurant.csproj index 2242827..0c43e46 100644 --- a/balakhonov_danila_lab_3/ApiRestaurant/ApiRestaurant.csproj +++ b/balakhonov_danila_lab_3/ApiRestaurant/ApiRestaurant.csproj @@ -4,10 +4,14 @@ net8.0 enable enable + 9589d6f5-875c-4d7d-8e68-37a2077e80be + Linux + . + diff --git a/balakhonov_danila_lab_3/ApiRestaurant/ApiRestaurant.sln b/balakhonov_danila_lab_3/ApiRestaurant/ApiRestaurant.sln new file mode 100644 index 0000000..caf1513 --- /dev/null +++ b/balakhonov_danila_lab_3/ApiRestaurant/ApiRestaurant.sln @@ -0,0 +1,25 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.11.35222.181 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApiRestaurant", "ApiRestaurant.csproj", "{6E19ADDC-7351-4145-9C49-B0CC87BD1206}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {6E19ADDC-7351-4145-9C49-B0CC87BD1206}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6E19ADDC-7351-4145-9C49-B0CC87BD1206}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6E19ADDC-7351-4145-9C49-B0CC87BD1206}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6E19ADDC-7351-4145-9C49-B0CC87BD1206}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {C62DE3C6-63AA-4075-9729-9F5ECD4E7B51} + EndGlobalSection +EndGlobal diff --git a/balakhonov_danila_lab_3/ApiRestaurant/Dockerfile b/balakhonov_danila_lab_3/ApiRestaurant/Dockerfile index b11051a..5c1647c 100644 --- a/balakhonov_danila_lab_3/ApiRestaurant/Dockerfile +++ b/balakhonov_danila_lab_3/ApiRestaurant/Dockerfile @@ -1,15 +1,30 @@ +# См. статью по ссылке https://aka.ms/customizecontainer, чтобы узнать как настроить контейнер отладки и как Visual Studio использует этот Dockerfile для создания образов для ускорения отладки. + +# Этот этап используется при запуске из VS в быстром режиме (по умолчанию для конфигурации отладки) +FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base +USER app +WORKDIR /app +EXPOSE 8080 +EXPOSE 8081 + + +# Этот этап используется для сборки проекта службы FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build -WORKDIR /App +ARG BUILD_CONFIGURATION=Release +WORKDIR /src +COPY ["ApiRestaurant.csproj", "."] +RUN dotnet restore "./ApiRestaurant.csproj" +COPY . . +WORKDIR "/src/." +RUN dotnet build "./ApiRestaurant.csproj" -c $BUILD_CONFIGURATION -o /app/build -# Copy everything -COPY . ./ -# Restore as distinct layers -RUN dotnet restore -# Build and publish a release -RUN dotnet publish -c Release -o out +# Этот этап используется для публикации проекта службы, который будет скопирован на последний этап +FROM build AS publish +ARG BUILD_CONFIGURATION=Release +RUN dotnet publish "./ApiRestaurant.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false -FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS app -ENV ASPNETCORE_URLS=http://*:5089 -WORKDIR /App -COPY --from=build /App/out . +# Этот этап используется в рабочей среде или при запуске из VS в обычном режиме (по умолчанию, когда конфигурация отладки не используется) +FROM base AS final +WORKDIR /app +COPY --from=publish /app/publish . ENTRYPOINT ["dotnet", "ApiRestaurant.dll"] \ No newline at end of file diff --git a/balakhonov_danila_lab_3/ApiRestaurant/Properties/launchSettings.json b/balakhonov_danila_lab_3/ApiRestaurant/Properties/launchSettings.json index 4e89f9f..80deff5 100644 --- a/balakhonov_danila_lab_3/ApiRestaurant/Properties/launchSettings.json +++ b/balakhonov_danila_lab_3/ApiRestaurant/Properties/launchSettings.json @@ -1,33 +1,24 @@ -{ - "$schema": "http://json.schemastore.org/launchsettings.json", - "iisSettings": { - "windowsAuthentication": false, - "anonymousAuthentication": true, - "iisExpress": { - "applicationUrl": "http://localhost:57319", - "sslPort": 44369 - } - }, +{ "profiles": { "http": { "commandName": "Project", - "dotnetRunMessages": true, "launchBrowser": true, "launchUrl": "swagger", - "applicationUrl": "http://localhost:5089", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" - } + }, + "dotnetRunMessages": true, + "applicationUrl": "http://localhost:5089" }, "https": { "commandName": "Project", - "dotnetRunMessages": true, "launchBrowser": true, "launchUrl": "swagger", - "applicationUrl": "https://localhost:7269;http://localhost:5089", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" - } + }, + "dotnetRunMessages": true, + "applicationUrl": "https://localhost:7269;http://localhost:5089" }, "IIS Express": { "commandName": "IISExpress", @@ -36,6 +27,26 @@ "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" } + }, + "Container (Dockerfile)": { + "commandName": "Docker", + "launchBrowser": true, + "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}/swagger", + "environmentVariables": { + "ASPNETCORE_HTTPS_PORTS": "8081", + "ASPNETCORE_HTTP_PORTS": "8080" + }, + "publishAllPorts": true, + "useSSL": true + } + }, + "$schema": "http://json.schemastore.org/launchsettings.json", + "iisSettings": { + "windowsAuthentication": false, + "anonymousAuthentication": true, + "iisExpress": { + "applicationUrl": "http://localhost:57319", + "sslPort": 44369 } } -} +} \ No newline at end of file From 1ee9e2c3fb28d0a33799bb8f37f599c9ed903308 Mon Sep 17 00:00:00 2001 From: mfnefd Date: Sun, 3 Nov 2024 22:15:01 +0400 Subject: [PATCH 08/16] =?UTF-8?q?=D0=BF=D0=BE=D1=81=D0=BB=D0=B5=D0=B4?= =?UTF-8?q?=D0=BD=D0=B8=D0=B9=20=D1=80=D1=8B=D0=B2=D0=BE=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- balakhonov_danila_lab_3/nginx.conf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/balakhonov_danila_lab_3/nginx.conf b/balakhonov_danila_lab_3/nginx.conf index 7c83869..175b1f1 100644 --- a/balakhonov_danila_lab_3/nginx.conf +++ b/balakhonov_danila_lab_3/nginx.conf @@ -1,4 +1,8 @@ http { + events { + worker_connections 1024; + } + server { listen 80; listen [::]:80; From 97c7b71067f337d6b3ed4be1f565acf376046e9c Mon Sep 17 00:00:00 2001 From: mfnefd Date: Sun, 3 Nov 2024 22:17:59 +0400 Subject: [PATCH 09/16] =?UTF-8?q?=D0=BD=D1=83=20=D0=B8=20=D0=BD=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- balakhonov_danila_lab_3/nginx.conf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/balakhonov_danila_lab_3/nginx.conf b/balakhonov_danila_lab_3/nginx.conf index 175b1f1..2a816c2 100644 --- a/balakhonov_danila_lab_3/nginx.conf +++ b/balakhonov_danila_lab_3/nginx.conf @@ -1,8 +1,8 @@ -http { - events { - worker_connections 1024; - } +events { + worker_connections 1024; +} +http { server { listen 80; listen [::]:80; From 8f2a9c126cafb0464afc4e800dedcf9d79abbe62 Mon Sep 17 00:00:00 2001 From: mfnefd Date: Sun, 3 Nov 2024 22:31:00 +0400 Subject: [PATCH 10/16] =?UTF-8?q?=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0?= =?UTF-8?q?=D0=B9!!!!!!!!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- balakhonov_danila_lab_3/docker-compose.yaml | 2 +- balakhonov_danila_lab_3/nginx.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/balakhonov_danila_lab_3/docker-compose.yaml b/balakhonov_danila_lab_3/docker-compose.yaml index cffaa51..4763734 100644 --- a/balakhonov_danila_lab_3/docker-compose.yaml +++ b/balakhonov_danila_lab_3/docker-compose.yaml @@ -4,7 +4,7 @@ services: environment: WAITER_API_URL: http://waiter-service:4000 expose: - - 5089 + - 8080 depends_on: - waiter-service diff --git a/balakhonov_danila_lab_3/nginx.conf b/balakhonov_danila_lab_3/nginx.conf index 2a816c2..70ef564 100644 --- a/balakhonov_danila_lab_3/nginx.conf +++ b/balakhonov_danila_lab_3/nginx.conf @@ -17,7 +17,7 @@ http { } location /restaurants/ { - proxy_pass http://restaurant-service:5089/; + proxy_pass http://restaurant-service:8080/; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-Proto $scheme; From e295c3fa5f108761c1bd617405f0f64cfe7c2c1f Mon Sep 17 00:00:00 2001 From: mfnefd Date: Sun, 3 Nov 2024 22:38:30 +0400 Subject: [PATCH 11/16] =?UTF-8?q?=D0=B7=D0=B0=D1=85=D0=BE=D0=B4=D0=B8?= =?UTF-8?q?=D1=82=20=D0=BA=D0=B0=D0=BA-=D1=82=D0=BE=20=D0=B2=20=D0=B1?= =?UTF-8?q?=D0=B0=D1=80=20=D1=87=D0=B5=D0=B1=D1=83=D1=80=D0=B0=D1=88=D0=BA?= =?UTF-8?q?=D0=B0=20=D1=81=20=D1=87=D0=B5=D0=BC=D0=BE=D0=B4=D0=B0=D0=BD?= =?UTF-8?q?=D0=BE=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- balakhonov_danila_lab_3/docker-compose.yaml | 2 ++ balakhonov_danila_lab_3/nginx.conf | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/balakhonov_danila_lab_3/docker-compose.yaml b/balakhonov_danila_lab_3/docker-compose.yaml index 4763734..fd9a5dc 100644 --- a/balakhonov_danila_lab_3/docker-compose.yaml +++ b/balakhonov_danila_lab_3/docker-compose.yaml @@ -1,6 +1,7 @@ services: restaurant-service: build: ./ApiRestaurant/ + container_name: restaurant environment: WAITER_API_URL: http://waiter-service:4000 expose: @@ -10,6 +11,7 @@ services: waiter-service: build: ./ApiWaiter/ + container_name: waiter environment: PORT: 4000 expose: diff --git a/balakhonov_danila_lab_3/nginx.conf b/balakhonov_danila_lab_3/nginx.conf index 70ef564..742d868 100644 --- a/balakhonov_danila_lab_3/nginx.conf +++ b/balakhonov_danila_lab_3/nginx.conf @@ -9,7 +9,7 @@ http { server_name localhost; location /waiters/ { - proxy_pass http://waiter-service:4000/; + proxy_pass http://waiter:4000/; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-Proto $scheme; @@ -17,7 +17,7 @@ http { } location /restaurants/ { - proxy_pass http://restaurant-service:8080/; + proxy_pass http://restaurant:8080/; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-Proto $scheme; From 4b5baf427232f1304dd3fcd8ff2c56295e2f0bda Mon Sep 17 00:00:00 2001 From: mfnefd Date: Sun, 3 Nov 2024 22:47:46 +0400 Subject: [PATCH 12/16] =?UTF-8?q?=D0=B8=D0=B7=D0=B2=D0=B8=D0=BD=D0=B8?= =?UTF-8?q?=D1=82=D0=B5=20=D1=83=20=D0=BC=D0=B5=D0=BD=D1=8F=20=D0=B3=D0=BE?= =?UTF-8?q?=D0=BB=D0=BE=D0=B2=D0=B0=20=D1=83=D0=B6=D0=B5=20=D0=BF=D0=BB?= =?UTF-8?q?=D1=8B=D0=B2=D0=B5=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- balakhonov_danila_lab_3/docker-compose.yaml | 14 ++++++-------- balakhonov_danila_lab_3/nginx.conf | 4 ++-- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/balakhonov_danila_lab_3/docker-compose.yaml b/balakhonov_danila_lab_3/docker-compose.yaml index fd9a5dc..8a1d306 100644 --- a/balakhonov_danila_lab_3/docker-compose.yaml +++ b/balakhonov_danila_lab_3/docker-compose.yaml @@ -1,17 +1,15 @@ services: - restaurant-service: + restaurant_service: build: ./ApiRestaurant/ - container_name: restaurant environment: - WAITER_API_URL: http://waiter-service:4000 + WAITER_API_URL: http://localhost:80/waiters/ expose: - 8080 depends_on: - - waiter-service + - waiter_service - waiter-service: + waiter_service: build: ./ApiWaiter/ - container_name: waiter environment: PORT: 4000 expose: @@ -20,8 +18,8 @@ services: nginx: image: nginx depends_on: - - restaurant-service - - waiter-service + - restaurant_service + - waiter_service ports: - "80:80" volumes: diff --git a/balakhonov_danila_lab_3/nginx.conf b/balakhonov_danila_lab_3/nginx.conf index 742d868..3595927 100644 --- a/balakhonov_danila_lab_3/nginx.conf +++ b/balakhonov_danila_lab_3/nginx.conf @@ -9,7 +9,7 @@ http { server_name localhost; location /waiters/ { - proxy_pass http://waiter:4000/; + proxy_pass http://waiter_service:4000/; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-Proto $scheme; @@ -17,7 +17,7 @@ http { } location /restaurants/ { - proxy_pass http://restaurant:8080/; + proxy_pass http://restaurant_service:8080/; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-Proto $scheme; From 54e0f8d8f32f16aa194ec694f48f31212f2f2b15 Mon Sep 17 00:00:00 2001 From: mfnefd Date: Sun, 3 Nov 2024 23:47:31 +0400 Subject: [PATCH 13/16] =?UTF-8?q?=D0=BC=D0=BE=D0=B6=D0=B5=D1=82=20=D0=B1?= =?UTF-8?q?=D1=8B=D1=82=D1=8C...=20=D1=81=D0=B5=D0=B9=D1=87=D0=B0=D1=81=3F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- balakhonov_danila_lab_3/nginx.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/balakhonov_danila_lab_3/nginx.conf b/balakhonov_danila_lab_3/nginx.conf index 3595927..fcc13da 100644 --- a/balakhonov_danila_lab_3/nginx.conf +++ b/balakhonov_danila_lab_3/nginx.conf @@ -9,7 +9,7 @@ http { server_name localhost; location /waiters/ { - proxy_pass http://waiter_service:4000/; + proxy_pass http://waiter_service:4000/waiters/; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-Proto $scheme; @@ -17,7 +17,7 @@ http { } location /restaurants/ { - proxy_pass http://restaurant_service:8080/; + proxy_pass http://restaurant_service:8080/api/restaurant; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-Proto $scheme; From 54157ec2bf913efa1577c3e5ce5f1eaac861f5d9 Mon Sep 17 00:00:00 2001 From: mfnefd Date: Mon, 4 Nov 2024 00:42:54 +0400 Subject: [PATCH 14/16] =?UTF-8?q?=D0=BD=D0=B5=D0=B1=D0=BE=D0=BB=D1=8C?= =?UTF-8?q?=D1=88=D0=B0=D1=8F=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BA=D0=B0?= =?UTF-8?q?=20=D1=87=D1=82=D0=BE=D0=B1=20=D0=BF=D0=BE=D0=BD=D1=8F=D1=82?= =?UTF-8?q?=D1=8C=20=D1=87=D1=82=D0=BE=20=D0=BF=D1=80=D0=BE=D0=B8=D1=81?= =?UTF-8?q?=D1=85=D0=BE=D0=B4=D0=B8=D1=82=20=D0=B2=D0=BE=D0=BE=D0=B1=D1=89?= =?UTF-8?q?=D0=B5...?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/RestaurantController.cs | 2 +- .../ApiRestaurant/NetworkSupport.cs | 28 +++++++++++++++++++ .../ApiRestaurant/Program.cs | 1 + balakhonov_danila_lab_3/docker-compose.yaml | 2 +- 4 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 balakhonov_danila_lab_3/ApiRestaurant/NetworkSupport.cs diff --git a/balakhonov_danila_lab_3/ApiRestaurant/Controllers/RestaurantController.cs b/balakhonov_danila_lab_3/ApiRestaurant/Controllers/RestaurantController.cs index 0d1a6de..2984cb8 100644 --- a/balakhonov_danila_lab_3/ApiRestaurant/Controllers/RestaurantController.cs +++ b/balakhonov_danila_lab_3/ApiRestaurant/Controllers/RestaurantController.cs @@ -22,7 +22,7 @@ public class RestaurantController : ControllerBase [HttpGet("{id}")] public async Task> GetOne(Guid id) { var restaurant = await _context.Restaurants.FindAsync(id); - if (restaurant == null) return NotFound(); + if (restaurant == null) return NotFound($"Restourant with [id: '{id}'] not found"); var waiters = await WaiterApiClient.GetAllForRestaurant(id); restaurant.Waiters = waiters; return restaurant; diff --git a/balakhonov_danila_lab_3/ApiRestaurant/NetworkSupport.cs b/balakhonov_danila_lab_3/ApiRestaurant/NetworkSupport.cs new file mode 100644 index 0000000..709bb5b --- /dev/null +++ b/balakhonov_danila_lab_3/ApiRestaurant/NetworkSupport.cs @@ -0,0 +1,28 @@ +namespace ApiRestaurant; + +public static class NetworkSupport +{ + public static async Task CheckConnectionAsync(string address) + { + using (var client = new HttpClient()) + { + try + { + var response = await client.GetAsync(address); + + if (response.IsSuccessStatusCode) + { + Console.WriteLine($"Соединение успешно проверено. Статус-код: {response.StatusCode}"); + } + else + { + Console.WriteLine($"Соединение не удалось проверить. Статус-код: {response.StatusCode}"); + } + } + catch (HttpRequestException ex) + { + Console.WriteLine($"Ошибка при проверке соединения: {ex.Message}"); + } + } + } +} \ No newline at end of file diff --git a/balakhonov_danila_lab_3/ApiRestaurant/Program.cs b/balakhonov_danila_lab_3/ApiRestaurant/Program.cs index 8eeab39..39106cb 100644 --- a/balakhonov_danila_lab_3/ApiRestaurant/Program.cs +++ b/balakhonov_danila_lab_3/ApiRestaurant/Program.cs @@ -8,6 +8,7 @@ var waiterApiAddress = Environment.GetEnvironmentVariable("WAITER_API_URL") ?? "http://localhost:4000/waiters/"; WaiterApiClient.Setup(waiterApiAddress); +await NetworkSupport.CheckConnectionAsync(waiterApiAddress); // Add services to the container. builder.Services.AddControllers(); diff --git a/balakhonov_danila_lab_3/docker-compose.yaml b/balakhonov_danila_lab_3/docker-compose.yaml index 8a1d306..21cf9e8 100644 --- a/balakhonov_danila_lab_3/docker-compose.yaml +++ b/balakhonov_danila_lab_3/docker-compose.yaml @@ -2,7 +2,7 @@ services: restaurant_service: build: ./ApiRestaurant/ environment: - WAITER_API_URL: http://localhost:80/waiters/ + WAITER_API_URL: http://waiter_service:4000/waiters/ expose: - 8080 depends_on: From 27daaeb0aad3fc6e322afadea4c8a7311776c37b Mon Sep 17 00:00:00 2001 From: mfnefd Date: Mon, 4 Nov 2024 01:34:00 +0400 Subject: [PATCH 15/16] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=20=D0=BA=D0=BE=D0=BD=D1=84=D0=B8=D0=B3=20?= =?UTF-8?q?=D0=BD=D0=B4=D0=B6=D0=B8=D0=BD=D0=BA=D1=81=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- balakhonov_danila_lab_3/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/balakhonov_danila_lab_3/nginx.conf b/balakhonov_danila_lab_3/nginx.conf index fcc13da..ec108f7 100644 --- a/balakhonov_danila_lab_3/nginx.conf +++ b/balakhonov_danila_lab_3/nginx.conf @@ -17,7 +17,7 @@ http { } location /restaurants/ { - proxy_pass http://restaurant_service:8080/api/restaurant; + proxy_pass http://restaurant_service:8080/api/restaurant/; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-Proto $scheme; From 56e663d77212d1965f13604d3e294ecd37d9d52a Mon Sep 17 00:00:00 2001 From: mfnefd Date: Mon, 4 Nov 2024 01:34:14 +0400 Subject: [PATCH 16/16] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=20=D1=80=D0=B8=D0=B4=D0=BC=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- balakhonov_danila_lab_3/README.md | 60 +++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 balakhonov_danila_lab_3/README.md diff --git a/balakhonov_danila_lab_3/README.md b/balakhonov_danila_lab_3/README.md new file mode 100644 index 0000000..dadbab5 --- /dev/null +++ b/balakhonov_danila_lab_3/README.md @@ -0,0 +1,60 @@ +# Лабораторная работа номер 3 + +> Здравствуйте меня зовут Балахонов Данила группа ПИбд-42 +> +> *— Балахонов Данила ПИбд-42* + +Видео лабораторной работы номер 3 доступно по этой [ссылке](https://drive.google.com/file/d/1KplDSt-BUQl9OUTM9x7VZcGeokuLhdOD/view?usp=sharing). + +## Как запустить лабораторную работу номер 3? +### Необходимые компоненты для запуска лабораторной работы номер 3 +> Здесь рассказана установка необходимых компонентов для запуска лабораторной работы номер 3 под дистрибутив GNU/Linux **Ubuntu**. + +Для запуска лабораторной работы номер 3 необходимы такие компоненты: + - Git + - Docker + - Docker compose + +Чтобы установить **Git**, необходимо ввести данные команды в командную строку: +``` bash +sudo apt-get update +sudo apt-get install git +``` + +Чтобы установить **Docker** и **Docker compose**, стоит ввести такие команды: +``` bash +# Настройка репозитория Docker +sudo apt-get update +sudo apt-get install ca-certificates curl +sudo install -m 0755 -d /etc/apt/keyrings +sudo curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc +sudo chmod a+r /etc/apt/keyrings/docker.asc + +echo \ + "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/ubuntu \ + $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | \ + sudo tee /etc/apt/sources.list.d/docker.list > /dev/null +sudo apt-get update + +# Установка Docker и его компонентов +sudo apt-get install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin +``` +### Запуск лабораторной работы номер 3 +Для запуска лабораторной работы номер 3 необходимо **склонировать** репозиторий в любую папку и **перейти на ветку** balakhonov_danila_lab_3. +Далее в папке с `docker-compose.yaml` нужно вызвать такую команду: +``` bash +sudo docker-compose up --build +``` +Таким образом контейнеры будут подготовлены и запущены. +Доступ к функционалну системы происходит через nginx, через порт 80. +## Какие технологии были использованы? +Для выполнения лабораторной работы номер 3 были использованы такие технологии, как: + - Dockerfile + - Docker compose + - Git + - .NET SDK и С# в частности + - ASP.NET Core + - Node.js + - Express +## Что делает лабораторная работа номер 3? +Суть лабораторной работы номер 3 заключается в распределении функционала между несколькими сервисами, а также реализации взаимодействия между ними. \ No newline at end of file