Merge branch 'release/v1.0.2'

Author: minhsangdotcom

.github/workflows/github-cicd.yml

@@ -10,6 +10,7 @@ on:
 
 env:
   DOTNET_INSTALL_DIR: "./.dotnet"
+  NUGET_PACKAGES: ${{ github.workspace }}/.nuget/packages
 
 jobs:
   build-and-deploy:
@@ -26,8 +27,9 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: '8.0.405'
+          dotnet-version: "8.0.13"
           cache: true
+          cache-dependency-path: "src/**/packages.lock.json"
       - name: Install dependencies
         run: dotnet restore --locked-mode
       - name: Build
@@ -42,6 +44,7 @@ jobs:
           path: |
             app/publish
             app/output/test-results
+          retention-days: 3
       - name: Log in to GitHub Container Registry
         uses: docker/login-action@v3
         with:
@@ -77,4 +80,4 @@ jobs:
 
             docker compose down
 
-            docker compose up -d --build
+            docker compose up -d --build

Dockers/ElasticSearch/docker-compose.yml

@@ -6,7 +6,7 @@ services:
     volumes:
       - certs:/usr/share/elasticsearch/config/certs
     networks:
-      - the-teplate-network
+      - the-template-network
     user: "0"
     command: >
       bash -c '
@@ -63,7 +63,7 @@ services:
     ports:
       - ${ES_PORT}:9200
     networks:
-      - the-teplate-network
+      - the-template-network
     environment:
       - node.name=es01
       - cluster.name=${CLUSTER_NAME}
@@ -195,7 +195,7 @@ services:
     ports:
       - ${KIBANA_PORT}:5601
     networks:
-      - the-teplate-network
+      - the-template-network
     environment:
       - SERVERNAME=kibana
       - ELASTICSEARCH_HOSTS=https://es01:9200
@@ -226,5 +226,5 @@ volumes:
     driver: local
 
 networks: 
-  the-teplate-network:
+  the-template-network:
     external: true

Dockers/MinioS3/docker-compose.yaml

@@ -29,7 +29,7 @@ services:
       - data1-1:/data1
       - data1-2:/data2
     networks:
-      - the-teplate-network
+      - the-template-network
 
   minio2:
     <<: *minio-common
@@ -38,7 +38,7 @@ services:
       - data2-1:/data1
       - data2-2:/data2
     networks:
-      - the-teplate-network
+      - the-template-network
 
   nginx:
     image: nginx:1.19.2-alpine
@@ -52,7 +52,7 @@ services:
       - minio1
       - minio2
     networks:
-      - the-teplate-network
+      - the-template-network
 
 ## By default this config uses default local driver,
 ## For custom volumes replace with volume driver configuration.
@@ -63,5 +63,5 @@ volumes:
   data2-2:
 
 networks: 
-  the-teplate-network:
+  the-template-network:
     external: true

Dockers/Otel/docker-compose.yaml

@@ -2,15 +2,16 @@ version: "3"
 
 services:
   collector:
-      image: otel/opentelemetry-collector-contrib:latest
+      image: otel/opentelemetry-collector:latest
       command: ["--config=/etc/otel-collector-config.yaml"]
       volumes:
         - ./otel-collector-config.yaml:/etc/otel-collector-config.yaml
       networks:
-        - the-teplate-network
+        - the-template-network
       ports:
         - "4317:4317"     # OTLP over gRPC receiver
         - "4318:4318"     # OTLP over HTTP receiver
+        - "13133:13133" # health_check extension
       depends_on:
         - jaeger
 
@@ -24,8 +25,8 @@ services:
       - "14268:14268"   # Jaeger collector HTTP port
       - "14250:14250"   # gRPC for Jaeger
     networks:
-      - the-teplate-network
+      - the-template-network
 
 networks: 
-  the-teplate-network:
+  the-template-network:
     external: true

Dockers/Postgresql/docker-compose.yml

@@ -10,7 +10,7 @@ services:
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
       POSTGRES_DB: ${POSTGRES_DB}
     networks:
-      - the-teplate-network
+      - the-template-network
     volumes:
       - ./db_data:/var/lib/postgresql/data/
 
@@ -24,10 +24,10 @@ services:
     depends_on:
       - database
     networks:
-      - the-teplate-network
+      - the-template-network
     volumes:
       - ./pgadmin_data:/var/lib/pgadmin/
 
 networks: 
-  the-teplate-network:
+  the-template-network:
     external: true

Dockers/README.md

@@ -2,7 +2,7 @@
 The first thing you're going to do is to create a docker network by following command :
 
 ```
-docker network create the-teplate-network
+docker network create the-template-network
 ```
 
 this is a little trick for docker containers can communicate with each other.

Dockers/Redis/docker-compose.yaml

@@ -7,7 +7,7 @@ services:
     ports:
       - "6379:6379"  # Map Redis default port to host
     networks:
-      - the-teplate-network
+      - the-template-network
     volumes:
       - redis_data:/data  # Persist Redis data using a named volume
     environment:
@@ -20,5 +20,5 @@ volumes:
     driver: local  # Use local storage for the Redis data volume
 
 networks: 
-  the-teplate-network:
+  the-template-network:
     external: true

Dockers/Seq/docker-compose.yaml

@@ -11,8 +11,8 @@ services:
     ports:
       - 5341:80
     networks:
-      - the-teplate-network
+      - the-template-network
 
 networks: 
-  the-teplate-network:
+  the-template-network:
     external: true

README-VIETNAMESE.md

@@ -259,7 +259,7 @@ _Phụ thuộc vào tầng Application và Domain_
 
 _Phụ thuộc vào tầng Application and Infrastructure_
 
-**_Contract_** : Chứa shared components qua các tầng
+**_Contract_** : Chứa shared components cho các tầng Application, Infrastructure and API.
 
 # Bắt đầu thôi nào
 

README.md

@@ -259,7 +259,7 @@ _It depends on Application and Domain layer_
 
 _It depends on Application and Infrastructure layer_
 
-**_Contract_** : Contains shared components across all layers
+**_Contract_** : Contains shared components for Application, Infrastructure and API layer.
 
 # Getting started
 

docker-compose.yml

@@ -1,25 +1,23 @@
 services:
-  webapi: &webapi_defaults
+  webapi:
     image: ghcr.io/${GITHUB_USER_NAME}/${IMAGE_NAME}:latest
     environment:
       - ASPNETCORE_ENVIRONMENT=Production
     expose:
       - "8080"
     networks:
-      - the-teplate-network
+      - the-template-network
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:8080/api/health"]
       interval: 30s
       timeout: 10s
       retries: 3
-  
-  webapi1:
-    <<: *webapi_defaults  # Reuse defaults
-    container_name: the_template1
-
-  webapi2:
-    <<: *webapi_defaults  # Reuse defaults
-    container_name: the_template2
+    deploy:
+      replicas: 2
+      restart_policy:
+        condition: on-failure
+        delay: 5s
+        max_attempts: 3
 
   nginx:
     image: nginx:latest
@@ -30,11 +28,10 @@ services:
       - ./nginx.conf:/etc/nginx/nginx.conf:ro
       - ./logs:/var/log/nginx
     depends_on:
-      - webapi1
-      - webapi2
+      - webapi
     networks:
-      - the-teplate-network
+      - the-template-network
 
-networks: 
-  the-teplate-network:
-    external: true
+networks:
+  the-template-network:
+    external: true

nginx/nginx.conf renamed to nginx.conf

@@ -10,8 +10,8 @@ http {
     error_log   /var/log/nginx/error.log warn;
 
     upstream backend {
-        server webapi1:8080 max_fails=3 fail_timeout=60s weight=2;
-        server webapi2:8080 max_fails=3 fail_timeout=60s;
+        # Use Docker's DNS-based service discovery
+        server webapi:8080 max_fails=3 fail_timeout=60s;
     }
 
     server {

packages.lock.json

@@ -25,8 +25,16 @@
     <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.8" />
     <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="9.0.1" />
     <PackageReference Include="Npgsql.DependencyInjection" Version="8.0.6" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.7.3" />
-    <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.7.3" />
+    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.11.1" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.11.0" />
+    <PackageReference Include="OpenTelemetry" Version="1.11.2" />
+    <PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.11.2" />
+    <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.11.2" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.11.1" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.EntityFrameworkCore" Version="1.11.0-beta.2" />
+
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="7.3.1" />
+    <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="7.3.1" />
   </ItemGroup>
 
   <PropertyGroup>
@@ -36,6 +44,7 @@
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <NoWarn>$(NoWarn);1591</NoWarn>
+    <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
   </PropertyGroup>
 
 </Project>

src/Api/Api.csproj

@@ -1,8 +1,8 @@
-using Application.UseCases.AuditLogs.Queries;
+using Api.common.RouteResults;
+using Api.common.Routers;
+using Application.Features.AuditLogs.Queries;
 using Ardalis.ApiEndpoints;
 using Contracts.ApiWrapper;
-using Contracts.RouteResults;
-using Contracts.Routers;
 using Mediator;
 using Microsoft.AspNetCore.Mvc;
 using Swashbuckle.AspNetCore.Annotations;

src/Api/Endpoints/AuditLogs/ListAuditLog.cs

@@ -1,8 +1,8 @@
+using Api.common.RouteResults;
+using Api.common.Routers;
 using Application.Features.Permissions;
 using Ardalis.ApiEndpoints;
 using Contracts.ApiWrapper;
-using Contracts.RouteResults;
-using Contracts.Routers;
 using Mediator;
 using Microsoft.AspNetCore.Mvc;
 using Swashbuckle.AspNetCore.Annotations;

src/Api/Endpoints/Permissions/ListPermissionEndpoint.cs

@@ -1,8 +1,8 @@
+using Api.common.RouteResults;
+using Api.common.Routers;
 using Application.Features.Regions.Queries.List.Communes;
 using Ardalis.ApiEndpoints;
 using Contracts.ApiWrapper;
-using Contracts.RouteResults;
-using Contracts.Routers;
 using Mediator;
 using Microsoft.AspNetCore.Mvc;
 using Swashbuckle.AspNetCore.Annotations;

src/Api/Endpoints/Regions/ListCommuneEndpoint.cs

@@ -1,8 +1,8 @@
+using Api.common.RouteResults;
+using Api.common.Routers;
 using Application.Features.Regions.Queries.List.Districts;
 using Ardalis.ApiEndpoints;
 using Contracts.ApiWrapper;
-using Contracts.RouteResults;
-using Contracts.Routers;
 using Mediator;
 using Microsoft.AspNetCore.Mvc;
 using Swashbuckle.AspNetCore.Annotations;

src/Api/Endpoints/Regions/ListDistrictEndpoint.cs

@@ -1,8 +1,8 @@
+using Api.common.RouteResults;
+using Api.common.Routers;
 using Application.Features.Regions.Queries.List.Provinces;
 using Ardalis.ApiEndpoints;
 using Contracts.ApiWrapper;
-using Contracts.RouteResults;
-using Contracts.Routers;
 using Mediator;
 using Microsoft.AspNetCore.Mvc;
 using Swashbuckle.AspNetCore.Annotations;

src/Api/Endpoints/Regions/ListProvinceEndpoint.cs

@@ -1,9 +1,9 @@
+using Api.common.RouteResults;
+using Api.common.Routers;
 using Application.Common.Auth;
 using Application.Features.Roles.Commands.Create;
 using Ardalis.ApiEndpoints;
 using Contracts.ApiWrapper;
-using Contracts.RouteResults;
-using Contracts.Routers;
 using Infrastructure.Constants;
 using Mediator;
 using Microsoft.AspNetCore.Mvc;

src/Api/Endpoints/Roles/CreateRoleEndpoint.cs

@@ -1,9 +1,10 @@
+using Api.common.RouteResults;
+using Api.common.Routers;
 using Application.Common.Auth;
 using Application.Features.Roles.Commands.Delete;
 using Ardalis.ApiEndpoints;
 using Contracts.ApiWrapper;
-using Contracts.RouteResults;
-using Contracts.Routers;
+using Contracts.Constants;
 using Infrastructure.Constants;
 using Mediator;
 using Microsoft.AspNetCore.Mvc;
@@ -18,7 +19,7 @@ public class DeleteRoleEndpoint(ISender sender)
     [SwaggerOperation(Tags = [Router.RoleRoute.Tags], Summary = "Delete Role")]
     [AuthorizeBy(permissions: $"{ActionPermission.delete}:{ObjectPermission.role}")]
     public override async Task<ActionResult<ApiResponse>> HandleAsync(
-        [FromRoute(Name = Router.Id)] string roleId,
+        [FromRoute(Name = RoutePath.Id)] string roleId,
         CancellationToken cancellationToken = default
     )
     {