added docs

- Just go through the gateway directly
- We'll need to update the mobile version eventually

src/.env

@@ -6,15 +6,15 @@
 
 # Use this values to run the app locally in Windows
 ESHOP_EXTERNAL_DNS_NAME_OR_IP=host.docker.internal
-ESHOP_STORAGE_CATALOG_URL=http://host.docker.internal:5202/c/api/v1/catalog/items/[0]/pic/
+ESHOP_STORAGE_CATALOG_URL=http://host.docker.internal:5121/c/api/v1/catalog/items/[0]/pic/
 
 # Use this values to run the app locally in Mac
 # ESHOP_EXTERNAL_DNS_NAME_OR_IP=docker.for.mac.localhost
-# ESHOP_STORAGE_CATALOG_URL=http://docker.for.mac.localhost:5202/c/api/v1/catalog/items/[0]/pic/
+# ESHOP_STORAGE_CATALOG_URL=http://docker.for.mac.localhost:5121/c/api/v1/catalog/items/[0]/pic/
 
 # Use this values to run the app locally in Linux
 # ESHOP_EXTERNAL_DNS_NAME_OR_IP=docker.for.linux.localhost
-# ESHOP_STORAGE_CATALOG_URL=http://docker.for.linux.localhost:5202/c/api/v1/catalog/items/[0]/pic/
+# ESHOP_STORAGE_CATALOG_URL=http://docker.for.linux.localhost:5121/c/api/v1/catalog/items/[0]/pic/
 
 # Configure this values to the cloud storage locations
 # ESHOP_STORAGE_CATALOG_URL=<YourAzureStorage_Catalog_BLOB_URL>

src/ApiGateways/Envoy/config/mobileshopping/envoy.yaml

@@ -1,139 +0,0 @@
-admin:
-  access_log_path: "/dev/null"
-  address:
-    socket_address:
-      address: 0.0.0.0
-      port_value: 8001
-static_resources:
-  listeners:
-  - address:
-      socket_address:
-        address: 0.0.0.0
-        port_value: 80
-    filter_chains:
-    - filters:
-      - name: envoy.http_connection_manager
-        config:
-          codec_type: auto
-          stat_prefix: ingress_http
-          route_config:
-            name: eshop_backend_route
-            virtual_hosts:
-            - name: eshop_backend
-              domains:
-              - "*"
-              routes:
-              - name: "c-short"
-                match:
-                  prefix: "/c/"
-                route:
-                  auto_host_rewrite: true
-                  prefix_rewrite: "/catalog-api/"
-                  cluster: catalog
-              - name: "c-long"
-                match:
-                  prefix: "/catalog-api/"
-                route:
-                  auto_host_rewrite: true
-                  cluster: catalog
-              - name: "o-short"
-                match:
-                  prefix: "/o/"
-                route:
-                  auto_host_rewrite: true
-                  prefix_rewrite: "/ordering-api/"
-                  cluster: ordering
-              - name: "o-long"
-                match:
-                  prefix: "/ordering-api/"
-                route:
-                  auto_host_rewrite: true
-                  cluster: ordering
-              - name: "h-long"
-                match:
-                  prefix: "/hub/notificationhub"
-                route:
-                  auto_host_rewrite: true
-                  cluster: signalr-hub
-                  timeout: 300s
-              - name: "b-short"
-                match:
-                  prefix: "/b/"
-                route:
-                  auto_host_rewrite: true
-                  prefix_rewrite: "/basket-api/"
-                  cluster: basket
-              - name: "b-long"
-                match:
-                  prefix: "/basket-api/"
-                route:
-                  auto_host_rewrite: true
-                  cluster: basket
-              - name: "agg"
-                match:
-                  prefix: "/"
-                route:
-                  auto_host_rewrite: true
-                  prefix_rewrite: "/"
-                  cluster: shoppingagg
-          http_filters:
-          - name: envoy.router
-          access_log:
-          - name: envoy.file_access_log
-            filter:
-              not_health_check_filter: {}
-            config:
-              json_format:
-                time: "%START_TIME%"
-                protocol: "%PROTOCOL%"
-                duration: "%DURATION%"
-                request_method: "%REQ(:METHOD)%"
-                request_host: "%REQ(HOST)%"
-                path: "%REQ(X-ENVOY-ORIGINAL-PATH?:PATH)%"
-                response_flags: "%RESPONSE_FLAGS%"
-                route_name: "%ROUTE_NAME%"
-                upstream_host: "%UPSTREAM_HOST%"
-                upstream_cluster: "%UPSTREAM_CLUSTER%"
-                upstream_local_address: "%UPSTREAM_LOCAL_ADDRESS%"
-              path: "/tmp/access.log"
-  clusters:
-  - name: shoppingagg
-    connect_timeout: 0.25s
-    type: strict_dns
-    lb_policy: round_robin
-    hosts:
-    - socket_address:
-        address: mobileshoppingagg
-        port_value: 80
-  - name: catalog
-    connect_timeout: 0.25s
-    type: strict_dns
-    lb_policy: round_robin
-    hosts:
-    - socket_address:
-        address: catalog-api
-        port_value: 80
-  - name: basket
-    connect_timeout: 0.25s
-    type: strict_dns
-    lb_policy: round_robin
-    hosts:
-    - socket_address:
-        address: basket-api
-        port_value: 80
-  - name: ordering
-    connect_timeout: 0.25s
-    type: strict_dns
-    lb_policy: round_robin
-    hosts:
-    - socket_address:
-        address: ordering-api
-        port_value: 80
-  - name: signalr-hub
-    connect_timeout: 0.25s
-    type: strict_dns
-    lb_policy: round_robin
-    hosts:
-    - socket_address:
-        address: ordering-signalrhub
-        port_value: 80

src/ApiGateways/Envoy/config/webshopping/envoy.yaml

@@ -1,142 +0,0 @@
-admin:
-  access_log_path: "/dev/null"
-  address:
-    socket_address:
-      address: 0.0.0.0
-      port_value: 8001
-static_resources:
-  listeners:
-  - address:
-      socket_address:
-        address: 0.0.0.0
-        port_value: 80
-    filter_chains:
-    - filters:
-      - name: envoy.http_connection_manager
-        config:
-          codec_type: auto
-          stat_prefix: ingress_http
-          route_config:
-            name: eshop_backend_route
-            virtual_hosts:
-            - name: eshop_backend
-              domains:
-              - "*"
-              routes:
-              - name: "c-short"
-                match:
-                  prefix: "/c/"
-                route:
-                  auto_host_rewrite: true
-                  prefix_rewrite: "/catalog-api/"
-                  cluster: catalog
-              - name: "c-long"
-                match:
-                  prefix: "/catalog-api/"
-                route:
-                  auto_host_rewrite: true
-                  cluster: catalog
-              - name: "o-short"
-                match:
-                  prefix: "/o/"
-                route:
-                  auto_host_rewrite: true
-                  prefix_rewrite: "/ordering-api/"
-                  cluster: ordering
-              - name: "o-long"
-                match:
-                  prefix: "/ordering-api/"
-                route:
-                  auto_host_rewrite: true
-                  cluster: ordering
-              - name: "h-long"
-                match:
-                  prefix: "/hub/notificationhub"
-                route:
-                  auto_host_rewrite: true
-                  cluster: signalr-hub
-                  timeout: 300s
-                  upgrade_configs:
-                    upgrade_type: "websocket"
-                    enabled: true
-              - name: "b-short"
-                match:
-                  prefix: "/b/"
-                route:
-                  auto_host_rewrite: true
-                  prefix_rewrite: "/basket-api/"
-                  cluster: basket
-              - name: "b-long"
-                match:
-                  prefix: "/basket-api/"
-                route:
-                  auto_host_rewrite: true
-                  cluster: basket
-              - name: "agg"
-                match:
-                  prefix: "/"
-                route:
-                  auto_host_rewrite: true
-                  prefix_rewrite: "/"
-                  cluster: shoppingagg
-          http_filters:
-          - name: envoy.router
-          access_log:
-          - name: envoy.file_access_log
-            filter:
-              not_health_check_filter: {}
-            config:
-              json_format:
-                time: "%START_TIME%"
-                protocol: "%PROTOCOL%"
-                duration: "%DURATION%"
-                request_method: "%REQ(:METHOD)%"
-                request_host: "%REQ(HOST)%"
-                path: "%REQ(X-ENVOY-ORIGINAL-PATH?:PATH)%"
-                response_flags: "%RESPONSE_FLAGS%"
-                route_name: "%ROUTE_NAME%"
-                upstream_host: "%UPSTREAM_HOST%"
-                upstream_cluster: "%UPSTREAM_CLUSTER%"
-                upstream_local_address: "%UPSTREAM_LOCAL_ADDRESS%"
-              path: "/tmp/access.log"
-  clusters:
-  - name: shoppingagg
-    connect_timeout: 0.25s
-    type: strict_dns
-    lb_policy: round_robin
-    hosts:
-    - socket_address:
-        address: webshoppingagg
-        port_value: 80
-  - name: catalog
-    connect_timeout: 0.25s
-    type: strict_dns
-    lb_policy: round_robin
-    hosts:
-    - socket_address:
-        address: catalog-api
-        port_value: 80
-  - name: basket
-    connect_timeout: 0.25s
-    type: strict_dns
-    lb_policy: round_robin
-    hosts:
-    - socket_address:
-        address: basket-api
-        port_value: 80
-  - name: ordering
-    connect_timeout: 0.25s
-    type: strict_dns
-    lb_policy: round_robin
-    hosts:
-    - socket_address:
-        address: ordering-api
-        port_value: 80
-  - name: signalr-hub
-    connect_timeout: 0.25s
-    type: strict_dns
-    lb_policy: round_robin
-    hosts:
-    - socket_address:
-        address: ordering-signalrhub
-        port_value: 80

src/ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile

@@ -33,6 +33,7 @@ COPY "Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj" "Service
 COPY "Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj" "Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj"
 COPY "Services/Payment/Payment.API/Payment.API.csproj" "Services/Payment/Payment.API/Payment.API.csproj"
 COPY "Services/Services.Common/Services.Common.csproj" "Services/Services.Common/Services.Common.csproj"
+COPY "Services/Contact/Contact.API/Contact.API.csproj" "Services/Contact/Contact.API/Contact.API.csproj"
 COPY "Services/Webhooks/Webhooks.API/Webhooks.API.csproj" "Services/Webhooks/Webhooks.API/Webhooks.API.csproj"
 COPY "Tests/Services/Application.FunctionalTests/Application.FunctionalTests.csproj" "Tests/Services/Application.FunctionalTests/Application.FunctionalTests.csproj"
 COPY "Web/WebhookClient/WebhookClient.csproj" "Web/WebhookClient/WebhookClient.csproj"

src/ApiGateways/Web.Bff.Shopping/aggregator/Dockerfile

@@ -33,6 +33,7 @@ COPY "Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj" "Service
 COPY "Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj" "Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj"
 COPY "Services/Payment/Payment.API/Payment.API.csproj" "Services/Payment/Payment.API/Payment.API.csproj"
 COPY "Services/Services.Common/Services.Common.csproj" "Services/Services.Common/Services.Common.csproj"
+COPY "Services/Contact/Contact.API/Contact.API.csproj" "Services/Contact/Contact.API/Contact.API.csproj"
 COPY "Services/Webhooks/Webhooks.API/Webhooks.API.csproj" "Services/Webhooks/Webhooks.API/Webhooks.API.csproj"
 COPY "Tests/Services/Application.FunctionalTests/Application.FunctionalTests.csproj" "Tests/Services/Application.FunctionalTests/Application.FunctionalTests.csproj"
 COPY "Web/WebhookClient/WebhookClient.csproj" "Web/WebhookClient/WebhookClient.csproj"

src/Directory.Packages.props

@@ -74,7 +74,7 @@
     <PackageVersion Include="Microsoft.Extensions.Logging.AzureAppServices" Version="7.0.3" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
     <PackageVersion Include="Microsoft.NETCore.Platforms" Version="7.0.0" />
-    <PackageVersion Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.17.0" />
+    <PackageVersion Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.18.1" />
     <PackageVersion Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.0.4" />
     <PackageVersion Include="Microsoft.Web.LibraryManager.Build" Version="2.1.175" />
     <PackageVersion Include="Moq" Version="4.18.4" />

src/Services/Basket/Basket.API/Dockerfile

@@ -32,6 +32,7 @@ COPY "Services/Ordering/Ordering.Infrastructure/Ordering.Infrastructure.csproj"
 COPY "Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj" "Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj"
 COPY "Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj" "Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj"
 COPY "Services/Payment/Payment.API/Payment.API.csproj" "Services/Payment/Payment.API/Payment.API.csproj"
+COPY "Services/Contact/Contact.API/Contact.API.csproj" "Services/Contact/Contact.API/Contact.API.csproj"
 COPY "Services/Services.Common/Services.Common.csproj" "Services/Services.Common/Services.Common.csproj"
 COPY "Services/Webhooks/Webhooks.API/Webhooks.API.csproj" "Services/Webhooks/Webhooks.API/Webhooks.API.csproj"
 COPY "Tests/Services/Application.FunctionalTests/Application.FunctionalTests.csproj" "Tests/Services/Application.FunctionalTests/Application.FunctionalTests.csproj"

src/Services/Catalog/Catalog.API/Dockerfile

@@ -33,6 +33,7 @@ COPY "Services/Ordering/Ordering.Infrastructure/Ordering.Infrastructure.csproj"
 COPY "Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj" "Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj"
 COPY "Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj" "Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj"
 COPY "Services/Payment/Payment.API/Payment.API.csproj" "Services/Payment/Payment.API/Payment.API.csproj"
+COPY "Services/Contact/Contact.API/Contact.API.csproj" "Services/Contact/Contact.API/Contact.API.csproj"
 COPY "Services/Services.Common/Services.Common.csproj" "Services/Services.Common/Services.Common.csproj"
 COPY "Services/Webhooks/Webhooks.API/Webhooks.API.csproj" "Services/Webhooks/Webhooks.API/Webhooks.API.csproj"
 COPY "Tests/Services/Application.FunctionalTests/Application.FunctionalTests.csproj" "Tests/Services/Application.FunctionalTests/Application.FunctionalTests.csproj"

src/Services/Contact/Contact.API/Contact.API.csproj

@@ -0,0 +1,26 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFramework>net7.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <UserSecretsId>9457faa3-370a-4009-8020-10e7de0fbf17</UserSecretsId>
+    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
+    <DockerfileContext>..\..\..</DockerfileContext>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" />
+    <PackageReference Include="Swashbuckle.AspNetCore" />
+  </ItemGroup>
+
+</Project>

src/Services/Contact/Contact.API/Controllers/ContactController.cs

@@ -0,0 +1,48 @@
+using Contact.API.Model;
+using Contact.API.ViewModel;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
+
+namespace Contact.API.Controllers;
+
+[Route("api/v1/[controller]")]
+[ApiController]
+public class ContactController : ControllerBase
+{
+    private readonly ApplicationDBContext _context;
+
+    public ContactController(ApplicationDBContext context)
+    {
+        this._context = context ?? throw new ArgumentNullException(nameof(context));
+    }
+
+    [HttpPost]
+    [Route("CreateContects")]
+    public async Task<IActionResult> PostQuery([FromBody]ContactViewModel model)
+    {
+        if(!ModelState.IsValid)
+            return BadRequest(ModelState);
+
+        var result = await _context.Contacts.AddAsync(new Model.Contact
+        {
+            Name = model.Name,
+            Email = model.Email,
+            Message = model.Query ??= string.Empty
+        });
+        return Created(string.Empty, result);
+    }
+
+    [HttpGet]
+    [Route("GetContacts")]
+    public async Task<List<ContactViewModel>> GetContacts()
+    {
+        var result = await _context.Contacts.Select(a => new ContactViewModel
+        {
+            Email = a.Email,
+            Name = a.Name,
+            Query = a.Message
+        }).ToListAsync();
+        return result;
+    }
+}

src/Services/Contact/Contact.API/Dockerfile

@@ -0,0 +1,60 @@
+#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:7.0 AS base
+WORKDIR /app
+EXPOSE 80
+EXPOSE 443
+
+FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
+WORKDIR /src
+COPY "eShopOnContainers-ServicesAndWebApps.sln" "eShopOnContainers-ServicesAndWebApps.sln"
+
+COPY "ApiGateways/Mobile.Bff.Shopping/aggregator/Mobile.Shopping.HttpAggregator.csproj" "ApiGateways/Mobile.Bff.Shopping/aggregator/Mobile.Shopping.HttpAggregator.csproj"
+COPY "ApiGateways/Web.Bff.Shopping/aggregator/Web.Shopping.HttpAggregator.csproj" "ApiGateways/Web.Bff.Shopping/aggregator/Web.Shopping.HttpAggregator.csproj"
+COPY "BuildingBlocks/EventBus/EventBus/EventBus.csproj" "BuildingBlocks/EventBus/EventBus/EventBus.csproj"
+COPY "BuildingBlocks/EventBus/EventBus.Tests/EventBus.Tests.csproj" "BuildingBlocks/EventBus/EventBus.Tests/EventBus.Tests.csproj"
+COPY "BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.csproj" "BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.csproj"
+COPY "BuildingBlocks/EventBus/EventBusServiceBus/EventBusServiceBus.csproj" "BuildingBlocks/EventBus/EventBusServiceBus/EventBusServiceBus.csproj"
+COPY "BuildingBlocks/EventBus/IntegrationEventLogEF/IntegrationEventLogEF.csproj" "BuildingBlocks/EventBus/IntegrationEventLogEF/IntegrationEventLogEF.csproj"
+COPY "BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHost.Customization.csproj" "BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHost.Customization.csproj"
+COPY "Services/Basket/Basket.API/Basket.API.csproj" "Services/Basket/Basket.API/Basket.API.csproj"
+COPY "Services/Basket/Basket.FunctionalTests/Basket.FunctionalTests.csproj" "Services/Basket/Basket.FunctionalTests/Basket.FunctionalTests.csproj"
+COPY "Services/Basket/Basket.UnitTests/Basket.UnitTests.csproj" "Services/Basket/Basket.UnitTests/Basket.UnitTests.csproj"
+COPY "Services/Catalog/Catalog.API/Catalog.API.csproj" "Services/Catalog/Catalog.API/Catalog.API.csproj"
+COPY "Services/Catalog/Catalog.FunctionalTests/Catalog.FunctionalTests.csproj" "Services/Catalog/Catalog.FunctionalTests/Catalog.FunctionalTests.csproj"
+COPY "Services/Catalog/Catalog.UnitTests/Catalog.UnitTests.csproj" "Services/Catalog/Catalog.UnitTests/Catalog.UnitTests.csproj"
+COPY "Services/Identity/Identity.API/Identity.API.csproj" "Services/Identity/Identity.API/Identity.API.csproj"
+COPY "Services/Ordering/Ordering.API/Ordering.API.csproj" "Services/Ordering/Ordering.API/Ordering.API.csproj"
+COPY "Services/Ordering/Ordering.BackgroundTasks/Ordering.BackgroundTasks.csproj" "Services/Ordering/Ordering.BackgroundTasks/Ordering.BackgroundTasks.csproj"
+COPY "Services/Ordering/Ordering.Domain/Ordering.Domain.csproj" "Services/Ordering/Ordering.Domain/Ordering.Domain.csproj"
+COPY "Services/Ordering/Ordering.FunctionalTests/Ordering.FunctionalTests.csproj" "Services/Ordering/Ordering.FunctionalTests/Ordering.FunctionalTests.csproj"
+COPY "Services/Ordering/Ordering.Infrastructure/Ordering.Infrastructure.csproj" "Services/Ordering/Ordering.Infrastructure/Ordering.Infrastructure.csproj"
+COPY "Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj" "Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj"
+COPY "Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj" "Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj"
+COPY "Services/Payment/Payment.API/Payment.API.csproj" "Services/Payment/Payment.API/Payment.API.csproj"
+COPY "Services/Contact/Contact.API/Contact.API.csproj" "Services/Contact/Contact.API/Contact.API.csproj"
+COPY "Services/Services.Common/Services.Common.csproj" "Services/Services.Common/Services.Common.csproj"
+COPY "Services/Webhooks/Webhooks.API/Webhooks.API.csproj" "Services/Webhooks/Webhooks.API/Webhooks.API.csproj"
+COPY "Tests/Services/Application.FunctionalTests/Application.FunctionalTests.csproj" "Tests/Services/Application.FunctionalTests/Application.FunctionalTests.csproj"
+COPY "Web/WebhookClient/WebhookClient.csproj" "Web/WebhookClient/WebhookClient.csproj"
+COPY "Web/WebMVC/WebMVC.csproj" "Web/WebMVC/WebMVC.csproj"
+COPY "Web/WebSPA/WebSPA.csproj" "Web/WebSPA/WebSPA.csproj"
+COPY "Web/WebStatus/WebStatus.csproj" "Web/WebStatus/WebStatus.csproj"
+
+COPY "docker-compose.dcproj" "docker-compose.dcproj"
+
+COPY "Directory.Packages.props" "Directory.Packages.props"
+COPY "NuGet.config" "NuGet.config"
+
+RUN dotnet restore "eShopOnContainers-ServicesAndWebApps.sln"
+
+COPY . .
+WORKDIR "/src/Services/Contact/Contact.API"
+RUN dotnet publish --no-restore -c Release -o /app
+
+FROM build AS publish
+
+FROM base AS final
+WORKDIR /app
+COPY --from=publish /app .
+ENTRYPOINT ["dotnet", "Contact.API.dll"]

src/Services/Contact/Contact.API/Migrations/20230724050259_initilasation.Designer.cs

@@ -0,0 +1,53 @@
+// <auto-generated />
+using System;
+using Contact.API.Model;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace Contact.API.Migrations
+{
+    [DbContext(typeof(ApplicationDBContext))]
+    [Migration("20230724050259_initilasation")]
+    partial class Initilasation
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "7.0.3")
+                .HasAnnotation("Relational:MaxIdentifierLength", 128);
+
+            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
+
+            modelBuilder.Entity("Contact.API.Model.Contact", b =>
+                {
+                    b.Property<Guid>("ID")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("ID");
+
+                    b.ToTable("Contacts");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

src/Services/Contact/Contact.API/Migrations/20230724050259_initilasation.cs

@@ -0,0 +1,36 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Contact.API.Migrations
+{
+    /// <inheritdoc />
+    public partial class Initilasation : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "Contacts",
+                columns: table => new
+                {
+                    ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    Name = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                    Email = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                    Message = table.Column<string>(type: "nvarchar(max)", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Contacts", x => x.ID);
+                });
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "Contacts");
+        }
+    }
+}

src/Services/Contact/Contact.API/Migrations/ApplicationDBContextModelSnapshot.cs

@@ -0,0 +1,50 @@
+// <auto-generated />
+using System;
+using Contact.API.Model;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace Contact.API.Migrations
+{
+    [DbContext(typeof(ApplicationDBContext))]
+    partial class ApplicationDBContextModelSnapshot : ModelSnapshot
+    {
+        protected override void BuildModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "7.0.3")
+                .HasAnnotation("Relational:MaxIdentifierLength", 128);
+
+            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
+
+            modelBuilder.Entity("Contact.API.Model.Contact", b =>
+                {
+                    b.Property<Guid>("ID")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("ID");
+
+                    b.ToTable("Contacts");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

src/Services/Contact/Contact.API/Model/ApplicationDBContext.cs

@@ -0,0 +1,30 @@
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Design;
+
+namespace Contact.API.Model;
+
+public class ApplicationDBContext : DbContext
+{
+    public ApplicationDBContext(DbContextOptions<ApplicationDBContext> option) : base(option) { }
+    protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
+    {
+        base.Database.EnsureCreated();
+        base.OnConfiguring(optionsBuilder);
+    }
+
+    public DbSet<Contact> Contacts { get; set; }
+
+}
+
+
+
+public class DbContextFactory : IDesignTimeDbContextFactory<ApplicationDBContext>
+{
+    public ApplicationDBContext CreateDbContext(string[] args)
+    {
+        var optionsBuilder = new DbContextOptionsBuilder<ApplicationDBContext>();
+        optionsBuilder.UseSqlServer("Server=.;Initial Catalog=Microsoft.eShopOnContainers.Services.ContactDb;Integrated Security=true");
+
+        return new ApplicationDBContext(optionsBuilder.Options);
+    }
+}

src/Services/Contact/Contact.API/Model/Contact.cs

@@ -0,0 +1,18 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace Contact.API.Model;
+
+public class Contact
+{
+    [Key]
+    public Guid ID { get; set; }
+
+    [Required]
+    public string Name { get; set; }
+
+    [Required]
+    public string Email { get; set; }
+
+    [Required]
+    public string Message { get; set; }
+}

src/Services/Contact/Contact.API/Program.cs

@@ -0,0 +1,29 @@
+using Contact.API.Model;
+
+var builder = WebApplication.CreateBuilder(args);
+
+// Add services to the container.
+
+builder.Services.
+    AddSqlServer<ApplicationDBContext>("server=127.0.0.1,5433;Initial Catalog=Microsoft.eShopOnContainers.Services.ContactDb;User Id=sa;Password=Pass@word;Encrypt=false");
+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();

src/Services/Contact/Contact.API/Properties/launchSettings.json

@@ -0,0 +1,38 @@
+{
+  "profiles": {
+    "Contact.API": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "launchUrl": "swagger",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "dotnetRunMessages": true,
+      "applicationUrl": "https://localhost:7237;http://localhost:5118"
+    },
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+      "launchUrl": "swagger",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "Docker": {
+      "commandName": "Docker",
+      "launchBrowser": true,
+      "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}/swagger",
+      "publishAllPorts": true,
+      "useSSL": true
+    }
+  },
+  "$schema": "https://json.schemastore.org/launchsettings.json",
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:37689",
+      "sslPort": 44355
+    }
+  }
+}

src/Services/Contact/Contact.API/ViewModel/ContactViewModel.cs

@@ -0,0 +1,17 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace Contact.API.ViewModel;
+
+public class ContactViewModel
+{
+    [Required]
+    [StringLength(maximumLength: 100, MinimumLength = 3)]
+    public required string Name { get; set; }
+
+    [Required]
+    [EmailAddress]
+    public required string Email { get; set; }
+
+    [StringLength(1000)]
+    public string? Query { get; set; }
+}

src/Services/Contact/Contact.API/appsettings.Development.json

@@ -0,0 +1,8 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  }
+}

src/Services/Contact/Contact.API/appsettings.json

@@ -0,0 +1,9 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  },
+  "AllowedHosts": "*"
+}

src/Services/Identity/Identity.API/Dockerfile

@@ -32,6 +32,7 @@ COPY "Services/Ordering/Ordering.Infrastructure/Ordering.Infrastructure.csproj"
 COPY "Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj" "Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj"
 COPY "Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj" "Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj"
 COPY "Services/Payment/Payment.API/Payment.API.csproj" "Services/Payment/Payment.API/Payment.API.csproj"
+COPY "Services/Contact/Contact.API/Contact.API.csproj" "Services/Contact/Contact.API/Contact.API.csproj"
 COPY "Services/Services.Common/Services.Common.csproj" "Services/Services.Common/Services.Common.csproj"
 COPY "Services/Webhooks/Webhooks.API/Webhooks.API.csproj" "Services/Webhooks/Webhooks.API/Webhooks.API.csproj"
 COPY "Tests/Services/Application.FunctionalTests/Application.FunctionalTests.csproj" "Tests/Services/Application.FunctionalTests/Application.FunctionalTests.csproj"

src/Services/Ordering/Ordering.API/Dockerfile

@@ -32,6 +32,7 @@ COPY "Services/Ordering/Ordering.Infrastructure/Ordering.Infrastructure.csproj"
 COPY "Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj" "Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj"
 COPY "Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj" "Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj"
 COPY "Services/Payment/Payment.API/Payment.API.csproj" "Services/Payment/Payment.API/Payment.API.csproj"
+COPY "Services/Contact/Contact.API/Contact.API.csproj" "Services/Contact/Contact.API/Contact.API.csproj"
 COPY "Services/Services.Common/Services.Common.csproj" "Services/Services.Common/Services.Common.csproj"
 COPY "Services/Webhooks/Webhooks.API/Webhooks.API.csproj" "Services/Webhooks/Webhooks.API/Webhooks.API.csproj"
 COPY "Tests/Services/Application.FunctionalTests/Application.FunctionalTests.csproj" "Tests/Services/Application.FunctionalTests/Application.FunctionalTests.csproj"

src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile

@@ -32,6 +32,7 @@ COPY "Services/Ordering/Ordering.Infrastructure/Ordering.Infrastructure.csproj"
 COPY "Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj" "Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj"
 COPY "Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj" "Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj"
 COPY "Services/Payment/Payment.API/Payment.API.csproj" "Services/Payment/Payment.API/Payment.API.csproj"
+COPY "Services/Contact/Contact.API/Contact.API.csproj" "Services/Contact/Contact.API/Contact.API.csproj"
 COPY "Services/Services.Common/Services.Common.csproj" "Services/Services.Common/Services.Common.csproj"
 COPY "Services/Webhooks/Webhooks.API/Webhooks.API.csproj" "Services/Webhooks/Webhooks.API/Webhooks.API.csproj"
 COPY "Tests/Services/Application.FunctionalTests/Application.FunctionalTests.csproj" "Tests/Services/Application.FunctionalTests/Application.FunctionalTests.csproj"

src/Services/Ordering/Ordering.SignalrHub/Dockerfile

@@ -33,6 +33,7 @@ COPY "Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj" "Service
 COPY "Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj" "Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj"
 COPY "Services/Payment/Payment.API/Payment.API.csproj" "Services/Payment/Payment.API/Payment.API.csproj"
 COPY "Services/Services.Common/Services.Common.csproj" "Services/Services.Common/Services.Common.csproj"
+COPY "Services/Contact/Contact.API/Contact.API.csproj" "Services/Contact/Contact.API/Contact.API.csproj"
 COPY "Services/Webhooks/Webhooks.API/Webhooks.API.csproj" "Services/Webhooks/Webhooks.API/Webhooks.API.csproj"
 COPY "Tests/Services/Application.FunctionalTests/Application.FunctionalTests.csproj" "Tests/Services/Application.FunctionalTests/Application.FunctionalTests.csproj"
 COPY "Web/WebhookClient/WebhookClient.csproj" "Web/WebhookClient/WebhookClient.csproj"

src/Services/Payment/Payment.API/Dockerfile

@@ -32,6 +32,7 @@ COPY "Services/Ordering/Ordering.Infrastructure/Ordering.Infrastructure.csproj"
 COPY "Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj" "Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj"
 COPY "Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj" "Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj"
 COPY "Services/Payment/Payment.API/Payment.API.csproj" "Services/Payment/Payment.API/Payment.API.csproj"
+COPY "Services/Contact/Contact.API/Contact.API.csproj" "Services/Contact/Contact.API/Contact.API.csproj"
 COPY "Services/Services.Common/Services.Common.csproj" "Services/Services.Common/Services.Common.csproj"
 COPY "Services/Webhooks/Webhooks.API/Webhooks.API.csproj" "Services/Webhooks/Webhooks.API/Webhooks.API.csproj"
 COPY "Tests/Services/Application.FunctionalTests/Application.FunctionalTests.csproj" "Tests/Services/Application.FunctionalTests/Application.FunctionalTests.csproj"

src/Services/Webhooks/Webhooks.API/Dockerfile

@@ -32,6 +32,7 @@ COPY "Services/Ordering/Ordering.Infrastructure/Ordering.Infrastructure.csproj"
 COPY "Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj" "Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj"
 COPY "Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj" "Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj"
 COPY "Services/Payment/Payment.API/Payment.API.csproj" "Services/Payment/Payment.API/Payment.API.csproj"
+COPY ["Services/Contact/Contact.API/Contact.API.csproj", "Services/Contact/Contact.API/Contact.API.csproj"]
 COPY "Services/Services.Common/Services.Common.csproj" "Services/Services.Common/Services.Common.csproj"
 COPY "Services/Webhooks/Webhooks.API/Webhooks.API.csproj" "Services/Webhooks/Webhooks.API/Webhooks.API.csproj"
 COPY "Tests/Services/Application.FunctionalTests/Application.FunctionalTests.csproj" "Tests/Services/Application.FunctionalTests/Application.FunctionalTests.csproj"

src/Web/WebMVC/Dockerfile

@@ -33,6 +33,7 @@ COPY "Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj" "Service
 COPY "Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj" "Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj"
 COPY "Services/Payment/Payment.API/Payment.API.csproj" "Services/Payment/Payment.API/Payment.API.csproj"
 COPY "Services/Services.Common/Services.Common.csproj" "Services/Services.Common/Services.Common.csproj"
+COPY "Services/Contact/Contact.API/Contact.API.csproj" "Services/Contact/Contact.API/Contact.API.csproj"
 COPY "Services/Webhooks/Webhooks.API/Webhooks.API.csproj" "Services/Webhooks/Webhooks.API/Webhooks.API.csproj"
 COPY "Tests/Services/Application.FunctionalTests/Application.FunctionalTests.csproj" "Tests/Services/Application.FunctionalTests/Application.FunctionalTests.csproj"
 COPY "Web/WebhookClient/WebhookClient.csproj" "Web/WebhookClient/WebhookClient.csproj"

src/Web/WebSPA/Dockerfile

@@ -44,6 +44,7 @@ COPY "Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj" "Service
 COPY "Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj" "Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj"
 COPY "Services/Payment/Payment.API/Payment.API.csproj" "Services/Payment/Payment.API/Payment.API.csproj"
 COPY "Services/Services.Common/Services.Common.csproj" "Services/Services.Common/Services.Common.csproj"
+COPY "Services/Contact/Contact.API/Contact.API.csproj" "Services/Contact/Contact.API/Contact.API.csproj"
 COPY "Services/Webhooks/Webhooks.API/Webhooks.API.csproj" "Services/Webhooks/Webhooks.API/Webhooks.API.csproj"
 COPY "Tests/Services/Application.FunctionalTests/Application.FunctionalTests.csproj" "Tests/Services/Application.FunctionalTests/Application.FunctionalTests.csproj"
 COPY "Web/WebhookClient/WebhookClient.csproj" "Web/WebhookClient/WebhookClient.csproj"

src/Web/WebStatus/Dockerfile

@@ -32,6 +32,7 @@ COPY "Services/Ordering/Ordering.Infrastructure/Ordering.Infrastructure.csproj"
 COPY "Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj" "Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj"
 COPY "Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj" "Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj"
 COPY "Services/Payment/Payment.API/Payment.API.csproj" "Services/Payment/Payment.API/Payment.API.csproj"
+COPY "Services/Contact/Contact.API/Contact.API.csproj" "Services/Contact/Contact.API/Contact.API.csproj"
 COPY "Services/Services.Common/Services.Common.csproj" "Services/Services.Common/Services.Common.csproj"
 COPY "Services/Webhooks/Webhooks.API/Webhooks.API.csproj" "Services/Webhooks/Webhooks.API/Webhooks.API.csproj"
 COPY "Tests/Services/Application.FunctionalTests/Application.FunctionalTests.csproj" "Tests/Services/Application.FunctionalTests/Application.FunctionalTests.csproj"

src/Web/WebhookClient/Dockerfile

@@ -33,6 +33,7 @@ COPY "Services/Ordering/Ordering.Infrastructure/Ordering.Infrastructure.csproj"
 COPY "Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj" "Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj"
 COPY "Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj" "Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj"
 COPY "Services/Payment/Payment.API/Payment.API.csproj" "Services/Payment/Payment.API/Payment.API.csproj"
+COPY "Services/Contact/Contact.API/Contact.API.csproj" "Services/Contact/Contact.API/Contact.API.csproj"
 COPY "Services/Services.Common/Services.Common.csproj" "Services/Services.Common/Services.Common.csproj"
 COPY "Services/Webhooks/Webhooks.API/Webhooks.API.csproj" "Services/Webhooks/Webhooks.API/Webhooks.API.csproj"
 COPY "Tests/Services/Application.FunctionalTests/Application.FunctionalTests.csproj" "Tests/Services/Application.FunctionalTests/Application.FunctionalTests.csproj"

src/docker-compose.dcproj

@@ -3,7 +3,7 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>fea0c318-ffed-4d39-8781-265718ca43dd</ProjectGuid>
     <DockerLaunchBrowser>True</DockerLaunchBrowser>
-    <DockerServiceUrl>http://host.docker.internal:5100</DockerServiceUrl>
+    <DockerServiceUrl>http://localhost:5100</DockerServiceUrl>
     <DockerServiceName>webmvc</DockerServiceName>
     <DockerTargetOS>Linux</DockerTargetOS>
     <ProjectVersion>2.1</ProjectVersion>

src/docker-compose.override.yml

@@ -33,6 +33,7 @@ services:
       - "6379:6379"
     volumes:
       - eshop-basketdata:/data
+
   rabbitmq:
     ports:
       - "15672:15672"
@@ -52,6 +53,7 @@ services:
       - WebShoppingAggClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5121
       - WebhooksApiClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5113
       - WebhooksWebClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5114
+      - ContactApiClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5106
       - UseCustomizationData=True
       - ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY}
       - OrchestratorType=${ORCHESTRATOR_TYPE}
@@ -155,7 +157,16 @@ services:
       - OrchestratorType=${ORCHESTRATOR_TYPE}
     ports:
       - "5108:80"
-
+  
+  contect-api:
+    environment:
+      - ASPNETCORE_ENVIRONMENT=Development
+      - ASPNETCORE_URLS=http://0.0.0.0:80
+      - ConnectionStrings__CatalogDb=${ESHOP_AZURE_CATALOG_DB:-Server=sqldata;Database=Microsoft.eShopOnContainers.Services.ContactDb;User Id=sa;Password=Pass@word;Encrypt=False;TrustServerCertificate=true}
+      - OrchestratorType=${ORCHESTRATOR_TYPE}
+    ports:
+      - "5106:80"
+ 
   webhooks-api:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
@@ -169,20 +180,6 @@ services:
     ports:
       - "5113:80"
 
-  mobileshoppingapigw:
-    volumes:
-      - ./ApiGateways/Envoy/config/mobileshopping:/etc/envoy
-    ports:
-    - "5200:80"
-    - "15200:8001"
-
-  webshoppingapigw:
-    volumes:
-      - ./ApiGateways/Envoy/config/webshopping:/etc/envoy
-    ports:
-    - "5202:80"
-    - "15202:8001"
-
   mobileshoppingagg:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development

src/docker-compose.prod.yml

@@ -128,7 +128,7 @@ services:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
       - ASPNETCORE_URLS=http://0.0.0.0:80
-      - PurchaseUrl=http://webshoppingapigw
+      - PurchaseUrl=http://webshoppingagg
       - IdentityUrl=http://10.0.75.1:5105  # Local Mac: Use http://docker.for.mac.localhost:5105 || Local Windows:  Use 10.0.75.1 in a "Docker for Windows" environment, if using "localhost" from browser. || #Remote access: Use ${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP} if using external IP or DNS name from browser.
       - CatalogUrlHC=http://catalog-api/hc
       - OrderingUrlHC=http://ordering-api/hc
@@ -191,26 +191,6 @@ services:
       - "15672:15672"  # Important: In a production environment your should remove the external port
       - "5672:5672"    # Important: In a production environment your should remove the external port
 
-  mobileshoppingapigw:
-    environment:
-      - ASPNETCORE_ENVIRONMENT=Development
-      - IdentityUrl=http://identity-api              #Local: You need to open your local dev-machine firewall at range 5100-5110.
-    ports:
-      - "5200:80"   # Important: In a production environment your should remove the external port (5200) kept here for microservice debugging purposes.
-                    # The API Gateway redirects and access through the internal port (80).
-    volumes:
-      - ./ApiGateways/Mobile.Bff.Shopping/apigw:/app/configuration
-
-  webshoppingapigw:
-    environment:
-      - ASPNETCORE_ENVIRONMENT=Development
-      - IdentityUrl=http://identity-api              #Local: You need to open your local dev-machine firewall at range 5100-5110.
-    ports:
-      - "5202:80"   # Important: In a production environment your should remove the external port (5202) kept here for microservice debugging purposes.
-                    # The API Gateway redirects and access through the internal port (80).
-    volumes:
-      - ./ApiGateways/Web.Bff.Shopping/apigw:/app/configuration
-
   mobileshoppingagg:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development

src/docker-compose.yml

@@ -1,32 +1,31 @@
 version: '3.4'
-
 services:
-
   seq:
-    image: datalust/seq:latest
+    image: 'datalust/seq:latest'
-
   sqldata:
-    image: mcr.microsoft.com/mssql/server:2019-latest 
+    image: 'mcr.microsoft.com/mssql/server:2019-latest'
-
   nosqldata:
     image: mongo
-
   basketdata:
-    image: redis:alpine
+    image: 'redis:alpine'
-
   rabbitmq:
-    image: rabbitmq:3-management-alpine
+    image: 'rabbitmq:3-management-alpine'
-
   identity-api:
-    image: ${REGISTRY:-eshop}/identity.api:${PLATFORM:-linux}-${TAG:-latest}
+    image: '${REGISTRY:-eshop}/identity.api:${PLATFORM:-linux}-${TAG:-latest}'
     build:
       context: .
       dockerfile: Services/Identity/Identity.API/Dockerfile
     depends_on:
       - sqldata
-
+  contect-api:
+    image: '${REGISTRY:-eshop}/contect.api:${PLATFORM:-linux}-${TAG:-latest}'
+    build:
+      context: .
+      dockerfile: Services/Contact/Contact.API/Dockerfile
+    depends_on:
+      - sqldata
   basket-api:
-    image: ${REGISTRY:-eshop}/basket.api:${PLATFORM:-linux}-${TAG:-latest}
+    image: '${REGISTRY:-eshop}/basket.api:${PLATFORM:-linux}-${TAG:-latest}'
     build:
       context: .
       dockerfile: Services/Basket/Basket.API/Dockerfile
@@ -34,55 +33,46 @@ services:
       - basketdata
       - identity-api
       - rabbitmq
-
   catalog-api:
-    image: ${REGISTRY:-eshop}/catalog.api:${PLATFORM:-linux}-${TAG:-latest}
+    image: '${REGISTRY:-eshop}/catalog.api:${PLATFORM:-linux}-${TAG:-latest}'
     build:
       context: .
       dockerfile: Services/Catalog/Catalog.API/Dockerfile
     depends_on:
       - sqldata
       - rabbitmq
-
   ordering-api:
-    image: ${REGISTRY:-eshop}/ordering.api:${PLATFORM:-linux}-${TAG:-latest}
+    image: '${REGISTRY:-eshop}/ordering.api:${PLATFORM:-linux}-${TAG:-latest}'
     build:
       context: .
       dockerfile: Services/Ordering/Ordering.API/Dockerfile
     depends_on:
       - sqldata
       - rabbitmq
-
   ordering-backgroundtasks:
-    image: ${REGISTRY:-eshop}/ordering.backgroundtasks:${PLATFORM:-linux}-${TAG:-latest}
+    image: '${REGISTRY:-eshop}/ordering.backgroundtasks:${PLATFORM:-linux}-${TAG:-latest}'
     build:
       context: .
       dockerfile: Services/Ordering/Ordering.BackgroundTasks/Dockerfile
     depends_on:
       - sqldata
       - rabbitmq
-
   payment-api:
-    image: ${REGISTRY:-eshop}/payment.api:${PLATFORM:-linux}-${TAG:-latest}
+    image: '${REGISTRY:-eshop}/payment.api:${PLATFORM:-linux}-${TAG:-latest}'
     build:
       context: .
       dockerfile: Services/Payment/Payment.API/Dockerfile
     depends_on:
       - rabbitmq
-
   webhooks-api:
-    image: ${REGISTRY:-eshop}/webhooks.api:${PLATFORM:-linux}-${TAG:-latest}
+    image: '${REGISTRY:-eshop}/webhooks.api:${PLATFORM:-linux}-${TAG:-latest}'
     build:
       context: .
       dockerfile: Services/Webhooks/Webhooks.API/Dockerfile
     depends_on:
       - sqldata
-
-  mobileshoppingapigw:
-    image: envoyproxy/envoy:v1.11.1
-
   mobileshoppingagg:
-    image: ${REGISTRY:-eshop}/mobileshoppingagg:${PLATFORM:-linux}-${TAG:-latest}
+    image: '${REGISTRY:-eshop}/mobileshoppingagg:${PLATFORM:-linux}-${TAG:-latest}'
     build:
       context: .
       dockerfile: ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile
@@ -94,9 +84,8 @@ services:
       - ordering-api
       - catalog-api
       - basket-api
-
   webshoppingagg:
-    image: ${REGISTRY:-eshop}/webshoppingagg:${PLATFORM:-linux}-${TAG:-latest}
+    image: '${REGISTRY:-eshop}/webshoppingagg:${PLATFORM:-linux}-${TAG:-latest}'
     build:
       context: .
       dockerfile: ApiGateways/Web.Bff.Shopping/aggregator/Dockerfile
@@ -108,9 +97,8 @@ services:
       - ordering-api
       - catalog-api
       - basket-api
-
   ordering-signalrhub:
-    image: ${REGISTRY:-eshop}/ordering.signalrhub:${PLATFORM:-linux}-${TAG:-latest}
+    image: '${REGISTRY:-eshop}/ordering.signalrhub:${PLATFORM:-linux}-${TAG:-latest}'
     build:
       context: .
       dockerfile: Services/Ordering/Ordering.SignalrHub/Dockerfile
@@ -122,38 +110,31 @@ services:
       - ordering-api
       - catalog-api
       - basket-api
-
   webstatus:
-    image: ${REGISTRY:-eshop}/webstatus:${PLATFORM:-linux}-${TAG:-latest}
+    image: '${REGISTRY:-eshop}/webstatus:${PLATFORM:-linux}-${TAG:-latest}'
     build:
       context: .
       dockerfile: Web/WebStatus/Dockerfile
-
   webspa:
-    image: ${REGISTRY:-eshop}/webspa:${PLATFORM:-linux}-${TAG:-latest}
+    image: '${REGISTRY:-eshop}/webspa:${PLATFORM:-linux}-${TAG:-latest}'
     build:
       context: .
       dockerfile: Web/WebSPA/Dockerfile
       args:
-        NODE_IMAGE: ${NODE_IMAGE:-node:16-bullseye}
+        NODE_IMAGE: '${NODE_IMAGE:-node:16-bullseye}'
     depends_on:
       - webshoppingagg
-
   webmvc:
-    image: ${REGISTRY:-eshop}/webmvc:${PLATFORM:-linux}-${TAG:-latest}
+    image: '${REGISTRY:-eshop}/webmvc:${PLATFORM:-linux}-${TAG:-latest}'
     build:
       context: .
       dockerfile: Web/WebMVC/Dockerfile
     depends_on:
       - webshoppingagg
-
   webhooks-client:
-    image: ${REGISTRY:-eshop}/webhooks.client:${PLATFORM:-linux}-${TAG:-latest}
+    image: '${REGISTRY:-eshop}/webhooks.client:${PLATFORM:-linux}-${TAG:-latest}'
     build:
       context: .
       dockerfile: Web/WebhookClient/Dockerfile
     depends_on:
       - webhooks-api
-
-  webshoppingapigw:
-    image: envoyproxy/envoy:v1.11.1

src/eShopOnContainers-ServicesAndWebApps.sln

@@ -103,17 +103,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Webhooks.API", "Services\We
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebhookClient", "Web\WebhookClient\WebhookClient.csproj", "{766D7E92-6AF0-476C-ADD5-282BF4D8C576}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Envoy", "Envoy", "{882A8F3A-C61F-4C44-86DD-A5A258714BF2}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "config", "config", "{3ABEEE8C-35E0-4185-9825-C44326151F5B}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ordering.BackgroundTasks", "Services\Ordering\Ordering.BackgroundTasks\Ordering.BackgroundTasks.csproj", "{D4DBA4A3-E4A5-4D9D-8ACF-F38F7D506191}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "webshopping", "webshopping", "{966B1B0B-2AE0-4438-8741-1C5A05556095}"
-	ProjectSection(SolutionItems) = preProject
-		ApiGateways\Envoy\config\webshopping\envoy.yaml = ApiGateways\Envoy\config\webshopping\envoy.yaml
-	EndProjectSection
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mobile.Bff.Shopping", "Mobile.Bff.Shopping", "{798BFC44-2CCD-45FA-B37A-5173B03C2B30}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mobile.Shopping.HttpAggregator", "ApiGateways\Mobile.Bff.Shopping\aggregator\Mobile.Shopping.HttpAggregator.csproj", "{B62E859F-825E-4C8B-93EC-5966EACFD026}"
@@ -126,6 +117,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Services.Common", "Services
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{42B85D0F-2ED6-4C00-91FA-103DACC3D5E2}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Contact", "Contact", "{C7684980-DC20-4957-85E4-92363C252256}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Contact.API", "Services\Contact\Contact.API\Contact.API.csproj", "{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Ad-Hoc|Any CPU = Ad-Hoc|Any CPU
@@ -1532,6 +1527,54 @@ Global
 		{CD430CE4-D5E0-4C96-84F5-AEC9162651B5}.Release|x64.Build.0 = Release|Any CPU
 		{CD430CE4-D5E0-4C96-84F5-AEC9162651B5}.Release|x86.ActiveCfg = Release|Any CPU
 		{CD430CE4-D5E0-4C96-84F5-AEC9162651B5}.Release|x86.Build.0 = Release|Any CPU
+		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
+		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
+		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
+		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
+		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.AppStore|ARM.ActiveCfg = Debug|Any CPU
+		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.AppStore|ARM.Build.0 = Debug|Any CPU
+		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.AppStore|x64.ActiveCfg = Debug|Any CPU
+		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.AppStore|x64.Build.0 = Debug|Any CPU
+		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.AppStore|x86.Build.0 = Debug|Any CPU
+		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.Debug|ARM.Build.0 = Debug|Any CPU
+		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.Debug|x64.Build.0 = Debug|Any CPU
+		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.Debug|x86.Build.0 = Debug|Any CPU
+		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.Release|ARM.ActiveCfg = Release|Any CPU
+		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.Release|ARM.Build.0 = Release|Any CPU
+		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.Release|iPhone.Build.0 = Release|Any CPU
+		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.Release|x64.ActiveCfg = Release|Any CPU
+		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.Release|x64.Build.0 = Release|Any CPU
+		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.Release|x86.ActiveCfg = Release|Any CPU
+		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1580,16 +1623,15 @@ Global
 		{E0AA11C4-2873-461D-8F82-53392530FB7A} = {91CF7717-08AB-4E65-B10E-0B426F01E2E8}
 		{84E2016E-0435-44C6-8020-3D288AA38B2C} = {E0AA11C4-2873-461D-8F82-53392530FB7A}
 		{766D7E92-6AF0-476C-ADD5-282BF4D8C576} = {E279BF0F-7F66-4F3A-A3AB-2CDA66C1CD04}
-		{882A8F3A-C61F-4C44-86DD-A5A258714BF2} = {77849D35-37D4-4802-81DC-9477B2775A40}
-		{3ABEEE8C-35E0-4185-9825-C44326151F5B} = {882A8F3A-C61F-4C44-86DD-A5A258714BF2}
 		{D4DBA4A3-E4A5-4D9D-8ACF-F38F7D506191} = {0BD0DB92-2D98-44D9-9AC0-C59186D59B0B}
-		{966B1B0B-2AE0-4438-8741-1C5A05556095} = {3ABEEE8C-35E0-4185-9825-C44326151F5B}
 		{798BFC44-2CCD-45FA-B37A-5173B03C2B30} = {77849D35-37D4-4802-81DC-9477B2775A40}
 		{B62E859F-825E-4C8B-93EC-5966EACFD026} = {798BFC44-2CCD-45FA-B37A-5173B03C2B30}
 		{373D8AA1-36BE-49EC-89F0-6CB736666285} = {807BB76E-B2BB-47A2-A57B-3D1B20FF5E7F}
 		{95D735BE-2899-4495-BE3F-2600E93B4E3C} = {373D8AA1-36BE-49EC-89F0-6CB736666285}
 		{CD430CE4-D5E0-4C96-84F5-AEC9162651B5} = {42B85D0F-2ED6-4C00-91FA-103DACC3D5E2}
 		{42B85D0F-2ED6-4C00-91FA-103DACC3D5E2} = {91CF7717-08AB-4E65-B10E-0B426F01E2E8}
+		{C7684980-DC20-4957-85E4-92363C252256} = {91CF7717-08AB-4E65-B10E-0B426F01E2E8}
+		{D02363DB-3F96-4DA7-BB18-B2DEE08BF3C3} = {C7684980-DC20-4957-85E4-92363C252256}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {25728519-5F0F-4973-8A64-0A81EB4EA8D9}

src/launchSettings.json

@@ -9,7 +9,6 @@
         "catalog-api": "StartDebugging",
         "identity-api": "StartDebugging",
         "mobileshoppingagg": "StartDebugging",
-        "mobileshoppingapigw": "StartWithoutDebugging",
         "nosqldata": "StartWithoutDebugging",
         "ordering-api": "StartDebugging",
         "ordering-backgroundtasks": "StartDebugging",
@@ -22,7 +21,6 @@
         "webhooks-client": "StartDebugging",
         "webmvc": "StartDebugging",
         "webshoppingagg": "StartDebugging",
-        "webshoppingapigw": "StartWithoutDebugging",
         "webspa": "StartDebugging",
         "webstatus": "StartDebugging"
       }