From 3db4a0fcd412732f49c03a69536e4e2f0bbea36b Mon Sep 17 00:00:00 2001 From: JulYakJul <137865717+JulYakJul@users.noreply.github.com> Date: Mon, 7 Oct 2024 11:28:34 +0400 Subject: [PATCH 1/4] Admin --- .../gitea_data/git/.ssh/environment | 1 + .../gitea_data/gitea/conf/app.ini | 62 +++ .../gitea_data/ssh/ssh_host_ecdsa_key | 9 + .../gitea_data/ssh/ssh_host_ecdsa_key.pub | 1 + .../gitea_data/ssh/ssh_host_ed25519_key | 7 + .../gitea_data/ssh/ssh_host_ed25519_key.pub | 1 + .../gitea_data/ssh/ssh_host_rsa_key | 38 ++ .../gitea_data/ssh/ssh_host_rsa_key.pub | 1 + .../Administrator/.dockerignore | 30 ++ .../Administrator/.gitignore | 484 ++++++++++++++++++ .../Administrator/Administrator.sln | 25 + .../Administrator/Administrator.csproj | 18 + .../Administrator/Administrator.http | 6 + .../Controllers/AdminController.cs | 102 ++++ .../DataBase/AdminDataBaseContext.cs | 38 ++ .../Administrator/DataBase/DBModels/Admin.cs | 21 + .../Administrator/Administrator/Dockerfile | 25 + .../Administrator/Administrator/Program.cs | 25 + .../Properties/launchSettings.json | 52 ++ .../appsettings.Development.json | 8 + .../Administrator/appsettings.json | 12 + 21 files changed, 966 insertions(+) create mode 100644 yakovleva_julia_lab_1/gitea_data/git/.ssh/environment create mode 100644 yakovleva_julia_lab_1/gitea_data/gitea/conf/app.ini create mode 100644 yakovleva_julia_lab_1/gitea_data/ssh/ssh_host_ecdsa_key create mode 100644 yakovleva_julia_lab_1/gitea_data/ssh/ssh_host_ecdsa_key.pub create mode 100644 yakovleva_julia_lab_1/gitea_data/ssh/ssh_host_ed25519_key create mode 100644 yakovleva_julia_lab_1/gitea_data/ssh/ssh_host_ed25519_key.pub create mode 100644 yakovleva_julia_lab_1/gitea_data/ssh/ssh_host_rsa_key create mode 100644 yakovleva_julia_lab_1/gitea_data/ssh/ssh_host_rsa_key.pub create mode 100644 yakovleva_yulia_lab_3/Administrator/.dockerignore create mode 100644 yakovleva_yulia_lab_3/Administrator/.gitignore create mode 100644 yakovleva_yulia_lab_3/Administrator/Administrator.sln create mode 100644 yakovleva_yulia_lab_3/Administrator/Administrator/Administrator.csproj create mode 100644 yakovleva_yulia_lab_3/Administrator/Administrator/Administrator.http create mode 100644 yakovleva_yulia_lab_3/Administrator/Administrator/Controllers/AdminController.cs create mode 100644 yakovleva_yulia_lab_3/Administrator/Administrator/DataBase/AdminDataBaseContext.cs create mode 100644 yakovleva_yulia_lab_3/Administrator/Administrator/DataBase/DBModels/Admin.cs create mode 100644 yakovleva_yulia_lab_3/Administrator/Administrator/Dockerfile create mode 100644 yakovleva_yulia_lab_3/Administrator/Administrator/Program.cs create mode 100644 yakovleva_yulia_lab_3/Administrator/Administrator/Properties/launchSettings.json create mode 100644 yakovleva_yulia_lab_3/Administrator/Administrator/appsettings.Development.json create mode 100644 yakovleva_yulia_lab_3/Administrator/Administrator/appsettings.json diff --git a/yakovleva_julia_lab_1/gitea_data/git/.ssh/environment b/yakovleva_julia_lab_1/gitea_data/git/.ssh/environment new file mode 100644 index 0000000..f86169b --- /dev/null +++ b/yakovleva_julia_lab_1/gitea_data/git/.ssh/environment @@ -0,0 +1 @@ +GITEA_CUSTOM=/data/gitea diff --git a/yakovleva_julia_lab_1/gitea_data/gitea/conf/app.ini b/yakovleva_julia_lab_1/gitea_data/gitea/conf/app.ini new file mode 100644 index 0000000..fc845ec --- /dev/null +++ b/yakovleva_julia_lab_1/gitea_data/gitea/conf/app.ini @@ -0,0 +1,62 @@ +APP_NAME = Gitea: Git with a cup of tea +RUN_MODE = prod + +[repository] +ROOT = /data/git/repositories + +[repository.local] +LOCAL_COPY_PATH = /data/gitea/tmp/local-repo + +[repository.upload] +TEMP_PATH = /data/gitea/uploads + +[server] +APP_DATA_PATH = /data/gitea +DOMAIN = localhost +SSH_DOMAIN = localhost +HTTP_PORT = 3000 +ROOT_URL = +DISABLE_SSH = false +SSH_PORT = 22 +SSH_LISTEN_PORT = 22 +LFS_START_SERVER = false + +[database] +PATH = /data/gitea/gitea.db +DB_TYPE = postgres +HOST = postgres:5432 +NAME = gitea +USER = gitea +PASSWD = gitea_password +LOG_SQL = false + +[indexer] +ISSUE_INDEXER_PATH = /data/gitea/indexers/issues.bleve + +[session] +PROVIDER_CONFIG = /data/gitea/sessions + +[picture] +AVATAR_UPLOAD_PATH = /data/gitea/avatars +REPOSITORY_AVATAR_UPLOAD_PATH = /data/gitea/repo-avatars + +[attachment] +PATH = /data/gitea/attachments + +[log] +MODE = console +LEVEL = info +ROOT_PATH = /data/gitea/log + +[security] +INSTALL_LOCK = false +SECRET_KEY = +REVERSE_PROXY_LIMIT = 1 +REVERSE_PROXY_TRUSTED_PROXIES = * + +[service] +DISABLE_REGISTRATION = false +REQUIRE_SIGNIN_VIEW = false + +[lfs] +PATH = /data/git/lfs diff --git a/yakovleva_julia_lab_1/gitea_data/ssh/ssh_host_ecdsa_key b/yakovleva_julia_lab_1/gitea_data/ssh/ssh_host_ecdsa_key new file mode 100644 index 0000000..2ae50d5 --- /dev/null +++ b/yakovleva_julia_lab_1/gitea_data/ssh/ssh_host_ecdsa_key @@ -0,0 +1,9 @@ +-----BEGIN OPENSSH PRIVATE KEY----- +b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAaAAAABNlY2RzYS +1zaGEyLW5pc3RwMjU2AAAACG5pc3RwMjU2AAAAQQQNsEEB8WbwWwL4UDC7O316GFwd6BeJ +czWHMc8lU7uUs9yeGulpQW/8WCT22eLQRwPMHwLrtLoWsQFtvRBA9SUcAAAAsLZgkFG2YJ +BRAAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBA2wQQHxZvBbAvhQ +MLs7fXoYXB3oF4lzNYcxzyVTu5Sz3J4a6WlBb/xYJPbZ4tBHA8wfAuu0uhaxAW29EED1JR +wAAAAhANznL/lP/wHg++WOEV8PKFSXU6nMjrxZ7d5h0F7Vw34UAAAAEXJvb3RANTRhNjlj +ZTM2NjEwAQIDBAUG +-----END OPENSSH PRIVATE KEY----- diff --git a/yakovleva_julia_lab_1/gitea_data/ssh/ssh_host_ecdsa_key.pub b/yakovleva_julia_lab_1/gitea_data/ssh/ssh_host_ecdsa_key.pub new file mode 100644 index 0000000..735da44 --- /dev/null +++ b/yakovleva_julia_lab_1/gitea_data/ssh/ssh_host_ecdsa_key.pub @@ -0,0 +1 @@ +ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBA2wQQHxZvBbAvhQMLs7fXoYXB3oF4lzNYcxzyVTu5Sz3J4a6WlBb/xYJPbZ4tBHA8wfAuu0uhaxAW29EED1JRw= root@54a69ce36610 diff --git a/yakovleva_julia_lab_1/gitea_data/ssh/ssh_host_ed25519_key b/yakovleva_julia_lab_1/gitea_data/ssh/ssh_host_ed25519_key new file mode 100644 index 0000000..503ed2b --- /dev/null +++ b/yakovleva_julia_lab_1/gitea_data/ssh/ssh_host_ed25519_key @@ -0,0 +1,7 @@ +-----BEGIN OPENSSH PRIVATE KEY----- +b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW +QyNTUxOQAAACAzsXGK5hUnYc4GBXdmz2PtyDs4a3kmsW9MbHc2KFJ7awAAAJinfTTDp300 +wwAAAAtzc2gtZWQyNTUxOQAAACAzsXGK5hUnYc4GBXdmz2PtyDs4a3kmsW9MbHc2KFJ7aw +AAAEBwjE6fuSN6txxLIq+bOtPruOAc79ZzXWkAZV5wu1B5jzOxcYrmFSdhzgYFd2bPY+3I +OzhreSaxb0xsdzYoUntrAAAAEXJvb3RANTRhNjljZTM2NjEwAQIDBA== +-----END OPENSSH PRIVATE KEY----- diff --git a/yakovleva_julia_lab_1/gitea_data/ssh/ssh_host_ed25519_key.pub b/yakovleva_julia_lab_1/gitea_data/ssh/ssh_host_ed25519_key.pub new file mode 100644 index 0000000..d95c5e6 --- /dev/null +++ b/yakovleva_julia_lab_1/gitea_data/ssh/ssh_host_ed25519_key.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDOxcYrmFSdhzgYFd2bPY+3IOzhreSaxb0xsdzYoUntr root@54a69ce36610 diff --git a/yakovleva_julia_lab_1/gitea_data/ssh/ssh_host_rsa_key b/yakovleva_julia_lab_1/gitea_data/ssh/ssh_host_rsa_key new file mode 100644 index 0000000..143a41c --- /dev/null +++ b/yakovleva_julia_lab_1/gitea_data/ssh/ssh_host_rsa_key @@ -0,0 +1,38 @@ +-----BEGIN OPENSSH PRIVATE KEY----- +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 +-----END OPENSSH PRIVATE KEY----- diff --git a/yakovleva_julia_lab_1/gitea_data/ssh/ssh_host_rsa_key.pub b/yakovleva_julia_lab_1/gitea_data/ssh/ssh_host_rsa_key.pub new file mode 100644 index 0000000..3d78862 --- /dev/null +++ b/yakovleva_julia_lab_1/gitea_data/ssh/ssh_host_rsa_key.pub @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDJElEmJ5S3Cuw37paCiwAh+//tEBs8k028UnCovuXmfnQVCQfa7Ubt1TtWAYhZIM58x4Dez74Rb7lr8sj5VbiVNUOxjb/aXRh9sHLjKC0GkJPdcy1fy3YukAL0yqwxL9dIDYeRY0awWDvwRwWypW1nfw7qInmnBDZEfnATYZFbauhSjPaoPvsO2Lo0rMSYI9EULyuA5Ac7rVEQQ0uAROWXnC8pMzEnHrgxkVmckrXsfsEu8vS3vC/hwPpn5W5NGDbkTugoHbl/QOy9c4dYP/uLb8e2vr9ONKbVFZDURwN2vsrvaLBwxr1AOgV0s2eSkBdwtdvi/Q43hBUSZLkhD1eMtDie4MLuYCQ8ZIXRy0nH6tFrQsazcEJqS/OBLYO8nbieOm4hRYgLd8bSfASnlklIsYBs3o0Z3zQO0WKk08pLL/hdSSwVhIMhnBb+imn2wb3jnPlhh7aL4lgyrVVw75vzh6BnHf5APcdbO1ZfFzNIT51AFDrpsGy7j4S2M82GoCs= root@54a69ce36610 diff --git a/yakovleva_yulia_lab_3/Administrator/.dockerignore b/yakovleva_yulia_lab_3/Administrator/.dockerignore new file mode 100644 index 0000000..4d72b4f --- /dev/null +++ b/yakovleva_yulia_lab_3/Administrator/.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/Administrator/.gitignore b/yakovleva_yulia_lab_3/Administrator/.gitignore new file mode 100644 index 0000000..5e57f18 --- /dev/null +++ b/yakovleva_yulia_lab_3/Administrator/.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/Administrator/Administrator.sln b/yakovleva_yulia_lab_3/Administrator/Administrator.sln new file mode 100644 index 0000000..4bdb397 --- /dev/null +++ b/yakovleva_yulia_lab_3/Administrator/Administrator.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}") = "Administrator", "Administrator\Administrator.csproj", "{45DF535F-4F9E-4A5C-9D60-4B0709863ED8}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {45DF535F-4F9E-4A5C-9D60-4B0709863ED8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {45DF535F-4F9E-4A5C-9D60-4B0709863ED8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {45DF535F-4F9E-4A5C-9D60-4B0709863ED8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {45DF535F-4F9E-4A5C-9D60-4B0709863ED8}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {211037E3-7DB9-4964-B9B8-211487849EED} + EndGlobalSection +EndGlobal diff --git a/yakovleva_yulia_lab_3/Administrator/Administrator/Administrator.csproj b/yakovleva_yulia_lab_3/Administrator/Administrator/Administrator.csproj new file mode 100644 index 0000000..c5b1942 --- /dev/null +++ b/yakovleva_yulia_lab_3/Administrator/Administrator/Administrator.csproj @@ -0,0 +1,18 @@ + + + + net8.0 + enable + enable + b3476a56-c45e-4a63-be32-5987c93f46b1 + Linux + + + + + + + + + + diff --git a/yakovleva_yulia_lab_3/Administrator/Administrator/Administrator.http b/yakovleva_yulia_lab_3/Administrator/Administrator/Administrator.http new file mode 100644 index 0000000..6780d1b --- /dev/null +++ b/yakovleva_yulia_lab_3/Administrator/Administrator/Administrator.http @@ -0,0 +1,6 @@ +@Administrator_HostAddress = http://localhost:5015 + +GET {{Administrator_HostAddress}}/weatherforecast/ +Accept: application/json + +### diff --git a/yakovleva_yulia_lab_3/Administrator/Administrator/Controllers/AdminController.cs b/yakovleva_yulia_lab_3/Administrator/Administrator/Controllers/AdminController.cs new file mode 100644 index 0000000..77e74f5 --- /dev/null +++ b/yakovleva_yulia_lab_3/Administrator/Administrator/Controllers/AdminController.cs @@ -0,0 +1,102 @@ +using Microsoft.AspNetCore.Mvc; +using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Logging; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Administrator.DataBase; +using Administrator.DataBase.DBModels; + +namespace Administrator.Controllers +{ + [ApiController] + [Route("Administrators/")] + public class AdminController : ControllerBase + { + private readonly AdminDataBaseContext _context; + private readonly ILogger _logger; + + public AdminController(AdminDataBaseContext context, ILogger logger) + { + _context = context; + _logger = logger; + } + + // + [HttpPost] + public async Task> CreateAdministrator(Admin administrator) + { + _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 (id != updatedAdministrator.Id) + { + return BadRequest("ID "); + } + + _context.Entry(updatedAdministrator).State = EntityState.Modified; + + try + { + await _context.SaveChangesAsync(); + } + catch (DbUpdateConcurrencyException) + { + if (!_context.Administrators.Any(a => a.Id == id)) + { + return NotFound(" "); + } + else + { + throw; + } + } + + return NoContent(); + } + + // + [HttpDelete("{id}")] + public async Task DeleteAdministrator(int id) + { + var administrator = await _context.Administrators.FindAsync(id); + if (administrator == null) + { + return NotFound(" "); + } + + _context.Administrators.Remove(administrator); + await _context.SaveChangesAsync(); + + return NoContent(); + } + + // + [HttpGet] + public async Task>> GetAllAdministrators() + { + return await _context.Administrators.ToListAsync(); + } + + // ID + [HttpGet("{id}")] + public async Task> GetAdministratorById(int id) + { + var administrator = await _context.Administrators.FindAsync(id); + + if (administrator == null) + { + return NotFound(" "); + } + + return administrator; + } + } +} diff --git a/yakovleva_yulia_lab_3/Administrator/Administrator/DataBase/AdminDataBaseContext.cs b/yakovleva_yulia_lab_3/Administrator/Administrator/DataBase/AdminDataBaseContext.cs new file mode 100644 index 0000000..7afa8af --- /dev/null +++ b/yakovleva_yulia_lab_3/Administrator/Administrator/DataBase/AdminDataBaseContext.cs @@ -0,0 +1,38 @@ +using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Configuration; + +namespace Administrator.DataBase +{ + public partial class AdminDataBaseContext : DbContext + { + public AdminDataBaseContext() + { + } + + public AdminDataBaseContext(DbContextOptions options) + : base(options) + { + } + + public virtual 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"); + } + } + } +} diff --git a/yakovleva_yulia_lab_3/Administrator/Administrator/DataBase/DBModels/Admin.cs b/yakovleva_yulia_lab_3/Administrator/Administrator/DataBase/DBModels/Admin.cs new file mode 100644 index 0000000..4879311 --- /dev/null +++ b/yakovleva_yulia_lab_3/Administrator/Administrator/DataBase/DBModels/Admin.cs @@ -0,0 +1,21 @@ +using System.ComponentModel.DataAnnotations; + +namespace Administrator.DataBase.DBModels +{ + public class Admin + { + [Key] + public int Id { get; set; } + + [Required] + [StringLength(50)] + public string FirstName { get; set; } + + + [StringLength(50)] + public string SecondName { get; set; } + + [Required] + public int ClientId { get; set; } + } +} diff --git a/yakovleva_yulia_lab_3/Administrator/Administrator/Dockerfile b/yakovleva_yulia_lab_3/Administrator/Administrator/Dockerfile new file mode 100644 index 0000000..a9d7d88 --- /dev/null +++ b/yakovleva_yulia_lab_3/Administrator/Administrator/Dockerfile @@ -0,0 +1,25 @@ +#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 ["Administrator/Administrator.csproj", "Administrator/"] +RUN dotnet restore "./Administrator/Administrator.csproj" +COPY . . +WORKDIR "/src/Administrator" +RUN dotnet build "./Administrator.csproj" -c $BUILD_CONFIGURATION -o /app/build + +FROM build AS publish +ARG BUILD_CONFIGURATION=Release +RUN dotnet publish "./Administrator.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false + +FROM base AS final +WORKDIR /app +COPY --from=publish /app/publish . +ENTRYPOINT ["dotnet", "Administrator.dll"] \ No newline at end of file diff --git a/yakovleva_yulia_lab_3/Administrator/Administrator/Program.cs b/yakovleva_yulia_lab_3/Administrator/Administrator/Program.cs new file mode 100644 index 0000000..15eacee --- /dev/null +++ b/yakovleva_yulia_lab_3/Administrator/Administrator/Program.cs @@ -0,0 +1,25 @@ +var builder = WebApplication.CreateBuilder(args); + +// Add services to the container. + +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(); diff --git a/yakovleva_yulia_lab_3/Administrator/Administrator/Properties/launchSettings.json b/yakovleva_yulia_lab_3/Administrator/Administrator/Properties/launchSettings.json new file mode 100644 index 0000000..0486126 --- /dev/null +++ b/yakovleva_yulia_lab_3/Administrator/Administrator/Properties/launchSettings.json @@ -0,0 +1,52 @@ +{ + "profiles": { + "http": { + "commandName": "Project", + "launchBrowser": true, + "launchUrl": "swagger", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + }, + "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, + "launchUrl": "swagger", + "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:60492", + "sslPort": 44346 + } + } +} \ No newline at end of file diff --git a/yakovleva_yulia_lab_3/Administrator/Administrator/appsettings.Development.json b/yakovleva_yulia_lab_3/Administrator/Administrator/appsettings.Development.json new file mode 100644 index 0000000..ff66ba6 --- /dev/null +++ b/yakovleva_yulia_lab_3/Administrator/Administrator/appsettings.Development.json @@ -0,0 +1,8 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning" + } + } +} diff --git a/yakovleva_yulia_lab_3/Administrator/Administrator/appsettings.json b/yakovleva_yulia_lab_3/Administrator/Administrator/appsettings.json new file mode 100644 index 0000000..ccef620 --- /dev/null +++ b/yakovleva_yulia_lab_3/Administrator/Administrator/appsettings.json @@ -0,0 +1,12 @@ +{ + "ConnectionStrings": { + "AdminDatabase": "Host=localhost;Database=Administrator;Username=postgres;Password=123" + }, + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning" + } + }, + "AllowedHosts": "*" +} 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 2/4] 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 From f5194bf885c86f6a6df66a942dd267542230c551 Mon Sep 17 00:00:00 2001 From: JulYakJul <137865717+JulYakJul@users.noreply.github.com> Date: Tue, 8 Oct 2024 16:56:07 +0400 Subject: [PATCH 3/4] Create README.md --- yakovleva_yulia_lab_3/README.md | 45 +++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 yakovleva_yulia_lab_3/README.md diff --git a/yakovleva_yulia_lab_3/README.md b/yakovleva_yulia_lab_3/README.md new file mode 100644 index 0000000..4092d9a --- /dev/null +++ b/yakovleva_yulia_lab_3/README.md @@ -0,0 +1,45 @@ +# Лабораторная работа 3 - REST API, Gateway и синхронный обмен между микросервисами + +## Описание +Были разработаны два микросервиса с простыми CRUD операциями и реализован синхронный обмен сообщениями между ними. + +Тема дипломной работы: Разработка системы для автоматизации процессов управления компьютерным клубом на платформе .Net + +На основе темы были созданны сущности: + +Администратор: +- Идентификатор +- Имя +- Фамилия +- Идентификатор клиента (связь "один ко многим") + +Клиент: +- Идентификатор +- Имя +- Фамилия + +Сервис Аминистратора имеет возможность управлять списком Клиентов. При создании Администратора можно указать идентификатор Клиента, +после чего идет запрос на сервис Клиента с целью узнать существует ли привязываемый Клиент. реализовано с помощью Web-API, интерфейс Swagger, +база данных PostgreSQL. Каждый сервис использует свою базу данных. + +## Запуск + +1. Запустить Docker +2. Открыть консоль, перейти в папку, где хранится docker-compose.yml +3. Выполнить команду: +``` +docker compose up --build +``` + +## Результат +Выполняем команду: +``` +docker compose ps +``` +Видим, что контейнеры успешно подняты. +Заходим на http://localhost:32774/swagger/index.html и http://localhost:32773/swagger/index.html - создаем администраторов и клиентов через Swagger. +Видим, что клиенты успешно созданны. +Создаем администраторов с ссылкой на клиента. + +## Отчет +Работоспособность: [видео](https://vk.com/video372869030_456239953?list=ln-KBJP1uxkWkQNlqzohl) \ No newline at end of file From a6a247cabff6951a889d299da8a3d1d798d1682d Mon Sep 17 00:00:00 2001 From: JulYakJul <137865717+JulYakJul@users.noreply.github.com> Date: Tue, 8 Oct 2024 17:02:29 +0400 Subject: [PATCH 4/4] delete trash --- .../gitea_data/git/.ssh/environment | 1 - .../gitea_data/gitea/conf/app.ini | 62 ------------------- .../gitea_data/ssh/ssh_host_ecdsa_key | 9 --- .../gitea_data/ssh/ssh_host_ecdsa_key.pub | 1 - .../gitea_data/ssh/ssh_host_ed25519_key | 7 --- .../gitea_data/ssh/ssh_host_ed25519_key.pub | 1 - .../gitea_data/ssh/ssh_host_rsa_key | 38 ------------ .../gitea_data/ssh/ssh_host_rsa_key.pub | 1 - 8 files changed, 120 deletions(-) delete mode 100644 yakovleva_julia_lab_1/gitea_data/git/.ssh/environment delete mode 100644 yakovleva_julia_lab_1/gitea_data/gitea/conf/app.ini delete mode 100644 yakovleva_julia_lab_1/gitea_data/ssh/ssh_host_ecdsa_key delete mode 100644 yakovleva_julia_lab_1/gitea_data/ssh/ssh_host_ecdsa_key.pub delete mode 100644 yakovleva_julia_lab_1/gitea_data/ssh/ssh_host_ed25519_key delete mode 100644 yakovleva_julia_lab_1/gitea_data/ssh/ssh_host_ed25519_key.pub delete mode 100644 yakovleva_julia_lab_1/gitea_data/ssh/ssh_host_rsa_key delete mode 100644 yakovleva_julia_lab_1/gitea_data/ssh/ssh_host_rsa_key.pub diff --git a/yakovleva_julia_lab_1/gitea_data/git/.ssh/environment b/yakovleva_julia_lab_1/gitea_data/git/.ssh/environment deleted file mode 100644 index f86169b..0000000 --- a/yakovleva_julia_lab_1/gitea_data/git/.ssh/environment +++ /dev/null @@ -1 +0,0 @@ -GITEA_CUSTOM=/data/gitea diff --git a/yakovleva_julia_lab_1/gitea_data/gitea/conf/app.ini b/yakovleva_julia_lab_1/gitea_data/gitea/conf/app.ini deleted file mode 100644 index fc845ec..0000000 --- a/yakovleva_julia_lab_1/gitea_data/gitea/conf/app.ini +++ /dev/null @@ -1,62 +0,0 @@ -APP_NAME = Gitea: Git with a cup of tea -RUN_MODE = prod - -[repository] -ROOT = /data/git/repositories - -[repository.local] -LOCAL_COPY_PATH = /data/gitea/tmp/local-repo - -[repository.upload] -TEMP_PATH = /data/gitea/uploads - -[server] -APP_DATA_PATH = /data/gitea -DOMAIN = localhost -SSH_DOMAIN = localhost -HTTP_PORT = 3000 -ROOT_URL = -DISABLE_SSH = false -SSH_PORT = 22 -SSH_LISTEN_PORT = 22 -LFS_START_SERVER = false - -[database] -PATH = /data/gitea/gitea.db -DB_TYPE = postgres -HOST = postgres:5432 -NAME = gitea -USER = gitea -PASSWD = gitea_password -LOG_SQL = false - -[indexer] -ISSUE_INDEXER_PATH = /data/gitea/indexers/issues.bleve - -[session] -PROVIDER_CONFIG = /data/gitea/sessions - -[picture] -AVATAR_UPLOAD_PATH = /data/gitea/avatars -REPOSITORY_AVATAR_UPLOAD_PATH = /data/gitea/repo-avatars - -[attachment] -PATH = /data/gitea/attachments - -[log] -MODE = console -LEVEL = info -ROOT_PATH = /data/gitea/log - -[security] -INSTALL_LOCK = false -SECRET_KEY = -REVERSE_PROXY_LIMIT = 1 -REVERSE_PROXY_TRUSTED_PROXIES = * - -[service] -DISABLE_REGISTRATION = false -REQUIRE_SIGNIN_VIEW = false - -[lfs] -PATH = /data/git/lfs diff --git a/yakovleva_julia_lab_1/gitea_data/ssh/ssh_host_ecdsa_key b/yakovleva_julia_lab_1/gitea_data/ssh/ssh_host_ecdsa_key deleted file mode 100644 index 2ae50d5..0000000 --- a/yakovleva_julia_lab_1/gitea_data/ssh/ssh_host_ecdsa_key +++ /dev/null @@ -1,9 +0,0 @@ ------BEGIN OPENSSH PRIVATE KEY----- -b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAaAAAABNlY2RzYS -1zaGEyLW5pc3RwMjU2AAAACG5pc3RwMjU2AAAAQQQNsEEB8WbwWwL4UDC7O316GFwd6BeJ -czWHMc8lU7uUs9yeGulpQW/8WCT22eLQRwPMHwLrtLoWsQFtvRBA9SUcAAAAsLZgkFG2YJ -BRAAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBA2wQQHxZvBbAvhQ -MLs7fXoYXB3oF4lzNYcxzyVTu5Sz3J4a6WlBb/xYJPbZ4tBHA8wfAuu0uhaxAW29EED1JR -wAAAAhANznL/lP/wHg++WOEV8PKFSXU6nMjrxZ7d5h0F7Vw34UAAAAEXJvb3RANTRhNjlj -ZTM2NjEwAQIDBAUG ------END OPENSSH PRIVATE KEY----- diff --git a/yakovleva_julia_lab_1/gitea_data/ssh/ssh_host_ecdsa_key.pub b/yakovleva_julia_lab_1/gitea_data/ssh/ssh_host_ecdsa_key.pub deleted file mode 100644 index 735da44..0000000 --- a/yakovleva_julia_lab_1/gitea_data/ssh/ssh_host_ecdsa_key.pub +++ /dev/null @@ -1 +0,0 @@ -ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBA2wQQHxZvBbAvhQMLs7fXoYXB3oF4lzNYcxzyVTu5Sz3J4a6WlBb/xYJPbZ4tBHA8wfAuu0uhaxAW29EED1JRw= root@54a69ce36610 diff --git a/yakovleva_julia_lab_1/gitea_data/ssh/ssh_host_ed25519_key b/yakovleva_julia_lab_1/gitea_data/ssh/ssh_host_ed25519_key deleted file mode 100644 index 503ed2b..0000000 --- a/yakovleva_julia_lab_1/gitea_data/ssh/ssh_host_ed25519_key +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN OPENSSH PRIVATE KEY----- -b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW -QyNTUxOQAAACAzsXGK5hUnYc4GBXdmz2PtyDs4a3kmsW9MbHc2KFJ7awAAAJinfTTDp300 -wwAAAAtzc2gtZWQyNTUxOQAAACAzsXGK5hUnYc4GBXdmz2PtyDs4a3kmsW9MbHc2KFJ7aw -AAAEBwjE6fuSN6txxLIq+bOtPruOAc79ZzXWkAZV5wu1B5jzOxcYrmFSdhzgYFd2bPY+3I -OzhreSaxb0xsdzYoUntrAAAAEXJvb3RANTRhNjljZTM2NjEwAQIDBA== ------END OPENSSH PRIVATE KEY----- diff --git a/yakovleva_julia_lab_1/gitea_data/ssh/ssh_host_ed25519_key.pub b/yakovleva_julia_lab_1/gitea_data/ssh/ssh_host_ed25519_key.pub deleted file mode 100644 index d95c5e6..0000000 --- a/yakovleva_julia_lab_1/gitea_data/ssh/ssh_host_ed25519_key.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDOxcYrmFSdhzgYFd2bPY+3IOzhreSaxb0xsdzYoUntr root@54a69ce36610 diff --git a/yakovleva_julia_lab_1/gitea_data/ssh/ssh_host_rsa_key b/yakovleva_julia_lab_1/gitea_data/ssh/ssh_host_rsa_key deleted file mode 100644 index 143a41c..0000000 --- a/yakovleva_julia_lab_1/gitea_data/ssh/ssh_host_rsa_key +++ /dev/null @@ -1,38 +0,0 @@ ------BEGIN OPENSSH PRIVATE KEY----- -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 ------END OPENSSH PRIVATE KEY----- diff --git a/yakovleva_julia_lab_1/gitea_data/ssh/ssh_host_rsa_key.pub b/yakovleva_julia_lab_1/gitea_data/ssh/ssh_host_rsa_key.pub deleted file mode 100644 index 3d78862..0000000 --- a/yakovleva_julia_lab_1/gitea_data/ssh/ssh_host_rsa_key.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDJElEmJ5S3Cuw37paCiwAh+//tEBs8k028UnCovuXmfnQVCQfa7Ubt1TtWAYhZIM58x4Dez74Rb7lr8sj5VbiVNUOxjb/aXRh9sHLjKC0GkJPdcy1fy3YukAL0yqwxL9dIDYeRY0awWDvwRwWypW1nfw7qInmnBDZEfnATYZFbauhSjPaoPvsO2Lo0rMSYI9EULyuA5Ac7rVEQQ0uAROWXnC8pMzEnHrgxkVmckrXsfsEu8vS3vC/hwPpn5W5NGDbkTugoHbl/QOy9c4dYP/uLb8e2vr9ONKbVFZDURwN2vsrvaLBwxr1AOgV0s2eSkBdwtdvi/Q43hBUSZLkhD1eMtDie4MLuYCQ8ZIXRy0nH6tFrQsazcEJqS/OBLYO8nbieOm4hRYgLd8bSfASnlklIsYBs3o0Z3zQO0WKk08pLL/hdSSwVhIMhnBb+imn2wb3jnPlhh7aL4lgyrVVw75vzh6BnHf5APcdbO1ZfFzNIT51AFDrpsGy7j4S2M82GoCs= root@54a69ce36610