refactor: corrections and refinements

.dockerignore

@@ -11,10 +11,10 @@
 **/*.*proj.user
 **/*.dbmdl
 **/*.jfm
+**/azds.yaml
 **/bin
 **/charts
 **/docker-compose*
-**/compose*
 **/Dockerfile*
 **/node_modules
 **/npm-debug.log

Directory.Build.props

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
   <PropertyGroup>
     <Authors>Jean Gatto (@jeangatto)</Authors>
     <MaintainerEmail>jean_gatto@hotmail.com</MaintainerEmail>
@@ -18,21 +17,4 @@
     <ContinuousIntegrationBuild Condition="'$(GITHUB_ACTIONS)' == 'true'">true</ContinuousIntegrationBuild>
     <NoWarn>$(NoWarn);1591</NoWarn>
   </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" />
-    <PackageReference Include="Roslynator.Analyzers">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="SonarAnalyzer.CSharp">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
-
 </Project>

Directory.Packages.props

@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <CentralPackageTransitivePinningEnabled>false</CentralPackageTransitivePinningEnabled>
   </PropertyGroup>
-
   <ItemGroup>
     <PackageVersion Include="Ardalis.Result.FluentValidation" Version="7.1.0" />
     <PackageVersion Include="Ardalis.Result" Version="7.1.0" />
@@ -54,6 +52,7 @@
     <PackageVersion Include="Microsoft.Extensions.Options" Version="7.0.1" />
     <PackageVersion Include="Microsoft.Extensions.Primitives" Version="7.0.0" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageVersion Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.4" />
     <PackageVersion Include="MiniProfiler.AspNetCore.Mvc" Version="4.3.8" />
     <PackageVersion Include="MiniProfiler.EntityFrameworkCore" Version="4.3.8" />
     <PackageVersion Include="MongoDB.Bson" Version="2.21.0" />
@@ -71,5 +70,4 @@
     <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.0" />
     <PackageVersion Include="xunit" Version="2.5.0" />
   </ItemGroup>
-
 </Project>

Shop.sln

@@ -59,6 +59,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Infrastructure", "Infrastru
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{9371D508-9FCA-4AED-ABCF-AF9457E743AC}"
 EndProject
+Project("{E53339B2-1760-4266-BCC7-CA923CBCF16C}") = "docker-compose", "docker-compose.dcproj", "{24EF58F6-CBF8-4910-A17C-E8DE7ED96A87}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -97,6 +99,10 @@ Global
 		{7BA06288-8446-4099-9341-D213A835763C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7BA06288-8446-4099-9341-D213A835763C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7BA06288-8446-4099-9341-D213A835763C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{24EF58F6-CBF8-4910-A17C-E8DE7ED96A87}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{24EF58F6-CBF8-4910-A17C-E8DE7ED96A87}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{24EF58F6-CBF8-4910-A17C-E8DE7ED96A87}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{24EF58F6-CBF8-4910-A17C-E8DE7ED96A87}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

docker-compose.dcproj

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" Sdk="Microsoft.Docker.Sdk">
+  <PropertyGroup Label="Globals">
+    <ProjectVersion>2.1</ProjectVersion>
+    <DockerTargetOS>Linux</DockerTargetOS>
+    <ProjectGuid>24ef58f6-cbf8-4910-a17c-e8de7ed96a87</ProjectGuid>
+    <DockerLaunchAction>LaunchBrowser</DockerLaunchAction>
+    <DockerServiceUrl>{Scheme}://localhost:{ServicePort}/swagger</DockerServiceUrl>
+    <DockerServiceName>shop-webapi</DockerServiceName>
+  </PropertyGroup>
+  <ItemGroup>
+    <None Include="docker-compose.override.yml">
+      <DependentUpon>docker-compose.yml</DependentUpon>
+    </None>
+    <None Include="docker-compose.yml" />
+    <None Include=".dockerignore" />
+  </ItemGroup>
+</Project>

docker-compose.override.yml

@@ -5,6 +5,9 @@ services:
   shop-webapi:
     environment:
       - ASPNETCORE_ENVIRONMENT=Docker
+      - ASPNETCORE_URLS=http://+:80
+    ports:
+      - "80"
     volumes:
       - ~/.aspnet/https:/root/.aspnet/https:ro
       - ~/.microsoft/usersecrets:/root/.microsoft/usersecrets:ro

docker-compose.yml

@@ -15,9 +15,7 @@ services:
       context: .
       dockerfile: src/Shop.PublicApi/Dockerfile
     expose:
-      - 5072
+      - 80
-    ports:
-      - "5072:5072"
     links:
       - sqlserver
       - mongoserver

launchSettings.json

@@ -0,0 +1,12 @@
+{
+  "profiles": {
+    "Docker Compose": {
+      "nativeDebugging": true,
+      "commandName": "DockerCompose",
+      "commandVersion": "1.0",
+      "serviceActions": {
+        "shop-webapi": "StartDebugging"
+      }
+    }
+  }
+}

src/Shop.Application/Shop.Application.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>

src/Shop.Core/Shop.Core.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>

src/Shop.Domain/Shop.Domain.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>

src/Shop.Infrastructure/Shop.Infrastructure.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
@@ -26,8 +26,8 @@
   </ItemGroup>
   
   <ItemGroup>
-    <InternalsVisibleTo Include="Shop.UnitTests" />
     <InternalsVisibleTo Include="DynamicProxyGenAssembly2" />
+    <InternalsVisibleTo Include="Shop.UnitTests" />
   </ItemGroup>
   
 </Project>

src/Shop.PublicApi/Dockerfile

@@ -1,35 +1,30 @@
-# https://hub.docker.com/_/microsoft-dotnet-sdk/ 
+FROM mcr.microsoft.com/dotnet/aspnet:7.0-bookworm-slim AS base
-ARG sdk_version=7.0-bookworm-slim 
-
-FROM mcr.microsoft.com/dotnet/aspnet:$sdk_version AS base
 WORKDIR /app
-EXPOSE 5072
+EXPOSE 80
+EXPOSE 443
 
-ENV ASPNETCORE_URLS=http://+:5072
 ENV DOTNET_NOLOGO=1
 ENV DOTNET_CLI_TELEMETRY_OPTOUT=1
 ENV DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
-ENV DOTNET_EnableDiagnostics=0
 
-FROM mcr.microsoft.com/dotnet/sdk:$sdk_version AS build
+FROM mcr.microsoft.com/dotnet/sdk:7.0-bookworm-slim AS build
-ARG configuration=Release
 WORKDIR /src
-COPY ["Directory.Build.props", "src/"]
+COPY ["Directory.Packages.props", "."]
-COPY ["Directory.Packages.props", "src/"]
+COPY ["Directory.Build.props", "."]
+COPY ["nuget.config", "."]
 COPY ["src/Shop.PublicApi/Shop.PublicApi.csproj", "src/Shop.PublicApi/"]
-COPY ["src/Shop.Infrastructure/Shop.Infrastructure.csproj", "src/Shop.Infrastructure/"]
+COPY ["src/Shop.Application/Shop.Application.csproj", "src/Shop.Application/"]
 COPY ["src/Shop.Domain/Shop.Domain.csproj", "src/Shop.Domain/"]
 COPY ["src/Shop.Core/Shop.Core.csproj", "src/Shop.Core/"]
-COPY ["src/Shop.Application/Shop.Application.csproj", "src/Shop.Application/"]
+COPY ["src/Shop.Infrastructure/Shop.Infrastructure.csproj", "src/Shop.Infrastructure/"]
 COPY ["src/Shop.Query/Shop.Query.csproj", "src/Shop.Query/"]
 RUN dotnet restore "src/Shop.PublicApi/Shop.PublicApi.csproj"
 COPY . .
 WORKDIR "/src/src/Shop.PublicApi"
-RUN dotnet build "Shop.PublicApi.csproj" --configuration $configuration --no-restore --nologo --output /app/build 
+RUN dotnet build "Shop.PublicApi.csproj" --configuration Release --no-restore --nologo --output /app/build 
 
 FROM build AS publish
-ARG configuration=Release
+RUN dotnet publish "Shop.PublicApi.csproj" --configuration Release --no-restore --nologo --self-contained true --output /app/publish
-RUN dotnet publish "Shop.PublicApi.csproj" --configuration $configuration --no-restore --nologo --self-contained true --output /app/publish
 
 FROM base AS final
 WORKDIR /app

src/Shop.PublicApi/Dockerfile.original

@@ -0,0 +1,37 @@
+# https://hub.docker.com/_/microsoft-dotnet-sdk/ 
+ARG sdk_version=7.0-bookworm-slim 
+
+FROM mcr.microsoft.com/dotnet/aspnet:$sdk_version AS base
+WORKDIR /app
+EXPOSE 5072
+
+ENV ASPNETCORE_URLS=http://+:5072
+ENV DOTNET_NOLOGO=1
+ENV DOTNET_CLI_TELEMETRY_OPTOUT=1
+ENV DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
+ENV DOTNET_EnableDiagnostics=0
+
+FROM mcr.microsoft.com/dotnet/sdk:$sdk_version AS build
+ARG configuration=Release
+WORKDIR /src
+COPY ["Directory.Build.props", "src/"]
+COPY ["Directory.Packages.props", "src/"]
+COPY ["src/Shop.PublicApi/Shop.PublicApi.csproj", "src/Shop.PublicApi/"]
+COPY ["src/Shop.Infrastructure/Shop.Infrastructure.csproj", "src/Shop.Infrastructure/"]
+COPY ["src/Shop.Domain/Shop.Domain.csproj", "src/Shop.Domain/"]
+COPY ["src/Shop.Core/Shop.Core.csproj", "src/Shop.Core/"]
+COPY ["src/Shop.Application/Shop.Application.csproj", "src/Shop.Application/"]
+COPY ["src/Shop.Query/Shop.Query.csproj", "src/Shop.Query/"]
+RUN dotnet restore "src/Shop.PublicApi/Shop.PublicApi.csproj"
+COPY . .
+WORKDIR "/src/src/Shop.PublicApi"
+RUN dotnet build "Shop.PublicApi.csproj" --configuration $configuration --no-restore --nologo --output /app/build 
+
+FROM build AS publish
+ARG configuration=Release
+RUN dotnet publish "Shop.PublicApi.csproj" --configuration $configuration --no-restore --nologo --self-contained true --output /app/publish
+
+FROM base AS final
+WORKDIR /app
+COPY --from=publish /app/publish .
+ENTRYPOINT ["dotnet", "Shop.PublicApi.dll"]

src/Shop.PublicApi/Extensions/ServicesCollectionExtensions.cs

@@ -29,18 +29,7 @@ internal static class ServicesCollectionExtensions
             {
                 Version = "v1",
                 Title = "Shop (e-commerce)",
-                Description = "ASP.NET Core C# CQRS Event Sourcing, REST API, DDD, SOLID Principles and Clean Architecture",
+                Description = "ASP.NET Core C# CQRS Event Sourcing, REST API, DDD, SOLID Principles and Clean Architecture"
-                Contact = new OpenApiContact
-                {
-                    Name = "Jean Gatto",
-                    Email = "jean_gatto@hotmail.com",
-                    Url = new Uri(configuration.GetValue<string>("Urls:LinkedIn"))
-                },
-                License = new OpenApiLicense
-                {
-                    Name = "MIT License",
-                    Url = new Uri(configuration.GetValue<string>("Urls:Github"))
-                }
             });
 
             var xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml";

src/Shop.PublicApi/Properties/launchSettings.json

@@ -1,4 +1,47 @@
-{
+{
+  "profiles": {
+    "http": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "launchUrl": "swagger",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "dotnetRunMessages": true,
+      "hotReloadEnabled": true,
+      "applicationUrl": "http://localhost:5072"
+    },
+    "https": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "launchUrl": "swagger",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "dotnetRunMessages": true,
+      "hotReloadEnabled": true,
+      "applicationUrl": "https://localhost:7225;"
+    },
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+      "launchUrl": "swagger",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "hotReloadEnabled": true
+    },
+    "Docker": {
+      "commandName": "Docker",
+      "launchBrowser": true,
+      "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}/swagger",
+      "environmentVariables": {
+        "ASPNETCORE_URLS": "https://+:443;http://+:80"
+      },
+      "publishAllPorts": true,
+      "useSSL": true
+    }
+  },
   "$schema": "https://json.schemastore.org/launchsettings.json",
   "iisSettings": {
     "windowsAuthentication": false,
@@ -7,38 +50,5 @@
       "applicationUrl": "http://localhost:6452",
       "sslPort": 44331
     }
-  },
-  "profiles": {
-    "http": {
-      "commandName": "Project",
-      "dotnetRunMessages": true,
-      "launchBrowser": true,
-      "hotReloadEnabled": true,
-      "launchUrl": "swagger",
-      "applicationUrl": "http://localhost:5072",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "https": {
-      "commandName": "Project",
-      "dotnetRunMessages": true,
-      "launchBrowser": true,
-      "hotReloadEnabled": true,
-      "launchUrl": "swagger",
-      "applicationUrl": "https://localhost:7225;",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "hotReloadEnabled": true,
-      "launchUrl": "swagger",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    }
   }
 }

src/Shop.PublicApi/Shop.PublicApi.csproj

@@ -1,14 +1,13 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
   
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
     <IncludeOpenAPIAnalyzers>true</IncludeOpenAPIAnalyzers>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <DockerTargetOS>Linux</DockerTargetOS>
-    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
+    <UserSecretsId>7d8d0af0-7540-48a6-b160-d34c988a1ad6</UserSecretsId>
-    <RuntimeIdentifiers>linux-arm64;linux-x64</RuntimeIdentifiers>
+    <DockerfileContext>..\..</DockerfileContext>
-    <PublishReadyToRun>true</PublishReadyToRun>
+    <DockerComposeProjectPath>..\..\docker-compose.dcproj</DockerComposeProjectPath>
-    <PublishReadyToRunShowWarnings>true</PublishReadyToRunShowWarnings>
   </PropertyGroup>
   
   <ItemGroup>
@@ -35,6 +34,7 @@
     <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" />
     <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" />
     <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" />
     <PackageReference Include="MiniProfiler.AspNetCore.Mvc" />
     <PackageReference Include="MiniProfiler.EntityFrameworkCore" />
     <PackageReference Include="Swashbuckle.AspNetCore" />

src/Shop.PublicApi/appsettings.Development.json

@@ -6,17 +6,13 @@
       "Microsoft.Hosting.Lifetime": "Information"
     }
   },
-  "Urls": {
-    "LinkedIn": "https://www.linkedin.com/in/jeangatto/",
-    "Github": "https://github.com/jeangatto/ASP.NET-Core-Clean-Architecture-CQRS-Event-Sourcing/blob/main/LICENSE"
-  },
   "ConnectionStrings": {
     "SqlConnection": "",
     "NoSqlConnection": "",
     "CacheConnection": ""
   },
   "CacheOptions": {
-    "AbsoluteExpirationInHours": 0,
+    "AbsoluteExpirationInHours": 2,
-    "SlidingExpirationInSeconds": 0
+    "SlidingExpirationInSeconds": 60
   }
 }

src/Shop.PublicApi/appsettings.Docker.json

@@ -6,10 +6,6 @@
       "Microsoft.Hosting.Lifetime": "Information"
     }
   },
-  "Urls": {
-    "LinkedIn": "https://www.linkedin.com/in/jeangatto/",
-    "Github": "https://github.com/jeangatto/ASP.NET-Core-Clean-Architecture-CQRS-Event-Sourcing/blob/main/LICENSE"
-  },
   "ConnectionStrings": {
     "SqlConnection": "Server=sqlserver;Integrated Security=true;Initial Catalog=ShopContext;User Id=sa;Password=pMA63033n6tF;Trusted_Connection=false;MultipleActiveResultSets=true;Encrypt=True;TrustServerCertificate=True;",
     "NoSqlConnection": "mongodb://mongoserver",

src/Shop.Query/Shop.Query.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>

tests/Shop.IntegrationTests/Controllers/V1/CustomersControllerTests.cs

@@ -474,9 +474,6 @@ public class CustomersControllerTests : IAsyncLifetime
         return new WebApplicationFactory<Program>()
             .WithWebHostBuilder(hostBuilder =>
             {
-                hostBuilder.UseSetting("Urls:LinkedIn", "https://www.linkedin.com/in/jeangatto/");
-                hostBuilder.UseSetting("Urls:Github", "https://github.com/jeangatto/ASP.NET-Core-Clean-Architecture-CQRS-Event-Sourcing/blob/main/LICENSE");
-
                 hostBuilder.UseSetting("ConnectionStrings:SqlConnection", "InMemory");
                 hostBuilder.UseSetting("ConnectionStrings:NoSqlConnection", "InMemory");
                 hostBuilder.UseSetting("ConnectionStrings:CacheConnection", "InMemory");

tests/Shop.IntegrationTests/Shop.IntegrationTests.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>

tests/Shop.UnitTests/Shop.UnitTests.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>