Refactored Core Infrastructure and Crosscutting (#61)

* Applied version to endpoints and ocelot routes.
* Added crosscutting signalR API project.
* Refactored Kafka consumer to ensure topic creation
* Full replacement of Http/Integration services with Kiota clients.
* Updated Kiota clients and client code with the latest API definitions.
* Enhanced docker-compose and its service dependencies.
* Ensured release build to github actions

Author: falberthen

EcommerceDDD.sln

@@ -65,7 +65,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EcommerceDDD.QuoteManagemen
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EcommerceDDD.InventoryManagement.Tests", "src\Services\EcommerceDDD.InventoryManagement.Tests\EcommerceDDD.InventoryManagement.Tests.csproj", "{487D7187-2669-4BB8-A3A7-F39031EC818B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EcommerceDDD.ServiceClients", "src\Crosscutting\EcommerceDDD.ServiceClients\EcommerceDDD.ServiceClients.csproj", "{46F37BDA-92DA-439B-A31D-170D22EE88FE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EcommerceDDD.ServiceClients", "src\Crosscutting\EcommerceDDD.ServiceClients\EcommerceDDD.ServiceClients.csproj", "{46F37BDA-92DA-439B-A31D-170D22EE88FE}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EcommerceDDD.SignalR", "src\Crosscutting\EcommerceDDD.SignalR\EcommerceDDD.SignalR.csproj", "{F5E1FABB-0F84-4815-902E-A466964E80CA}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -251,6 +253,14 @@ Global
 		{46F37BDA-92DA-439B-A31D-170D22EE88FE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{46F37BDA-92DA-439B-A31D-170D22EE88FE}.Release|x64.ActiveCfg = Release|Any CPU
 		{46F37BDA-92DA-439B-A31D-170D22EE88FE}.Release|x64.Build.0 = Release|Any CPU
+		{F5E1FABB-0F84-4815-902E-A466964E80CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F5E1FABB-0F84-4815-902E-A466964E80CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F5E1FABB-0F84-4815-902E-A466964E80CA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F5E1FABB-0F84-4815-902E-A466964E80CA}.Debug|x64.Build.0 = Debug|Any CPU
+		{F5E1FABB-0F84-4815-902E-A466964E80CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F5E1FABB-0F84-4815-902E-A466964E80CA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F5E1FABB-0F84-4815-902E-A466964E80CA}.Release|x64.ActiveCfg = Release|Any CPU
+		{F5E1FABB-0F84-4815-902E-A466964E80CA}.Release|x64.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -284,6 +294,7 @@ Global
 		{FD844762-CFC4-4A49-9831-042A86294BF3} = {7B1F8BA8-D8A4-4604-92F8-8AB9EA0485B8}
 		{487D7187-2669-4BB8-A3A7-F39031EC818B} = {C90A4F2B-9DDF-40F8-B0EC-C5546622313E}
 		{46F37BDA-92DA-439B-A31D-170D22EE88FE} = {2EBCF63E-7C14-47A7-B972-C7870434AD32}
+		{F5E1FABB-0F84-4815-902E-A466964E80CA} = {2EBCF63E-7C14-47A7-B972-C7870434AD32}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {920B9A56-71E3-492F-93BD-FA154EF349D2}

README.md

@@ -31,6 +31,7 @@ This project is an experimental full-stack application I use to combine several
 ├── Crosscutting
 │   ├── ServiceClients
 │   ├── ApiGateway
+│   ├── SignalR
 │   └── IdentityServer
 │
 ├── Services

docker-compose.yml

@@ -1,3 +1,5 @@
+version: '3.8'
+
 services:
   postgres:
     image: postgres:latest
@@ -24,51 +26,57 @@ services:
       on-failure
 
   zookeeper:
-    image: confluentinc/cp-zookeeper:latest
-    hostname: zookeeper
+    image: confluentinc/cp-zookeeper:7.6.1
     container_name: zookeeper
-    networks:
-      - ecommercedddnet
     ports:
       - '2181:2181'
     environment:
       ZOOKEEPER_CLIENT_PORT: 2181
       ZOOKEEPER_TICK_TIME: 2000
-    restart: 
-      on-failure
+    volumes:
+      - zookeeper-data:/var/lib/zookeeper/data
+      - zookeeper-log:/var/lib/zookeeper/log
+    networks:
+      - ecommercedddnet
+    restart: always
 
   kafka:
-    image: confluentinc/cp-kafka:latest
-    hostname: kafka
+    image: confluentinc/cp-kafka:7.6.1
     container_name: kafka
-    healthcheck:
-      test: ["CMD", "kafka-broker-api-versions", "--bootstrap-server", "localhost:9092"]
-      interval: 10s
-      timeout: 5s
-      retries: 5
-      start_period: 20s
-    networks:
-      - ecommercedddnet
     ports:
       - '29092:29092'
       - '9092:9092'
     environment:
       KAFKA_BROKER_ID: 1
-      KAFKA_ZOOKEEPER_CONNECT: 'zookeeper:2181'
-      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: 'PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT'
+      KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
+      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT
       KAFKA_ADVERTISED_LISTENERS: 'PLAINTEXT://kafka:29092,PLAINTEXT_HOST://kafka:9092'
       KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
       KAFKA_GROUP_INITIAL_REBALANCE_DELAY_MS: 0
-      KAFKA_AUTO_CREATE_TOPICS_ENABLE: 'true'
-    restart: 
-      on-failure
-    depends_on:      
+      KAFKA_LOG_DIRS: /var/lib/kafka/data
+      KAFKA_LOG_RETENTION_HOURS: 168
+      KAFKA_AUTO_CREATE_TOPICS_ENABLE: 'true'      
+      KAFKA_LOG_CLEANUP_POLICY: delete    
+      KAFKA_REPLICA_FETCH_MAX_BYTES: 104857600
+      KAFKA_REPLICA_SOCKET_TIMEOUT_MS: 300000
+    healthcheck:
+      test: ["CMD", "kafka-broker-api-versions", "--bootstrap-server", "kafka:29092"]
+      interval: 20s
+      timeout: 10s
+      retries: 5
+      start_period: 40s
+    volumes:
+      - kafka-data:/var/lib/kafka/data
+    networks:
+      - ecommercedddnet
+    restart: always
+    depends_on:
       zookeeper:
-        condition: service_started   
+        condition: service_started
 
   kafka_topics_ui:
     image: provectuslabs/kafka-ui:latest
-    hostname: kafka-ui
+    container_name: kafka-ui
     ports:
       - '8080:8080'
     environment:
@@ -78,32 +86,45 @@ services:
       - ecommercedddnet
     restart: 
       on-failure
-    depends_on:
-      zookeeper:
-        condition: service_started
+    depends_on:      
       kafka:
+        condition: service_healthy
+      postgres:
+        condition: service_healthy
+      connect:
+        condition: service_started
+      zookeeper:
         condition: service_started
 
   connect:
     image: debezium/connect:2.5
     container_name: connect
     ports:
-      - '8083:8083'
+      - '8083:8083'    
     environment:
-      BOOTSTRAP_SERVERS: 'kafka:9092'
+      BOOTSTRAP_SERVERS: 'kafka:29092'
       GROUP_ID: 1
       CONFIG_STORAGE_TOPIC: CONNECT_CONFIGS
       OFFSET_STORAGE_TOPIC: CONNECT_OFFSETS
-      STATUS_STORAGE_TOPIC: CONNECT_STATUSES    
+      STATUS_STORAGE_TOPIC: CONNECT_STATUSES
+    healthcheck:
+      test: curl --fail http://localhost:8083/ || exit 1
+      interval: 10s
+      timeout: 5s
+      retries: 10
+      start_period: 40s
+    volumes:
+      - debezium-data:/kafka/data
     networks:
       - ecommercedddnet
-    restart: 
-      on-failure
+    restart: always
     depends_on:
       postgres:
-        condition: service_started
+        condition: service_healthy
       kafka:
-        condition: service_started      
+        condition: service_healthy
+      zookeeper:
+        condition: service_started
 
   pgadmin:
     image: dpage/pgadmin4:latest
@@ -115,7 +136,7 @@ services:
     volumes:
       - 'pgadmin:/var/lib/pgadmin'
     ports:
-      - '$PGADMIN_PORT:80'
+      - '8081:80'
     networks:
       - ecommercedddnet
     restart: 
@@ -150,7 +171,7 @@ services:
       postgres:
         condition: 
             service_healthy
-
+  
   ecommerceddd-apigateway:
     image: ecommerceddd-apigateway
     container_name: ecommerceddd-apigateway
@@ -188,8 +209,36 @@ services:
         condition: service_started
       ecommerceddd-shipments:
         condition: service_started
+  
+  ecommerceddd-signalr:
+    image: ecommerceddd-signalr
+    container_name: ecommerceddd-signalr
+    build:
+      context: .
+      dockerfile: src/Crosscutting/EcommerceDDD.SignalR/Dockerfile
+    environment:
+      ASPNETCORE_ENVIRONMENT: '${ASPNETCORE_ENVIRONMENT:-Development}'
+      ASPNETCORE_URLS: 'http://+:80'    
+    healthcheck:
+      test: curl --fail http://ecommerceddd-signalr:80/health || exit 1
+      interval: 10s
+      timeout: 30s
+      retries: 5
+      start_period: 5s
+      start_interval: 5s
+    ports:
+      - '5002:80'
+    networks:
+      - ecommercedddnet    
+    restart:
+      always
+    depends_on:      
+      ecommerceddd-identityserver:
+        condition: service_started
+      ecommerceddd-orders:
+        condition: service_started
 
-  # Services
+  # Services  
   ecommerceddd-customers:
     image: ecommerceddd-customers
     container_name: ecommerceddd-customers
@@ -313,7 +362,7 @@ services:
       dockerfile: src/Services/EcommerceDDD.OrderProcessing/Dockerfile
     environment:
       ASPNETCORE_ENVIRONMENT: '${ASPNETCORE_ENVIRONMENT:-Development}'
-      ASPNETCORE_URLS: 'http://+:80'    
+      ASPNETCORE_URLS: 'http://+:80'      
     healthcheck:      
       test: curl --fail http://ecommerceddd-orders:80/health || exit 1
       interval: 10s
@@ -329,15 +378,15 @@ services:
       on-failure
     depends_on:
       postgres:
-        condition: service_healthy      
+        condition: service_healthy
       kafka:
-        condition: service_healthy      
-      ecommerceddd-products:
-        condition: service_started
+        condition: service_healthy
       connect:
+        condition: service_healthy
+      ecommerceddd-products:
         condition: service_started
       ecommerceddd-identityserver:
-        condition: service_started        
+        condition: service_started   
 
   ecommerceddd-payments:
     image: ecommerceddd-payments
@@ -410,7 +459,14 @@ services:
 networks:
   ecommercedddnet:
     driver: bridge
+    ipam:
+      config:
+        - subnet: 172.28.0.0/16
 
 volumes:
   postgres:
+  zookeeper-data:
+  zookeeper-log:
+  kafka-data:
   pgadmin:
+  debezium-data:

src/Core/EcommerceDDD.Core.Infrastructure.Tests/GlobalUsings.cs

@@ -1,10 +1,9 @@
-global using EcommerceDDD.Core.Infrastructure.Http;
 global using EcommerceDDD.Core.Infrastructure.Identity;
-global using EcommerceDDD.Core.Infrastructure.Integration;
-global using EcommerceDDD.Core.Testing;
 global using Microsoft.AspNetCore.Http;
 global using Microsoft.Extensions.Caching.Memory;
-global using Newtonsoft.Json;
+global using Microsoft.Extensions.Options;
 global using NSubstitute;
+global using System.IdentityModel.Tokens.Jwt;
 global using System.Net;
+global using System.Text;
 global using Xunit;

src/Core/EcommerceDDD.Core.Infrastructure.Tests/Http/FakeHttpMessageHandler.cs

@@ -0,0 +1,18 @@
+namespace EcommerceDDD.Core.Infrastructure.Tests.Http;
+
+public class FakeHttpMessageHandler : HttpMessageHandler
+{
+	private readonly HttpResponseMessage _fakeResponse;
+
+	public FakeHttpMessageHandler(HttpResponseMessage fakeResponse)
+	{
+		_fakeResponse = fakeResponse;
+	}
+
+	protected override Task<HttpResponseMessage> SendAsync(
+		HttpRequestMessage request,
+		CancellationToken cancellationToken)
+	{
+		return Task.FromResult(_fakeResponse);
+	}
+}