diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/.github/workflows/dotnet-desktop.yml @@ -0,0 +1 @@ + diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml new file mode 100644 index 0000000..b4bea3b --- /dev/null +++ b/.github/workflows/dotnet.yml @@ -0,0 +1,25 @@ +name: BookStore Build Pipline +on: + push: + branches: + - main + pull_request: + branches: + - main +jobs: + build: + runs-on: windows-2022 + steps: + - name: Check out + uses: actions/checkout@v2 + - name: Setup .Net + uses: actions/setup-dotnet@v1 + with: + dotnet-version: 8.0.204 + include-prerelease: true + - name: Restore + run: dotnet restore + - name: Build + run: dotnet build --no-restore + - name: Test + run: dotnet test --no-build --verbosity normal diff --git a/.gitignore b/.gitignore index 7fdd162..04a3488 100644 --- a/.gitignore +++ b/.gitignore @@ -369,3 +369,4 @@ FodyWeavers.xsd /src/BookStore.Presentation/MVC/wwwroot/BookPhoto /src/BookStore.Presentation/MVC/wwwroot/Books /src/BookStore.Presentation/MVC/wwwroot/UserProfileImage +/ConsoleApp1 diff --git a/BookStore.sln b/BookStore.sln index 181901e..50eb531 100644 --- a/BookStore.sln +++ b/BookStore.sln @@ -5,17 +5,21 @@ VisualStudioVersion = 17.8.34316.72 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E63592A0-27C4-4444-BD76-903F182458F1}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BookStore.Domain", "src\BookStore.Domain\BookStore.Domain.csproj", "{6E8888F1-9B76-421E-ACEF-A499B3D04927}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BookStore.Domain", "src\BookStore.Domain\BookStore.Domain.csproj", "{6E8888F1-9B76-421E-ACEF-A499B3D04927}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BookStore.Application", "src\BookStore.Application\BookStore.Application.csproj", "{D22C7023-F7E3-468C-AEA1-37B97C680D15}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BookStore.Application", "src\BookStore.Application\BookStore.Application.csproj", "{D22C7023-F7E3-468C-AEA1-37B97C680D15}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BookStore.Infrastructure", "src\BookStore.Infrastructure\BookStore.Infrastructure.csproj", "{B6A4EF17-870B-4BF7-AAAE-FDC55E5831ED}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BookStore.Infrastructure", "src\BookStore.Infrastructure\BookStore.Infrastructure.csproj", "{B6A4EF17-870B-4BF7-AAAE-FDC55E5831ED}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "BookStore.Presentation", "BookStore.Presentation", "{3F32713F-015A-4919-93CA-E1A5B34B4863}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "API", "src\BookStore.Presentation\API\API.csproj", "{A71B8C92-ACA9-40D5-B277-E4CA6D2E195D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "API", "src\BookStore.Presentation\API\API.csproj", "{A71B8C92-ACA9-40D5-B277-E4CA6D2E195D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MVC", "src\BookStore.Presentation\MVC\MVC.csproj", "{34FD9F69-7D8B-4762-BFF3-11DE5C98CFE9}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MVC", "src\BookStore.Presentation\MVC\MVC.csproj", "{34FD9F69-7D8B-4762-BFF3-11DE5C98CFE9}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleApp1", "ConsoleApp1\ConsoleApp1.csproj", "{216E730C-ACC0-4053-A332-713E53440962}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BookStore.Infrastructure.Build", "src\BookStore.Infrastructure.Build\BookStore.Infrastructure.Build.csproj", "{785D78EE-F055-46F3-A7DD-6F8F488DDF1E}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -43,6 +47,14 @@ Global {34FD9F69-7D8B-4762-BFF3-11DE5C98CFE9}.Debug|Any CPU.Build.0 = Debug|Any CPU {34FD9F69-7D8B-4762-BFF3-11DE5C98CFE9}.Release|Any CPU.ActiveCfg = Release|Any CPU {34FD9F69-7D8B-4762-BFF3-11DE5C98CFE9}.Release|Any CPU.Build.0 = Release|Any CPU + {216E730C-ACC0-4053-A332-713E53440962}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {216E730C-ACC0-4053-A332-713E53440962}.Debug|Any CPU.Build.0 = Debug|Any CPU + {216E730C-ACC0-4053-A332-713E53440962}.Release|Any CPU.ActiveCfg = Release|Any CPU + {216E730C-ACC0-4053-A332-713E53440962}.Release|Any CPU.Build.0 = Release|Any CPU + {785D78EE-F055-46F3-A7DD-6F8F488DDF1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {785D78EE-F055-46F3-A7DD-6F8F488DDF1E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {785D78EE-F055-46F3-A7DD-6F8F488DDF1E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {785D78EE-F055-46F3-A7DD-6F8F488DDF1E}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -54,6 +66,8 @@ Global {3F32713F-015A-4919-93CA-E1A5B34B4863} = {E63592A0-27C4-4444-BD76-903F182458F1} {A71B8C92-ACA9-40D5-B277-E4CA6D2E195D} = {3F32713F-015A-4919-93CA-E1A5B34B4863} {34FD9F69-7D8B-4762-BFF3-11DE5C98CFE9} = {3F32713F-015A-4919-93CA-E1A5B34B4863} + {216E730C-ACC0-4053-A332-713E53440962} = {E63592A0-27C4-4444-BD76-903F182458F1} + {785D78EE-F055-46F3-A7DD-6F8F488DDF1E} = {E63592A0-27C4-4444-BD76-903F182458F1} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {8C5D27F3-0D32-4A29-AE50-8C54EE56B386} diff --git a/src/BookStore.Application/useCases/Authors/Commands/CreateAuthorCommandHandler.cs b/src/BookStore.Application/useCases/Authors/Commands/CreateAuthorCommandHandler.cs index 1065a86..91650b3 100644 --- a/src/BookStore.Application/useCases/Authors/Commands/CreateAuthorCommandHandler.cs +++ b/src/BookStore.Application/useCases/Authors/Commands/CreateAuthorCommandHandler.cs @@ -3,6 +3,7 @@ using Mapster; using MediatR; using Microsoft.AspNetCore.Hosting; +using System.IO; namespace BookStore.Application.useCases.Authors.Commands { @@ -24,18 +25,30 @@ public async Task Handle(CreateAuthorCommand command, CancellationToken string fileName = ""; try { + var newFilePath = ""; fileName = Guid.NewGuid().ToString() + Path.GetExtension(file.FileName); filePath = Path.Combine(_webHostEnvironment.WebRootPath, "AuthorsProfileImage", fileName); - using (var stream = new FileStream(filePath, FileMode.Create)) + + if (!Directory.Exists(newFilePath)) { - await file.CopyToAsync(stream); + for (int i = 0; i < filePath.Split("\\").Length; i++) + { + if (i + 1 != filePath.Split("\\").Length) + newFilePath += filePath.Split("\\")[i] + "\\"; + } + + Directory.CreateDirectory(newFilePath); } - } - catch (Exception ex) + + using (var stream = new FileStream(filePath, FileMode.Create)) + await file.CopyToAsync(stream); + + } catch (Exception ex) { await Console.Out.WriteLineAsync($"Error: {ex.Message}"); } + var author = command.Adapt(); author.PhotoPath = "/AuthorsProfileImage/" + fileName; var res = await _context.Authors.AddAsync(author); diff --git a/src/BookStore.Application/useCases/Books/Commands/CreateBookCommandHandler.cs b/src/BookStore.Application/useCases/Books/Commands/CreateBookCommandHandler.cs index 47ea84f..740a7ea 100644 --- a/src/BookStore.Application/useCases/Books/Commands/CreateBookCommandHandler.cs +++ b/src/BookStore.Application/useCases/Books/Commands/CreateBookCommandHandler.cs @@ -38,12 +38,36 @@ public async Task Handle(CreateBookCommand request, CancellationToken canc try { + var newFilePath = ""; + fileName = Guid.NewGuid().ToString() + Path.GetExtension(file.FileName); filePath = Path.Combine(_webHostEnvironment.WebRootPath, "Books", fileName); PhotofileName = Guid.NewGuid().ToString() + Path.GetExtension(PhotoFile.FileName); PhotofilePath = Path.Combine(_webHostEnvironment.WebRootPath, "BookPhoto", PhotofileName); + if (!Directory.Exists(filePath)) + { + for (int i = 0; i < filePath.Split("\\").Length; i++) + { + if (i + 1 != filePath.Split("\\").Length) + newFilePath += filePath.Split("\\")[i] + "\\"; + } + + Directory.CreateDirectory(newFilePath); + } + + if (!Directory.Exists(PhotofilePath)) + { + newFilePath = ""; + for (int i = 0; i < PhotofilePath.Split("\\").Length; i++) + { + if (i + 1 != PhotofilePath.Split("\\").Length) + newFilePath += PhotofilePath.Split("\\")[i] + "\\"; + } + + Directory.CreateDirectory(newFilePath); + } using (var stream = new FileStream(filePath, FileMode.Create)) { diff --git a/src/BookStore.Infrastructure.Build/BookStore.Infrastructure.Build.csproj b/src/BookStore.Infrastructure.Build/BookStore.Infrastructure.Build.csproj new file mode 100644 index 0000000..9ef96f3 --- /dev/null +++ b/src/BookStore.Infrastructure.Build/BookStore.Infrastructure.Build.csproj @@ -0,0 +1,14 @@ + + + + Exe + net8.0 + enable + enable + + + + + + + diff --git a/src/BookStore.Infrastructure.Build/Program.cs b/src/BookStore.Infrastructure.Build/Program.cs new file mode 100644 index 0000000..1456f1d --- /dev/null +++ b/src/BookStore.Infrastructure.Build/Program.cs @@ -0,0 +1,84 @@ +using ADotNet.Clients; +using ADotNet.Models.Pipelines.GithubPipelines.DotNets; +using ADotNet.Models.Pipelines.GithubPipelines.DotNets.Tasks; +using ADotNet.Models.Pipelines.GithubPipelines.DotNets.Tasks.SetupDotNetTaskV1s; + +var githubPipline = new GithubPipeline +{ + Name = "BookStore Build Pipline", + OnEvents = new Events + { + PullRequest = new PullRequestEvent + { + Branches = new string[] { "main" } + }, + + Push = new PushEvent + { + Branches = new string[] { "main" } + }, + + }, + + Jobs = new Dictionary + { + { + "build", + new Job + { + RunsOn = BuildMachines.Windows2022, + + Steps = new List + { + new CheckoutTaskV2 + { + Name = "Check out" + }, + + new SetupDotNetTaskV1 + { + Name = "Setup .Net", + + TargetDotNetVersion = new TargetDotNetVersion + { + DotNetVersion = "8.0.204", + IncludePrerelease = true + } + }, + + new RestoreTask + { + Name = "Restore" + }, + + new DotNetBuildTask + { + Name = "Build" + }, + + new TestTask + { + Name = "Test" + } + } + } + } + } +}; + +var client = new ADotNetClient(); + + +string buildScriptPath = "../../../../../.github/workflows/dotnet.yml"; +string directoryPath = Path.GetDirectoryName(buildScriptPath)!; + +if (!Directory.Exists(directoryPath)) +{ + Directory.CreateDirectory(directoryPath); +} + +client.SerializeAndWriteToFile +( + adoPipeline: githubPipline, + path: buildScriptPath +); \ No newline at end of file diff --git a/src/BookStore.Presentation/MVC/MVC.csproj b/src/BookStore.Presentation/MVC/MVC.csproj index d1a012c..f1d1999 100644 --- a/src/BookStore.Presentation/MVC/MVC.csproj +++ b/src/BookStore.Presentation/MVC/MVC.csproj @@ -20,10 +20,4 @@ - - - - - - diff --git a/src/BookStore.Presentation/MVC/Properties/launchSettings.json b/src/BookStore.Presentation/MVC/Properties/launchSettings.json index dec2026..4c0d290 100644 --- a/src/BookStore.Presentation/MVC/Properties/launchSettings.json +++ b/src/BookStore.Presentation/MVC/Properties/launchSettings.json @@ -12,8 +12,8 @@ "http": { "commandName": "Project", "dotnetRunMessages": true, - "launchBrowser": true, - "applicationUrl": "http://localhost:5197", + "launchBrowser": false, + "applicationUrl": "http://localhost:5189", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" } diff --git a/src/BookStore.Presentation/MVC/appsettings.json b/src/BookStore.Presentation/MVC/appsettings.json index 3f3d129..0b4cab0 100644 --- a/src/BookStore.Presentation/MVC/appsettings.json +++ b/src/BookStore.Presentation/MVC/appsettings.json @@ -9,7 +9,7 @@ "BotToken": "7040566448:AAGuJLoJsg8xqAAW4yWGPkZDR6PIxBlU0ns", "ConnectionStrings": { "SQLServer": "Data Source=(localdb)\\MSSQLLocalDB;Initial Catalog=BookStore.MVC.DB;", - "Postgres": "Host=localhost;Port=5432;Username=postgres;Password=sardor0618!;Database=BookStoree.DB" + "Postgres": "Host=localhost;Port=5432;Username=postgres;Password=coder;Database=BookStore.Db" }, "Serilog": { "Using": [ "Serilog.Sinks.File" ], @@ -26,5 +26,6 @@ } } ] + } }