From 12cd98aa7d36c34758f108576dbcbad11127831c Mon Sep 17 00:00:00 2001 From: JulYakJul <137865717+JulYakJul@users.noreply.github.com> Date: Tue, 8 Oct 2024 16:30:55 +0400 Subject: [PATCH] yakovleva_yulia_lab_3 is ready --- .../Administrator/.config/dotnet-tools.json | 12 + .../Administrator/Administrator.csproj | 4 + .../Controllers/AdminController.cs | 34 +- .../DataBase/AdminDataBaseContext.cs | 28 +- .../Administrator/Administrator/Program.cs | 31 +- .../Properties/launchSettings.json | 20 +- .../Administrator/Administrator/Startup.cs | 55 ++ .../Administrator/appsettings.json | 2 +- yakovleva_yulia_lab_3/Buyer/.dockerignore | 30 ++ yakovleva_yulia_lab_3/Buyer/.gitignore | 484 ++++++++++++++++++ yakovleva_yulia_lab_3/Buyer/Buyer.sln | 25 + .../Buyer/Buyer/Buyer - Backup.csproj | 22 + .../Buyer/Buyer/Buyer.csproj | 27 + yakovleva_yulia_lab_3/Buyer/Buyer/Buyer.http | 6 + .../Buyer/Controllers/BuyerController.cs | 105 ++++ .../Buyer/DataBase/BuyerDataBaseContext.cs | 20 + .../Buyer/Buyer/DataBase/DBModels/Buyers.cs | 18 + yakovleva_yulia_lab_3/Buyer/Buyer/Dockerfile | 27 + yakovleva_yulia_lab_3/Buyer/Buyer/Program.cs | 10 + .../Buyer/Properties/launchSettings.json | 42 ++ yakovleva_yulia_lab_3/Buyer/Buyer/Startup.cs | 50 ++ .../Buyer/Buyer/appsettings.Development.json | 8 + .../Buyer/Buyer/appsettings.json | 12 + yakovleva_yulia_lab_3/docker-compose.yaml | 50 ++ 24 files changed, 1055 insertions(+), 67 deletions(-) create mode 100644 yakovleva_yulia_lab_3/Administrator/.config/dotnet-tools.json create mode 100644 yakovleva_yulia_lab_3/Administrator/Administrator/Startup.cs create mode 100644 yakovleva_yulia_lab_3/Buyer/.dockerignore create mode 100644 yakovleva_yulia_lab_3/Buyer/.gitignore create mode 100644 yakovleva_yulia_lab_3/Buyer/Buyer.sln create mode 100644 yakovleva_yulia_lab_3/Buyer/Buyer/Buyer - Backup.csproj create mode 100644 yakovleva_yulia_lab_3/Buyer/Buyer/Buyer.csproj create mode 100644 yakovleva_yulia_lab_3/Buyer/Buyer/Buyer.http create mode 100644 yakovleva_yulia_lab_3/Buyer/Buyer/Controllers/BuyerController.cs create mode 100644 yakovleva_yulia_lab_3/Buyer/Buyer/DataBase/BuyerDataBaseContext.cs create mode 100644 yakovleva_yulia_lab_3/Buyer/Buyer/DataBase/DBModels/Buyers.cs create mode 100644 yakovleva_yulia_lab_3/Buyer/Buyer/Dockerfile create mode 100644 yakovleva_yulia_lab_3/Buyer/Buyer/Program.cs create mode 100644 yakovleva_yulia_lab_3/Buyer/Buyer/Properties/launchSettings.json create mode 100644 yakovleva_yulia_lab_3/Buyer/Buyer/Startup.cs create mode 100644 yakovleva_yulia_lab_3/Buyer/Buyer/appsettings.Development.json create mode 100644 yakovleva_yulia_lab_3/Buyer/Buyer/appsettings.json create mode 100644 yakovleva_yulia_lab_3/docker-compose.yaml diff --git a/yakovleva_yulia_lab_3/Administrator/.config/dotnet-tools.json b/yakovleva_yulia_lab_3/Administrator/.config/dotnet-tools.json new file mode 100644 index 0000000..d7000af --- /dev/null +++ b/yakovleva_yulia_lab_3/Administrator/.config/dotnet-tools.json @@ -0,0 +1,12 @@ +{ + "version": 1, + "isRoot": true, + "tools": { + "dotnet-ef": { + "version": "8.0.8", + "commands": [ + "dotnet-ef" + ] + } + } +} \ No newline at end of file diff --git a/yakovleva_yulia_lab_3/Administrator/Administrator/Administrator.csproj b/yakovleva_yulia_lab_3/Administrator/Administrator/Administrator.csproj index c5b1942..3583898 100644 --- a/yakovleva_yulia_lab_3/Administrator/Administrator/Administrator.csproj +++ b/yakovleva_yulia_lab_3/Administrator/Administrator/Administrator.csproj @@ -10,6 +10,10 @@ + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/yakovleva_yulia_lab_3/Administrator/Administrator/Controllers/AdminController.cs b/yakovleva_yulia_lab_3/Administrator/Administrator/Controllers/AdminController.cs index 77e74f5..1357898 100644 --- a/yakovleva_yulia_lab_3/Administrator/Administrator/Controllers/AdminController.cs +++ b/yakovleva_yulia_lab_3/Administrator/Administrator/Controllers/AdminController.cs @@ -15,30 +15,42 @@ namespace Administrator.Controllers { private readonly AdminDataBaseContext _context; private readonly ILogger _logger; + private readonly IHttpClientFactory _clientFactory; - public AdminController(AdminDataBaseContext context, ILogger logger) + public AdminController(AdminDataBaseContext context, ILogger logger, IHttpClientFactory clientFactory) { _context = context; _logger = logger; + _clientFactory = clientFactory; } // [HttpPost] public async Task> CreateAdministrator(Admin administrator) { + if (!await ClientExists(administrator.ClientId)) + { + return BadRequest(" ."); + } + _context.Administrators.Add(administrator); await _context.SaveChangesAsync(); return CreatedAtAction(nameof(GetAdministratorById), new { id = administrator.Id }, administrator); } - // + // [HttpPut("{id}")] public async Task UpdateAdministrator(int id, Admin updatedAdministrator) { + if (!await ClientExists(updatedAdministrator.ClientId)) + { + return BadRequest(" ."); + } + if (id != updatedAdministrator.Id) { - return BadRequest("ID "); + return BadRequest(); } _context.Entry(updatedAdministrator).State = EntityState.Modified; @@ -49,9 +61,9 @@ namespace Administrator.Controllers } catch (DbUpdateConcurrencyException) { - if (!_context.Administrators.Any(a => a.Id == id)) + if (!AdminExists(id)) { - return NotFound(" "); + return NotFound(); } else { @@ -98,5 +110,17 @@ namespace Administrator.Controllers return administrator; } + + private bool AdminExists(int id) + { + return _context.Administrators.Any(e => e.Id == id); + } + + private async Task ClientExists(int buyerId) + { + var client = _clientFactory.CreateClient("BuyerService"); + var response = await client.GetAsync($"Buyers/{buyerId}"); + return response.IsSuccessStatusCode; + } } } diff --git a/yakovleva_yulia_lab_3/Administrator/Administrator/DataBase/AdminDataBaseContext.cs b/yakovleva_yulia_lab_3/Administrator/Administrator/DataBase/AdminDataBaseContext.cs index 7afa8af..b66251b 100644 --- a/yakovleva_yulia_lab_3/Administrator/Administrator/DataBase/AdminDataBaseContext.cs +++ b/yakovleva_yulia_lab_3/Administrator/Administrator/DataBase/AdminDataBaseContext.cs @@ -1,38 +1,20 @@ -using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.Configuration; +using Administrator.DataBase.DBModels; +using Microsoft.EntityFrameworkCore; namespace Administrator.DataBase { - public partial class AdminDataBaseContext : DbContext + public class AdminDataBaseContext : DbContext { - public AdminDataBaseContext() - { - } - public AdminDataBaseContext(DbContextOptions options) : base(options) { } - public virtual DbSet Administrators { get; set; } + public DbSet Administrators { get; set; } protected override void OnModelCreating(ModelBuilder modelBuilder) { - modelBuilder.Entity(entity => - { - entity.Property(e => e.Id).ValueGeneratedOnAdd(); - }); - OnModelCreatingPartial(modelBuilder); - } - - partial void OnModelCreatingPartial(ModelBuilder modelBuilder); - - protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) - { - if (!optionsBuilder.IsConfigured) - { - optionsBuilder.UseNpgsql("Host=localhost;Database=Administrator;Username=postgres;Password=123"); - } + modelBuilder.Entity().ToTable("Administrators"); } } } diff --git a/yakovleva_yulia_lab_3/Administrator/Administrator/Program.cs b/yakovleva_yulia_lab_3/Administrator/Administrator/Program.cs index 15eacee..56b8d8b 100644 --- a/yakovleva_yulia_lab_3/Administrator/Administrator/Program.cs +++ b/yakovleva_yulia_lab_3/Administrator/Administrator/Program.cs @@ -1,25 +1,10 @@ -var builder = WebApplication.CreateBuilder(args); +var host = CreateHostBuilder(args).Build(); -// Add services to the container. +host.Run(); -builder.Services.AddControllers(); -// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle -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(); +static IHostBuilder CreateHostBuilder(string[] args) => + Host.CreateDefaultBuilder(args) + .ConfigureWebHostDefaults(webBuilder => + { + webBuilder.UseStartup(); + }); diff --git a/yakovleva_yulia_lab_3/Administrator/Administrator/Properties/launchSettings.json b/yakovleva_yulia_lab_3/Administrator/Administrator/Properties/launchSettings.json index 0486126..78fbb4e 100644 --- a/yakovleva_yulia_lab_3/Administrator/Administrator/Properties/launchSettings.json +++ b/yakovleva_yulia_lab_3/Administrator/Administrator/Properties/launchSettings.json @@ -10,16 +10,6 @@ "dotnetRunMessages": true, "applicationUrl": "http://localhost:5015" }, - "https": { - "commandName": "Project", - "launchBrowser": true, - "launchUrl": "swagger", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - }, - "dotnetRunMessages": true, - "applicationUrl": "https://localhost:7049;http://localhost:5015" - }, "IIS Express": { "commandName": "IISExpress", "launchBrowser": true, @@ -33,11 +23,11 @@ "launchBrowser": true, "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}/swagger", "environmentVariables": { - "ASPNETCORE_HTTPS_PORTS": "8081", - "ASPNETCORE_HTTP_PORTS": "8080" + "ASPNETCORE_ENVIRONMENT": "Development", + "ASPNETCORE_URLS": "http://+:80" }, "publishAllPorts": true, - "useSSL": true + "useSSL": false } }, "$schema": "http://json.schemastore.org/launchsettings.json", @@ -46,7 +36,7 @@ "anonymousAuthentication": true, "iisExpress": { "applicationUrl": "http://localhost:60492", - "sslPort": 44346 + "sslPort": 0 } } -} \ No newline at end of file +} diff --git a/yakovleva_yulia_lab_3/Administrator/Administrator/Startup.cs b/yakovleva_yulia_lab_3/Administrator/Administrator/Startup.cs new file mode 100644 index 0000000..adec894 --- /dev/null +++ b/yakovleva_yulia_lab_3/Administrator/Administrator/Startup.cs @@ -0,0 +1,55 @@ +using Microsoft.EntityFrameworkCore; +using Administrator.DataBase; + +public class Startup +{ + public Startup(IConfiguration configuration) + { + Configuration = configuration; + } + + public IConfiguration Configuration { get; } + + public void ConfigureServices(IServiceCollection services) + { + services.AddControllers(); + + services.AddDbContext(options => + options.UseNpgsql(Configuration.GetConnectionString("AdminDatabase"))); + + services.AddHttpClient("BuyerService", client => + { + client.BaseAddress = new Uri("http://buyer-service:8080/"); + }); + + services.AddSwaggerGen(); + } + + public void Configure(IApplicationBuilder app, IWebHostEnvironment env, IServiceScopeFactory serviceScopeFactory) + { + if (env.IsDevelopment()) + { + app.UseDeveloperExceptionPage(); + } + + app.UseHttpsRedirection(); + + app.UseRouting(); + + app.UseAuthorization(); + + using (var scope = serviceScopeFactory.CreateScope()) + { + var context = scope.ServiceProvider.GetRequiredService(); + context.Database.Migrate(); + } + + app.UseEndpoints(endpoints => + { + endpoints.MapControllers(); + }); + + app.UseSwagger(); + app.UseSwaggerUI(); + } +} diff --git a/yakovleva_yulia_lab_3/Administrator/Administrator/appsettings.json b/yakovleva_yulia_lab_3/Administrator/Administrator/appsettings.json index ccef620..cf4c47d 100644 --- a/yakovleva_yulia_lab_3/Administrator/Administrator/appsettings.json +++ b/yakovleva_yulia_lab_3/Administrator/Administrator/appsettings.json @@ -1,6 +1,6 @@ { "ConnectionStrings": { - "AdminDatabase": "Host=localhost;Database=Administrator;Username=postgres;Password=123" + "AdminDatabase": "Host=postgresdb;Database=administrator;Username=postgres;Password=123" }, "Logging": { "LogLevel": { diff --git a/yakovleva_yulia_lab_3/Buyer/.dockerignore b/yakovleva_yulia_lab_3/Buyer/.dockerignore new file mode 100644 index 0000000..4d72b4f --- /dev/null +++ b/yakovleva_yulia_lab_3/Buyer/.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/yakovleva_yulia_lab_3/Buyer/.gitignore b/yakovleva_yulia_lab_3/Buyer/.gitignore new file mode 100644 index 0000000..5e57f18 --- /dev/null +++ b/yakovleva_yulia_lab_3/Buyer/.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/yakovleva_yulia_lab_3/Buyer/Buyer.sln b/yakovleva_yulia_lab_3/Buyer/Buyer.sln new file mode 100644 index 0000000..73c139c --- /dev/null +++ b/yakovleva_yulia_lab_3/Buyer/Buyer.sln @@ -0,0 +1,25 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.9.34728.123 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Buyer", "Buyer\Buyer.csproj", "{3845B5A1-0A3C-427B-9659-67590EEDB4B6}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {3845B5A1-0A3C-427B-9659-67590EEDB4B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3845B5A1-0A3C-427B-9659-67590EEDB4B6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3845B5A1-0A3C-427B-9659-67590EEDB4B6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3845B5A1-0A3C-427B-9659-67590EEDB4B6}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {2074E7E7-D084-4F69-AED8-8DD2830D2A68} + EndGlobalSection +EndGlobal diff --git a/yakovleva_yulia_lab_3/Buyer/Buyer/Buyer - Backup.csproj b/yakovleva_yulia_lab_3/Buyer/Buyer/Buyer - Backup.csproj new file mode 100644 index 0000000..3583898 --- /dev/null +++ b/yakovleva_yulia_lab_3/Buyer/Buyer/Buyer - Backup.csproj @@ -0,0 +1,22 @@ + + + + net8.0 + enable + enable + b3476a56-c45e-4a63-be32-5987c93f46b1 + Linux + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + diff --git a/yakovleva_yulia_lab_3/Buyer/Buyer/Buyer.csproj b/yakovleva_yulia_lab_3/Buyer/Buyer/Buyer.csproj new file mode 100644 index 0000000..7eb035b --- /dev/null +++ b/yakovleva_yulia_lab_3/Buyer/Buyer/Buyer.csproj @@ -0,0 +1,27 @@ + + + + net8.0 + enable + enable + f9482e07-2725-46f1-9b04-c34d26c4f674 + Linux + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + + + + + diff --git a/yakovleva_yulia_lab_3/Buyer/Buyer/Buyer.http b/yakovleva_yulia_lab_3/Buyer/Buyer/Buyer.http new file mode 100644 index 0000000..6780d1b --- /dev/null +++ b/yakovleva_yulia_lab_3/Buyer/Buyer/Buyer.http @@ -0,0 +1,6 @@ +@Administrator_HostAddress = http://localhost:5015 + +GET {{Administrator_HostAddress}}/weatherforecast/ +Accept: application/json + +### diff --git a/yakovleva_yulia_lab_3/Buyer/Buyer/Controllers/BuyerController.cs b/yakovleva_yulia_lab_3/Buyer/Buyer/Controllers/BuyerController.cs new file mode 100644 index 0000000..9f70376 --- /dev/null +++ b/yakovleva_yulia_lab_3/Buyer/Buyer/Controllers/BuyerController.cs @@ -0,0 +1,105 @@ +using Microsoft.AspNetCore.Mvc; +using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Logging; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Buyer.DataBase; +using Buyer.DataBase.DBModels; + +namespace Buyer.Controllers +{ + [ApiController] + [Route("Buyers/")] + public class BuyerController : Controller + { + private readonly BuyerDataBaseContext _dbContext; + + public BuyerController(BuyerDataBaseContext dbContext) + { + _dbContext = dbContext; + } + + // + [HttpGet] + public async Task>> GetAllBuyers() + { + return await _dbContext.Buyers.ToListAsync(); + } + + // ID + [HttpGet("{id}")] + public async Task> GetBuyer(int id) + { + var Buyer = await _dbContext.Buyers.FindAsync(id); + + if (Buyer == null) + { + return NotFound(); + } + + return Buyer; + } + + // + [HttpPost] + public async Task> CreateBuyer(Buyers Buyer) + { + _dbContext.Buyers.Add(Buyer); + await _dbContext.SaveChangesAsync(); + + return CreatedAtAction(nameof(GetBuyer), new { id = Buyer.Id }, Buyer); + } + + // + [HttpPut("{id}")] + public async Task UpdateBuyer(int id, Buyers Buyer) + { + if (id != Buyer.Id) + { + return BadRequest(); + } + + _dbContext.Entry(Buyer).State = EntityState.Modified; + + try + { + await _dbContext.SaveChangesAsync(); + } + catch (DbUpdateConcurrencyException) + { + if (!BuyerExists(id)) + { + return NotFound(); + } + else + { + throw; + } + } + + return NoContent(); + } + + // + [HttpDelete("{id}")] + public async Task DeleteBuyer(int id) + { + var Buyer = await _dbContext.Buyers.FindAsync(id); + if (Buyer == null) + { + return NotFound(); + } + + _dbContext.Buyers.Remove(Buyer); + await _dbContext.SaveChangesAsync(); + + return NoContent(); + } + + private bool BuyerExists(int id) + { + return _dbContext.Buyers.Any(e => e.Id == id); + } + } +} diff --git a/yakovleva_yulia_lab_3/Buyer/Buyer/DataBase/BuyerDataBaseContext.cs b/yakovleva_yulia_lab_3/Buyer/Buyer/DataBase/BuyerDataBaseContext.cs new file mode 100644 index 0000000..d645634 --- /dev/null +++ b/yakovleva_yulia_lab_3/Buyer/Buyer/DataBase/BuyerDataBaseContext.cs @@ -0,0 +1,20 @@ +using Buyer.DataBase.DBModels; +using Microsoft.EntityFrameworkCore; + +namespace Buyer.DataBase +{ + public class BuyerDataBaseContext : DbContext + { + public BuyerDataBaseContext(DbContextOptions options) + : base(options) + { + } + + public DbSet Buyers { get; set; } + + protected override void OnModelCreating(ModelBuilder modelBuilder) + { + modelBuilder.Entity().ToTable("Buyers"); + } + } +} diff --git a/yakovleva_yulia_lab_3/Buyer/Buyer/DataBase/DBModels/Buyers.cs b/yakovleva_yulia_lab_3/Buyer/Buyer/DataBase/DBModels/Buyers.cs new file mode 100644 index 0000000..b7852c6 --- /dev/null +++ b/yakovleva_yulia_lab_3/Buyer/Buyer/DataBase/DBModels/Buyers.cs @@ -0,0 +1,18 @@ +using System.ComponentModel.DataAnnotations; + +namespace Buyer.DataBase.DBModels +{ + public class Buyers + { + [Key] + public int Id { get; set; } + + [Required] + [StringLength(50)] + public string FirstName { get; set; } + + + [StringLength(50)] + public string SecondName { get; set; } + } +} diff --git a/yakovleva_yulia_lab_3/Buyer/Buyer/Dockerfile b/yakovleva_yulia_lab_3/Buyer/Buyer/Dockerfile new file mode 100644 index 0000000..045b57a --- /dev/null +++ b/yakovleva_yulia_lab_3/Buyer/Buyer/Dockerfile @@ -0,0 +1,27 @@ +#See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging. + +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 +ARG BUILD_CONFIGURATION=Release +WORKDIR /src +COPY ["Buyer/Buyer.csproj", "Buyer/"] +RUN dotnet restore "./Buyer/Buyer.csproj" +COPY . . +WORKDIR "/src/Buyer" +RUN dotnet build "./Buyer.csproj" -c $BUILD_CONFIGURATION -o /app/build + +FROM build AS publish +ARG BUILD_CONFIGURATION=Release +RUN dotnet publish "./Buyer.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false + +FROM base AS final +WORKDIR /app +COPY --from=publish /app/publish . +ENTRYPOINT ["dotnet", "Buyer.dll"] + +CMD dotnet ef database update --no-build && dotnet BuyerService.dll \ No newline at end of file diff --git a/yakovleva_yulia_lab_3/Buyer/Buyer/Program.cs b/yakovleva_yulia_lab_3/Buyer/Buyer/Program.cs new file mode 100644 index 0000000..56b8d8b --- /dev/null +++ b/yakovleva_yulia_lab_3/Buyer/Buyer/Program.cs @@ -0,0 +1,10 @@ +var host = CreateHostBuilder(args).Build(); + +host.Run(); + +static IHostBuilder CreateHostBuilder(string[] args) => + Host.CreateDefaultBuilder(args) + .ConfigureWebHostDefaults(webBuilder => + { + webBuilder.UseStartup(); + }); diff --git a/yakovleva_yulia_lab_3/Buyer/Buyer/Properties/launchSettings.json b/yakovleva_yulia_lab_3/Buyer/Buyer/Properties/launchSettings.json new file mode 100644 index 0000000..78fbb4e --- /dev/null +++ b/yakovleva_yulia_lab_3/Buyer/Buyer/Properties/launchSettings.json @@ -0,0 +1,42 @@ +{ + "profiles": { + "http": { + "commandName": "Project", + "launchBrowser": true, + "launchUrl": "swagger", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + }, + "dotnetRunMessages": true, + "applicationUrl": "http://localhost:5015" + }, + "IIS Express": { + "commandName": "IISExpress", + "launchBrowser": true, + "launchUrl": "swagger", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + "Container (Dockerfile)": { + "commandName": "Docker", + "launchBrowser": true, + "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}/swagger", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development", + "ASPNETCORE_URLS": "http://+:80" + }, + "publishAllPorts": true, + "useSSL": false + } + }, + "$schema": "http://json.schemastore.org/launchsettings.json", + "iisSettings": { + "windowsAuthentication": false, + "anonymousAuthentication": true, + "iisExpress": { + "applicationUrl": "http://localhost:60492", + "sslPort": 0 + } + } +} diff --git a/yakovleva_yulia_lab_3/Buyer/Buyer/Startup.cs b/yakovleva_yulia_lab_3/Buyer/Buyer/Startup.cs new file mode 100644 index 0000000..617d2d2 --- /dev/null +++ b/yakovleva_yulia_lab_3/Buyer/Buyer/Startup.cs @@ -0,0 +1,50 @@ +using Microsoft.EntityFrameworkCore; +using Buyer.DataBase; + +public class Startup +{ + public Startup(IConfiguration configuration) + { + Configuration = configuration; + } + + public IConfiguration Configuration { get; } + + public void ConfigureServices(IServiceCollection services) + { + services.AddControllers(); + + services.AddDbContext(options => + options.UseNpgsql(Configuration.GetConnectionString("BuyerDatabase"))); + + services.AddSwaggerGen(); + } + + public void Configure(IApplicationBuilder app, IWebHostEnvironment env, IServiceScopeFactory serviceScopeFactory) + { + if (env.IsDevelopment()) + { + app.UseDeveloperExceptionPage(); + } + + app.UseHttpsRedirection(); + + app.UseRouting(); + + app.UseAuthorization(); + + using (var scope = serviceScopeFactory.CreateScope()) + { + var context = scope.ServiceProvider.GetRequiredService(); + context.Database.Migrate(); + } + + app.UseEndpoints(endpoints => + { + endpoints.MapControllers(); + }); + + app.UseSwagger(); + app.UseSwaggerUI(); + } +} diff --git a/yakovleva_yulia_lab_3/Buyer/Buyer/appsettings.Development.json b/yakovleva_yulia_lab_3/Buyer/Buyer/appsettings.Development.json new file mode 100644 index 0000000..ff66ba6 --- /dev/null +++ b/yakovleva_yulia_lab_3/Buyer/Buyer/appsettings.Development.json @@ -0,0 +1,8 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning" + } + } +} diff --git a/yakovleva_yulia_lab_3/Buyer/Buyer/appsettings.json b/yakovleva_yulia_lab_3/Buyer/Buyer/appsettings.json new file mode 100644 index 0000000..a2752bb --- /dev/null +++ b/yakovleva_yulia_lab_3/Buyer/Buyer/appsettings.json @@ -0,0 +1,12 @@ +{ + "ConnectionStrings": { + "BuyerDatabase": "Host=postgresdb;Database=buyer;Username=postgres;Password=123" + }, + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning" + } + }, + "AllowedHosts": "*" +} diff --git a/yakovleva_yulia_lab_3/docker-compose.yaml b/yakovleva_yulia_lab_3/docker-compose.yaml new file mode 100644 index 0000000..70475f6 --- /dev/null +++ b/yakovleva_yulia_lab_3/docker-compose.yaml @@ -0,0 +1,50 @@ +services: + postgresdb: + image: postgres:latest + container_name: postgres_container + environment: + POSTGRES_USER: postgres + POSTGRES_PASSWORD: 123 + POSTGRES_DB: administrator + PGDATA: /var/lib/postgresql/data/pgdata + ports: + - "5430:5432" # Проброс порта для PostgreSQL + volumes: + - ./database.sql:/docker-entrypoint-initdb.d/database.sql # Инициализация базы данных + restart: always + networks: + - desision-making-system-network + + administrator-service: + container_name: administrator-service + depends_on: + - postgresdb # Заивисмость от запуска Posgresql + build: + context: ./Administrator + dockerfile: ./Administrator/Dockerfile + environment: + ASPNETCORE_ENVIRONMENT: "Development" # Настраиваем среду разработки + ASPNETCORE_URLS: "http://+:8080" + ports: + - "32773:8080" # Проброс порта 8080 + networks: + - desision-making-system-network + + buyer-service: + container_name: buyer-service + depends_on: + - postgresdb # Заивисмость от запуска Posgresql + build: + context: ./Buyer + dockerfile: ./Buyer/Dockerfile + environment: + ASPNETCORE_ENVIRONMENT: "Development" # Настраиваем среду разработки + ASPNETCORE_URLS: "http://+:8080" + ports: + - "32774:8080" # Проброс порта + networks: + - desision-making-system-network + +networks: + desision-making-system-network: + driver: bridge