diff --git a/tasks/ostrovskaya-sf/lab_3/.gitignore b/tasks/ostrovskaya-sf/lab_3/.gitignore new file mode 100644 index 0000000..104b544 --- /dev/null +++ b/tasks/ostrovskaya-sf/lab_3/.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/tasks/ostrovskaya-sf/lab_3/README.md b/tasks/ostrovskaya-sf/lab_3/README.md new file mode 100644 index 0000000..a3c2b2b --- /dev/null +++ b/tasks/ostrovskaya-sf/lab_3/README.md @@ -0,0 +1,87 @@ +# Отчет по лабораторной работе №3 + +Выполнила студентка гр. ИСЭбд-41 Островская С. Ф. + +## REST API, Gateway и синхронный обмен между микросервисами + +## Создание микросервисов + +1. Создала первый микросервис - `dotnet new web -n worker-1` +2. Добавила решение - `dotnet new sln` +3. Связала решение и проект - `dotnet sln worker-1.sln add worker-1.csproj` +4. Для второго микросервиса выполнила пункты 1-3 +5. Добавила библиотеку Swagger и OpenAi - `dotnet add worker-1.csproj package Swashbuckle.AspNetCore` , `dotnet add worker-1.csproj package Microsoft.AspNetCore.OpenApi` +6. Запустила - `dotnet run` + +Скриншоты протестированных микросервисов: +![](pic/pic1.jpg) +![](pic/pic2.jpg) + +## Реализация синхронного обмена + +Код реализации синхронного обмена: + +```cs +//Файд Program.cs проекта worker-2 +app.MapGet("/Requests/", async () => +{ + var httpClient = new HttpClient(); + var secondWorkerResponse = await httpClient.GetStringAsync("http://worker-1:8080/"); + + return secondWorkerResponse.ToArray(); +}) +.WithName("GetRequests") +.WithOpenApi(); +``` + +## Реализация gateway при помощи nginx + +Добавила nginx.conf: + +```conf +server { + listen 8080; + listen [::]:8080; + server_name localhost; + + location / { + root /usr/share/nginx/html; + index index.html index.htm; + } + + location /worker-1/ { + proxy_pass http://worker-1:8080/; + 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 /worker-1; + } + + location /worker-2/ { + proxy_pass http://worker-2:8080/; + 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 /worker-2; + } +} + +``` + +Результат, после выполнения команды `docker compose up`: + +Docker: + +![](pic/pic3.jpg) + +index.html на gateway-1: + +![](pic/pic4.jpg) + +worker-1: + +![](pic/pic5.jpg) + +worker-2: + +![](pic/pic6.jpg) \ No newline at end of file diff --git a/tasks/ostrovskaya-sf/lab_3/docker-compose.yml b/tasks/ostrovskaya-sf/lab_3/docker-compose.yml new file mode 100644 index 0000000..e9ca4b9 --- /dev/null +++ b/tasks/ostrovskaya-sf/lab_3/docker-compose.yml @@ -0,0 +1,15 @@ +version: "3.1" +services: + worker-1: + build: ./worker-1 + worker-2: + build: ./worker-2 + depends_on: + - worker-1 + gateway: + image: nginx:latest + ports: + - 8080:8080 + volumes: + - ./static:/usr/share/nginx/html:ro + - ./nginx.conf:/etc/nginx/conf.d/default.conf:ro \ No newline at end of file diff --git a/tasks/ostrovskaya-sf/lab_3/nginx.conf b/tasks/ostrovskaya-sf/lab_3/nginx.conf new file mode 100644 index 0000000..f649a4a --- /dev/null +++ b/tasks/ostrovskaya-sf/lab_3/nginx.conf @@ -0,0 +1,26 @@ +server { + listen 8080; + listen [::]:8080; + server_name localhost; + + location / { + root /usr/share/nginx/html; + index index.html index.htm; + } + + location /worker-1/ { + proxy_pass http://worker-1:8080/; + 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 /worker-1; + } + + location /worker-2/ { + proxy_pass http://worker-2:8080/; + 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 /worker-2; + } +} \ No newline at end of file diff --git a/tasks/ostrovskaya-sf/lab_3/pic/pic1.jpg b/tasks/ostrovskaya-sf/lab_3/pic/pic1.jpg new file mode 100644 index 0000000..2f42897 Binary files /dev/null and b/tasks/ostrovskaya-sf/lab_3/pic/pic1.jpg differ diff --git a/tasks/ostrovskaya-sf/lab_3/pic/pic2.jpg b/tasks/ostrovskaya-sf/lab_3/pic/pic2.jpg new file mode 100644 index 0000000..302d42a Binary files /dev/null and b/tasks/ostrovskaya-sf/lab_3/pic/pic2.jpg differ diff --git a/tasks/ostrovskaya-sf/lab_3/pic/pic3.jpg b/tasks/ostrovskaya-sf/lab_3/pic/pic3.jpg new file mode 100644 index 0000000..97e080b Binary files /dev/null and b/tasks/ostrovskaya-sf/lab_3/pic/pic3.jpg differ diff --git a/tasks/ostrovskaya-sf/lab_3/pic/pic4.jpg b/tasks/ostrovskaya-sf/lab_3/pic/pic4.jpg new file mode 100644 index 0000000..9a51b8c Binary files /dev/null and b/tasks/ostrovskaya-sf/lab_3/pic/pic4.jpg differ diff --git a/tasks/ostrovskaya-sf/lab_3/pic/pic5.jpg b/tasks/ostrovskaya-sf/lab_3/pic/pic5.jpg new file mode 100644 index 0000000..44bb124 Binary files /dev/null and b/tasks/ostrovskaya-sf/lab_3/pic/pic5.jpg differ diff --git a/tasks/ostrovskaya-sf/lab_3/pic/pic6.jpg b/tasks/ostrovskaya-sf/lab_3/pic/pic6.jpg new file mode 100644 index 0000000..f3339b4 Binary files /dev/null and b/tasks/ostrovskaya-sf/lab_3/pic/pic6.jpg differ diff --git a/tasks/ostrovskaya-sf/lab_3/static/index.html b/tasks/ostrovskaya-sf/lab_3/static/index.html new file mode 100644 index 0000000..0085b20 --- /dev/null +++ b/tasks/ostrovskaya-sf/lab_3/static/index.html @@ -0,0 +1,13 @@ + + + + + + Тестовое приложение для л/р 3 + + +

Островская Софья Федоровна, группа ИСЭбд-41.

+

Отправить запрос к worker-1

+

Отправить запрос к worker-2

+ + \ No newline at end of file diff --git a/tasks/ostrovskaya-sf/lab_3/worker-1/Dockerfile b/tasks/ostrovskaya-sf/lab_3/worker-1/Dockerfile new file mode 100644 index 0000000..7a8ce23 --- /dev/null +++ b/tasks/ostrovskaya-sf/lab_3/worker-1/Dockerfile @@ -0,0 +1,11 @@ +FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build-env +WORKDIR /app + +COPY . ./ +RUN dotnet restore +RUN dotnet publish -c Release -o out + +FROM mcr.microsoft.com/dotnet/aspnet:8.0 +WORKDIR /app +COPY --from=build-env /app/out . +ENTRYPOINT ["dotnet", "worker-1.dll"] \ No newline at end of file diff --git a/tasks/ostrovskaya-sf/lab_3/worker-1/Program.cs b/tasks/ostrovskaya-sf/lab_3/worker-1/Program.cs new file mode 100644 index 0000000..6daa4d9 --- /dev/null +++ b/tasks/ostrovskaya-sf/lab_3/worker-1/Program.cs @@ -0,0 +1,124 @@ +List requests = new() +{ + new Request() { Uuid= Guid.Parse("a1b5c571-a859-4bb8-9fd2-7431ddd6c464"), Title = "Дополнительное соглашение на расценку", Student = "Иванов Иван Иванович", DateAgreement = new DateTime(2023, 7, 01), AgreementValid = true }, + new Request() { Uuid= Guid.Parse("53d08f8c-19f5-4028-8e92-520470c8f747"), Title = "Дополнительное соглашение на продление срока проживания", Student = "Петров Петр Петрович", DateAgreement = new DateTime(2023, 5, 01), AgreementValid = false }, +}; + +var builder = WebApplication.CreateBuilder(args); + +builder.Services.AddEndpointsApiExplorer(); +builder.Services.AddSwaggerGen(); + +var app = builder.Build(); + +if (app.Environment.IsDevelopment()) +{ + app.UseSwagger(); + app.UseSwaggerUI(); +} + +app.UseHttpsRedirection(); + +app.MapGet("/", () => +{ + return requests.Select(r => new RequestEntityDto() + { + Uuid = r.Uuid, + Title = r.Title, + DateAgreement = r.DateAgreement, + Student = r.Student, + AgreementValid = r.AgreementValid, + }); +}) +.WithName("GetRequests") +.WithOpenApi(); + +app.MapGet("/{uuid}", (Guid uuid) => +{ + var request = requests.FirstOrDefault(r => r.Uuid == uuid); + if (request == null) + return Results.NotFound(); + return Results.Json(new RequestEntityDto() + { + Uuid = request.Uuid, + Title = request.Title, + DateAgreement = request.DateAgreement, + Student = request.Student, + AgreementValid = request.AgreementValid, + }); +}) +.WithName("GetRequestByGUID") +.WithOpenApi(); + +app.MapPost("/{title}/{Student}/{DateAgreement}/{AgreementValid}", (string title, string Student, DateTime DateAgreement, bool AgreementValid) => +{ + Guid NewGuid = Guid.NewGuid(); + requests.Add(new Request() { Uuid = NewGuid, Title = (string)title, Student = (string)Student, DateAgreement = (DateTime)DateAgreement, AgreementValid = (bool)AgreementValid }); + + var request = requests.FirstOrDefault(r => r.Uuid == NewGuid); + if (request == null) + return Results.NotFound(); + return Results.Json(new RequestEntityDto() + { + Uuid = request.Uuid, + Title = request.Title, + DateAgreement = request.DateAgreement, + Student = request.Student, + AgreementValid = request.AgreementValid, + }); +}) +.WithName("PostRequest") +.WithOpenApi(); + +app.MapPatch("/{uuid}/{title}/{Student}/{DateAgreement}/{AgreementValid}", (Guid uuid, string? title, string? Student, DateTime DateAgreement, bool AgreementValid) => +{ + var request = requests.FirstOrDefault(r => r.Uuid == uuid); + if (request == null) + return Results.NotFound(); + if (title != null) request.Title = title; + if (Student != ",") request.Student = Student; + if (DateAgreement != request.DateAgreement) request.DateAgreement = DateAgreement; + if (AgreementValid != request.AgreementValid) request.AgreementValid = AgreementValid; + + return Results.Json(new RequestEntityDto() + { + Uuid = request.Uuid, + Title = request.Title, + DateAgreement = request.DateAgreement, + Student = request.Student, + AgreementValid = request.AgreementValid, + }); +}) +.WithName("UpdateRequest") +.WithOpenApi(); + +app.MapDelete("/{uuid}", (Guid uuid) => +{ + var request = requests.FirstOrDefault(r => r.Uuid == uuid); + if (request == null) + return Results.NotFound(); + requests.Remove(request); + return Results.Json(new RequestEntityDto() + { + Uuid = request.Uuid, + Title = request.Title, + DateAgreement = request.DateAgreement, + Student = request.Student, + AgreementValid = request.AgreementValid, + }); +}) +.WithName("DeleteRequestByGUID") +.WithOpenApi(); + +app.Run(); + +public class Request +{ + public Guid Uuid { get; set; } + public string Title { get; set; } = string.Empty; + public string Student { get; set; } = string.Empty; + public DateTime DateAgreement { get; set; } + public bool AgreementValid { get; set; } +} + +public class RequestEntityDto : Request { } \ No newline at end of file diff --git a/tasks/ostrovskaya-sf/lab_3/worker-1/Properties/launchSettings.json b/tasks/ostrovskaya-sf/lab_3/worker-1/Properties/launchSettings.json new file mode 100644 index 0000000..37db1a2 --- /dev/null +++ b/tasks/ostrovskaya-sf/lab_3/worker-1/Properties/launchSettings.json @@ -0,0 +1,38 @@ +{ + "$schema": "http://json.schemastore.org/launchsettings.json", + "iisSettings": { + "windowsAuthentication": false, + "anonymousAuthentication": true, + "iisExpress": { + "applicationUrl": "http://localhost:19149", + "sslPort": 44373 + } + }, + "profiles": { + "http": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": true, + "applicationUrl": "http://localhost:5193", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + "https": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": true, + "applicationUrl": "https://localhost:7248;http://localhost:5193", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + "IIS Express": { + "commandName": "IISExpress", + "launchBrowser": true, + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + } + } +} diff --git a/tasks/ostrovskaya-sf/lab_3/worker-1/appsettings.Development.json b/tasks/ostrovskaya-sf/lab_3/worker-1/appsettings.Development.json new file mode 100644 index 0000000..0c208ae --- /dev/null +++ b/tasks/ostrovskaya-sf/lab_3/worker-1/appsettings.Development.json @@ -0,0 +1,8 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning" + } + } +} diff --git a/tasks/ostrovskaya-sf/lab_3/worker-1/appsettings.json b/tasks/ostrovskaya-sf/lab_3/worker-1/appsettings.json new file mode 100644 index 0000000..10f68b8 --- /dev/null +++ b/tasks/ostrovskaya-sf/lab_3/worker-1/appsettings.json @@ -0,0 +1,9 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning" + } + }, + "AllowedHosts": "*" +} diff --git a/tasks/ostrovskaya-sf/lab_3/worker-1/worker-1.csproj b/tasks/ostrovskaya-sf/lab_3/worker-1/worker-1.csproj new file mode 100644 index 0000000..795c30e --- /dev/null +++ b/tasks/ostrovskaya-sf/lab_3/worker-1/worker-1.csproj @@ -0,0 +1,15 @@ + + + + net8.0 + enable + enable + worker_1 + + + + + + + + diff --git a/tasks/ostrovskaya-sf/lab_3/worker-1/worker-1.sln b/tasks/ostrovskaya-sf/lab_3/worker-1/worker-1.sln new file mode 100644 index 0000000..606b9c7 --- /dev/null +++ b/tasks/ostrovskaya-sf/lab_3/worker-1/worker-1.sln @@ -0,0 +1,22 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.31903.59 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "worker-1", "worker-1.csproj", "{025ED07B-DD93-4AEF-81BA-60F1FF536EA3}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {025ED07B-DD93-4AEF-81BA-60F1FF536EA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {025ED07B-DD93-4AEF-81BA-60F1FF536EA3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {025ED07B-DD93-4AEF-81BA-60F1FF536EA3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {025ED07B-DD93-4AEF-81BA-60F1FF536EA3}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection +EndGlobal diff --git a/tasks/ostrovskaya-sf/lab_3/worker-2/Dockerfile b/tasks/ostrovskaya-sf/lab_3/worker-2/Dockerfile new file mode 100644 index 0000000..7f6b963 --- /dev/null +++ b/tasks/ostrovskaya-sf/lab_3/worker-2/Dockerfile @@ -0,0 +1,11 @@ +FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build-env +WORKDIR /app + +COPY . ./ +RUN dotnet restore +RUN dotnet publish -c Release -o out + +FROM mcr.microsoft.com/dotnet/aspnet:8.0 +WORKDIR /app +COPY --from=build-env /app/out . +ENTRYPOINT ["dotnet", "worker-2.dll"] \ No newline at end of file diff --git a/tasks/ostrovskaya-sf/lab_3/worker-2/Program.cs b/tasks/ostrovskaya-sf/lab_3/worker-2/Program.cs new file mode 100644 index 0000000..b15ac5f --- /dev/null +++ b/tasks/ostrovskaya-sf/lab_3/worker-2/Program.cs @@ -0,0 +1,133 @@ + +using System.Diagnostics.Contracts; + +List agrs = new() +{ + new Contract() { Uuid= Guid.NewGuid(), Number = "Договор №655/55 от 01.07.2023", IdRequest = Guid.Parse("a1b5c571-a859-4bb8-9fd2-7431ddd6c464") } +}; + +var builder = WebApplication.CreateBuilder(args); + +builder.Services.AddEndpointsApiExplorer(); +builder.Services.AddSwaggerGen(); + +var app = builder.Build(); + +if (app.Environment.IsDevelopment()) +{ + app.UseSwagger(); + app.UseSwaggerUI(); +} + +app.UseHttpsRedirection(); + +app.MapGet("/", () => +{ + return agrs.Select(r => new ContractEntityDto() + { + Uuid = r.Uuid, + Number = r.Number, + IdRequest = r.IdRequest, + }); +}) +.WithName("GetAgreements") +.WithOpenApi(); + +app.MapGet("/{uuid}", (Guid uuid) => +{ + var agr = agrs.FirstOrDefault(r => r.Uuid == uuid); + if (agr == null) + return Results.NotFound(); + return Results.Json(new ContractEntityDto() + { + Uuid = agr.Uuid, + Number = agr.Number, + IdRequest = agr.IdRequest, + }); +}) +.WithName("GetAgreementByGUID") +.WithOpenApi(); + +app.MapPost("/{number}/{idRequest}", (string? number, Guid idRequest) => +{ + Guid NewGuid = Guid.NewGuid(); + agrs.Add(new Contract() { Uuid = NewGuid, Number = (string)number, IdRequest = (Guid)idRequest }); + + var agr = agrs.FirstOrDefault(r => r.Uuid == NewGuid); + if (agr == null) + return Results.NotFound(); + return Results.Json(new ContractEntityDto() + { + Uuid = agr.Uuid, + Number = agr.Number, + IdRequest = agr.IdRequest, + }); +}) +.WithName("PostAgreement") +.WithOpenApi(); + +app.MapPatch("/{uuid}/{number}/{idRequest}", (Guid uuid, string? number, Guid idRequest) => +{ + var agr = agrs.FirstOrDefault(r => r.Uuid == uuid); + if (agr == null) + return Results.NotFound(); + if (number != ",") agr.Number = number; + if (idRequest != agr.IdRequest) agr.IdRequest = idRequest; + + return Results.Json(new ContractEntityDto() + { + Uuid = agr.Uuid, + Number = agr.Number, + IdRequest = agr.IdRequest, + }); +}) +.WithName("UpdateAgreement") +.WithOpenApi(); + +app.MapDelete("/{uuid}", (Guid uuid) => +{ + var agr = agrs.FirstOrDefault(r => r.Uuid == uuid); + if (agr == null) + return Results.NotFound(); + agrs.Remove(agr); + return Results.Json(new ContractEntityDto() + { + Uuid = agr.Uuid, + Number = agr.Number, + IdRequest = agr.IdRequest, + }); +}) +.WithName("DeleteAgreement") +.WithOpenApi(); + +app.MapGet("/Requests/", async () => +{ + var httpClient = new HttpClient(); + var secondWorkerResponse = await httpClient.GetStringAsync("http://worker-1:8080/"); + + return secondWorkerResponse.ToArray(); +}) +.WithName("GetRequests") +.WithOpenApi(); + +app.Run(); + +public class Contract +{ + public Guid Uuid { get; set; } + public string Number { get; set; } = string.Empty; + public Guid IdRequest { get; set; } +} + +public class ContractEntityDto : Contract { } + +public class Request +{ + public Guid Uuid { get; set; } + public string Title { get; set; } = string.Empty; + public string Student { get; set; } = string.Empty; + public DateTime DateAgreement { get; set; } + public bool AgreementValid { get; set; } +} + +public class RequestEntityDto : Request { } \ No newline at end of file diff --git a/tasks/ostrovskaya-sf/lab_3/worker-2/Properties/launchSettings.json b/tasks/ostrovskaya-sf/lab_3/worker-2/Properties/launchSettings.json new file mode 100644 index 0000000..a97df8a --- /dev/null +++ b/tasks/ostrovskaya-sf/lab_3/worker-2/Properties/launchSettings.json @@ -0,0 +1,38 @@ +{ + "$schema": "http://json.schemastore.org/launchsettings.json", + "iisSettings": { + "windowsAuthentication": false, + "anonymousAuthentication": true, + "iisExpress": { + "applicationUrl": "http://localhost:4895", + "sslPort": 44369 + } + }, + "profiles": { + "http": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": true, + "applicationUrl": "http://localhost:5229", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + "https": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": true, + "applicationUrl": "https://localhost:7256;http://localhost:5229", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + "IIS Express": { + "commandName": "IISExpress", + "launchBrowser": true, + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + } + } +} diff --git a/tasks/ostrovskaya-sf/lab_3/worker-2/appsettings.Development.json b/tasks/ostrovskaya-sf/lab_3/worker-2/appsettings.Development.json new file mode 100644 index 0000000..0c208ae --- /dev/null +++ b/tasks/ostrovskaya-sf/lab_3/worker-2/appsettings.Development.json @@ -0,0 +1,8 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning" + } + } +} diff --git a/tasks/ostrovskaya-sf/lab_3/worker-2/appsettings.json b/tasks/ostrovskaya-sf/lab_3/worker-2/appsettings.json new file mode 100644 index 0000000..10f68b8 --- /dev/null +++ b/tasks/ostrovskaya-sf/lab_3/worker-2/appsettings.json @@ -0,0 +1,9 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning" + } + }, + "AllowedHosts": "*" +} diff --git a/tasks/ostrovskaya-sf/lab_3/worker-2/worker-2.csproj b/tasks/ostrovskaya-sf/lab_3/worker-2/worker-2.csproj new file mode 100644 index 0000000..9e8d22f --- /dev/null +++ b/tasks/ostrovskaya-sf/lab_3/worker-2/worker-2.csproj @@ -0,0 +1,15 @@ + + + + net8.0 + enable + enable + worker_2 + + + + + + + + diff --git a/tasks/ostrovskaya-sf/lab_3/worker-2/worker-2.sln b/tasks/ostrovskaya-sf/lab_3/worker-2/worker-2.sln new file mode 100644 index 0000000..88fe9ba --- /dev/null +++ b/tasks/ostrovskaya-sf/lab_3/worker-2/worker-2.sln @@ -0,0 +1,22 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.31903.59 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "worker-2", "worker-2.csproj", "{B1A3FA28-4BDF-4928-98BD-2B103E12C437}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {B1A3FA28-4BDF-4928-98BD-2B103E12C437}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B1A3FA28-4BDF-4928-98BD-2B103E12C437}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B1A3FA28-4BDF-4928-98BD-2B103E12C437}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B1A3FA28-4BDF-4928-98BD-2B103E12C437}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection +EndGlobal