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:5121/c/api/v1/catalog/items/[0]/pic/
+ESHOP_STORAGE_CATALOG_URL=http://host.docker.internal:5202/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:5121/c/api/v1/catalog/items/[0]/pic/
+# ESHOP_STORAGE_CATALOG_URL=http://docker.for.mac.localhost:5202/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:5121/c/api/v1/catalog/items/[0]/pic/
+# ESHOP_STORAGE_CATALOG_URL=http://docker.for.linux.localhost:5202/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

@@ -0,0 +1,139 @@
+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

@@ -0,0 +1,142 @@
+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/Controllers/BasketController.cs

@@ -16,7 +16,8 @@ public class BasketController : ControllerBase
 
     [HttpPost]
     [HttpPut]
-    [ProducesResponseType(StatusCodes.Status400BadRequest)]
+    [ProducesResponseType((int)HttpStatusCode.BadRequest)]
+    [ProducesResponseType(typeof(BasketData), (int)HttpStatusCode.OK)]
     public async Task<ActionResult<BasketData>> UpdateAllBasketAsync([FromBody] UpdateBasketRequest data)
     {
         if (data.Items == null || !data.Items.Any())
@@ -72,7 +73,8 @@ public class BasketController : ControllerBase
 
     [HttpPut]
     [Route("items")]
-    [ProducesResponseType(StatusCodes.Status400BadRequest)]
+    [ProducesResponseType((int)HttpStatusCode.BadRequest)]
+    [ProducesResponseType(typeof(BasketData), (int)HttpStatusCode.OK)]
     public async Task<ActionResult<BasketData>> UpdateQuantitiesAsync([FromBody] UpdateBasketItemsRequest data)
     {
         if (!data.Updates.Any())
@@ -108,8 +110,8 @@ public class BasketController : ControllerBase
 
     [HttpPost]
     [Route("items")]
-    [ProducesResponseType(StatusCodes.Status400BadRequest)]
-    [ProducesResponseType(StatusCodes.Status200OK)]
+    [ProducesResponseType((int)HttpStatusCode.BadRequest)]
+    [ProducesResponseType((int)HttpStatusCode.OK)]
     public async Task<ActionResult> AddBasketItemAsync([FromBody] AddBasketItemRequest data)
     {
         if (data == null || data.Quantity == 0)

src/ApiGateways/Mobile.Bff.Shopping/aggregator/Controllers/HomeController.cs

@@ -0,0 +1,11 @@
+namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Controllers;
+
+[Route("")]
+public class HomeController : Controller
+{
+    [HttpGet]
+    public IActionResult Index()
+    {
+        return new RedirectResult("~/swagger");
+    }
+}

src/ApiGateways/Mobile.Bff.Shopping/aggregator/Controllers/OrderController.cs

@@ -16,7 +16,8 @@ public class OrderController : ControllerBase
 
     [Route("draft/{basketId}")]
     [HttpGet]
-    [ProducesResponseType(StatusCodes.Status400BadRequest)]
+    [ProducesResponseType((int)HttpStatusCode.BadRequest)]
+    [ProducesResponseType(typeof(OrderData), (int)HttpStatusCode.OK)]
     public async Task<ActionResult<OrderData>> GetOrderDraftAsync(string basketId)
     {
         if (string.IsNullOrEmpty(basketId))

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

@@ -33,7 +33,6 @@ 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/Mobile.Bff.Shopping/aggregator/GlobalUsings.cs

@@ -1,13 +1,34 @@
-global using System.Text.Json;
-global using CatalogApi;
-global using Grpc.Core;
+global using CatalogApi;
 global using Grpc.Core.Interceptors;
+global using Grpc.Core;
 global using GrpcBasket;
+global using HealthChecks.UI.Client;
+global using Microsoft.AspNetCore.Authentication.JwtBearer;
+global using Microsoft.AspNetCore.Authentication;
 global using Microsoft.AspNetCore.Authorization;
+global using Microsoft.AspNetCore.Builder;
+global using Microsoft.AspNetCore.Diagnostics.HealthChecks;
+global using Microsoft.AspNetCore.Http;
 global using Microsoft.AspNetCore.Mvc;
 global using Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Config;
 global using Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Infrastructure;
 global using Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Models;
 global using Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Services;
+global using Microsoft.Extensions.Configuration;
+global using Microsoft.Extensions.DependencyInjection;
+global using Microsoft.Extensions.Diagnostics.HealthChecks;
+global using Microsoft.Extensions.Logging;
 global using Microsoft.Extensions.Options;
+global using Microsoft.OpenApi.Models;
+global using System.Collections.Generic;
+global using System.IdentityModel.Tokens.Jwt;
+global using System.Linq;
+global using System.Net.Http.Headers;
+global using System.Net.Http;
+global using System.Net;
+global using System.Text.Json;
+global using System.Threading.Tasks;
+global using System.Threading;
+global using System;
+global using Microsoft.IdentityModel.Tokens;
 global using Services.Common;

src/ApiGateways/Mobile.Bff.Shopping/aggregator/Mobile.Shopping.HttpAggregator.csproj

@@ -5,15 +5,31 @@
     <AssemblyName>Mobile.Shopping.HttpAggregator</AssemblyName>
     <RootNamespace>Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator</RootNamespace>
     <DockerComposeProjectPath>..\..\..\docker-compose.dcproj</DockerComposeProjectPath>
-    <ImplicitUsings>enable</ImplicitUsings>
+    <GenerateErrorForMissingTargetingPacks>false</GenerateErrorForMissingTargetingPacks>
+    <IsTransformWebConfigDisabled>true</IsTransformWebConfigDisabled>    
   </PropertyGroup>
 
+  <ItemGroup>
+    <Compile Remove="wwwroot\**" />
+    <Content Remove="wwwroot\**" />
+    <EmbeddedResource Remove="wwwroot\**" />
+    <None Remove="wwwroot\**" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Yarp.ReverseProxy" />
+    <PackageReference Include="AspNetCore.HealthChecks.UI.Client" />
     <PackageReference Include="AspNetCore.HealthChecks.Uris" />
     <PackageReference Include="Google.Protobuf" />
     <PackageReference Include="Grpc.AspNetCore.Server.ClientFactory" />
+    <PackageReference Include="Grpc.Core" />
+    <PackageReference Include="Grpc.Net.ClientFactory" />
     <PackageReference Include="Grpc.Tools" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" />
+    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.HealthChecks" />
+    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" />
+    <PackageReference Include="Swashbuckle.AspNetCore" />
   </ItemGroup>
 
   <ItemGroup>

src/ApiGateways/Mobile.Bff.Shopping/aggregator/Services/OrderApiClient.cs

@@ -23,6 +23,9 @@ public class OrderApiClient : IOrderApiClient
 
         var ordersDraftResponse = await response.Content.ReadAsStringAsync();
 
-        return JsonSerializer.Deserialize<OrderData>(ordersDraftResponse, JsonDefaults.CaseInsensitiveOptions);
+        return JsonSerializer.Deserialize<OrderData>(ordersDraftResponse, new JsonSerializerOptions
+        {
+            PropertyNameCaseInsensitive = true
+        });
     }
 }

src/ApiGateways/Web.Bff.Shopping/aggregator/Controllers/BasketController.cs

@@ -16,7 +16,8 @@ public class BasketController : ControllerBase
 
     [HttpPost]
     [HttpPut]
-    [ProducesResponseType(StatusCodes.Status400BadRequest)]
+    [ProducesResponseType((int)HttpStatusCode.BadRequest)]
+    [ProducesResponseType(typeof(BasketData), (int)HttpStatusCode.OK)]
     public async Task<ActionResult<BasketData>> UpdateAllBasketAsync([FromBody] UpdateBasketRequest data)
     {
         if (data.Items == null || !data.Items.Any())
@@ -73,7 +74,8 @@ public class BasketController : ControllerBase
 
     [HttpPut]
     [Route("items")]
-    [ProducesResponseType(StatusCodes.Status400BadRequest)]
+    [ProducesResponseType((int)HttpStatusCode.BadRequest)]
+    [ProducesResponseType(typeof(BasketData), (int)HttpStatusCode.OK)]
     public async Task<ActionResult<BasketData>> UpdateQuantitiesAsync([FromBody] UpdateBasketItemsRequest data)
     {
         if (!data.Updates.Any())
@@ -107,8 +109,8 @@ public class BasketController : ControllerBase
 
     [HttpPost]
     [Route("items")]
-    [ProducesResponseType(StatusCodes.Status400BadRequest)]
-    [ProducesResponseType(StatusCodes.Status200OK)]
+    [ProducesResponseType((int)HttpStatusCode.BadRequest)]
+    [ProducesResponseType((int)HttpStatusCode.OK)]
     public async Task<ActionResult> AddBasketItemAsync([FromBody] AddBasketItemRequest data)
     {
         if (data == null || data.Quantity == 0)

src/ApiGateways/Web.Bff.Shopping/aggregator/Controllers/OrderController.cs

@@ -16,7 +16,8 @@ public class OrderController : ControllerBase
 
     [Route("draft/{basketId}")]
     [HttpGet]
-    [ProducesResponseType(StatusCodes.Status400BadRequest)]
+    [ProducesResponseType((int)HttpStatusCode.BadRequest)]
+    [ProducesResponseType(typeof(OrderData), (int)HttpStatusCode.OK)]
     public async Task<ActionResult<OrderData>> GetOrderDraftAsync(string basketId)
     {
         if (string.IsNullOrWhiteSpace(basketId))

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

@@ -33,7 +33,6 @@ 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/GlobalUsings.cs

@@ -1,13 +1,27 @@
-global using System.Text.Json;
+global using System;
+global using System.Collections.Generic;
+global using System.Linq;
+global using System.Net;
+global using System.Net.Http;
+global using System.Net.Http.Headers;
+global using System.Text.Json;
+global using System.Threading;
+global using System.Threading.Tasks;
 global using CatalogApi;
 global using Grpc.Core;
 global using Grpc.Core.Interceptors;
 global using GrpcBasket;
+global using Microsoft.AspNetCore.Authentication;
 global using Microsoft.AspNetCore.Authorization;
+global using Microsoft.AspNetCore.Builder;
+global using Microsoft.AspNetCore.Http;
 global using Microsoft.AspNetCore.Mvc;
 global using Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Config;
 global using Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Infrastructure;
 global using Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Models;
 global using Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Services;
+global using Microsoft.Extensions.Configuration;
+global using Microsoft.Extensions.DependencyInjection;
+global using Microsoft.Extensions.Logging;
 global using Microsoft.Extensions.Options;
 global using Services.Common;

src/ApiGateways/Web.Bff.Shopping/aggregator/Services/OrderApiClient.cs

@@ -23,6 +23,9 @@ public class OrderApiClient : IOrderApiClient
 
         var ordersDraftResponse = await response.Content.ReadAsStringAsync();
 
-        return JsonSerializer.Deserialize<OrderData>(ordersDraftResponse, JsonDefaults.CaseInsensitiveOptions);
+        return JsonSerializer.Deserialize<OrderData>(ordersDraftResponse, new JsonSerializerOptions
+        {
+            PropertyNameCaseInsensitive = true
+        });
     }
 }

src/ApiGateways/Web.Bff.Shopping/aggregator/Web.Shopping.HttpAggregator.csproj

@@ -4,7 +4,6 @@
     <TargetFramework>net7.0</TargetFramework>
     <AssemblyName>Web.Shopping.HttpAggregator</AssemblyName>
     <RootNamespace>Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator</RootNamespace>
-    <ImplicitUsings>enable</ImplicitUsings>
     <DockerComposeProjectPath>..\..\..\docker-compose.dcproj</DockerComposeProjectPath>
   </PropertyGroup>
 

src/BuildingBlocks/EventBus/EventBus/EventBus.csproj

@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>Microsoft.eShopOnContainers.BuildingBlocks.EventBus</RootNamespace>
   </PropertyGroup>
 

src/BuildingBlocks/EventBus/EventBus/GlobalUsings.cs

@@ -1,4 +1,8 @@
-global using System.Text.Json.Serialization;
-global using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions;
+global using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions;
 global using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events;
 global using static Microsoft.eShopOnContainers.BuildingBlocks.EventBus.InMemoryEventBusSubscriptionsManager;
+global using System.Collections.Generic;
+global using System.Linq;
+global using System.Text.Json.Serialization;
+global using System.Threading.Tasks;
+global using System;

src/BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.cs

@@ -5,9 +5,6 @@ public class EventBusRabbitMQ : IEventBus, IDisposable
 {
     const string BROKER_NAME = "eshop_event_bus";
 
-    private static readonly JsonSerializerOptions s_indentedOptions = new() { WriteIndented = true };
-    private static readonly JsonSerializerOptions s_caseInsensitiveOptions = new() { PropertyNameCaseInsensitive = true };
-
     private readonly IRabbitMQPersistentConnection _persistentConnection;
     private readonly ILogger<EventBusRabbitMQ> _logger;
     private readonly IEventBusSubscriptionsManager _subsManager;
@@ -72,7 +69,10 @@ public class EventBusRabbitMQ : IEventBus, IDisposable
 
         channel.ExchangeDeclare(exchange: BROKER_NAME, type: "direct");
 
-        var body = JsonSerializer.SerializeToUtf8Bytes(@event, @event.GetType(), s_indentedOptions);
+        var body = JsonSerializer.SerializeToUtf8Bytes(@event, @event.GetType(), new JsonSerializerOptions
+        {
+            WriteIndented = true
+        });
 
         policy.Execute(() =>
         {
@@ -256,7 +256,7 @@ public class EventBusRabbitMQ : IEventBus, IDisposable
                     var handler = scope.ServiceProvider.GetService(subscription.HandlerType);
                     if (handler == null) continue;
                     var eventType = _subsManager.GetEventTypeByName(eventName);
-                    var integrationEvent = JsonSerializer.Deserialize(message, eventType, s_caseInsensitiveOptions);
+                    var integrationEvent = JsonSerializer.Deserialize(message, eventType, new JsonSerializerOptions() { PropertyNameCaseInsensitive = true });
                     var concreteType = typeof(IIntegrationEventHandler<>).MakeGenericType(eventType);
 
                     await Task.Yield();

src/BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.csproj

@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>Microsoft.eShopOnContainers.BuildingBlocks.EventBusRabbitMQ</RootNamespace>
   </PropertyGroup>
 

src/BuildingBlocks/EventBus/EventBusRabbitMQ/GlobalUsings.cs

@@ -1,13 +1,16 @@
-global using System.Net.Sockets;
-global using System.Text;
-global using System.Text.Json;
-global using Microsoft.eShopOnContainers.BuildingBlocks.EventBus;
-global using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions;
-global using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events;
-global using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Extensions;
-global using Microsoft.Extensions.Logging;
+global using Microsoft.Extensions.Logging;
 global using Polly;
 global using Polly.Retry;
 global using RabbitMQ.Client;
 global using RabbitMQ.Client.Events;
 global using RabbitMQ.Client.Exceptions;
+global using System;
+global using System.IO;
+global using System.Net.Sockets;
+global using Microsoft.eShopOnContainers.BuildingBlocks.EventBus;
+global using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions;
+global using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events;
+global using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Extensions;
+global using System.Text;
+global using System.Threading.Tasks;
+global using System.Text.Json;

src/BuildingBlocks/EventBus/EventBusServiceBus/EventBusServiceBus.csproj

@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>Microsoft.eShopOnContainers.BuildingBlocks.EventBusServiceBus</RootNamespace>
   </PropertyGroup>
 

src/BuildingBlocks/EventBus/EventBusServiceBus/GlobalUsings.cs

@@ -1,11 +1,13 @@
-global using System.Text;
+global using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions;
+global using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events;
+global using System.Threading.Tasks;
+global using System;
+global using Microsoft.eShopOnContainers.BuildingBlocks.EventBus;
+global using Microsoft.Extensions.Logging;
+global using System.Text;
 global using System.Text.Json;
 global using Azure.Messaging.ServiceBus;
 global using Azure.Messaging.ServiceBus.Administration;
-global using Microsoft.eShopOnContainers.BuildingBlocks.EventBus;
-global using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions;
-global using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events;
-global using Microsoft.Extensions.Logging;
 
 
 

src/BuildingBlocks/EventBus/IntegrationEventLogEF/GlobalUsings.cs

@@ -1,8 +1,12 @@
-global using System.ComponentModel.DataAnnotations.Schema;
+global using Microsoft.EntityFrameworkCore;
+global using Microsoft.EntityFrameworkCore.Metadata.Builders;
+global using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events;
+global using System;
+global using System.Text.Json;
+global using System.ComponentModel.DataAnnotations.Schema;
+global using System.Linq;
+global using System.Threading.Tasks;
+global using Microsoft.EntityFrameworkCore.Storage;
+global using System.Collections.Generic;
 global using System.Data.Common;
 global using System.Reflection;
-global using System.Text.Json;
-global using Microsoft.EntityFrameworkCore;
-global using Microsoft.EntityFrameworkCore.Metadata.Builders;
-global using Microsoft.EntityFrameworkCore.Storage;
-global using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events;

src/BuildingBlocks/EventBus/IntegrationEventLogEF/IntegrationEventLogEF.csproj

@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>Microsoft.eShopOnContainers.BuildingBlocks.IntegrationEventLogEF</RootNamespace>
   </PropertyGroup>
 

src/BuildingBlocks/EventBus/IntegrationEventLogEF/IntegrationEventLogEntry.cs

@@ -2,16 +2,16 @@
 
 public class IntegrationEventLogEntry
 {
-    private static readonly JsonSerializerOptions s_indentedOptions = new() { WriteIndented = true };
-    private static readonly JsonSerializerOptions s_caseInsensitiveOptions = new() { PropertyNameCaseInsensitive = true };
-
     private IntegrationEventLogEntry() { }
     public IntegrationEventLogEntry(IntegrationEvent @event, Guid transactionId)
     {
         EventId = @event.Id;
         CreationTime = @event.CreationDate;
         EventTypeName = @event.GetType().FullName;
-        Content = JsonSerializer.Serialize(@event, @event.GetType(), s_indentedOptions);
+        Content = JsonSerializer.Serialize(@event, @event.GetType(), new JsonSerializerOptions
+        {
+            WriteIndented = true
+        });
         State = EventStateEnum.NotPublished;
         TimesSent = 0;
         TransactionId = transactionId.ToString();
@@ -30,7 +30,7 @@ public class IntegrationEventLogEntry
 
     public IntegrationEventLogEntry DeserializeJsonContent(Type type)
     {
-        IntegrationEvent = JsonSerializer.Deserialize(Content, type, s_caseInsensitiveOptions) as IntegrationEvent;
+        IntegrationEvent = JsonSerializer.Deserialize(Content, type, new JsonSerializerOptions() { PropertyNameCaseInsensitive = true }) as IntegrationEvent;
         return this;
     }
 }

src/BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHost.Customization.csproj

@@ -2,15 +2,23 @@
 
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
+    <GenerateErrorForMissingTargetingPacks>false</GenerateErrorForMissingTargetingPacks>
   </PropertyGroup>
 
-  <ItemGroup>
-    <FrameworkReference Include="Microsoft.AspNetCore.App" />
-  </ItemGroup>
+    <ItemGroup>
+        <FrameworkReference Include="Microsoft.AspNetCore.App" />
+    </ItemGroup>
 
-  <ItemGroup>
+    <ItemGroup>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" />
+    <PackageReference Include="Microsoft.NETCore.Platforms" />
     <PackageReference Include="Polly" />
     <PackageReference Include="System.Data.SqlClient" />
   </ItemGroup>

src/BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHostExtensions.cs

@@ -1,75 +1,77 @@
-using System.Data.SqlClient;
+using System;
+using System.Data.SqlClient;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Polly;
 
-namespace Microsoft.AspNetCore.Hosting;
-
-public static class IWebHostExtensions
+namespace Microsoft.AspNetCore.Hosting
 {
-    public static bool IsInKubernetes(this IServiceProvider services)
+    public static class IWebHostExtensions
     {
-        var cfg = services.GetService<IConfiguration>();
-        var orchestratorType = cfg.GetValue<string>("OrchestratorType");
-        return orchestratorType?.ToUpper() == "K8S";
-    }
-
-    public static IServiceProvider MigrateDbContext<TContext>(this IServiceProvider services, Action<TContext, IServiceProvider> seeder) where TContext : DbContext
-    {
-        var underK8s = services.IsInKubernetes();
-
-        using var scope = services.CreateScope();
-        var scopeServices = scope.ServiceProvider;
-        var logger = scopeServices.GetRequiredService<ILogger<TContext>>();
-        var context = scopeServices.GetService<TContext>();
-
-        try
+        public static bool IsInKubernetes(this IServiceProvider services)
         {
-            logger.LogInformation("Migrating database associated with context {DbContextName}", typeof(TContext).Name);
-
-            if (underK8s)
-            {
-                InvokeSeeder(seeder, context, scopeServices);
-            }
-            else
-            {
-                var retries = 10;
-                var retry = Policy.Handle<SqlException>()
-                    .WaitAndRetry(
-                        retryCount: retries,
-                        sleepDurationProvider: retryAttempt => TimeSpan.FromSeconds(Math.Pow(2, retryAttempt)),
-                        onRetry: (exception, timeSpan, retry, ctx) =>
-                        {
-                            logger.LogWarning(exception, "[{prefix}] Error migrating database (attempt {retry} of {retries})", nameof(TContext), retry, retries);
-                        });
-
-                //if the sql server container is not created on run docker compose this
-                //migration can't fail for network related exception. The retry options for DbContext only 
-                //apply to transient exceptions
-                // Note that this is NOT applied when running some orchestrators (let the orchestrator to recreate the failing service)
-                retry.Execute(() => InvokeSeeder(seeder, context, scopeServices));
-            }
-
-            logger.LogInformation("Migrated database associated with context {DbContextName}", typeof(TContext).Name);
-        }
-        catch (Exception ex)
-        {
-            logger.LogError(ex, "An error occurred while migrating the database used on context {DbContextName}", typeof(TContext).Name);
-            if (underK8s)
-            {
-                throw;          // Rethrow under k8s because we rely on k8s to re-run the pod
-            }
+            var cfg = services.GetService<IConfiguration>();
+            var orchestratorType = cfg.GetValue<string>("OrchestratorType");
+            return orchestratorType?.ToUpper() == "K8S";
         }
 
-        return services;
-    }
+        public static IServiceProvider MigrateDbContext<TContext>(this IServiceProvider services, Action<TContext, IServiceProvider> seeder) where TContext : DbContext
+        {
+            var underK8s = services.IsInKubernetes();
 
-    private static void InvokeSeeder<TContext>(Action<TContext, IServiceProvider> seeder, TContext context, IServiceProvider services)
-        where TContext : DbContext
-    {
-        context.Database.Migrate();
-        seeder(context, services);
+            using var scope = services.CreateScope();
+            var scopeServices = scope.ServiceProvider;
+            var logger = scopeServices.GetRequiredService<ILogger<TContext>>();
+            var context = scopeServices.GetService<TContext>();
+
+            try
+            {
+                logger.LogInformation("Migrating database associated with context {DbContextName}", typeof(TContext).Name);
+
+                if (underK8s)
+                {
+                    InvokeSeeder(seeder, context, scopeServices);
+                }
+                else
+                {
+                    var retries = 10;
+                    var retry = Policy.Handle<SqlException>()
+                        .WaitAndRetry(
+                            retryCount: retries,
+                            sleepDurationProvider: retryAttempt => TimeSpan.FromSeconds(Math.Pow(2, retryAttempt)),
+                            onRetry: (exception, timeSpan, retry, ctx) =>
+                            {
+                                logger.LogWarning(exception, "[{prefix}] Error migrating database (attempt {retry} of {retries})", nameof(TContext), retry, retries);
+                            });
+
+                    //if the sql server container is not created on run docker compose this
+                    //migration can't fail for network related exception. The retry options for DbContext only 
+                    //apply to transient exceptions
+                    // Note that this is NOT applied when running some orchestrators (let the orchestrator to recreate the failing service)
+                    retry.Execute(() => InvokeSeeder(seeder, context, scopeServices));
+                }
+
+                logger.LogInformation("Migrated database associated with context {DbContextName}", typeof(TContext).Name);
+            }
+            catch (Exception ex)
+            {
+                logger.LogError(ex, "An error occurred while migrating the database used on context {DbContextName}", typeof(TContext).Name);
+                if (underK8s)
+                {
+                    throw;          // Rethrow under k8s because we rely on k8s to re-run the pod
+                }
+            }
+
+            return services;
+        }
+
+        private static void InvokeSeeder<TContext>(Action<TContext, IServiceProvider> seeder, TContext context, IServiceProvider services)
+            where TContext : DbContext
+        {
+            context.Database.Migrate();
+            seeder(context, services);
+        }
     }
 }

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.18.1" />
+    <PackageVersion Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.17.0" />
     <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/Basket.API.csproj

@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
     <DockerComposeProjectPath>..\..\..\..\docker-compose.dcproj</DockerComposeProjectPath>
     <UserSecretsId>2964ec8e-0d48-4541-b305-94cab537f867</UserSecretsId>
   </PropertyGroup>

src/Services/Basket/Basket.API/BasketSettings.cs

@@ -0,0 +1,7 @@
+namespace Microsoft.eShopOnContainers.Services.Basket.API;
+
+public class BasketSettings
+{
+    public string ConnectionString { get; set; }
+}
+

src/Services/Basket/Basket.API/Controllers/BasketController.cs

@@ -23,6 +23,7 @@ public class BasketController : ControllerBase
     }
 
     [HttpGet("{id}")]
+    [ProducesResponseType(typeof(CustomerBasket), (int)HttpStatusCode.OK)]
     public async Task<ActionResult<CustomerBasket>> GetBasketByIdAsync(string id)
     {
         var basket = await _repository.GetBasketAsync(id);
@@ -31,6 +32,7 @@ public class BasketController : ControllerBase
     }
 
     [HttpPost]
+    [ProducesResponseType(typeof(CustomerBasket), (int)HttpStatusCode.OK)]
     public async Task<ActionResult<CustomerBasket>> UpdateBasketAsync([FromBody] CustomerBasket value)
     {
         return Ok(await _repository.UpdateBasketAsync(value));
@@ -38,8 +40,8 @@ public class BasketController : ControllerBase
 
     [Route("checkout")]
     [HttpPost]
-    [ProducesResponseType(StatusCodes.Status202Accepted)]
-    [ProducesResponseType(StatusCodes.Status400BadRequest)]
+    [ProducesResponseType((int)HttpStatusCode.Accepted)]
+    [ProducesResponseType((int)HttpStatusCode.BadRequest)]
     public async Task<ActionResult> CheckoutAsync([FromBody] BasketCheckout basketCheckout, [FromHeader(Name = "x-requestid")] string requestId)
     {
         var userId = _identityService.GetUserIdentity();
@@ -79,7 +81,7 @@ public class BasketController : ControllerBase
 
     // DELETE api/values/5
     [HttpDelete("{id}")]
-    [ProducesResponseType(StatusCodes.Status200OK)]
+    [ProducesResponseType(typeof(void), (int)HttpStatusCode.OK)]
     public async Task DeleteBasketByIdAsync(string id)
     {
         await _repository.DeleteBasketAsync(id);

src/Services/Basket/Basket.API/Dockerfile

@@ -32,7 +32,6 @@ 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/Basket/Basket.API/GlobalUsings.cs

@@ -1,6 +1,11 @@
-global using System.ComponentModel.DataAnnotations;
+global using System;
+global using System.Collections.Generic;
+global using System.ComponentModel.DataAnnotations;
+global using System.Linq;
+global using System.Net;
 global using System.Security.Claims;
 global using System.Text.Json;
+global using System.Threading.Tasks;
 global using Basket.API.IntegrationEvents.EventHandling;
 global using Basket.API.IntegrationEvents.Events;
 global using Basket.API.Model;
@@ -8,6 +13,8 @@ global using Basket.API.Repositories;
 global using Grpc.Core;
 global using GrpcBasket;
 global using Microsoft.AspNetCore.Authorization;
+global using Microsoft.AspNetCore.Builder;
+global using Microsoft.AspNetCore.Http;
 global using Microsoft.AspNetCore.Mvc;
 global using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions;
 global using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events;
@@ -15,5 +22,8 @@ global using Microsoft.eShopOnContainers.Services.Basket.API.IntegrationEvents.E
 global using Microsoft.eShopOnContainers.Services.Basket.API.IntegrationEvents.Events;
 global using Microsoft.eShopOnContainers.Services.Basket.API.Model;
 global using Microsoft.eShopOnContainers.Services.Basket.API.Services;
+global using Microsoft.Extensions.Configuration;
+global using Microsoft.Extensions.DependencyInjection;
+global using Microsoft.Extensions.Logging;
 global using Services.Common;
 global using StackExchange.Redis;

src/Services/Basket/Basket.API/Repositories/RedisBasketRepository.cs

@@ -35,12 +35,15 @@ public class RedisBasketRepository : IBasketRepository
             return null;
         }
 
-        return JsonSerializer.Deserialize<CustomerBasket>(data, JsonDefaults.CaseInsensitiveOptions);
+        return JsonSerializer.Deserialize<CustomerBasket>(data, new JsonSerializerOptions
+        {
+            PropertyNameCaseInsensitive = true
+        });
     }
 
     public async Task<CustomerBasket> UpdateBasketAsync(CustomerBasket basket)
     {
-        var created = await _database.StringSetAsync(basket.BuyerId, JsonSerializer.Serialize(basket, JsonDefaults.CaseInsensitiveOptions));
+        var created = await _database.StringSetAsync(basket.BuyerId, JsonSerializer.Serialize(basket));
 
         if (!created)
         {
@@ -48,7 +51,7 @@ public class RedisBasketRepository : IBasketRepository
             return null;
         }
 
-        _logger.LogInformation("Basket item persisted successfully.");
+        _logger.LogInformation("Basket item persisted succesfully.");
 
         return await GetBasketAsync(basket.BuyerId);
     }

src/Services/Catalog/Catalog.API/Catalog.API.csproj

@@ -5,7 +5,6 @@
     <AssemblyName>Catalog.API</AssemblyName>
     <PackageId>Catalog.API</PackageId>
     <UserSecretsId>aspnet-Catalog.API-20161122013618</UserSecretsId>
-    <ImplicitUsings>enable</ImplicitUsings>
     <DockerComposeProjectPath>..\..\..\..\docker-compose.dcproj</DockerComposeProjectPath>
   </PropertyGroup>
 

src/Services/Catalog/Catalog.API/Controllers/CatalogController.cs

@@ -20,9 +20,9 @@ public class CatalogController : ControllerBase
     // GET api/v1/[controller]/items[?pageSize=3&pageIndex=10]
     [HttpGet]
     [Route("items")]
-    [ProducesResponseType(typeof(PaginatedItemsViewModel<CatalogItem>), StatusCodes.Status200OK)]
-    [ProducesResponseType(typeof(IEnumerable<CatalogItem>), StatusCodes.Status200OK)]
-    [ProducesResponseType(StatusCodes.Status400BadRequest)]
+    [ProducesResponseType(typeof(PaginatedItemsViewModel<CatalogItem>), (int)HttpStatusCode.OK)]
+    [ProducesResponseType(typeof(IEnumerable<CatalogItem>), (int)HttpStatusCode.OK)]
+    [ProducesResponseType((int)HttpStatusCode.BadRequest)]
     public async Task<IActionResult> ItemsAsync([FromQuery] int pageSize = 10, [FromQuery] int pageIndex = 0, string ids = null)
     {
         if (!string.IsNullOrEmpty(ids))
@@ -74,8 +74,9 @@ public class CatalogController : ControllerBase
 
     [HttpGet]
     [Route("items/{id:int}")]
-    [ProducesResponseType(StatusCodes.Status404NotFound)]
-    [ProducesResponseType(StatusCodes.Status400BadRequest)]
+    [ProducesResponseType((int)HttpStatusCode.NotFound)]
+    [ProducesResponseType((int)HttpStatusCode.BadRequest)]
+    [ProducesResponseType(typeof(CatalogItem), (int)HttpStatusCode.OK)]
     public async Task<ActionResult<CatalogItem>> ItemByIdAsync(int id)
     {
         if (id <= 0)
@@ -101,6 +102,7 @@ public class CatalogController : ControllerBase
     // GET api/v1/[controller]/items/withname/samplename[?pageSize=3&pageIndex=10]
     [HttpGet]
     [Route("items/withname/{name:minlength(1)}")]
+    [ProducesResponseType(typeof(PaginatedItemsViewModel<CatalogItem>), (int)HttpStatusCode.OK)]
     public async Task<ActionResult<PaginatedItemsViewModel<CatalogItem>>> ItemsWithNameAsync(string name, [FromQuery] int pageSize = 10, [FromQuery] int pageIndex = 0)
     {
         var totalItems = await _catalogContext.CatalogItems
@@ -121,6 +123,7 @@ public class CatalogController : ControllerBase
     // GET api/v1/[controller]/items/type/1/brand[?pageSize=3&pageIndex=10]
     [HttpGet]
     [Route("items/type/{catalogTypeId}/brand/{catalogBrandId:int?}")]
+    [ProducesResponseType(typeof(PaginatedItemsViewModel<CatalogItem>), (int)HttpStatusCode.OK)]
     public async Task<ActionResult<PaginatedItemsViewModel<CatalogItem>>> ItemsByTypeIdAndBrandIdAsync(int catalogTypeId, int? catalogBrandId, [FromQuery] int pageSize = 10, [FromQuery] int pageIndex = 0)
     {
         var root = (IQueryable<CatalogItem>)_catalogContext.CatalogItems;
@@ -148,6 +151,7 @@ public class CatalogController : ControllerBase
     // GET api/v1/[controller]/items/type/all/brand[?pageSize=3&pageIndex=10]
     [HttpGet]
     [Route("items/type/all/brand/{catalogBrandId:int?}")]
+    [ProducesResponseType(typeof(PaginatedItemsViewModel<CatalogItem>), (int)HttpStatusCode.OK)]
     public async Task<ActionResult<PaginatedItemsViewModel<CatalogItem>>> ItemsByBrandIdAsync(int? catalogBrandId, [FromQuery] int pageSize = 10, [FromQuery] int pageIndex = 0)
     {
         var root = (IQueryable<CatalogItem>)_catalogContext.CatalogItems;
@@ -173,6 +177,7 @@ public class CatalogController : ControllerBase
     // GET api/v1/[controller]/CatalogTypes
     [HttpGet]
     [Route("catalogtypes")]
+    [ProducesResponseType(typeof(List<CatalogType>), (int)HttpStatusCode.OK)]
     public async Task<ActionResult<List<CatalogType>>> CatalogTypesAsync()
     {
         return await _catalogContext.CatalogTypes.ToListAsync();
@@ -181,6 +186,7 @@ public class CatalogController : ControllerBase
     // GET api/v1/[controller]/CatalogBrands
     [HttpGet]
     [Route("catalogbrands")]
+    [ProducesResponseType(typeof(List<CatalogBrand>), (int)HttpStatusCode.OK)]
     public async Task<ActionResult<List<CatalogBrand>>> CatalogBrandsAsync()
     {
         return await _catalogContext.CatalogBrands.ToListAsync();
@@ -189,8 +195,8 @@ public class CatalogController : ControllerBase
     //PUT api/v1/[controller]/items
     [Route("items")]
     [HttpPut]
-    [ProducesResponseType(StatusCodes.Status404NotFound)]
-    [ProducesResponseType(StatusCodes.Status201Created)]
+    [ProducesResponseType((int)HttpStatusCode.NotFound)]
+    [ProducesResponseType((int)HttpStatusCode.Created)]
     public async Task<ActionResult> UpdateProductAsync([FromBody] CatalogItem productToUpdate)
     {
         var catalogItem = await _catalogContext.CatalogItems.SingleOrDefaultAsync(i => i.Id == productToUpdate.Id);
@@ -229,7 +235,7 @@ public class CatalogController : ControllerBase
     //POST api/v1/[controller]/items
     [Route("items")]
     [HttpPost]
-    [ProducesResponseType(StatusCodes.Status201Created)]
+    [ProducesResponseType((int)HttpStatusCode.Created)]
     public async Task<ActionResult> CreateProductAsync([FromBody] CatalogItem product)
     {
         var item = new CatalogItem
@@ -252,8 +258,8 @@ public class CatalogController : ControllerBase
     //DELETE api/v1/[controller]/id
     [Route("{id}")]
     [HttpDelete]
-    [ProducesResponseType(StatusCodes.Status204NoContent)]
-    [ProducesResponseType(StatusCodes.Status404NotFound)]
+    [ProducesResponseType((int)HttpStatusCode.NoContent)]
+    [ProducesResponseType((int)HttpStatusCode.NotFound)]
     public async Task<ActionResult> DeleteProductAsync(int id)
     {
         var product = _catalogContext.CatalogItems.SingleOrDefault(x => x.Id == id);

src/Services/Catalog/Catalog.API/Dockerfile

@@ -33,7 +33,6 @@ 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/GlobalUsings.cs

@@ -1,10 +1,18 @@
-global using System.Data.Common;
+global using System;
+global using System.Collections.Generic;
+global using System.Data.Common;
 global using System.Data.SqlClient;
 global using System.Globalization;
+global using System.IO;
 global using System.IO.Compression;
+global using System.Linq;
+global using System.Net;
 global using System.Text.RegularExpressions;
-global using Catalog.API.Apis;
+global using System.Threading.Tasks;
 global using Grpc.Core;
+global using Microsoft.AspNetCore.Builder;
+global using Microsoft.AspNetCore.Hosting;
+global using Microsoft.AspNetCore.Http;
 global using Microsoft.AspNetCore.Mvc;
 global using Microsoft.EntityFrameworkCore;
 global using Microsoft.EntityFrameworkCore.Design;
@@ -25,7 +33,11 @@ global using Microsoft.eShopOnContainers.Services.Catalog.API.IntegrationEvents.
 global using Microsoft.eShopOnContainers.Services.Catalog.API.IntegrationEvents.Events;
 global using Microsoft.eShopOnContainers.Services.Catalog.API.Model;
 global using Microsoft.eShopOnContainers.Services.Catalog.API.ViewModel;
+global using Microsoft.Extensions.Configuration;
+global using Microsoft.Extensions.DependencyInjection;
+global using Microsoft.Extensions.Logging;
 global using Microsoft.Extensions.Options;
 global using Polly;
 global using Polly.Retry;
 global using Services.Common;
+global using Catalog.API.Apis;

src/Services/Catalog/Catalog.API/Grpc/CatalogService.cs

@@ -2,6 +2,7 @@
 using static CatalogApi.Catalog;
 
 namespace Microsoft.eShopOnContainers.Services.Catalog.API.Grpc;
+using Microsoft.Extensions.Logging;
 
 public class CatalogService : CatalogBase
 {

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

@@ -1,26 +0,0 @@
-<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

@@ -1,48 +0,0 @@
-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

@@ -1,60 +0,0 @@
-#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

@@ -1,53 +0,0 @@
-// <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

@@ -1,36 +0,0 @@
-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

@@ -1,50 +0,0 @@
-// <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

@@ -1,30 +0,0 @@
-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

@@ -1,18 +0,0 @@
-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

@@ -1,29 +0,0 @@
-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

@@ -1,38 +0,0 @@
-{
-  "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

@@ -1,17 +0,0 @@
-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

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

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

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

src/Services/Identity/Identity.API/Dockerfile

@@ -32,7 +32,6 @@ 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/Identity/Identity.API/Identity.API.csproj

@@ -3,7 +3,6 @@
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
     <UserSecretsId>aspnet-eShopOnContainers.Identity-90487118-103c-4ff0-b9da-e5e26f7ab0c5</UserSecretsId>
-    <ImplicitUsings>enable</ImplicitUsings>
     <DockerComposeProjectPath>..\..\..\..\docker-compose.dcproj</DockerComposeProjectPath>
   </PropertyGroup>
 

src/Services/Ordering/Ordering.API/Controllers/OrdersController.cs

@@ -1,7 +1,9 @@
-using CardType = Microsoft.eShopOnContainers.Services.Ordering.API.Application.Queries.CardType;
-using Order = Microsoft.eShopOnContainers.Services.Ordering.API.Application.Queries.Order;
+namespace Microsoft.eShopOnContainers.Services.Ordering.API.Controllers;
 
-namespace Microsoft.eShopOnContainers.Services.Ordering.API.Controllers;
+using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Extensions;
+using Microsoft.eShopOnContainers.Services.Ordering.API.Application.Commands;
+using Microsoft.eShopOnContainers.Services.Ordering.API.Application.Queries;
+using Microsoft.eShopOnContainers.Services.Ordering.API.Infrastructure.Services;
 
 [Route("api/v1/[controller]")]
 [Authorize]
@@ -27,8 +29,8 @@ public class OrdersController : ControllerBase
 
     [Route("cancel")]
     [HttpPut]
-    [ProducesResponseType(StatusCodes.Status200OK)]
-    [ProducesResponseType(StatusCodes.Status400BadRequest)]
+    [ProducesResponseType((int)HttpStatusCode.OK)]
+    [ProducesResponseType((int)HttpStatusCode.BadRequest)]
     public async Task<IActionResult> CancelOrderAsync([FromBody] CancelOrderCommand command, [FromHeader(Name = "x-requestid")] string requestId)
     {
         bool commandResult = false;
@@ -57,8 +59,8 @@ public class OrdersController : ControllerBase
 
     [Route("ship")]
     [HttpPut]
-    [ProducesResponseType(StatusCodes.Status200OK)]
-    [ProducesResponseType(StatusCodes.Status400BadRequest)]
+    [ProducesResponseType((int)HttpStatusCode.OK)]
+    [ProducesResponseType((int)HttpStatusCode.BadRequest)]
     public async Task<IActionResult> ShipOrderAsync([FromBody] ShipOrderCommand command, [FromHeader(Name = "x-requestid")] string requestId)
     {
         bool commandResult = false;
@@ -87,9 +89,9 @@ public class OrdersController : ControllerBase
 
     [Route("{orderId:int}")]
     [HttpGet]
-    [ProducesResponseType(typeof(Order), StatusCodes.Status200OK)]
-    [ProducesResponseType(StatusCodes.Status404NotFound)]
-    public async Task<ActionResult<Order>> GetOrderAsync(int orderId)
+    [ProducesResponseType(typeof(Order), (int)HttpStatusCode.OK)]
+    [ProducesResponseType((int)HttpStatusCode.NotFound)]
+    public async Task<ActionResult> GetOrderAsync(int orderId)
     {
         try
         {
@@ -97,7 +99,7 @@ public class OrdersController : ControllerBase
             //var order customer = await _mediator.Send(new GetOrderByIdQuery(orderId));
             var order = await _orderQueries.GetOrderAsync(orderId);
 
-            return order;
+            return Ok(order);
         }
         catch
         {
@@ -106,7 +108,7 @@ public class OrdersController : ControllerBase
     }
 
     [HttpGet]
-    [ProducesResponseType(typeof(IEnumerable<OrderSummary>), StatusCodes.Status200OK)]
+    [ProducesResponseType(typeof(IEnumerable<OrderSummary>), (int)HttpStatusCode.OK)]
     public async Task<ActionResult<IEnumerable<OrderSummary>>> GetOrdersAsync()
     {
         var userid = _identityService.GetUserIdentity();
@@ -117,7 +119,7 @@ public class OrdersController : ControllerBase
 
     [Route("cardtypes")]
     [HttpGet]
-    [ProducesResponseType(typeof(IEnumerable<CardType>), StatusCodes.Status200OK)]
+    [ProducesResponseType(typeof(IEnumerable<CardType>), (int)HttpStatusCode.OK)]
     public async Task<ActionResult<IEnumerable<CardType>>> GetCardTypesAsync()
     {
         var cardTypes = await _orderQueries.GetCardTypesAsync();

src/Services/Ordering/Ordering.API/Dockerfile

@@ -32,7 +32,6 @@ 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/Extensions/BasketItemExtensions.cs

@@ -1,5 +1,8 @@
 namespace Microsoft.eShopOnContainers.Services.Ordering.API.Extensions;
 
+using System.Collections.Generic;
+using Microsoft.eShopOnContainers.Services.Ordering.API.Application.Models;
+
 public static class BasketItemExtensions
 {
     public static IEnumerable<OrderItemDTO> ToOrderItemsDTO(this IEnumerable<BasketItem> basketItems)

src/Services/Ordering/Ordering.API/GlobalUsings.cs

@@ -1,6 +1,13 @@
-global using System.Data.Common;
+global using System;
+global using System.Collections.Generic;
+global using System.Data.Common;
 global using System.Data.SqlClient;
+global using System.IO;
+global using System.Linq;
+global using System.Net;
 global using System.Runtime.Serialization;
+global using System.Threading;
+global using System.Threading.Tasks;
 global using Azure.Identity;
 global using Dapper;
 global using FluentValidation;
@@ -8,6 +15,9 @@ global using Google.Protobuf.Collections;
 global using Grpc.Core;
 global using MediatR;
 global using Microsoft.AspNetCore.Authorization;
+global using Microsoft.AspNetCore.Builder;
+global using Microsoft.AspNetCore.Hosting;
+global using Microsoft.AspNetCore.Http;
 global using Microsoft.AspNetCore.Mvc;
 global using Microsoft.EntityFrameworkCore;
 global using Microsoft.EntityFrameworkCore.Design;
@@ -36,6 +46,9 @@ global using Microsoft.eShopOnContainers.Services.Ordering.Domain.SeedWork;
 global using Microsoft.eShopOnContainers.Services.Ordering.Infrastructure;
 global using Microsoft.eShopOnContainers.Services.Ordering.Infrastructure.Idempotency;
 global using Microsoft.eShopOnContainers.Services.Ordering.Infrastructure.Repositories;
+global using Microsoft.Extensions.Configuration;
+global using Microsoft.Extensions.DependencyInjection;
+global using Microsoft.Extensions.Logging;
 global using Microsoft.Extensions.Options;
 global using Polly;
 global using Polly.Retry;

src/Services/Ordering/Ordering.API/Ordering.API.csproj

@@ -3,7 +3,6 @@
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
     <UserSecretsId>aspnet-Ordering.API-20161122013547</UserSecretsId>
-    <ImplicitUsings>enable</ImplicitUsings>
     <DockerComposeProjectPath>..\..\..\..\docker-compose.dcproj</DockerComposeProjectPath>
     <RootNamespace>Microsoft.eShopOnContainers.Services.Ordering.API</RootNamespace>
   </PropertyGroup>

src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile

@@ -32,7 +32,6 @@ 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/GlobalUsings.cs

@@ -1,8 +1,10 @@
-global using Microsoft.AspNetCore.Builder;
+global using System;
+global using Microsoft.AspNetCore.Builder;
 global using Microsoft.Extensions.Configuration;
 global using Microsoft.Extensions.DependencyInjection;
 global using Microsoft.Extensions.Hosting;
 global using Microsoft.Extensions.Logging;
+global using Ordering.BackgroundTasks;
 global using Ordering.BackgroundTasks.Extensions;
 global using Ordering.BackgroundTasks.Services;
 global using Services.Common;

src/Services/Ordering/Ordering.BackgroundTasks/Ordering.BackgroundTasks.csproj

@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
     <UserSecretsId>dotnet-Ordering.BackgroundTasks-9D3E1DD6-405B-447F-8AAB-1708B36D260E</UserSecretsId>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>    
   </PropertyGroup>

src/Services/Ordering/Ordering.Domain/GlobalUsings.cs

@@ -1,7 +1,12 @@
-global using System.Reflection;
-global using global::Microsoft.eShopOnContainers.Services.Ordering.Domain.Exceptions;
+global using global::Microsoft.eShopOnContainers.Services.Ordering.Domain.Exceptions;
 global using MediatR;
+global using Microsoft.eShopOnContainers.Services.Ordering.Domain.Seedwork;
 global using Microsoft.eShopOnContainers.Services.Ordering.Domain.AggregatesModel.BuyerAggregate;
 global using Microsoft.eShopOnContainers.Services.Ordering.Domain.AggregatesModel.OrderAggregate;
 global using Microsoft.eShopOnContainers.Services.Ordering.Domain.Events;
-global using Microsoft.eShopOnContainers.Services.Ordering.Domain.Seedwork;
+global using System.Collections.Generic;
+global using System.Linq;
+global using System.Reflection;
+global using System.Threading.Tasks;
+global using System.Threading;
+global using System;

src/Services/Ordering/Ordering.Domain/Ordering.Domain.csproj

@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>

src/Services/Ordering/Ordering.Infrastructure/GlobalUsings.cs

@@ -1,12 +1,17 @@
-global using System.Data;
-global using MediatR;
-global using Microsoft.EntityFrameworkCore;
+global using MediatR;
 global using Microsoft.EntityFrameworkCore.Design;
 global using Microsoft.EntityFrameworkCore.Metadata.Builders;
 global using Microsoft.EntityFrameworkCore.Storage;
+global using Microsoft.EntityFrameworkCore;
 global using Microsoft.eShopOnContainers.Services.Ordering.Domain.AggregatesModel.BuyerAggregate;
 global using Microsoft.eShopOnContainers.Services.Ordering.Domain.AggregatesModel.OrderAggregate;
-global using Microsoft.eShopOnContainers.Services.Ordering.Domain.Exceptions;
 global using Microsoft.eShopOnContainers.Services.Ordering.Domain.Seedwork;
-global using Microsoft.eShopOnContainers.Services.Ordering.Infrastructure.EntityConfigurations;
 global using Microsoft.eShopOnContainers.Services.Ordering.Infrastructure.Idempotency;
+global using Microsoft.eShopOnContainers.Services.Ordering.Domain.Exceptions;
+global using Microsoft.eShopOnContainers.Services.Ordering.Infrastructure.EntityConfigurations;
+global using System.Data;
+global using System.Linq;
+global using System.Threading.Tasks;
+global using System.Threading;
+global using System;
+global using System.Collections.Generic;

src/Services/Ordering/Ordering.Infrastructure/Ordering.Infrastructure.csproj

@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>

src/Services/Ordering/Ordering.SignalrHub/Dockerfile

@@ -33,7 +33,6 @@ 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/Ordering/Ordering.SignalrHub/GlobalUsings.cs

@@ -1,5 +1,9 @@
-global using Microsoft.AspNetCore.Authentication.JwtBearer;
+global using System;
+global using System.Collections.Generic;
+global using System.Threading.Tasks;
+global using Microsoft.AspNetCore.Authentication.JwtBearer;
 global using Microsoft.AspNetCore.Authorization;
+global using Microsoft.AspNetCore.Builder;
 global using Microsoft.AspNetCore.SignalR;
 global using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions;
 global using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events;
@@ -7,4 +11,7 @@ global using Microsoft.eShopOnContainers.Services.Ordering.SignalrHub;
 global using Microsoft.eShopOnContainers.Services.Ordering.SignalrHub.IntegrationEvents;
 global using Microsoft.eShopOnContainers.Services.Ordering.SignalrHub.IntegrationEvents.EventHandling;
 global using Microsoft.eShopOnContainers.Services.Ordering.SignalrHub.IntegrationEvents.Events;
+global using Microsoft.Extensions.Configuration;
+global using Microsoft.Extensions.DependencyInjection;
+global using Microsoft.Extensions.Logging;
 global using Services.Common;

src/Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj

@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
     <DockerComposeProjectPath>..\..\..\..\docker-compose.dcproj</DockerComposeProjectPath>
   </PropertyGroup>
 

src/Services/Ordering/Ordering.UnitTests/Application/OrdersWebApiTest.cs

@@ -110,10 +110,10 @@ public class OrdersWebApiTest
 
         //Act
         var orderController = new OrdersController(_mediatorMock.Object, _orderQueriesMock.Object, _identityServiceMock.Object, _loggerMock.Object);
-        var actionResult = await orderController.GetOrderAsync(fakeOrderId);
+        var actionResult = await orderController.GetOrderAsync(fakeOrderId) as OkObjectResult;
 
         //Assert
-        Assert.Same(actionResult.Value, fakeDynamicResult);
+        Assert.Equal(actionResult.StatusCode, (int)System.Net.HttpStatusCode.OK);
     }
 
     [Fact]

src/Services/Payment/Payment.API/Dockerfile

@@ -32,7 +32,6 @@ 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/Payment/Payment.API/GlobalUsings.cs

@@ -1,7 +1,11 @@
-global using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions;
+global using System.Threading.Tasks;
+global using Microsoft.AspNetCore.Builder;
+global using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions;
 global using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events;
 global using Microsoft.eShopOnContainers.Payment.API;
 global using Microsoft.eShopOnContainers.Payment.API.IntegrationEvents.EventHandling;
 global using Microsoft.eShopOnContainers.Payment.API.IntegrationEvents.Events;
+global using Microsoft.Extensions.DependencyInjection;
+global using Microsoft.Extensions.Logging;
 global using Microsoft.Extensions.Options;
 global using Services.Common;

src/Services/Payment/Payment.API/Payment.API.csproj

@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
     <DockerComposeProjectPath>..\..\..\..\docker-compose.dcproj</DockerComposeProjectPath>
   </PropertyGroup>
 

src/Services/Services.Common/JsonDefaults.cs

@@ -1,11 +0,0 @@
-using System.Text.Json;
-
-namespace Services.Common;
-
-public static class JsonDefaults
-{
-    public static readonly JsonSerializerOptions CaseInsensitiveOptions = new()
-    {
-        PropertyNameCaseInsensitive = true
-    };
-}

src/Services/Webhooks/Webhooks.API/Controllers/WebhooksController.cs

@@ -17,7 +17,7 @@ public class WebhooksController : ControllerBase
 
     [Authorize]
     [HttpGet]
-    [ProducesResponseType(typeof(IEnumerable<WebhookSubscription>), StatusCodes.Status200OK)]
+    [ProducesResponseType(typeof(IEnumerable<WebhookSubscription>), (int)HttpStatusCode.OK)]
     public async Task<IActionResult> ListByUser()
     {
         var userId = _identityService.GetUserIdentity();
@@ -27,8 +27,8 @@ public class WebhooksController : ControllerBase
 
     [Authorize]
     [HttpGet("{id:int}")]
-    [ProducesResponseType(typeof(WebhookSubscription), StatusCodes.Status200OK)]
-    [ProducesResponseType(StatusCodes.Status404NotFound)]
+    [ProducesResponseType(typeof(WebhookSubscription), (int)HttpStatusCode.OK)]
+    [ProducesResponseType((int)HttpStatusCode.NotFound)]
     public async Task<IActionResult> GetByUserAndId(int id)
     {
         var userId = _identityService.GetUserIdentity();
@@ -42,9 +42,9 @@ public class WebhooksController : ControllerBase
 
     [Authorize]
     [HttpPost]
-    [ProducesResponseType(StatusCodes.Status201Created)]
-    [ProducesResponseType(StatusCodes.Status400BadRequest)]
-    [ProducesResponseType(StatusCodes.Status418ImATeapot)]
+    [ProducesResponseType((int)HttpStatusCode.Created)]
+    [ProducesResponseType((int)HttpStatusCode.BadRequest)]
+    [ProducesResponseType(418)]
     public async Task<IActionResult> SubscribeWebhook(WebhookSubscriptionRequest request)
     {
         if (!ModelState.IsValid)
@@ -71,14 +71,14 @@ public class WebhooksController : ControllerBase
         }
         else
         {
-            return StatusCode(StatusCodes.Status418ImATeapot, "Grant URL invalid");
+            return StatusCode(418, "Grant url can't be validated");
         }
     }
 
     [Authorize]
     [HttpDelete("{id:int}")]
-    [ProducesResponseType(StatusCodes.Status202Accepted)]
-    [ProducesResponseType(StatusCodes.Status404NotFound)]
+    [ProducesResponseType((int)HttpStatusCode.Accepted)]
+    [ProducesResponseType((int)HttpStatusCode.NotFound)]
     public async Task<IActionResult> UnsubscribeWebhook(int id)
     {
         var userId = _identityService.GetUserIdentity();

src/Services/Webhooks/Webhooks.API/Dockerfile

@@ -32,7 +32,6 @@ 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/GlobalUsings.cs

@@ -1,16 +1,26 @@
-global using System.ComponentModel.DataAnnotations;
+global using System;
+global using System.Collections.Generic;
+global using System.ComponentModel.DataAnnotations;
 global using System.Data.Common;
 global using System.Linq;
+global using System.Net;
 global using System.Net.Http;
 global using System.Text;
 global using System.Text.Json;
+global using System.Threading.Tasks;
 global using Microsoft.AspNetCore.Authorization;
+global using Microsoft.AspNetCore.Builder;
+global using Microsoft.AspNetCore.Hosting;
+global using Microsoft.AspNetCore.Http;
 global using Microsoft.AspNetCore.Mvc;
 global using Microsoft.EntityFrameworkCore;
 global using Microsoft.EntityFrameworkCore.Design;
 global using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions;
 global using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events;
 global using Microsoft.eShopOnContainers.BuildingBlocks.IntegrationEventLogEF.Services;
+global using Microsoft.Extensions.Configuration;
+global using Microsoft.Extensions.DependencyInjection;
+global using Microsoft.Extensions.Logging;
 global using Services.Common;
 global using Webhooks.API.Infrastructure;
 global using Webhooks.API.IntegrationEvents;

src/Services/Webhooks/Webhooks.API/Webhooks.API.csproj

@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
   </PropertyGroup>
 

src/Tests/Services/Application.FunctionalTests/GlobalUsings.cs

@@ -1,14 +1,14 @@
 global using System;
-global using System.Collections.Generic;
-global using System.Linq;
 global using System.Net.Http;
-global using System.Security.Claims;
-global using System.Text;
-global using System.Text.Json;
-global using System.Threading.Tasks;
 global using Microsoft.AspNetCore.Http;
+global using System.Security.Claims;
+global using System.Threading.Tasks;
 global using Microsoft.eShopOnContainers.Services.Basket.API.Model;
 global using Microsoft.eShopOnContainers.WebMVC.ViewModels;
+global using System.Text.Json;
+global using System.Collections.Generic;
+global using System.Linq;
+global using System.Text;
 global using WebMVC.Services.ModelDTOs;
 global using Xunit;
 

src/Web/WebMVC/Dockerfile

@@ -33,7 +33,6 @@ 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/WebMVC/Services/BasketService.cs

@@ -29,7 +29,10 @@ public class BasketService : IBasketService
         var responseString = await response.Content.ReadAsStringAsync();
         return string.IsNullOrEmpty(responseString) ?
             new Basket() { BuyerId = user.Id } :
-            JsonSerializer.Deserialize<Basket>(responseString, JsonDefaults.CaseInsensitiveOptions);
+            JsonSerializer.Deserialize<Basket>(responseString, new JsonSerializerOptions
+            {
+                PropertyNameCaseInsensitive = true
+            });
     }
 
     public async Task<Basket> UpdateBasket(Basket basket)
@@ -79,7 +82,10 @@ public class BasketService : IBasketService
 
         var jsonResponse = await response.Content.ReadAsStringAsync();
 
-        return JsonSerializer.Deserialize<Basket>(jsonResponse, JsonDefaults.CaseInsensitiveOptions);
+        return JsonSerializer.Deserialize<Basket>(jsonResponse, new JsonSerializerOptions
+        {
+            PropertyNameCaseInsensitive = true
+        });
     }
 
     public async Task<Order> GetOrderDraft(string basketId)
@@ -88,7 +94,10 @@ public class BasketService : IBasketService
 
         var responseString = await _apiClient.GetStringAsync(uri);
 
-        var response = JsonSerializer.Deserialize<Order>(responseString, JsonDefaults.CaseInsensitiveOptions);
+        var response = JsonSerializer.Deserialize<Order>(responseString, new JsonSerializerOptions
+        {
+            PropertyNameCaseInsensitive = true
+        });
 
         return response;
     }

src/Web/WebMVC/Services/CatalogService.cs

@@ -23,7 +23,10 @@ public class CatalogService : ICatalogService
 
         var responseString = await _httpClient.GetStringAsync(uri);
 
-        var catalog = JsonSerializer.Deserialize<Catalog>(responseString, JsonDefaults.CaseInsensitiveOptions);
+        var catalog = JsonSerializer.Deserialize<Catalog>(responseString, new JsonSerializerOptions
+        {
+            PropertyNameCaseInsensitive = true
+        });
 
         return catalog;
     }

src/Web/WebMVC/Services/OrderingService.cs

@@ -23,7 +23,10 @@ public class OrderingService : IOrderingService
 
         var responseString = await _httpClient.GetStringAsync(uri);
 
-        var response = JsonSerializer.Deserialize<Order>(responseString, JsonDefaults.CaseInsensitiveOptions);
+        var response = JsonSerializer.Deserialize<Order>(responseString, new JsonSerializerOptions
+        {
+            PropertyNameCaseInsensitive = true
+        });
 
         return response;
     }
@@ -34,7 +37,10 @@ public class OrderingService : IOrderingService
 
         var responseString = await _httpClient.GetStringAsync(uri);
 
-        var response = JsonSerializer.Deserialize<List<Order>>(responseString, JsonDefaults.CaseInsensitiveOptions);
+        var response = JsonSerializer.Deserialize<List<Order>>(responseString, new JsonSerializerOptions
+        {
+            PropertyNameCaseInsensitive = true
+        });
 
         return response;
     }

src/Web/WebMVC/WebMVC.csproj

@@ -3,7 +3,6 @@
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
     <UserSecretsId>aspnet-Microsoft.eShopOnContainers-946ae052-8305-4a99-965b-ec8636ddbae3</UserSecretsId>
-    <ImplicitUsings>enable</ImplicitUsings>
     <DockerComposeProjectPath>..\..\..\docker-compose.dcproj</DockerComposeProjectPath>
     <TypeScriptToolsVersion>3.0</TypeScriptToolsVersion>
   </PropertyGroup>

src/Web/WebSPA/AppSettings.cs

@@ -3,6 +3,7 @@
 public class AppSettings
 {
     public string IdentityUrl { get; set; }
+    public string BasketUrl { get; set; }
     public string MarketingUrl { get; set; }
 
     public string PurchaseUrl { get; set; }

src/Web/WebSPA/Dockerfile

@@ -44,7 +44,6 @@ 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/Extensions/Extensions.cs

@@ -1,12 +0,0 @@
-internal static class Extensions
-{
-    public static IServiceCollection AddHealthChecks(this IServiceCollection services, IConfiguration configuration)
-    {
-        var hcBuilder = services.AddHealthChecks();
-
-        hcBuilder
-            .AddUrlGroup(_ => new Uri(configuration["IdentityUrlHC"]), name: "identityapi-check", tags: new string[] { "identityapi" });
-
-        return services;
-    }
-}

src/Web/WebSPA/GlobalUsings.cs

@@ -1,6 +1,24 @@
-global using System.IO.Compression;
+global using eShopConContainers.WebSPA;
+global using Microsoft.AspNetCore;
+global using Microsoft.AspNetCore.Hosting;
+global using Microsoft.Extensions.Configuration;
+global using Microsoft.Extensions.Logging;
+global using System.IO;
 global using eShopOnContainers.WebSPA;
+global using HealthChecks.UI.Client;
+global using Microsoft.AspNetCore.Antiforgery;
+global using Microsoft.AspNetCore.Builder;
+global using Microsoft.AspNetCore.DataProtection;
+global using Microsoft.AspNetCore.Diagnostics.HealthChecks;
+global using Microsoft.AspNetCore.Http;
+global using Microsoft.AspNetCore.Mvc;
 global using Microsoft.AspNetCore.SpaServices.AngularCli;
-global using Microsoft.Extensions.Options;
-global using Services.Common;
+global using Microsoft.Extensions.DependencyInjection;
+global using Microsoft.Extensions.Diagnostics.HealthChecks;
+global using Microsoft.Extensions.Hosting;
+global using StackExchange.Redis;
+global using System;
 global using WebSPA.Infrastructure;
+global using Microsoft.Extensions.Options;
+global using System.IO.Compression;
+global using System.Linq;

src/Web/WebSPA/Program.cs

@@ -1,21 +1,78 @@
 var builder = WebApplication.CreateBuilder(args);
+builder.WebHost.UseContentRoot(Directory.GetCurrentDirectory());
 
-builder.AddServiceDefaults();
+builder.Services.AddApplicationInsightsTelemetry(builder.Configuration);
+builder.Services.AddApplicationInsightsKubernetesEnricher();
+builder.Services.AddHealthChecks()
+    .AddCheck("self", () => HealthCheckResult.Healthy())
+    .AddUrlGroup(new Uri(builder.Configuration["IdentityUrlHC"]), name: "identityapi-check", tags: new string[] { "identityapi" });
 
-builder.Services.AddHealthChecks(builder.Configuration);
 builder.Services.Configure<AppSettings>(builder.Configuration);
+if (builder.Configuration.GetValue<string>("IsClusterEnv") == bool.TrueString)
+{
+    builder.Services.AddDataProtection(opts =>
+    {
+        opts.ApplicationDiscriminator = "eshop.webspa";
+    })
+    .PersistKeysToStackExchangeRedis(ConnectionMultiplexer.Connect(builder.Configuration["DPConnectionString"]), "DataProtection-Keys");
+}
+
+
+// Add Anti-forgery services and configure the header name that angular will use by default.
+builder.Services.AddAntiforgery(options => options.HeaderName = "X-XSRF-TOKEN");
+
+// Add controllers support and add a global AutoValidateAntiforgeryTokenFilter that will make the application check for an Anti-forgery token on all "mutating" requests (POST, PUT, DELETE).
+// The AutoValidateAntiforgeryTokenFilter is an internal class registered when we register views, so we need to register controllers and views also.
+builder.Services.AddControllersWithViews(options => options.Filters.Add(new AutoValidateAntiforgeryTokenAttribute()))
+    .AddJsonOptions(options =>
+    {
+        options.JsonSerializerOptions.PropertyNameCaseInsensitive = true;
+    });
 
 // Setup where the compiled version of our spa application will be, when in production. 
-builder.Services.AddSpaStaticFiles(options =>
+builder.Services.AddSpaStaticFiles(configuration =>
 {
-    options.RootPath = "wwwroot";
+    configuration.RootPath = "wwwroot";
 });
 
+builder.Logging.AddConfiguration(builder.Configuration.GetSection("Logging"));
+builder.Logging.AddAzureWebAppDiagnostics();
+
 var app = builder.Build();
 
-app.UseServiceDefaults();
+// Here we add Angular default Anti-forgery cookie name on first load. https://angular.io/guide/http#security-xsrf-protection
+// This cookie will be read by Angular app and its value will be sent back to the application as the header configured in .AddAntiforgery()
+var antiForgery = app.Services.GetRequiredService<IAntiforgery>();
+app.Use(next => context =>
+{
+    string path = context.Request.Path.Value;
 
-app.UseFileServer();
+    if (string.Equals(path, "/", StringComparison.OrdinalIgnoreCase) ||
+        string.Equals(path, "/index.html", StringComparison.OrdinalIgnoreCase))
+    {
+        // The request token has to be sent as a JavaScript-readable cookie, 
+        // and Angular uses it by default.
+        var tokens = antiForgery.GetAndStoreTokens(context);
+        context.Response.Cookies.Append("XSRF-TOKEN", tokens.RequestToken,
+            new CookieOptions() { HttpOnly = false });
+    }
+
+    return next(context);
+});
+
+// Seed Data
+WebContextSeed.Seed(app, app.Environment, app.Services.GetRequiredService<ILogger<WebContextSeed>>());
+
+var pathBase = app.Configuration["PATH_BASE"];
+
+if (!string.IsNullOrEmpty(pathBase))
+{
+    app.Services.GetRequiredService<ILogger<WebContextSeed>>().LogDebug("Using PATH_BASE '{PathBase}'", pathBase);
+    app.UsePathBase(pathBase);
+}
+
+app.UseDefaultFiles();
+app.UseStaticFiles();
 
 // This will make the application to respond with the index.html and the rest of the assets present on the configured folder (at AddSpaStaticFiles() (wwwroot))
 if (!app.Environment.IsDevelopment())
@@ -24,12 +81,16 @@ if (!app.Environment.IsDevelopment())
 }
 
 app.UseRouting();
-
-#pragma warning disable ASP0014 // Suggest using top level route registrations
-app.UseEndpoints(routes =>
+app.MapDefaultControllerRoute();
+app.MapControllers();
+app.MapHealthChecks("/liveness", new HealthCheckOptions
 {
-    // TODO: Change this route
-    routes.MapGet("/home/configuration", (IOptions<AppSettings> options) => options.Value);
+    Predicate = r => r.Name.Contains("self")
+});
+app.MapHealthChecks("/hc", new HealthCheckOptions()
+{
+    Predicate = _ => true,
+    ResponseWriter = UIResponseWriter.WriteHealthCheckUIResponse
 });
 
 // Handles all still unattended (by any other middleware) requests by returning the default page of the SPA (wwwroot/index.html).
@@ -48,7 +109,4 @@ app.UseSpa(spa =>
     }
 });
 
-// Seed Data
-WebContextSeed.Seed(app, app.Environment, app.Logger);
-
 await app.RunAsync();

src/Web/WebSPA/Properties/launchSettings.json

@@ -1,5 +1,24 @@
 {
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:58018/",
+      "sslPort": 0
+    }
+  },
   "profiles": {
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "Docker": {
+      "commandName": "Docker",
+      "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}",
+      "publishAllPorts": true
+    },
     "WebSPA": {
       "commandName": "Project",
       "launchBrowser": true,
@@ -8,11 +27,6 @@
         "ASPNETCORE_ENVIRONMENT": "Development"
       },
       "applicationUrl": "http://localhost:5104"
-    },
-    "Docker": {
-      "commandName": "Docker",
-      "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}",
-      "publishAllPorts": true
     }
   }
 }

src/Web/WebSPA/Server/Controllers/HomeController.cs

@@ -0,0 +1,18 @@
+// For more information on enabling MVC for empty projects, visit http://go.microsoft.com/fwlink/?LinkID=397860
+namespace eShopConContainers.WebSPA.Server.Controllers;
+
+public class HomeController : Controller
+{
+    private readonly IWebHostEnvironment _env;
+    private readonly IOptionsSnapshot<AppSettings> _settings;
+
+    public HomeController(IWebHostEnvironment env, IOptionsSnapshot<AppSettings> settings)
+    {
+        _env = env;
+        _settings = settings;
+    }
+    public IActionResult Configuration()
+    {
+        return Json(_settings.Value);
+    }
+}

src/Web/WebSPA/Server/Infrastructure/WebContextSeed.cs

@@ -4,7 +4,7 @@ using Microsoft.Extensions.Logging;
 
 public class WebContextSeed
 {
-    public static void Seed(IApplicationBuilder applicationBuilder, IWebHostEnvironment env, ILogger logger)
+    public static void Seed(IApplicationBuilder applicationBuilder, IWebHostEnvironment env, ILogger<WebContextSeed> logger)
     {
         var settings = applicationBuilder
             .ApplicationServices.GetRequiredService<IOptions<AppSettings>>().Value;

src/Web/WebSPA/WebSPA.csproj

@@ -2,9 +2,9 @@
 
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
     <UserSecretsId>aspnetcorespa-c23d27a4-eb88-4b18-9b77-2a93f3b15119</UserSecretsId>
     <TypeScriptCompileOnSaveEnabled>false</TypeScriptCompileOnSaveEnabled>
+    <IsTransformWebConfigDisabled>true</IsTransformWebConfigDisabled>
     <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
     <GeneratedItemPatterns>wwwroot/dist/**</GeneratedItemPatterns>
     <DefaultItemExcludes>$(DefaultItemExcludes);$(GeneratedItemPatterns)</DefaultItemExcludes>
@@ -22,20 +22,26 @@
     <Content Update="appsettings.json;">
       <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
     </Content>
+    <Content Update="web.config;">
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+    </Content>
     <Content Update="wwwroot\**\*;">
       <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
     </Content>
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="AspNetCore.HealthChecks.UI.Client" />
     <PackageReference Include="AspNetCore.HealthChecks.Uris" />
+    <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" />
+    <PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" />
+    <PackageReference Include="Microsoft.ApplicationInsights.Kubernetes" />
     <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" />
+    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.HealthChecks" />
     <PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" />
+    <PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" />    
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\Services\Services.Common\Services.Common.csproj" />
+    <PackageReference Include="Newtonsoft.Json" />
   </ItemGroup>
   
   <Target Name="DebugEnsureNodeEnv" BeforeTargets="Build" Condition=" '$(Configuration)' == 'Debug' And !Exists('$(SpaRoot)node_modules') ">

src/Web/WebSPA/appsettings.json

@@ -1,19 +1,24 @@
 {
+  "IdentityUrl": "http://host.docker.internal:5105",
+  "CallBackUrl": "http://host.docker.internal:5104/",
+  "BasketUrl" : "http://host.docker.internal:5103",
+  "PurchaseUrl": "http://host.docker.internal:5202",
+  "PurchaseUrlHC": "http://host.docker.internal:5202/hc",
+  "IdentityUrlHC": "http://host.docker.internal:5105/hc",
+  "SignalrHubUrl": "http://host.docker.internal:5112",
+  "UseCustomizationData": true,
+  "IsClusterEnv": "False",
+  "ActivateCampaignDetailFunction": false,
   "Logging": {
+    "Console": {
+      "IncludeScopes": false
+    },
     "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
+      "Default": "Debug",
+      "System": "Information",
+      "Microsoft": "Information"
     }
   },
-  "IdentityUrl": "http://localhost:5223",
-  "CallBackUrl": "http://localhost:5331/",
-  "PurchaseUrl": "http://localhost:5229",
-  "PurchaseUrlHC": "http://localhost:5229/hc",
-  "IdentityUrlHC": "http://localhost:5223/hc",
-  "SignalrHubUrl": "http://localhost:5229",
-  "UseCustomizationData": true,
-  "IsClusterEnv": false,
-  "ActivateCampaignDetailFunction": false,
   "ApplicationInsights": {
     "InstrumentationKey": ""
   }

src/Web/WebSPA/web.config

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <!--
+    Configure your application settings in appsettings.json. Learn more at https://go.microsoft.com/fwlink/?LinkId=786380
+  -->
+  <system.webServer>
+    <handlers>
+      <add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModuleV2" resourceType="Unspecified" />
+    </handlers>
+    <aspNetCore processPath="%LAUNCHER_PATH%" arguments="%LAUNCHER_ARGS%" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" forwardWindowsAuthToken="false" hostingModel="InProcess">
+      <environmentVariables />
+    </aspNetCore>
+  </system.webServer>
+</configuration>

src/Web/WebStatus/Dockerfile

@@ -32,7 +32,6 @@ 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/WebStatus/GlobalUsings.cs

@@ -1,5 +1,13 @@
-global using Azure.Core;
+global using Microsoft.AspNetCore.Mvc;
+global using Microsoft.Extensions.Configuration;
+global using System.Linq;
+global using Microsoft.AspNetCore.Hosting;
+global using System;
+global using System.Collections.Generic;
 global using Azure.Identity;
+global using Azure.Core;
+global using Microsoft.AspNetCore.Builder;
 global using Microsoft.AspNetCore.Diagnostics.HealthChecks;
-global using Microsoft.AspNetCore.Mvc;
+global using Microsoft.Extensions.DependencyInjection;
 global using Microsoft.Extensions.Diagnostics.HealthChecks;
+global using Microsoft.Extensions.Hosting;

src/Web/WebStatus/WebStatus.csproj

@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
     <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
     <DockerComposeProjectPath>..\..\..\docker-compose.dcproj</DockerComposeProjectPath>
+    <IsTransformWebConfigDisabled>true</IsTransformWebConfigDisabled>    
   </PropertyGroup>
 
   <ItemGroup>