Browse Source
Merge branch 'dev' of https://github.com/dotnet-architecture/eShopOnContainers into dev
# Conflicts: # eShopOnContainers-ServicesAndWebApps.sln # k8s/deployments.yaml # k8s/gen-k8s-env-aks.ps1 # k8s/internalurls.yaml # k8s/ocelot/configuration-web-shopping.json # src/ApiGateways/ApiGw-Base/Program.cs # src/ApiGateways/Mobile.Bff.Shopping/apigw/configuration.json # src/ApiGateways/Web.Bff.Shopping/apigw/configuration.json # src/Services/Identity/Identity.API/Configuration/Config.cs # src/Services/Identity/Identity.API/Data/ConfigurationDbContextSeed.cs # src/Services/Ordering/Ordering.Domain/AggregatesModel/OrderAggregate/Order.cs # src/Web/WebMVC/AppSettings.cs # src/Web/WebMVC/Startup.cs # src/Web/WebSPA/AppSettings.cs # src/Web/WebSPA/Client/modules/shared/models/configuration.model.ts # src/Web/WebSPA/Client/modules/shared/services/configuration.service.ts # src/Web/WebSPA/Client/modules/shared/services/security.service.tspull/616/head
ddrsql
6 years ago
129 changed files with 10159 additions and 622 deletions
Split View
Diff Options
-
+2 -0.dockerignore
-
+2 -0.gitignore
-
+4 -6README.md
-
+37 -0build/acr-build/queue-all.ps1
-
+10 -0docker-compose-windows.yml
-
+0 -19docker-compose.ci.build.yml
-
+0 -1docker-compose.dcproj
-
+5 -0docker-compose.override.windows.yml
-
+39 -2docker-compose.override.yml
-
+20 -0docker-compose.prod.yml
-
+15 -0docker-compose.yml
-
+285 -51eShopOnContainers-ServicesAndWebApps.sln
-
+3 -3global.json
-
+11 -4k8s/README.k8s.md
-
+72 -0k8s/build-push-images.ps1
-
+0 -0k8s/conf_cloud.yaml
-
+0 -0k8s/conf_local.yaml
-
+12 -2k8s/deploy.ps1
-
+309 -287k8s/deployments.yaml
-
+12 -11k8s/gen-k8s-env-aks.ps1
-
+33 -0k8s/internalurls.yaml
-
+154 -0k8s/ocelot/configuration-web-shopping.json
-
+17 -3k8s/services.yaml
-
+11 -0package-lock.json
-
+31 -0src/ApiGateways/ApiGw-Base/Program.cs
-
+118 -0src/ApiGateways/Mobile.Bff.Shopping/apigw/configuration.json
-
+130 -0src/ApiGateways/Web.Bff.Shopping/apigw/configuration.json
-
+1 -1src/Services/Basket/Basket.API/Basket.API.csproj
-
+3 -1src/Services/Basket/Basket.API/Controllers/BasketController.cs
-
+4 -1src/Services/Basket/Basket.API/IntegrationEvents/Events/UserCheckoutAcceptedIntegrationEvent.cs
-
+1 -1src/Services/Catalog/Catalog.API/Catalog.API.csproj
-
+49 -9src/Services/Identity/Identity.API/Configuration/Config.cs
-
+56 -20src/Services/Identity/Identity.API/Data/ConfigurationDbContextSeed.cs
-
+1 -1src/Services/Identity/Identity.API/Identity.API.csproj
-
+3 -1src/Services/Identity/Identity.API/Services/ProfileService.cs
-
+1 -1src/Services/Location/Locations.API/Locations.API.csproj
-
+1 -1src/Services/Marketing/Marketing.API/Marketing.API.csproj
-
+5 -1src/Services/Ordering/Ordering.API/Application/Commands/CreateOrderCommand.cs
-
+1 -1src/Services/Ordering/Ordering.API/Application/Commands/CreateOrderCommandHandler.cs
-
+46 -0src/Services/Ordering/Ordering.API/Application/DomainEventHandlers/OrderCancelled/OrderCancelledDomainEventHandler.cs
-
+14 -6src/Services/Ordering/Ordering.API/Application/DomainEventHandlers/OrderGracePeriodConfirmed/OrderStatusChangedToAwaitingValidationDomainEventHandler.cs
-
+21 -8src/Services/Ordering/Ordering.API/Application/DomainEventHandlers/OrderPaid/OrderStatusChangedToPaidDomainEventHandler.cs
-
+47 -0src/Services/Ordering/Ordering.API/Application/DomainEventHandlers/OrderShipped/OrderShippedDomainEventHandler.cs
-
+18 -4src/Services/Ordering/Ordering.API/Application/DomainEventHandlers/OrderStartedEvent/ValidateOrAddBuyerAggregateWhenOrderStartedDomainEventHandler.cs
-
+14 -6src/Services/Ordering/Ordering.API/Application/DomainEventHandlers/OrderStockConfirmed/OrderStatusChangedToStockConfirmedDomainEventHandler.cs
-
+3 -0src/Services/Ordering/Ordering.API/Application/IntegrationEvents/EventHandling/OrderPaymentSuccededIntegrationEventHandler.cs
-
+3 -0src/Services/Ordering/Ordering.API/Application/IntegrationEvents/EventHandling/OrderStockConfirmedIntegrationEventHandler.cs
-
+1 -1src/Services/Ordering/Ordering.API/Application/IntegrationEvents/EventHandling/UserCheckoutAcceptedIntegrationEventHandler.cs
-
+5 -1src/Services/Ordering/Ordering.API/Application/IntegrationEvents/Events/OrderStatusChangedToAwaitingValidationIntegrationEvent.cs
-
+22 -0src/Services/Ordering/Ordering.API/Application/IntegrationEvents/Events/OrderStatusChangedToCancelledIntegrationEvent.cs
-
+7 -1src/Services/Ordering/Ordering.API/Application/IntegrationEvents/Events/OrderStatusChangedToPaidIntegrationEvent.cs
-
+22 -0src/Services/Ordering/Ordering.API/Application/IntegrationEvents/Events/OrderStatusChangedToShippedIntegrationEvent.cs
-
+8 -2src/Services/Ordering/Ordering.API/Application/IntegrationEvents/Events/OrderStatusChangedToStockConfirmedIntegrationEvent.cs
-
+22 -0src/Services/Ordering/Ordering.API/Application/IntegrationEvents/Events/OrderStatusChangedTosubmittedIntegrationEvent.cs
-
+4 -1src/Services/Ordering/Ordering.API/Application/IntegrationEvents/Events/UserCheckoutAcceptedIntegrationEvent.cs
-
+238 -0src/Services/Ordering/Ordering.API/Infrastructure/Migrations/20180412143935_NamePropertyInBuyer.Designer.cs
-
+86 -0src/Services/Ordering/Ordering.API/Infrastructure/Migrations/20180412143935_NamePropertyInBuyer.cs
-
+15 -28src/Services/Ordering/Ordering.API/Infrastructure/Migrations/OrderingContextModelSnapshot.cs
-
+2 -0src/Services/Ordering/Ordering.API/Infrastructure/Services/IIdentityService.cs
-
+5 -0src/Services/Ordering/Ordering.API/Infrastructure/Services/IdentityService.cs
-
+1 -1src/Services/Ordering/Ordering.API/Ordering.API.csproj
-
+4 -4src/Services/Ordering/Ordering.API/Startup.cs
-
+2 -1src/Services/Ordering/Ordering.API/settings.json
-
+4 -1src/Services/Ordering/Ordering.Domain/AggregatesModel/BuyerAggregate/Buyer.cs
-
+1 -0src/Services/Ordering/Ordering.Domain/AggregatesModel/BuyerAggregate/IBuyerRepository.cs
-
+33 -18src/Services/Ordering/Ordering.Domain/AggregatesModel/OrderAggregate/Order.cs
-
+18 -0src/Services/Ordering/Ordering.Domain/Events/OrderCancelledDomainEvent.cs
-
+15 -0src/Services/Ordering/Ordering.Domain/Events/OrderShippedDomainEvent.cs
-
+3 -1src/Services/Ordering/Ordering.Domain/Events/OrderStartedDomainEvent.cs
-
+2 -0src/Services/Ordering/Ordering.Infrastructure/EntityConfigurations/BuyerEntityTYpeConfiguration.cs
-
+10 -0src/Services/Ordering/Ordering.Infrastructure/Repositories/BuyerRepository.cs
-
+30 -0src/Services/Ordering/Ordering.SignalrHub/AutofacModules/ApplicationModule.cs
-
+20 -0src/Services/Ordering/Ordering.SignalrHub/Dockerfile
-
+28 -0src/Services/Ordering/Ordering.SignalrHub/IntegrationEvents/EventHandling/OrderStatusChangedToCancelledIntegrationEventHandler.cs
-
+26 -0src/Services/Ordering/Ordering.SignalrHub/IntegrationEvents/EventHandling/OrderStatusChangedToPaidIntegrationEventHandler.cs
-
+28 -0src/Services/Ordering/Ordering.SignalrHub/IntegrationEvents/EventHandling/OrderStatusChangedToShippedIntegrationEventHandler.cs
-
+29 -0src/Services/Ordering/Ordering.SignalrHub/IntegrationEvents/EventHandling/OrderStatusChangedToStockConfirmedIntegrationEventHandler.cs
-
+29 -0src/Services/Ordering/Ordering.SignalrHub/IntegrationEvents/EventHandling/OrderStatusChangedToSubmittedIntegrationEventHandler.cs
-
+27 -0src/Services/Ordering/Ordering.SignalrHub/IntegrationEvents/EventHandling/orderStatusChangedToAwaitingValidationIntegrationEventHandler.cs
-
+19 -0src/Services/Ordering/Ordering.SignalrHub/IntegrationEvents/Events/OrderStatusChangedToAwaitingValidationIntegrationEvent.cs
-
+22 -0src/Services/Ordering/Ordering.SignalrHub/IntegrationEvents/Events/OrderStatusChangedToCancelledIntegrationEvent.cs
-
+23 -0src/Services/Ordering/Ordering.SignalrHub/IntegrationEvents/Events/OrderStatusChangedToPaidIntegrationEvent.cs
-
+22 -0src/Services/Ordering/Ordering.SignalrHub/IntegrationEvents/Events/OrderStatusChangedToShippedIntegrationEvent.cs
-
+18 -0src/Services/Ordering/Ordering.SignalrHub/IntegrationEvents/Events/OrderStatusChangedToStockConfirmedIntegrationEvent.cs
-
+22 -0src/Services/Ordering/Ordering.SignalrHub/IntegrationEvents/Events/OrderStatusChangedToSubmittedIntegrationEvent.cs
-
+26 -0src/Services/Ordering/Ordering.SignalrHub/NotificationHub.cs
-
+26 -0src/Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj
-
+25 -0src/Services/Ordering/Ordering.SignalrHub/Program.cs
-
+27 -0src/Services/Ordering/Ordering.SignalrHub/Properties/launchSettings.json
-
+214 -0src/Services/Ordering/Ordering.SignalrHub/Startup.cs
-
+15 -0src/Services/Ordering/Ordering.SignalrHub/appsettings.json
-
+1 -1src/Services/Payment/Payment.API/Payment.API.csproj
-
+3 -4src/Web/WebMVC/AppSettings.cs
-
+2 -0src/Web/WebMVC/Startup.cs
-
+26 -27src/Web/WebMVC/Views/Order/Index.cshtml
-
+51 -0src/Web/WebMVC/Views/Shared/_Layout.cshtml
-
+2 -1src/Web/WebMVC/WebMVC.csproj
-
+14 -0src/Web/WebMVC/bundleconfig.json
-
+26 -0src/Web/WebMVC/package-lock.json
-
+10 -0src/Web/WebMVC/package.json
+ 2
- 0
.dockerignore
View File
+ 2
- 0
.gitignore
View File
+ 4
- 6
README.md
View File
+ 37
- 0
build/acr-build/queue-all.ps1
View File
| @ -0,0 +1,37 @@ | |||
| Param( | |||
| [parameter(Mandatory=$false)][string]$acrName, | |||
| [parameter(Mandatory=$false)][string]$gitUser, | |||
| [parameter(Mandatory=$false)][string]$repoName="eShopOnContainers", | |||
| [parameter(Mandatory=$false)][string]$gitBranch="dev", | |||
| [parameter(Mandatory=$true)][string]$patToken | |||
| ) | |||
| $gitContext = "https://github.com/$gitUser/$repoName" | |||
| $services = @( | |||
| @{ Name="eshopbasket"; Image="eshop/basket.api"; File="src/Services/Basket/Basket.API/Dockerfile" }, | |||
| @{ Name="eshopcatalog"; Image="eshop/catalog.api"; File="src/Services/Catalog/Catalog.API/Dockerfile" }, | |||
| @{ Name="eshopidentity"; Image="eshop/identity.api"; File="src/Services/Identity/Identity.API/Dockerfile" }, | |||
| @{ Name="eshopordering"; Image="eshop/ordering.api"; File="src/Services/Ordering/Ordering.API/Dockerfile" }, | |||
| @{ Name="eshoporderingbg"; Image="eshop/ordering.backgroundtasks"; File="src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile" }, | |||
| @{ Name="eshopmarketing"; Image="eshop/marketing.api"; File="src/Services/Marketing/Marketing.API/Dockerfile" }, | |||
| @{ Name="eshopwebspa"; Image="eshop/webspa"; File="src/Web/WebSPA/Dockerfile" }, | |||
| @{ Name="eshopwebmvc"; Image="eshop/webmvc"; File="src/Web/WebMVC/Dockerfile" }, | |||
| @{ Name="eshopwebstatus"; Image="eshop/webstatus"; File="src/Web/WebStatus/Dockerfile" }, | |||
| @{ Name="eshoppayment"; Image="eshop/payment.api"; File="src/Services/Payment/Payment.API/Dockerfile" }, | |||
| @{ Name="eshoplocations"; Image="eshop/locations.api"; File="src/Services/Location/Locations.API/Dockerfile" }, | |||
| @{ Name="eshopocelotapigw"; Image="eshop/ocelotapigw"; File="src/ApiGateways/ApiGw-Base/Dockerfile" }, | |||
| @{ Name="eshopmobileshoppingagg"; Image="eshop/mobileshoppingagg"; File="src/ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile" }, | |||
| @{ Name="eshopwebshoppingagg"; Image="eshop/webshoppingagg"; File="src/ApiGateways/Web.Bff.Shopping/aggregator/Dockerfile" }, | |||
| @{ Name="eshoporderingsignalrhub"; Image="eshop/ordering.signalrhub"; File="src/Services/Ordering/Ordering.SignalrHub/Dockerfile" } | |||
| ) | |||
| $services |% { | |||
| $bname = $_.Name | |||
| $bimg = $_.Image | |||
| $bfile = $_.File | |||
| Write-Host "Setting ACR build $bname ($bimg)" | |||
| az acr build-task create --registry $acrName --name $bname --image ${bimg}:$gitBranch --context $gitContext --branch $gitBranch --git-access-token $patToken --file $bfile | |||
| } | |||
| # Basket.API | |||
+ 10
- 0
docker-compose-windows.yml
View File
+ 0
- 19
docker-compose.ci.build.yml
View File
| @ -1,19 +0,0 @@ | |||
| version: '3.4' | |||
| services: | |||
| ci-build: | |||
| image: microsoft/aspnetcore-build:2.0.2 #Depending on the bug below, you can also try this other SDK image: microsoft/aspnetcore-build:1.0-2.0-2017-10 or microsoft/aspnetcore-build:1.0-2.0 | |||
| volumes: | |||
| - .:/src | |||
| - ./cli-linux:/cli-linux | |||
| working_dir: /src | |||
| # Next line is using the .sln file to compile all the projects. | |||
| # Sometime there is an issue in msbuild exits the process before finishing building the bits: (https://github.com/Microsoft/msbuild/issues/2153) | |||
| # Random error: error MSB4017: The build stopped unexpectedly be cause of an unexpected logger failure. | |||
| command: /bin/bash -c "pushd ./src/Web/WebSPA && npm rebuild node-sass && popd && dotnet publish ./eShopOnContainers-ServicesAndWebApps.sln -c Release -o ./obj/Docker/publish" | |||
| # NOTE: Using build-bits-linux.sh from Linux build container exits before ending. | |||
| #command: /bin/bash -c "pushd ./src/Web/WebSPA && npm rebuild node-sass && popd && pushd /cli-linux && ./build-bits-linux.sh /src" | |||
+ 0
- 1
docker-compose.dcproj
View File
+ 5
- 0
docker-compose.override.windows.yml
View File
+ 39
- 2
docker-compose.override.yml
View File
+ 20
- 0
docker-compose.prod.yml
View File
+ 15
- 0
docker-compose.yml
View File
+ 285
- 51
eShopOnContainers-ServicesAndWebApps.sln
View File
+ 3
- 3
global.json
View File
| @ -1,5 +1,5 @@ | |||
| { | |||
| "sdk": { | |||
| "version":"2.1.2" | |||
| } | |||
| "sdk": { | |||
| "version": "2.1.4" | |||
| } | |||
| } | |||
+ 11
- 4
k8s/README.k8s.md
View File
+ 72
- 0
k8s/build-push-images.ps1
View File
| @ -0,0 +1,72 @@ | |||
| Param( | |||
| [parameter(Mandatory=$false)][string]$registry, | |||
| [parameter(Mandatory=$false)][string]$dockerUser, | |||
| [parameter(Mandatory=$false)][string]$dockerPassword, | |||
| [parameter(Mandatory=$false)][string]$imageTag, | |||
| [parameter(Mandatory=$false)][bool]$buildImages=$true, | |||
| [parameter(Mandatory=$false)][bool]$pushImages=$true, | |||
| [parameter(Mandatory=$false)][string]$dockerOrg="eshop" | |||
| ) | |||
| # Initialization | |||
| $useDockerHub = [string]::IsNullOrEmpty($registry) | |||
| # Check required commands (only if not in CI environment) | |||
| $requiredCommands = ("docker", "docker-compose") | |||
| foreach ($command in $requiredCommands) { | |||
| if ((Get-Command $command -ErrorAction SilentlyContinue) -eq $null) { | |||
| Write-Host "$command must be on path" -ForegroundColor Red | |||
| exit | |||
| } | |||
| } | |||
| # Get tag to use from current branch if no tag is passed | |||
| if ([string]::IsNullOrEmpty($imageTag)) { | |||
| $imageTag = $(git rev-parse --abbrev-ref HEAD) | |||
| } | |||
| Write-Host "Docker image Tag: $imageTag" -ForegroundColor Yellow | |||
| # Build docker images if needed | |||
| if ($buildImages) { | |||
| Write-Host "Building Docker images tagged with '$imageTag'" -ForegroundColor Yellow | |||
| $env:TAG=$imageTag | |||
| docker-compose -p .. -f ../docker-compose.yml build | |||
| } | |||
| # Login to Docker registry | |||
| if (-not [string]::IsNullOrEmpty($dockerUser)) { | |||
| $registryFDQN = if (-not $useDockerHub) {$registry} else {"index.docker.io/v1/"} | |||
| Write-Host "Logging in to $registryFDQN as user $dockerUser" -ForegroundColor Yellow | |||
| if ($useDockerHub) { | |||
| docker login -u $dockerUser -p $dockerPassword | |||
| } | |||
| else { | |||
| docker login -u $dockerUser -p $dockerPassword $registryFDQN | |||
| } | |||
| if (-not $LastExitCode -eq 0) { | |||
| Write-Host "Login failed" -ForegroundColor Red | |||
| exit | |||
| } | |||
| } | |||
| # Push images to Docker registry | |||
| if ($pushImages) { | |||
| Write-Host "Pushing images to $registry/$dockerOrg..." -ForegroundColor Yellow | |||
| $services = ("basket.api", "catalog.api", "identity.api", "ordering.api", "ordering.backgroundtasks", "marketing.api","payment.api","locations.api", "webmvc", "webspa", "webstatus", "ocelotapigw", "mobileshoppingagg", "webshoppingagg", "ordering.signalrhub") | |||
| foreach ($service in $services) { | |||
| $imageFqdn = if ($useDockerHub) {"$dockerOrg/${service}"} else {"$registry/$dockerOrg/${service}"} | |||
| docker tag eshop/${service}:$imageTag ${imageFqdn}:$imageTag | |||
| docker push ${imageFqdn}:$imageTag | |||
| } | |||
| } | |||
k8s/conf_cloud.yml → k8s/conf_cloud.yaml
View File
k8s/conf_local.yml → k8s/conf_local.yaml
View File
+ 12
- 2
k8s/deploy.ps1
View File
+ 309
- 287
k8s/deployments.yaml
View File
+ 12
- 11
k8s/gen-k8s-env-aks.ps1
View File
+ 33
- 0
k8s/internalurls.yaml
View File
| @ -0,0 +1,33 @@ | |||
| apiVersion: v1 | |||
| kind: ConfigMap | |||
| metadata: | |||
| name: internalurls | |||
| labels: | |||
| app: eshop | |||
| data: | |||
| # Internal Services & healthchecks | |||
| basket: http://basket | |||
| basket__hc: http://basket/hc | |||
| catalog: http://catalog | |||
| catalog__hc: http://catalog/hc | |||
| identity: http://identity | |||
| identity__hc: http://identity/hc | |||
| ordering: http://ordering | |||
| ordering__hc: http://ordering/hc | |||
| ordering-background: http://ordering-background | |||
| ordering-background__hc: http://ordering-background/hc | |||
| marketing: http://marketing | |||
| marketing__hc: http://marketing/hc | |||
| locations: http://locations | |||
| locations__hc: http://locations/hc | |||
| payment__hc: http://payment/hc | |||
| mvc__hc: http://webmvc/hc | |||
| spa__hc: http://webspa/hc | |||
| # Aggreggators | |||
| mobileshoppingagg: http://mobileshoppingagg | |||
| webshoppingagg: http://webshoppingagg | |||
| # API GWs | |||
| apigwmm: http://ocelotapigw-mm | |||
| apigwms: http://ocelotapigw-ms | |||
| apigwwm: http://ocelotapigw-wm | |||
| apigwws: http://ocelotapigw-ws | |||
+ 154
- 0
k8s/ocelot/configuration-web-shopping.json
View File
| @ -0,0 +1,154 @@ | |||
| { | |||
| "ReRoutes": [ | |||
| { | |||
| "DownstreamPathTemplate": "/api/{version}/{everything}", | |||
| "DownstreamScheme": "http", | |||
| "DownstreamHostAndPorts": [ | |||
| { | |||
| "Host": "catalog", | |||
| "Port": 80 | |||
| } | |||
| ], | |||
| "UpstreamPathTemplate": "/api/{version}/c/{everything}", | |||
| "UpstreamHttpMethod": [ "GET" ] | |||
| }, | |||
| { | |||
| "DownstreamPathTemplate": "/api/{version}/{everything}", | |||
| "DownstreamScheme": "http", | |||
| "DownstreamHostAndPorts": [ | |||
| { | |||
| "Host": "basket", | |||
| "Port": 80 | |||
| } | |||
| ], | |||
| "UpstreamPathTemplate": "/api/{version}/b/{everything}", | |||
| "UpstreamHttpMethod": [], | |||
| "AuthenticationOptions": { | |||
| "AuthenticationProviderKey": "IdentityApiKey", | |||
| "AllowedScopes": [] | |||
| } | |||
| }, | |||
| { | |||
| "DownstreamPathTemplate": "/api/{version}/{everything}", | |||
| "DownstreamScheme": "http", | |||
| "DownstreamHostAndPorts": [ | |||
| { | |||
| "Host": "ordering", | |||
| "Port": 80 | |||
| } | |||
| ], | |||
| "UpstreamPathTemplate": "/api/{version}/o/{everything}", | |||
| "UpstreamHttpMethod": [], | |||
| "AuthenticationOptions": { | |||
| "AuthenticationProviderKey": "IdentityApiKey", | |||
| "AllowedScopes": [] | |||
| } | |||
| }, | |||
| { | |||
| "DownstreamPathTemplate": "/{everything}", | |||
| "DownstreamScheme": "http", | |||
| "DownstreamHostAndPorts": [ | |||
| { | |||
| "Host": "webshoppingagg", | |||
| "Port": 80 | |||
| } | |||
| ], | |||
| "UpstreamPathTemplate": "/{everything}", | |||
| "UpstreamHttpMethod": [ "POST", "PUT", "GET" ], | |||
| "AuthenticationOptions": { | |||
| "AuthenticationProviderKey": "IdentityApiKey", | |||
| "AllowedScopes": [] | |||
| } | |||
| }, | |||
| { | |||
| "DownstreamPathTemplate": "/{everything}", | |||
| "DownstreamScheme": "http", | |||
| "DownstreamHostAndPorts": [ | |||
| { | |||
| "Host": "ordering", | |||
| "Port": 80 | |||
| } | |||
| ], | |||
| "UpstreamPathTemplate": "/orders-api/{everything}", | |||
| "UpstreamHttpMethod": [] | |||
| }, | |||
| { | |||
| "DownstreamPathTemplate": "/{everything}", | |||
| "DownstreamScheme": "http", | |||
| "DownstreamHostAndPorts": [ | |||
| { | |||
| "Host": "ordering-signalrhub", | |||
| "Port": 80 | |||
| } | |||
| ], | |||
| "UpstreamPathTemplate": "/hub/{everything}", | |||
| "UpstreamHttpMethod": [] | |||
| }, | |||
| { | |||
| "DownstreamPathTemplate": "/{everything}", | |||
| "DownstreamScheme": "http", | |||
| "DownstreamHostAndPorts": [ | |||
| { | |||
| "Host": "basket", | |||
| "Port": 80 | |||
| } | |||
| ], | |||
| "UpstreamPathTemplate": "/basket-api/{everything}", | |||
| "UpstreamHttpMethod": [] | |||
| }, | |||
| { | |||
| "DownstreamPathTemplate": "/{everything}", | |||
| "DownstreamScheme": "http", | |||
| "DownstreamHostAndPorts": [ | |||
| { | |||
| "Host": "catalog", | |||
| "Port": 80 | |||
| } | |||
| ], | |||
| "UpstreamPathTemplate": "/catalog-api/{everything}", | |||
| "UpstreamHttpMethod": [] | |||
| }, | |||
| { | |||
| "DownstreamPathTemplate": "/{everything}", | |||
| "DownstreamScheme": "http", | |||
| "DownstreamHostAndPorts": [ | |||
| { | |||
| "Host": "marketing", | |||
| "Port": 80 | |||
| } | |||
| ], | |||
| "UpstreamPathTemplate": "/marketing-api/{everything}", | |||
| "UpstreamHttpMethod": [] | |||
| }, | |||
| { | |||
| "DownstreamPathTemplate": "/{everything}", | |||
| "DownstreamScheme": "http", | |||
| "DownstreamHostAndPorts": [ | |||
| { | |||
| "Host": "payment", | |||
| "Port": 80 | |||
| } | |||
| ], | |||
| "UpstreamPathTemplate": "/payment-api/{everything}", | |||
| "UpstreamHttpMethod": [] | |||
| }, | |||
| { | |||
| "DownstreamPathTemplate": "/{everything}", | |||
| "DownstreamScheme": "http", | |||
| "DownstreamHostAndPorts": [ | |||
| { | |||
| "Host": "locations.api", | |||
| "Port": 80 | |||
| } | |||
| ], | |||
| "UpstreamPathTemplate": "/location-api/{everything}", | |||
| "UpstreamHttpMethod": [] | |||
| } | |||
| ], | |||
| "GlobalConfiguration": { | |||
| "RequestIdKey": "OcRequestId", | |||
| "AdministrationPath": "/administration" | |||
| } | |||
| } | |||
+ 17
- 3
k8s/services.yaml
View File
+ 11
- 0
package-lock.json
View File
| @ -0,0 +1,11 @@ | |||
| { | |||
| "requires": true, | |||
| "lockfileVersion": 1, | |||
| "dependencies": { | |||
| "@aspnet/signalr": { | |||
| "version": "1.0.0-preview1-update1", | |||
| "resolved": "https://registry.npmjs.org/@aspnet/signalr/-/signalr-1.0.0-preview1-update1.tgz", | |||
| "integrity": "sha512-TGFCoLa2svN37Ew5ue0kGFxbkmQzq2I9N5TMLFBWRrpTYF4txlE3yPX0EaPt/NToKBaK1A+VK8Q+1MGSYtnqUw==" | |||
| } | |||
| } | |||
| } | |||
+ 31
- 0
src/ApiGateways/ApiGw-Base/Program.cs
View File
| @ -0,0 +1,31 @@ | |||
| using System; | |||
| using System.Collections.Generic; | |||
| using System.IO; | |||
| using System.Linq; | |||
| using System.Threading.Tasks; | |||
| using Microsoft.AspNetCore; | |||
| using Microsoft.AspNetCore.Hosting; | |||
| using Microsoft.Extensions.Configuration; | |||
| using Microsoft.Extensions.Logging; | |||
| using Microsoft.Extensions.DependencyInjection; | |||
| namespace OcelotApiGw | |||
| { | |||
| public class Program | |||
| { | |||
| public static void Main(string[] args) | |||
| { | |||
| BuildWebHost(args).Run(); | |||
| } | |||
| public static IWebHost BuildWebHost(string[] args) | |||
| { | |||
| IWebHostBuilder builder = WebHost.CreateDefaultBuilder(args); | |||
| builder.ConfigureServices(s => s.AddSingleton(builder)) | |||
| .ConfigureAppConfiguration(ic => ic.AddJsonFile(Path.Combine("configuration", "configuration.json"))) | |||
| .UseStartup<Startup>(); | |||
| IWebHost host = builder.Build(); | |||
| return host; | |||
| } | |||
| } | |||
| } | |||
+ 118
- 0
src/ApiGateways/Mobile.Bff.Shopping/apigw/configuration.json
View File
| @ -0,0 +1,118 @@ | |||
| { | |||
| "ReRoutes": [ | |||
| { | |||
| "DownstreamPathTemplate": "/api/{version}/{everything}", | |||
| "DownstreamScheme": "http", | |||
| "DownstreamHostAndPorts": [ | |||
| { | |||
| "Host": "catalog.api", | |||
| "Port": 80 | |||
| } | |||
| ], | |||
| "UpstreamPathTemplate": "/api/{version}/c/{everything}", | |||
| "UpstreamHttpMethod": [ "GET" ] | |||
| }, | |||
| { | |||
| "DownstreamPathTemplate": "/api/{version}/{everything}", | |||
| "DownstreamScheme": "http", | |||
| "DownstreamHostAndPorts": [ | |||
| { | |||
| "Host": "basket.api", | |||
| "Port": 80 | |||
| } | |||
| ], | |||
| "UpstreamPathTemplate": "/api/{version}/b/{everything}", | |||
| "UpstreamHttpMethod": [], | |||
| "AuthenticationOptions": { | |||
| "AuthenticationProviderKey": "IdentityApiKey", | |||
| "AllowedScopes": [] | |||
| } | |||
| }, | |||
| { | |||
| "DownstreamPathTemplate": "/api/{version}/{everything}", | |||
| "DownstreamScheme": "http", | |||
| "DownstreamHostAndPorts": [ | |||
| { | |||
| "Host": "ordering.api", | |||
| "Port": 80 | |||
| } | |||
| ], | |||
| "UpstreamPathTemplate": "/api/{version}/o/{everything}", | |||
| "UpstreamHttpMethod": [], | |||
| "AuthenticationOptions": { | |||
| "AuthenticationProviderKey": "IdentityApiKey", | |||
| "AllowedScopes": [] | |||
| } | |||
| }, | |||
| { | |||
| "DownstreamPathTemplate": "/{everything}", | |||
| "DownstreamScheme": "http", | |||
| "DownstreamHostAndPorts": [ | |||
| { | |||
| "Host": "mobileshoppingagg", | |||
| "Port": 80 | |||
| } | |||
| ], | |||
| "UpstreamPathTemplate": "/{everything}", | |||
| "UpstreamHttpMethod": [ "POST", "PUT", "GET" ], | |||
| "AuthenticationOptions": { | |||
| "AuthenticationProviderKey": "IdentityApiKey", | |||
| "AllowedScopes": [] | |||
| } | |||
| }, | |||
| { | |||
| "DownstreamPathTemplate": "/{everything}", | |||
| "DownstreamScheme": "http", | |||
| "DownstreamHostAndPorts": [ | |||
| { | |||
| "Host": "ordering.api", | |||
| "Port": 80 | |||
| } | |||
| ], | |||
| "UpstreamPathTemplate": "/orders-api/{everything}", | |||
| "UpstreamHttpMethod": [] | |||
| }, | |||
| { | |||
| "DownstreamPathTemplate": "/{everything}", | |||
| "DownstreamScheme": "http", | |||
| "DownstreamHostAndPorts": [ | |||
| { | |||
| "Host": "basket.api", | |||
| "Port": 80 | |||
| } | |||
| ], | |||
| "UpstreamPathTemplate": "/basket-api/{everything}", | |||
| "UpstreamHttpMethod": [] | |||
| }, | |||
| { | |||
| "DownstreamPathTemplate": "/{everything}", | |||
| "DownstreamScheme": "http", | |||
| "DownstreamHostAndPorts": [ | |||
| { | |||
| "Host": "catalog.api", | |||
| "Port": 80 | |||
| } | |||
| ], | |||
| "UpstreamPathTemplate": "/catalog-api/{everything}", | |||
| "UpstreamHttpMethod": [] | |||
| }, | |||
| { | |||
| "DownstreamPathTemplate": "/{everything}", | |||
| "DownstreamScheme": "http", | |||
| "DownstreamHostAndPorts": [ | |||
| { | |||
| "Host": "payment.api", | |||
| "Port": 80 | |||
| } | |||
| ], | |||
| "UpstreamPathTemplate": "/payment-api/{everything}", | |||
| "UpstreamHttpMethod": [] | |||
| } | |||
| ], | |||
| "GlobalConfiguration": { | |||
| "RequestIdKey": "OcRequestId", | |||
| "AdministrationPath": "/administration" | |||
| } | |||
| } | |||
+ 130
- 0
src/ApiGateways/Web.Bff.Shopping/apigw/configuration.json
View File
| @ -0,0 +1,130 @@ | |||
| { | |||
| "ReRoutes": [ | |||
| { | |||
| "DownstreamPathTemplate": "/api/{version}/{everything}", | |||
| "DownstreamScheme": "http", | |||
| "DownstreamHostAndPorts": [ | |||
| { | |||
| "Host": "catalog.api", | |||
| "Port": 80 | |||
| } | |||
| ], | |||
| "UpstreamPathTemplate": "/api/{version}/c/{everything}", | |||
| "UpstreamHttpMethod": [ "GET" ] | |||
| }, | |||
| { | |||
| "DownstreamPathTemplate": "/api/{version}/{everything}", | |||
| "DownstreamScheme": "http", | |||
| "DownstreamHostAndPorts": [ | |||
| { | |||
| "Host": "basket.api", | |||
| "Port": 80 | |||
| } | |||
| ], | |||
| "UpstreamPathTemplate": "/api/{version}/b/{everything}", | |||
| "UpstreamHttpMethod": [], | |||
| "AuthenticationOptions": { | |||
| "AuthenticationProviderKey": "IdentityApiKey", | |||
| "AllowedScopes": [] | |||
| } | |||
| }, | |||
| { | |||
| "DownstreamPathTemplate": "/api/{version}/{everything}", | |||
| "DownstreamScheme": "http", | |||
| "DownstreamHostAndPorts": [ | |||
| { | |||
| "Host": "ordering.api", | |||
| "Port": 80 | |||
| } | |||
| ], | |||
| "UpstreamPathTemplate": "/api/{version}/o/{everything}", | |||
| "UpstreamHttpMethod": [], | |||
| "AuthenticationOptions": { | |||
| "AuthenticationProviderKey": "IdentityApiKey", | |||
| "AllowedScopes": [] | |||
| } | |||
| }, | |||
| { | |||
| "DownstreamPathTemplate": "/{everything}", | |||
| "DownstreamScheme": "http", | |||
| "DownstreamHostAndPorts": [ | |||
| { | |||
| "Host": "webshoppingagg", | |||
| "Port": 80 | |||
| } | |||
| ], | |||
| "UpstreamPathTemplate": "/{everything}", | |||
| "UpstreamHttpMethod": [ "POST", "PUT", "GET" ], | |||
| "AuthenticationOptions": { | |||
| "AuthenticationProviderKey": "IdentityApiKey", | |||
| "AllowedScopes": [] | |||
| } | |||
| }, | |||
| { | |||
| "DownstreamPathTemplate": "/{everything}", | |||
| "DownstreamScheme": "http", | |||
| "DownstreamHostAndPorts": [ | |||
| { | |||
| "Host": "ordering.api", | |||
| "Port": 80 | |||
| } | |||
| ], | |||
| "UpstreamPathTemplate": "/orders-api/{everything}", | |||
| "UpstreamHttpMethod": [] | |||
| }, | |||
| { | |||
| "DownstreamPathTemplate": "/{everything}", | |||
| "DownstreamScheme": "http", | |||
| "DownstreamHostAndPorts": [ | |||
| { | |||
| "Host": "ordering.signalrhub", | |||
| "Port": 80 | |||
| } | |||
| ], | |||
| "UpstreamPathTemplate": "/hub/{everything}", | |||
| "UpstreamHttpMethod": [] | |||
| }, | |||
| { | |||
| "DownstreamPathTemplate": "/{everything}", | |||
| "DownstreamScheme": "http", | |||
| "DownstreamHostAndPorts": [ | |||
| { | |||
| "Host": "basket.api", | |||
| "Port": 80 | |||
| } | |||
| ], | |||
| "UpstreamPathTemplate": "/basket-api/{everything}", | |||
| "UpstreamHttpMethod": [] | |||
| }, | |||
| { | |||
| "DownstreamPathTemplate": "/{everything}", | |||
| "DownstreamScheme": "http", | |||
| "DownstreamHostAndPorts": [ | |||
| { | |||
| "Host": "catalog.api", | |||
| "Port": 80 | |||
| } | |||
| ], | |||
| "UpstreamPathTemplate": "/catalog-api/{everything}", | |||
| "UpstreamHttpMethod": [] | |||
| }, | |||
| { | |||
| "DownstreamPathTemplate": "/{everything}", | |||
| "DownstreamScheme": "http", | |||
| "DownstreamHostAndPorts": [ | |||
| { | |||
| "Host": "payment.api", | |||
| "Port": 80 | |||
| } | |||
| ], | |||
| "UpstreamPathTemplate": "/payment-api/{everything}", | |||
| "UpstreamHttpMethod": [] | |||
| } | |||
| ], | |||
| "GlobalConfiguration": { | |||
| "RequestIdKey": "OcRequestId", | |||
| "AdministrationPath": "/administration" | |||
| } | |||
| } | |||
+ 1
- 1
src/Services/Basket/Basket.API/Basket.API.csproj
View File
+ 3
- 1
src/Services/Basket/Basket.API/Controllers/BasketController.cs
View File
+ 4
- 1
src/Services/Basket/Basket.API/IntegrationEvents/Events/UserCheckoutAcceptedIntegrationEvent.cs
View File
+ 1
- 1
src/Services/Catalog/Catalog.API/Catalog.API.csproj
View File
+ 49
- 9
src/Services/Identity/Identity.API/Configuration/Config.cs
View File
+ 56
- 20
src/Services/Identity/Identity.API/Data/ConfigurationDbContextSeed.cs
View File
+ 1
- 1
src/Services/Identity/Identity.API/Identity.API.csproj
View File
+ 3
- 1
src/Services/Identity/Identity.API/Services/ProfileService.cs
View File
+ 1
- 1
src/Services/Location/Locations.API/Locations.API.csproj
View File
+ 1
- 1
src/Services/Marketing/Marketing.API/Marketing.API.csproj
View File
+ 5
- 1
src/Services/Ordering/Ordering.API/Application/Commands/CreateOrderCommand.cs
View File
+ 1
- 1
src/Services/Ordering/Ordering.API/Application/Commands/CreateOrderCommandHandler.cs
View File
+ 46
- 0
src/Services/Ordering/Ordering.API/Application/DomainEventHandlers/OrderCancelled/OrderCancelledDomainEventHandler.cs
View File
| @ -0,0 +1,46 @@ | |||
| using MediatR; | |||
| using Microsoft.eShopOnContainers.Services.Ordering.Domain.AggregatesModel.BuyerAggregate; | |||
| using Microsoft.eShopOnContainers.Services.Ordering.Domain.AggregatesModel.OrderAggregate; | |||
| using Microsoft.Extensions.Logging; | |||
| using Ordering.API.Application.IntegrationEvents; | |||
| using Ordering.API.Application.IntegrationEvents.Events; | |||
| using Ordering.Domain.Events; | |||
| using System; | |||
| using System.Threading; | |||
| using System.Threading.Tasks; | |||
| namespace Ordering.API.Application.DomainEventHandlers.OrderCancelled | |||
| { | |||
| public class OrderCancelledDomainEventHandler | |||
| : INotificationHandler<OrderCancelledDomainEvent> | |||
| { | |||
| private readonly IOrderRepository _orderRepository; | |||
| private readonly IBuyerRepository _buyerRepository; | |||
| private readonly ILoggerFactory _logger; | |||
| private readonly IOrderingIntegrationEventService _orderingIntegrationEventService; | |||
| public OrderCancelledDomainEventHandler( | |||
| IOrderRepository orderRepository, | |||
| ILoggerFactory logger, | |||
| IBuyerRepository buyerRepository, | |||
| IOrderingIntegrationEventService orderingIntegrationEventService) | |||
| { | |||
| _orderRepository = orderRepository ?? throw new ArgumentNullException(nameof(orderRepository)); | |||
| _logger = logger ?? throw new ArgumentNullException(nameof(logger)); | |||
| _buyerRepository = buyerRepository ?? throw new ArgumentNullException(nameof(buyerRepository)); | |||
| } | |||
| public async Task Handle(OrderCancelledDomainEvent orderCancelledDomainEvent, CancellationToken cancellationToken) | |||
| { | |||
| _logger.CreateLogger(nameof(OrderCancelledDomainEvent)) | |||
| .LogTrace($"Order with Id: {orderCancelledDomainEvent.Order.Id} has been successfully updated with " + | |||
| $"a status order id: {OrderStatus.Shipped.Id}"); | |||
| var order = await _orderRepository.GetAsync(orderCancelledDomainEvent.Order.Id); | |||
| var buyer = await _buyerRepository.FindByIdAsync(order.GetBuyerId.Value.ToString()); | |||
| var orderStatusChangedToCancelledIntegrationEvent = new OrderStatusChangedToCancelledIntegrationEvent(order.Id, order.OrderStatus.Name, buyer.Name); | |||
| await _orderingIntegrationEventService.PublishThroughEventBusAsync(orderStatusChangedToCancelledIntegrationEvent); | |||
| } | |||
| } | |||
| } | |||
+ 14
- 6
src/Services/Ordering/Ordering.API/Application/DomainEventHandlers/OrderGracePeriodConfirmed/OrderStatusChangedToAwaitingValidationDomainEventHandler.cs
View File
+ 21
- 8
src/Services/Ordering/Ordering.API/Application/DomainEventHandlers/OrderPaid/OrderStatusChangedToPaidDomainEventHandler.cs
View File
+ 47
- 0
src/Services/Ordering/Ordering.API/Application/DomainEventHandlers/OrderShipped/OrderShippedDomainEventHandler.cs
View File
| @ -0,0 +1,47 @@ | |||
| using MediatR; | |||
| using Microsoft.eShopOnContainers.Services.Ordering.Domain.AggregatesModel.BuyerAggregate; | |||
| using Microsoft.eShopOnContainers.Services.Ordering.Domain.AggregatesModel.OrderAggregate; | |||
| using Microsoft.Extensions.Logging; | |||
| using Ordering.API.Application.IntegrationEvents; | |||
| using Ordering.API.Application.IntegrationEvents.Events; | |||
| using Ordering.Domain.Events; | |||
| using System; | |||
| using System.Threading; | |||
| using System.Threading.Tasks; | |||
| namespace Ordering.API.Application.DomainEventHandlers.OrderShipped | |||
| { | |||
| public class OrderShippedDomainEventHandler | |||
| : INotificationHandler<OrderShippedDomainEvent> | |||
| { | |||
| private readonly IOrderRepository _orderRepository; | |||
| private readonly IBuyerRepository _buyerRepository; | |||
| private readonly IOrderingIntegrationEventService _orderingIntegrationEventService; | |||
| private readonly ILoggerFactory _logger; | |||
| public OrderShippedDomainEventHandler( | |||
| IOrderRepository orderRepository, | |||
| ILoggerFactory logger, | |||
| IBuyerRepository buyerRepository, | |||
| IOrderingIntegrationEventService orderingIntegrationEventService) | |||
| { | |||
| _orderRepository = orderRepository ?? throw new ArgumentNullException(nameof(orderRepository)); | |||
| _logger = logger ?? throw new ArgumentNullException(nameof(logger)); | |||
| _buyerRepository = buyerRepository ?? throw new ArgumentNullException(nameof(buyerRepository)); | |||
| _orderingIntegrationEventService = orderingIntegrationEventService; | |||
| } | |||
| public async Task Handle(OrderShippedDomainEvent orderShippedDomainEvent, CancellationToken cancellationToken) | |||
| { | |||
| _logger.CreateLogger(nameof(OrderShippedDomainEvent)) | |||
| .LogTrace($"Order with Id: {orderShippedDomainEvent.Order.Id} has been successfully updated with " + | |||
| $"a status order id: {OrderStatus.Shipped.Id}"); | |||
| var order = await _orderRepository.GetAsync(orderShippedDomainEvent.Order.Id); | |||
| var buyer = await _buyerRepository.FindByIdAsync(order.GetBuyerId.Value.ToString()); | |||
| var orderStatusChangedToShippedIntegrationEvent = new OrderStatusChangedToShippedIntegrationEvent(order.Id, order.OrderStatus.Name, buyer.Name); | |||
| await _orderingIntegrationEventService.PublishThroughEventBusAsync(orderStatusChangedToShippedIntegrationEvent); | |||
| } | |||
| } | |||
| } | |||
+ 18
- 4
src/Services/Ordering/Ordering.API/Application/DomainEventHandlers/OrderStartedEvent/ValidateOrAddBuyerAggregateWhenOrderStartedDomainEventHandler.cs
View File
+ 14
- 6
src/Services/Ordering/Ordering.API/Application/DomainEventHandlers/OrderStockConfirmed/OrderStatusChangedToStockConfirmedDomainEventHandler.cs
View File
+ 3
- 0
src/Services/Ordering/Ordering.API/Application/IntegrationEvents/EventHandling/OrderPaymentSuccededIntegrationEventHandler.cs
View File
+ 3
- 0
src/Services/Ordering/Ordering.API/Application/IntegrationEvents/EventHandling/OrderStockConfirmedIntegrationEventHandler.cs
View File
+ 1
- 1
src/Services/Ordering/Ordering.API/Application/IntegrationEvents/EventHandling/UserCheckoutAcceptedIntegrationEventHandler.cs
View File
+ 5
- 1
src/Services/Ordering/Ordering.API/Application/IntegrationEvents/Events/OrderStatusChangedToAwaitingValidationIntegrationEvent.cs
View File
+ 22
- 0
src/Services/Ordering/Ordering.API/Application/IntegrationEvents/Events/OrderStatusChangedToCancelledIntegrationEvent.cs
View File
| @ -0,0 +1,22 @@ | |||
| using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events; | |||
| using System; | |||
| using System.Collections.Generic; | |||
| using System.Linq; | |||
| using System.Threading.Tasks; | |||
| namespace Ordering.API.Application.IntegrationEvents.Events | |||
| { | |||
| public class OrderStatusChangedToCancelledIntegrationEvent : IntegrationEvent | |||
| { | |||
| public int OrderId { get; } | |||
| public string OrderStatus { get; } | |||
| public string BuyerName { get; } | |||
| public OrderStatusChangedToCancelledIntegrationEvent(int orderId, string orderStatus, string buyerName) | |||
| { | |||
| OrderId = orderId; | |||
| OrderStatus = orderStatus; | |||
| BuyerName = buyerName; | |||
| } | |||
| } | |||
| } | |||
+ 7
- 1
src/Services/Ordering/Ordering.API/Application/IntegrationEvents/Events/OrderStatusChangedToPaidIntegrationEvent.cs
View File
+ 22
- 0
src/Services/Ordering/Ordering.API/Application/IntegrationEvents/Events/OrderStatusChangedToShippedIntegrationEvent.cs
View File
| @ -0,0 +1,22 @@ | |||
| using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events; | |||
| using System; | |||
| using System.Collections.Generic; | |||
| using System.Linq; | |||
| using System.Threading.Tasks; | |||
| namespace Ordering.API.Application.IntegrationEvents.Events | |||
| { | |||
| public class OrderStatusChangedToShippedIntegrationEvent : IntegrationEvent | |||
| { | |||
| public int OrderId { get; } | |||
| public string OrderStatus { get; } | |||
| public string BuyerName { get; } | |||
| public OrderStatusChangedToShippedIntegrationEvent(int orderId, string orderStatus, string buyerName) | |||
| { | |||
| OrderId = orderId; | |||
| OrderStatus = orderStatus; | |||
| BuyerName = buyerName; | |||
| } | |||
| } | |||
| } | |||
+ 8
- 2
src/Services/Ordering/Ordering.API/Application/IntegrationEvents/Events/OrderStatusChangedToStockConfirmedIntegrationEvent.cs
View File
+ 22
- 0
src/Services/Ordering/Ordering.API/Application/IntegrationEvents/Events/OrderStatusChangedTosubmittedIntegrationEvent.cs
View File
| @ -0,0 +1,22 @@ | |||
| using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events; | |||
| using System; | |||
| using System.Collections.Generic; | |||
| using System.Linq; | |||
| using System.Threading.Tasks; | |||
| namespace Ordering.API.Application.IntegrationEvents.Events | |||
| { | |||
| public class OrderStatusChangedToSubmittedIntegrationEvent : IntegrationEvent | |||
| { | |||
| public int OrderId { get; } | |||
| public string OrderStatus { get; } | |||
| public string BuyerName { get; } | |||
| public OrderStatusChangedToSubmittedIntegrationEvent(int orderId, string orderStatus, string buyerName) | |||
| { | |||
| OrderId = orderId; | |||
| OrderStatus = orderStatus; | |||
| BuyerName = buyerName; | |||
| } | |||
| } | |||
| } | |||
+ 4
- 1
src/Services/Ordering/Ordering.API/Application/IntegrationEvents/Events/UserCheckoutAcceptedIntegrationEvent.cs
View File
+ 238
- 0
src/Services/Ordering/Ordering.API/Infrastructure/Migrations/20180412143935_NamePropertyInBuyer.Designer.cs
View File
| @ -0,0 +1,238 @@ | |||
| // <auto-generated /> | |||
| using Microsoft.EntityFrameworkCore; | |||
| using Microsoft.EntityFrameworkCore.Infrastructure; | |||
| using Microsoft.EntityFrameworkCore.Metadata; | |||
| using Microsoft.EntityFrameworkCore.Migrations; | |||
| using Microsoft.EntityFrameworkCore.Storage; | |||
| using Microsoft.EntityFrameworkCore.Storage.Internal; | |||
| using Microsoft.eShopOnContainers.Services.Ordering.Infrastructure; | |||
| using System; | |||
| namespace Ordering.API.Infrastructure.Migrations | |||
| { | |||
| [DbContext(typeof(OrderingContext))] | |||
| [Migration("20180412143935_NamePropertyInBuyer")] | |||
| partial class NamePropertyInBuyer | |||
| { | |||
| protected override void BuildTargetModel(ModelBuilder modelBuilder) | |||
| { | |||
| #pragma warning disable 612, 618 | |||
| modelBuilder | |||
| .HasAnnotation("ProductVersion", "2.0.1-rtm-125") | |||
| .HasAnnotation("Relational:Sequence:.orderitemseq", "'orderitemseq', '', '1', '10', '', '', 'Int64', 'False'") | |||
| .HasAnnotation("Relational:Sequence:ordering.buyerseq", "'buyerseq', 'ordering', '1', '10', '', '', 'Int64', 'False'") | |||
| .HasAnnotation("Relational:Sequence:ordering.orderseq", "'orderseq', 'ordering', '1', '10', '', '', 'Int64', 'False'") | |||
| .HasAnnotation("Relational:Sequence:ordering.paymentseq", "'paymentseq', 'ordering', '1', '10', '', '', 'Int64', 'False'") | |||
| .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); | |||
| modelBuilder.Entity("Microsoft.eShopOnContainers.Services.Ordering.Domain.AggregatesModel.BuyerAggregate.Buyer", b => | |||
| { | |||
| b.Property<int>("Id") | |||
| .ValueGeneratedOnAdd() | |||
| .HasAnnotation("SqlServer:HiLoSequenceName", "buyerseq") | |||
| .HasAnnotation("SqlServer:HiLoSequenceSchema", "ordering") | |||
| .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.SequenceHiLo); | |||
| b.Property<string>("IdentityGuid") | |||
| .IsRequired() | |||
| .HasMaxLength(200); | |||
| b.Property<string>("Name"); | |||
| b.HasKey("Id"); | |||
| b.HasIndex("IdentityGuid") | |||
| .IsUnique(); | |||
| b.ToTable("buyers","ordering"); | |||
| }); | |||
| modelBuilder.Entity("Microsoft.eShopOnContainers.Services.Ordering.Domain.AggregatesModel.BuyerAggregate.CardType", b => | |||
| { | |||
| b.Property<int>("Id") | |||
| .HasDefaultValue(1); | |||
| b.Property<string>("Name") | |||
| .IsRequired() | |||
| .HasMaxLength(200); | |||
| b.HasKey("Id"); | |||
| b.ToTable("cardtypes","ordering"); | |||
| }); | |||
| modelBuilder.Entity("Microsoft.eShopOnContainers.Services.Ordering.Domain.AggregatesModel.BuyerAggregate.PaymentMethod", b => | |||
| { | |||
| b.Property<int>("Id") | |||
| .ValueGeneratedOnAdd() | |||
| .HasAnnotation("SqlServer:HiLoSequenceName", "paymentseq") | |||
| .HasAnnotation("SqlServer:HiLoSequenceSchema", "ordering") | |||
| .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.SequenceHiLo); | |||
| b.Property<string>("Alias") | |||
| .IsRequired() | |||
| .HasMaxLength(200); | |||
| b.Property<int>("BuyerId"); | |||
| b.Property<string>("CardHolderName") | |||
| .IsRequired() | |||
| .HasMaxLength(200); | |||
| b.Property<string>("CardNumber") | |||
| .IsRequired() | |||
| .HasMaxLength(25); | |||
| b.Property<int>("CardTypeId"); | |||
| b.Property<DateTime>("Expiration"); | |||
| b.HasKey("Id"); | |||
| b.HasIndex("BuyerId"); | |||
| b.HasIndex("CardTypeId"); | |||
| b.ToTable("paymentmethods","ordering"); | |||
| }); | |||
| modelBuilder.Entity("Microsoft.eShopOnContainers.Services.Ordering.Domain.AggregatesModel.OrderAggregate.Order", b => | |||
| { | |||
| b.Property<int>("Id") | |||
| .ValueGeneratedOnAdd() | |||
| .HasAnnotation("SqlServer:HiLoSequenceName", "orderseq") | |||
| .HasAnnotation("SqlServer:HiLoSequenceSchema", "ordering") | |||
| .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.SequenceHiLo); | |||
| b.Property<int?>("BuyerId"); | |||
| b.Property<string>("Description"); | |||
| b.Property<DateTime>("OrderDate"); | |||
| b.Property<int>("OrderStatusId"); | |||
| b.Property<int?>("PaymentMethodId"); | |||
| b.HasKey("Id"); | |||
| b.HasIndex("BuyerId"); | |||
| b.HasIndex("OrderStatusId"); | |||
| b.HasIndex("PaymentMethodId"); | |||
| b.ToTable("orders","ordering"); | |||
| }); | |||
| modelBuilder.Entity("Microsoft.eShopOnContainers.Services.Ordering.Domain.AggregatesModel.OrderAggregate.OrderItem", b => | |||
| { | |||
| b.Property<int>("Id") | |||
| .ValueGeneratedOnAdd() | |||
| .HasAnnotation("SqlServer:HiLoSequenceName", "orderitemseq") | |||
| .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.SequenceHiLo); | |||
| b.Property<decimal>("Discount"); | |||
| b.Property<int>("OrderId"); | |||
| b.Property<string>("PictureUrl"); | |||
| b.Property<int>("ProductId"); | |||
| b.Property<string>("ProductName") | |||
| .IsRequired(); | |||
| b.Property<decimal>("UnitPrice"); | |||
| b.Property<int>("Units"); | |||
| b.HasKey("Id"); | |||
| b.HasIndex("OrderId"); | |||
| b.ToTable("orderItems","ordering"); | |||
| }); | |||
| modelBuilder.Entity("Microsoft.eShopOnContainers.Services.Ordering.Domain.AggregatesModel.OrderAggregate.OrderStatus", b => | |||
| { | |||
| b.Property<int>("Id") | |||
| .HasDefaultValue(1); | |||
| b.Property<string>("Name") | |||
| .IsRequired() | |||
| .HasMaxLength(200); | |||
| b.HasKey("Id"); | |||
| b.ToTable("orderstatus","ordering"); | |||
| }); | |||
| modelBuilder.Entity("Microsoft.eShopOnContainers.Services.Ordering.Infrastructure.Idempotency.ClientRequest", b => | |||
| { | |||
| b.Property<Guid>("Id") | |||
| .ValueGeneratedOnAdd(); | |||
| b.Property<string>("Name") | |||
| .IsRequired(); | |||
| b.Property<DateTime>("Time"); | |||
| b.HasKey("Id"); | |||
| b.ToTable("requests","ordering"); | |||
| }); | |||
| modelBuilder.Entity("Microsoft.eShopOnContainers.Services.Ordering.Domain.AggregatesModel.BuyerAggregate.PaymentMethod", b => | |||
| { | |||
| b.HasOne("Microsoft.eShopOnContainers.Services.Ordering.Domain.AggregatesModel.BuyerAggregate.Buyer") | |||
| .WithMany("PaymentMethods") | |||
| .HasForeignKey("BuyerId") | |||
| .OnDelete(DeleteBehavior.Cascade); | |||
| b.HasOne("Microsoft.eShopOnContainers.Services.Ordering.Domain.AggregatesModel.BuyerAggregate.CardType", "CardType") | |||
| .WithMany() | |||
| .HasForeignKey("CardTypeId") | |||
| .OnDelete(DeleteBehavior.Cascade); | |||
| }); | |||
| modelBuilder.Entity("Microsoft.eShopOnContainers.Services.Ordering.Domain.AggregatesModel.OrderAggregate.Order", b => | |||
| { | |||
| b.HasOne("Microsoft.eShopOnContainers.Services.Ordering.Domain.AggregatesModel.BuyerAggregate.Buyer") | |||
| .WithMany() | |||
| .HasForeignKey("BuyerId"); | |||
| b.HasOne("Microsoft.eShopOnContainers.Services.Ordering.Domain.AggregatesModel.OrderAggregate.OrderStatus", "OrderStatus") | |||
| .WithMany() | |||
| .HasForeignKey("OrderStatusId") | |||
| .OnDelete(DeleteBehavior.Cascade); | |||
| b.HasOne("Microsoft.eShopOnContainers.Services.Ordering.Domain.AggregatesModel.BuyerAggregate.PaymentMethod") | |||
| .WithMany() | |||
| .HasForeignKey("PaymentMethodId") | |||
| .OnDelete(DeleteBehavior.Restrict); | |||
| b.OwnsOne("Microsoft.eShopOnContainers.Services.Ordering.Domain.AggregatesModel.OrderAggregate.Address", "Address", b1 => | |||
| { | |||
| b1.Property<int>("OrderId"); | |||
| b1.ToTable("orders","ordering"); | |||
| b1.HasOne("Microsoft.eShopOnContainers.Services.Ordering.Domain.AggregatesModel.OrderAggregate.Order") | |||
| .WithOne("Address") | |||
| .HasForeignKey("Microsoft.eShopOnContainers.Services.Ordering.Domain.AggregatesModel.OrderAggregate.Address", "OrderId") | |||
| .OnDelete(DeleteBehavior.Cascade); | |||
| }); | |||
| }); | |||
| modelBuilder.Entity("Microsoft.eShopOnContainers.Services.Ordering.Domain.AggregatesModel.OrderAggregate.OrderItem", b => | |||
| { | |||
| b.HasOne("Microsoft.eShopOnContainers.Services.Ordering.Domain.AggregatesModel.OrderAggregate.Order") | |||
| .WithMany("OrderItems") | |||
| .HasForeignKey("OrderId") | |||
| .OnDelete(DeleteBehavior.Cascade); | |||
| }); | |||
| #pragma warning restore 612, 618 | |||
| } | |||
| } | |||
| } | |||
+ 86
- 0
src/Services/Ordering/Ordering.API/Infrastructure/Migrations/20180412143935_NamePropertyInBuyer.cs
View File
| @ -0,0 +1,86 @@ | |||
| using Microsoft.EntityFrameworkCore.Migrations; | |||
| using System; | |||
| using System.Collections.Generic; | |||
| namespace Ordering.API.Infrastructure.Migrations | |||
| { | |||
| public partial class NamePropertyInBuyer : Migration | |||
| { | |||
| protected override void Up(MigrationBuilder migrationBuilder) | |||
| { | |||
| migrationBuilder.DropForeignKey( | |||
| name: "FK_orderItems_orders_OrderId", | |||
| schema: "ordering", | |||
| table: "orderItems"); | |||
| migrationBuilder.AddColumn<string>( | |||
| name: "Name", | |||
| schema: "ordering", | |||
| table: "buyers", | |||
| nullable: true); | |||
| migrationBuilder.AddForeignKey( | |||
| name: "FK_orderItems_orders_OrderId", | |||
| schema: "ordering", | |||
| table: "orderItems", | |||
| column: "OrderId", | |||
| principalSchema: "ordering", | |||
| principalTable: "orders", | |||
| principalColumn: "Id", | |||
| onDelete: ReferentialAction.Cascade); | |||
| } | |||
| protected override void Down(MigrationBuilder migrationBuilder) | |||
| { | |||
| migrationBuilder.DropForeignKey( | |||
| name: "FK_orderItems_orders_OrderId", | |||
| schema: "ordering", | |||
| table: "orderItems"); | |||
| migrationBuilder.DropColumn( | |||
| name: "Name", | |||
| schema: "ordering", | |||
| table: "buyers"); | |||
| migrationBuilder.AddColumn<string>( | |||
| name: "City", | |||
| schema: "ordering", | |||
| table: "orders", | |||
| nullable: true); | |||
| migrationBuilder.AddColumn<string>( | |||
| name: "Country", | |||
| schema: "ordering", | |||
| table: "orders", | |||
| nullable: true); | |||
| migrationBuilder.AddColumn<string>( | |||
| name: "State", | |||
| schema: "ordering", | |||
| table: "orders", | |||
| nullable: true); | |||
| migrationBuilder.AddColumn<string>( | |||
| name: "Street", | |||
| schema: "ordering", | |||
| table: "orders", | |||
| nullable: true); | |||
| migrationBuilder.AddColumn<string>( | |||
| name: "ZipCode", | |||
| schema: "ordering", | |||
| table: "orders", | |||
| nullable: true); | |||
| migrationBuilder.AddForeignKey( | |||
| name: "FK_orderItems_orders_OrderId", | |||
| schema: "ordering", | |||
| table: "orderItems", | |||
| column: "OrderId", | |||
| principalSchema: "ordering", | |||
| principalTable: "orders", | |||
| principalColumn: "Id", | |||
| onDelete: ReferentialAction.Cascade); | |||
| } | |||
| } | |||
| } | |||
+ 15
- 28
src/Services/Ordering/Ordering.API/Infrastructure/Migrations/OrderingContextModelSnapshot.cs
View File
+ 2
- 0
src/Services/Ordering/Ordering.API/Infrastructure/Services/IIdentityService.cs
View File
+ 5
- 0
src/Services/Ordering/Ordering.API/Infrastructure/Services/IdentityService.cs
View File
+ 1
- 1
src/Services/Ordering/Ordering.API/Ordering.API.csproj
View File
+ 4
- 4
src/Services/Ordering/Ordering.API/Startup.cs
View File
+ 2
- 1
src/Services/Ordering/Ordering.API/settings.json
View File
+ 4
- 1
src/Services/Ordering/Ordering.Domain/AggregatesModel/BuyerAggregate/Buyer.cs
View File
+ 1
- 0
src/Services/Ordering/Ordering.Domain/AggregatesModel/BuyerAggregate/IBuyerRepository.cs
View File
+ 33
- 18
src/Services/Ordering/Ordering.Domain/AggregatesModel/OrderAggregate/Order.cs
View File
+ 18
- 0
src/Services/Ordering/Ordering.Domain/Events/OrderCancelledDomainEvent.cs
View File
| @ -0,0 +1,18 @@ | |||
| using MediatR; | |||
| using Microsoft.eShopOnContainers.Services.Ordering.Domain.AggregatesModel.OrderAggregate; | |||
| using System; | |||
| using System.Collections.Generic; | |||
| using System.Text; | |||
| namespace Ordering.Domain.Events | |||
| { | |||
| public class OrderCancelledDomainEvent : INotification | |||
| { | |||
| public Order Order { get; } | |||
| public OrderCancelledDomainEvent(Order order) | |||
| { | |||
| Order = order; | |||
| } | |||
| } | |||
| } | |||
+ 15
- 0
src/Services/Ordering/Ordering.Domain/Events/OrderShippedDomainEvent.cs
View File
| @ -0,0 +1,15 @@ | |||
| using MediatR; | |||
| using Microsoft.eShopOnContainers.Services.Ordering.Domain.AggregatesModel.OrderAggregate; | |||
| namespace Ordering.Domain.Events | |||
| { | |||
| public class OrderShippedDomainEvent : INotification | |||
| { | |||
| public Order Order { get; } | |||
| public OrderShippedDomainEvent(Order order) | |||
| { | |||
| Order = order; | |||
| } | |||
| } | |||
| } | |||
+ 3
- 1
src/Services/Ordering/Ordering.Domain/Events/OrderStartedDomainEvent.cs
View File
+ 2
- 0
src/Services/Ordering/Ordering.Infrastructure/EntityConfigurations/BuyerEntityTYpeConfiguration.cs
View File
+ 10
- 0
src/Services/Ordering/Ordering.Infrastructure/Repositories/BuyerRepository.cs
View File
+ 30
- 0
src/Services/Ordering/Ordering.SignalrHub/AutofacModules/ApplicationModule.cs
View File
| @ -0,0 +1,30 @@ | |||
| using Autofac; | |||
| using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions; | |||
| using Ordering.SignalrHub.IntegrationEvents; | |||
| using System; | |||
| using System.Collections.Generic; | |||
| using System.Linq; | |||
| using System.Reflection; | |||
| using System.Threading.Tasks; | |||
| namespace Ordering.SignalrHub.AutofacModules | |||
| { | |||
| public class ApplicationModule | |||
| : Autofac.Module | |||
| { | |||
| public string QueriesConnectionString { get; } | |||
| public ApplicationModule() | |||
| { | |||
| } | |||
| protected override void Load(ContainerBuilder builder) | |||
| { | |||
| builder.RegisterAssemblyTypes(typeof(OrderStatusChangedToAwaitingValidationIntegrationEvent).GetTypeInfo().Assembly) | |||
| .AsClosedTypesOf(typeof(IIntegrationEventHandler<>)); | |||
| } | |||
| } | |||
| } | |||
+ 20
- 0
src/Services/Ordering/Ordering.SignalrHub/Dockerfile
View File
| @ -0,0 +1,20 @@ | |||
| FROM microsoft/aspnetcore:2.0 AS base | |||
| WORKDIR /app | |||
| EXPOSE 80 | |||
| FROM microsoft/aspnetcore-build:2.0 AS build | |||
| WORKDIR /src | |||
| COPY eShopOnContainers-ServicesAndWebApps.sln ./ | |||
| COPY src/Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj src/Services/Ordering/Ordering.SignalrHub/ | |||
| RUN dotnet restore -nowarn:msb3202,nu1503 | |||
| COPY . . | |||
| WORKDIR /src/src/Services/Ordering/Ordering.SignalrHub | |||
| RUN dotnet build Ordering.SignalrHub.csproj -c Release -o /app | |||
| FROM build AS publish | |||
| RUN dotnet publish Ordering.SignalrHub.csproj -c Release -o /app | |||
| FROM base AS final | |||
| WORKDIR /app | |||
| COPY --from=publish /app . | |||
| ENTRYPOINT ["dotnet", "Ordering.SignalrHub.dll"] | |||
+ 28
- 0
src/Services/Ordering/Ordering.SignalrHub/IntegrationEvents/EventHandling/OrderStatusChangedToCancelledIntegrationEventHandler.cs
View File
| @ -0,0 +1,28 @@ | |||
| using Microsoft.AspNetCore.SignalR; | |||
| using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions; | |||
| using Ordering.SignalrHub.IntegrationEvents.Events; | |||
| using System; | |||
| using System.Collections.Generic; | |||
| using System.Linq; | |||
| using System.Threading.Tasks; | |||
| namespace Ordering.SignalrHub.IntegrationEvents.EventHandling | |||
| { | |||
| public class OrderStatusChangedToCancelledIntegrationEventHandler : IIntegrationEventHandler<OrderStatusChangedToCancelledIntegrationEvent> | |||
| { | |||
| private readonly IHubContext<NotificationsHub> _hubContext; | |||
| public OrderStatusChangedToCancelledIntegrationEventHandler(IHubContext<NotificationsHub> hubContext) | |||
| { | |||
| _hubContext = hubContext ?? throw new ArgumentNullException(nameof(hubContext)); | |||
| } | |||
| public async Task Handle(OrderStatusChangedToCancelledIntegrationEvent @event) | |||
| { | |||
| await _hubContext.Clients | |||
| .Group(@event.BuyerName) | |||
| .SendAsync("UpdatedOrderState", new { OrderId = @event.OrderId, Status = @event.OrderStatus }); | |||
| } | |||
| } | |||
| } | |||
+ 26
- 0
src/Services/Ordering/Ordering.SignalrHub/IntegrationEvents/EventHandling/OrderStatusChangedToPaidIntegrationEventHandler.cs
View File
| @ -0,0 +1,26 @@ | |||
| using Microsoft.AspNetCore.SignalR; | |||
| using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions; | |||
| using Ordering.SignalrHub.IntegrationEvents.Events; | |||
| using System; | |||
| using System.Threading.Tasks; | |||
| namespace Ordering.SignalrHub.IntegrationEvents.EventHandling | |||
| { | |||
| public class OrderStatusChangedToPaidIntegrationEventHandler : IIntegrationEventHandler<OrderStatusChangedToPaidIntegrationEvent> | |||
| { | |||
| private readonly IHubContext<NotificationsHub> _hubContext; | |||
| public OrderStatusChangedToPaidIntegrationEventHandler(IHubContext<NotificationsHub> hubContext) | |||
| { | |||
| _hubContext = hubContext ?? throw new ArgumentNullException(nameof(hubContext)); | |||
| } | |||
| public async Task Handle(OrderStatusChangedToPaidIntegrationEvent @event) | |||
| { | |||
| await _hubContext.Clients | |||
| .Group(@event.BuyerName) | |||
| .SendAsync("UpdatedOrderState", new { OrderId = @event.OrderId, Status = @event.OrderStatus }); | |||
| } | |||
| } | |||
| } | |||
+ 28
- 0
src/Services/Ordering/Ordering.SignalrHub/IntegrationEvents/EventHandling/OrderStatusChangedToShippedIntegrationEventHandler.cs
View File
| @ -0,0 +1,28 @@ | |||
| using Microsoft.AspNetCore.SignalR; | |||
| using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions; | |||
| using Ordering.SignalrHub.IntegrationEvents.Events; | |||
| using System; | |||
| using System.Collections.Generic; | |||
| using System.Linq; | |||
| using System.Threading.Tasks; | |||
| namespace Ordering.SignalrHub.IntegrationEvents.EventHandling | |||
| { | |||
| public class OrderStatusChangedToShippedIntegrationEventHandler : IIntegrationEventHandler<OrderStatusChangedToShippedIntegrationEvent> | |||
| { | |||
| private readonly IHubContext<NotificationsHub> _hubContext; | |||
| public OrderStatusChangedToShippedIntegrationEventHandler(IHubContext<NotificationsHub> hubContext) | |||
| { | |||
| _hubContext = hubContext ?? throw new ArgumentNullException(nameof(hubContext)); | |||
| } | |||
| public async Task Handle(OrderStatusChangedToShippedIntegrationEvent @event) | |||
| { | |||
| await _hubContext.Clients | |||
| .Group(@event.BuyerName) | |||
| .SendAsync("UpdatedOrderState", new { OrderId = @event.OrderId, Status = @event.OrderStatus }); | |||
| } | |||
| } | |||
| } | |||
+ 29
- 0
src/Services/Ordering/Ordering.SignalrHub/IntegrationEvents/EventHandling/OrderStatusChangedToStockConfirmedIntegrationEventHandler.cs
View File
| @ -0,0 +1,29 @@ | |||
| using Microsoft.AspNetCore.SignalR; | |||
| using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions; | |||
| using Ordering.SignalrHub.IntegrationEvents.Events; | |||
| using System; | |||
| using System.Collections.Generic; | |||
| using System.Linq; | |||
| using System.Threading.Tasks; | |||
| namespace Ordering.SignalrHub.IntegrationEvents.EventHandling | |||
| { | |||
| public class OrderStatusChangedToStockConfirmedIntegrationEventHandler : | |||
| IIntegrationEventHandler<OrderStatusChangedToStockConfirmedIntegrationEvent> | |||
| { | |||
| private readonly IHubContext<NotificationsHub> _hubContext; | |||
| public OrderStatusChangedToStockConfirmedIntegrationEventHandler(IHubContext<NotificationsHub> hubContext) | |||
| { | |||
| _hubContext = hubContext ?? throw new ArgumentNullException(nameof(hubContext)); | |||
| } | |||
| public async Task Handle(OrderStatusChangedToStockConfirmedIntegrationEvent @event) | |||
| { | |||
| await _hubContext.Clients | |||
| .Group(@event.BuyerName) | |||
| .SendAsync("UpdatedOrderState", new { OrderId = @event.OrderId, Status = @event.OrderStatus }); | |||
| } | |||
| } | |||
| } | |||
+ 29
- 0
src/Services/Ordering/Ordering.SignalrHub/IntegrationEvents/EventHandling/OrderStatusChangedToSubmittedIntegrationEventHandler.cs
View File
| @ -0,0 +1,29 @@ | |||
| using Microsoft.AspNetCore.SignalR; | |||
| using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions; | |||
| using Ordering.SignalrHub.IntegrationEvents.Events; | |||
| using System; | |||
| using System.Collections.Generic; | |||
| using System.Linq; | |||
| using System.Threading.Tasks; | |||
| namespace Ordering.SignalrHub.IntegrationEvents.EventHandling | |||
| { | |||
| public class OrderStatusChangedToSubmittedIntegrationEventHandler : | |||
| IIntegrationEventHandler<OrderStatusChangedToSubmittedIntegrationEvent> | |||
| { | |||
| private readonly IHubContext<NotificationsHub> _hubContext; | |||
| public OrderStatusChangedToSubmittedIntegrationEventHandler(IHubContext<NotificationsHub> hubContext) | |||
| { | |||
| _hubContext = hubContext ?? throw new ArgumentNullException(nameof(hubContext)); | |||
| } | |||
| public async Task Handle(OrderStatusChangedToSubmittedIntegrationEvent @event) | |||
| { | |||
| await _hubContext.Clients | |||
| .Group(@event.BuyerName) | |||
| .SendAsync("UpdatedOrderState", new { OrderId = @event.OrderId, Status = @event.OrderStatus }); | |||
| } | |||
| } | |||
| } | |||
+ 27
- 0
src/Services/Ordering/Ordering.SignalrHub/IntegrationEvents/EventHandling/orderStatusChangedToAwaitingValidationIntegrationEventHandler.cs
View File
| @ -0,0 +1,27 @@ | |||
| using Microsoft.AspNetCore.SignalR; | |||
| using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions; | |||
| using System; | |||
| using System.Collections.Generic; | |||
| using System.Linq; | |||
| using System.Threading.Tasks; | |||
| namespace Ordering.SignalrHub.IntegrationEvents | |||
| { | |||
| public class OrderStatusChangedToAwaitingValidationIntegrationEventHandler : IIntegrationEventHandler<OrderStatusChangedToAwaitingValidationIntegrationEvent> | |||
| { | |||
| private readonly IHubContext<NotificationsHub> _hubContext; | |||
| public OrderStatusChangedToAwaitingValidationIntegrationEventHandler(IHubContext<NotificationsHub> hubContext) | |||
| { | |||
| _hubContext = hubContext ?? throw new ArgumentNullException(nameof(hubContext)); | |||
| } | |||
| public async Task Handle(OrderStatusChangedToAwaitingValidationIntegrationEvent @event) | |||
| { | |||
| await _hubContext.Clients | |||
| .Group(@event.BuyerName) | |||
| .SendAsync("UpdatedOrderState", new { OrderId = @event.OrderId, Status = @event.OrderStatus }); | |||
| } | |||
| } | |||
| } | |||
+ 19
- 0
src/Services/Ordering/Ordering.SignalrHub/IntegrationEvents/Events/OrderStatusChangedToAwaitingValidationIntegrationEvent.cs
View File
| @ -0,0 +1,19 @@ | |||
| using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events; | |||
| using System.Collections.Generic; | |||
| namespace Ordering.SignalrHub.IntegrationEvents | |||
| { | |||
| public class OrderStatusChangedToAwaitingValidationIntegrationEvent : IntegrationEvent | |||
| { | |||
| public int OrderId { get; } | |||
| public string OrderStatus { get; } | |||
| public string BuyerName { get; } | |||
| public OrderStatusChangedToAwaitingValidationIntegrationEvent(int orderId, string orderStatus, string buyerName) | |||
| { | |||
| OrderId = orderId; | |||
| OrderStatus = orderStatus; | |||
| BuyerName = buyerName; | |||
| } | |||
| } | |||
| } | |||
+ 22
- 0
src/Services/Ordering/Ordering.SignalrHub/IntegrationEvents/Events/OrderStatusChangedToCancelledIntegrationEvent.cs
View File
| @ -0,0 +1,22 @@ | |||
| using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events; | |||
| using System; | |||
| using System.Collections.Generic; | |||
| using System.Linq; | |||
| using System.Threading.Tasks; | |||
| namespace Ordering.SignalrHub.IntegrationEvents.Events | |||
| { | |||
| public class OrderStatusChangedToCancelledIntegrationEvent : IntegrationEvent | |||
| { | |||
| public int OrderId { get; } | |||
| public string OrderStatus { get; } | |||
| public string BuyerName { get; } | |||
| public OrderStatusChangedToCancelledIntegrationEvent(int orderId, string orderStatus, string buyerName) | |||
| { | |||
| OrderId = orderId; | |||
| OrderStatus = orderStatus; | |||
| BuyerName = buyerName; | |||
| } | |||
| } | |||
| } | |||
+ 23
- 0
src/Services/Ordering/Ordering.SignalrHub/IntegrationEvents/Events/OrderStatusChangedToPaidIntegrationEvent.cs
View File
| @ -0,0 +1,23 @@ | |||
| using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events; | |||
| using System; | |||
| using System.Collections.Generic; | |||
| using System.Linq; | |||
| using System.Threading.Tasks; | |||
| namespace Ordering.SignalrHub.IntegrationEvents.Events | |||
| { | |||
| public class OrderStatusChangedToPaidIntegrationEvent : IntegrationEvent | |||
| { | |||
| public int OrderId { get; } | |||
| public string OrderStatus { get; } | |||
| public string BuyerName { get; } | |||
| public OrderStatusChangedToPaidIntegrationEvent(int orderId, | |||
| string orderStatus, string buyerName) | |||
| { | |||
| OrderId = orderId; | |||
| OrderStatus = orderStatus; | |||
| BuyerName = buyerName; | |||
| } | |||
| } | |||
| } | |||
+ 22
- 0
src/Services/Ordering/Ordering.SignalrHub/IntegrationEvents/Events/OrderStatusChangedToShippedIntegrationEvent.cs
View File
| @ -0,0 +1,22 @@ | |||
| using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events; | |||
| using System; | |||
| using System.Collections.Generic; | |||
| using System.Linq; | |||
| using System.Threading.Tasks; | |||
| namespace Ordering.SignalrHub.IntegrationEvents.Events | |||
| { | |||
| public class OrderStatusChangedToShippedIntegrationEvent : IntegrationEvent | |||
| { | |||
| public int OrderId { get; } | |||
| public string OrderStatus { get; } | |||
| public string BuyerName { get; } | |||
| public OrderStatusChangedToShippedIntegrationEvent(int orderId, string orderStatus, string buyerName) | |||
| { | |||
| OrderId = orderId; | |||
| OrderStatus = orderStatus; | |||
| BuyerName = buyerName; | |||
| } | |||
| } | |||
| } | |||
+ 18
- 0
src/Services/Ordering/Ordering.SignalrHub/IntegrationEvents/Events/OrderStatusChangedToStockConfirmedIntegrationEvent.cs
View File
| @ -0,0 +1,18 @@ | |||
| using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events; | |||
| namespace Ordering.SignalrHub.IntegrationEvents.Events | |||
| { | |||
| public class OrderStatusChangedToStockConfirmedIntegrationEvent : IntegrationEvent | |||
| { | |||
| public int OrderId { get; } | |||
| public string OrderStatus { get; } | |||
| public string BuyerName { get; } | |||
| public OrderStatusChangedToStockConfirmedIntegrationEvent(int orderId, string orderStatus, string buyerName) | |||
| { | |||
| OrderId = orderId; | |||
| OrderStatus = orderStatus; | |||
| BuyerName = buyerName; | |||
| } | |||
| } | |||
| } | |||
+ 22
- 0
src/Services/Ordering/Ordering.SignalrHub/IntegrationEvents/Events/OrderStatusChangedToSubmittedIntegrationEvent.cs
View File
| @ -0,0 +1,22 @@ | |||
| using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events; | |||
| using System; | |||
| using System.Collections.Generic; | |||
| using System.Linq; | |||
| using System.Threading.Tasks; | |||
| namespace Ordering.SignalrHub.IntegrationEvents.Events | |||
| { | |||
| public class OrderStatusChangedToSubmittedIntegrationEvent : IntegrationEvent | |||
| { | |||
| public int OrderId { get; } | |||
| public string OrderStatus { get; } | |||
| public string BuyerName { get; } | |||
| public OrderStatusChangedToSubmittedIntegrationEvent(int orderId, string orderStatus, string buyerName) | |||
| { | |||
| OrderId = orderId; | |||
| OrderStatus = orderStatus; | |||
| BuyerName = buyerName; | |||
| } | |||
| } | |||
| } | |||
+ 26
- 0
src/Services/Ordering/Ordering.SignalrHub/NotificationHub.cs
View File
| @ -0,0 +1,26 @@ | |||
| using Microsoft.AspNetCore.Authorization; | |||
| using Microsoft.AspNetCore.SignalR; | |||
| using System; | |||
| using System.Collections.Generic; | |||
| using System.Linq; | |||
| using System.Threading.Tasks; | |||
| namespace Ordering.SignalrHub | |||
| { | |||
| [Authorize] | |||
| public class NotificationsHub : Hub | |||
| { | |||
| public override async Task OnConnectedAsync() | |||
| { | |||
| await Groups.AddAsync(Context.ConnectionId, Context.User.Identity.Name); | |||
| await base.OnConnectedAsync(); | |||
| } | |||
| public override async Task OnDisconnectedAsync(Exception ex) | |||
| { | |||
| await Groups.RemoveAsync(Context.ConnectionId, Context.User.Identity.Name); | |||
| await base.OnDisconnectedAsync(ex); | |||
| } | |||
| } | |||
| } | |||
+ 26
- 0
src/Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj
View File
| @ -0,0 +1,26 @@ | |||
| <Project Sdk="Microsoft.NET.Sdk.Web"> | |||
| <PropertyGroup> | |||
| <TargetFramework>netcoreapp2.0</TargetFramework> | |||
| <DockerComposeProjectPath>..\..\..\..\docker-compose.dcproj</DockerComposeProjectPath> | |||
| </PropertyGroup> | |||
| <ItemGroup> | |||
| <Folder Include="wwwroot\" /> | |||
| </ItemGroup> | |||
| <ItemGroup> | |||
| <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.2.1" /> | |||
| <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.6" /> | |||
| <PackageReference Include="Microsoft.AspNetCore.SignalR" Version="1.0.0-preview2-final" /> | |||
| <PackageReference Include="Microsoft.AspNetCore.SignalR.Core" Version="1.0.0-preview2-final" /> | |||
| <PackageReference Include="Microsoft.AspNetCore.SignalR.Redis" Version="1.0.0-preview2-final" /> | |||
| </ItemGroup> | |||
| <ItemGroup> | |||
| <ProjectReference Include="..\..\..\BuildingBlocks\EventBus\EventBusRabbitMQ\EventBusRabbitMQ.csproj" /> | |||
| <ProjectReference Include="..\..\..\BuildingBlocks\EventBus\EventBusServiceBus\EventBusServiceBus.csproj" /> | |||
| <ProjectReference Include="..\..\..\BuildingBlocks\EventBus\EventBus\EventBus.csproj" /> | |||
| </ItemGroup> | |||
| </Project> | |||
+ 25
- 0
src/Services/Ordering/Ordering.SignalrHub/Program.cs
View File
| @ -0,0 +1,25 @@ | |||
| using System; | |||
| using System.Collections.Generic; | |||
| using System.IO; | |||
| using System.Linq; | |||
| using System.Threading.Tasks; | |||
| using Microsoft.AspNetCore; | |||
| using Microsoft.AspNetCore.Hosting; | |||
| using Microsoft.Extensions.Configuration; | |||
| using Microsoft.Extensions.Logging; | |||
| namespace Ordering.SignalrHub | |||
| { | |||
| public class Program | |||
| { | |||
| public static void Main(string[] args) | |||
| { | |||
| BuildWebHost(args).Run(); | |||
| } | |||
| public static IWebHost BuildWebHost(string[] args) => | |||
| WebHost.CreateDefaultBuilder(args) | |||
| .UseStartup<Startup>() | |||
| .Build(); | |||
| } | |||
| } | |||
+ 27
- 0
src/Services/Ordering/Ordering.SignalrHub/Properties/launchSettings.json
View File
| @ -0,0 +1,27 @@ | |||
| { | |||
| "iisSettings": { | |||
| "windowsAuthentication": false, | |||
| "anonymousAuthentication": true, | |||
| "iisExpress": { | |||
| "applicationUrl": "http://localhost:51311/", | |||
| "sslPort": 0 | |||
| } | |||
| }, | |||
| "profiles": { | |||
| "IIS Express": { | |||
| "commandName": "IISExpress", | |||
| "launchBrowser": true, | |||
| "environmentVariables": { | |||
| "ASPNETCORE_ENVIRONMENT": "Development" | |||
| } | |||
| }, | |||
| "Ordering.SignalrHub": { | |||
| "commandName": "Project", | |||
| "launchBrowser": true, | |||
| "environmentVariables": { | |||
| "ASPNETCORE_ENVIRONMENT": "Development" | |||
| }, | |||
| "applicationUrl": "http://localhost:51312/" | |||
| } | |||
| } | |||
| } | |||
+ 214
- 0
src/Services/Ordering/Ordering.SignalrHub/Startup.cs
View File
| @ -0,0 +1,214 @@ | |||
| using Autofac; | |||
| using Autofac.Extensions.DependencyInjection; | |||
| using Microsoft.AspNetCore.Authentication.JwtBearer; | |||
| using Microsoft.AspNetCore.Builder; | |||
| using Microsoft.Azure.ServiceBus; | |||
| using Microsoft.eShopOnContainers.BuildingBlocks.EventBus; | |||
| using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions; | |||
| using Microsoft.eShopOnContainers.BuildingBlocks.EventBusRabbitMQ; | |||
| using Microsoft.eShopOnContainers.BuildingBlocks.EventBusServiceBus; | |||
| using Microsoft.Extensions.Configuration; | |||
| using Microsoft.Extensions.DependencyInjection; | |||
| using Microsoft.Extensions.Logging; | |||
| using Ordering.SignalrHub.AutofacModules; | |||
| using Ordering.SignalrHub.IntegrationEvents; | |||
| using Ordering.SignalrHub.IntegrationEvents.EventHandling; | |||
| using Ordering.SignalrHub.IntegrationEvents.Events; | |||
| using RabbitMQ.Client; | |||
| using StackExchange.Redis; | |||
| using System; | |||
| using System.IdentityModel.Tokens.Jwt; | |||
| namespace Ordering.SignalrHub | |||
| { | |||
| public class Startup | |||
| { | |||
| public Startup(IConfiguration configuration) | |||
| { | |||
| Configuration = configuration; | |||
| } | |||
| // This method gets called by the runtime. Use this method to add services to the container. | |||
| // For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940 | |||
| public IServiceProvider ConfigureServices(IServiceCollection services) | |||
| { | |||
| services.AddCors(options => | |||
| { | |||
| options.AddPolicy("CorsPolicy", | |||
| builder => builder.AllowAnyOrigin() | |||
| .AllowAnyMethod() | |||
| .AllowAnyHeader() | |||
| .AllowCredentials()); | |||
| }); | |||
| if (Configuration.GetValue<string>("IsClusterEnv") == bool.TrueString) | |||
| { | |||
| services | |||
| .AddSignalR() | |||
| .AddRedis(Configuration["SignalrStoreConnectionString"]); | |||
| } | |||
| else | |||
| { | |||
| services.AddSignalR(); | |||
| } | |||
| if (Configuration.GetValue<bool>("AzureServiceBusEnabled")) | |||
| { | |||
| services.AddSingleton<IServiceBusPersisterConnection>(sp => | |||
| { | |||
| var logger = sp.GetRequiredService<ILogger<DefaultServiceBusPersisterConnection>>(); | |||
| var serviceBusConnectionString = Configuration["EventBusConnection"]; | |||
| var serviceBusConnection = new ServiceBusConnectionStringBuilder(serviceBusConnectionString); | |||
| return new DefaultServiceBusPersisterConnection(serviceBusConnection, logger); | |||
| }); | |||
| } | |||
| else | |||
| { | |||
| services.AddSingleton<IRabbitMQPersistentConnection>(sp => | |||
| { | |||
| var logger = sp.GetRequiredService<ILogger<DefaultRabbitMQPersistentConnection>>(); | |||
| var factory = new ConnectionFactory() | |||
| { | |||
| HostName = Configuration["EventBusConnection"] | |||
| }; | |||
| if (!string.IsNullOrEmpty(Configuration["EventBusUserName"])) | |||
| { | |||
| factory.UserName = Configuration["EventBusUserName"]; | |||
| } | |||
| if (!string.IsNullOrEmpty(Configuration["EventBusPassword"])) | |||
| { | |||
| factory.Password = Configuration["EventBusPassword"]; | |||
| } | |||
| var retryCount = 5; | |||
| if (!string.IsNullOrEmpty(Configuration["EventBusRetryCount"])) | |||
| { | |||
| retryCount = int.Parse(Configuration["EventBusRetryCount"]); | |||
| } | |||
| return new DefaultRabbitMQPersistentConnection(factory, logger, retryCount); | |||
| }); | |||
| } | |||
| ConfigureAuthService(services); | |||
| RegisterEventBus(services); | |||
| services.AddOptions(); | |||
| //configure autofac | |||
| var container = new ContainerBuilder(); | |||
| container.RegisterModule(new ApplicationModule()); | |||
| container.Populate(services); | |||
| return new AutofacServiceProvider(container.Build()); | |||
| } | |||
| public IConfiguration Configuration { get; } | |||
| // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. | |||
| public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory) | |||
| { | |||
| loggerFactory.AddConsole(Configuration.GetSection("Logging")); | |||
| loggerFactory.AddDebug(); | |||
| loggerFactory.AddAzureWebAppDiagnostics(); | |||
| loggerFactory.AddApplicationInsights(app.ApplicationServices, LogLevel.Trace); | |||
| var pathBase = Configuration["PATH_BASE"]; | |||
| if (!string.IsNullOrEmpty(pathBase)) | |||
| { | |||
| loggerFactory.CreateLogger("init").LogDebug($"Using PATH BASE '{pathBase}'"); | |||
| app.UsePathBase(pathBase); | |||
| } | |||
| app.UseCors("CorsPolicy"); | |||
| app.UseAuthentication(); | |||
| app.UseSignalR(routes => | |||
| { | |||
| routes.MapHub<NotificationsHub>("/notificationhub", options => | |||
| options.Transports = Microsoft.AspNetCore.Http.Connections.TransportType.All); | |||
| }); | |||
| ConfigureEventBus(app); | |||
| } | |||
| private void ConfigureEventBus(IApplicationBuilder app) | |||
| { | |||
| var eventBus = app.ApplicationServices.GetRequiredService<IEventBus>(); | |||
| eventBus.Subscribe<OrderStatusChangedToAwaitingValidationIntegrationEvent, OrderStatusChangedToAwaitingValidationIntegrationEventHandler>(); | |||
| eventBus.Subscribe<OrderStatusChangedToPaidIntegrationEvent, OrderStatusChangedToPaidIntegrationEventHandler>(); | |||
| eventBus.Subscribe<OrderStatusChangedToStockConfirmedIntegrationEvent, OrderStatusChangedToStockConfirmedIntegrationEventHandler>(); | |||
| eventBus.Subscribe<OrderStatusChangedToShippedIntegrationEvent, OrderStatusChangedToShippedIntegrationEventHandler>(); | |||
| eventBus.Subscribe<OrderStatusChangedToCancelledIntegrationEvent, OrderStatusChangedToCancelledIntegrationEventHandler>(); | |||
| eventBus.Subscribe<OrderStatusChangedToSubmittedIntegrationEvent, OrderStatusChangedToSubmittedIntegrationEventHandler>(); | |||
| } | |||
| private void ConfigureAuthService(IServiceCollection services) | |||
| { | |||
| // prevent from mapping "sub" claim to nameidentifier. | |||
| JwtSecurityTokenHandler.DefaultInboundClaimTypeMap.Remove("sub"); | |||
| var identityUrl = Configuration.GetValue<string>("IdentityUrl"); | |||
| services.AddAuthentication(options => | |||
| { | |||
| options.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme; | |||
| options.DefaultChallengeScheme = JwtBearerDefaults.AuthenticationScheme; | |||
| }).AddJwtBearer(options => | |||
| { | |||
| options.Authority = identityUrl; | |||
| options.RequireHttpsMetadata = false; | |||
| options.Audience = "orders.signalrhub"; | |||
| }); | |||
| } | |||
| private void RegisterEventBus(IServiceCollection services) | |||
| { | |||
| var subscriptionClientName = Configuration["SubscriptionClientName"]; | |||
| if (Configuration.GetValue<bool>("AzureServiceBusEnabled")) | |||
| { | |||
| services.AddSingleton<IEventBus, EventBusServiceBus>(sp => | |||
| { | |||
| var serviceBusPersisterConnection = sp.GetRequiredService<IServiceBusPersisterConnection>(); | |||
| var iLifetimeScope = sp.GetRequiredService<ILifetimeScope>(); | |||
| var logger = sp.GetRequiredService<ILogger<EventBusServiceBus>>(); | |||
| var eventBusSubcriptionsManager = sp.GetRequiredService<IEventBusSubscriptionsManager>(); | |||
| return new EventBusServiceBus(serviceBusPersisterConnection, logger, | |||
| eventBusSubcriptionsManager, subscriptionClientName, iLifetimeScope); | |||
| }); | |||
| } | |||
| else | |||
| { | |||
| services.AddSingleton<IEventBus, EventBusRabbitMQ>(sp => | |||
| { | |||
| var rabbitMQPersistentConnection = sp.GetRequiredService<IRabbitMQPersistentConnection>(); | |||
| var iLifetimeScope = sp.GetRequiredService<ILifetimeScope>(); | |||
| var logger = sp.GetRequiredService<ILogger<EventBusRabbitMQ>>(); | |||
| var eventBusSubcriptionsManager = sp.GetRequiredService<IEventBusSubscriptionsManager>(); | |||
| var retryCount = 5; | |||
| if (!string.IsNullOrEmpty(Configuration["EventBusRetryCount"])) | |||
| { | |||
| retryCount = int.Parse(Configuration["EventBusRetryCount"]); | |||
| } | |||
| return new EventBusRabbitMQ(rabbitMQPersistentConnection, logger, iLifetimeScope, eventBusSubcriptionsManager, subscriptionClientName, retryCount); | |||
| }); | |||
| } | |||
| services.AddSingleton<IEventBusSubscriptionsManager, InMemoryEventBusSubscriptionsManager>(); | |||
| } | |||
| } | |||
| } | |||
+ 15
- 0
src/Services/Ordering/Ordering.SignalrHub/appsettings.json
View File
| @ -0,0 +1,15 @@ | |||
| { | |||
| "IdentityUrl": "http://localhost:5105", | |||
| "Logging": { | |||
| "IncludeScopes": false, | |||
| "LogLevel": { | |||
| "Default": "Trace", | |||
| "System": "Information", | |||
| "Microsoft": "Information" | |||
| } | |||
| }, | |||
| "AzureServiceBusEnabled": false, | |||
| "SubscriptionClientName": "Ordering.signalrhub", | |||
| "EventBusRetryCount": 5, | |||
| "EventBusConnection": "localhost" | |||
| } | |||
+ 1
- 1
src/Services/Payment/Payment.API/Payment.API.csproj
View File
+ 3
- 4
src/Web/WebMVC/AppSettings.cs
View File
+ 2
- 0
src/Web/WebMVC/Startup.cs
View File
+ 26
- 27
src/Web/WebMVC/Views/Order/Index.cshtml
View File
+ 51
- 0
src/Web/WebMVC/Views/Shared/_Layout.cshtml
View File
+ 2
- 1
src/Web/WebMVC/WebMVC.csproj
View File
+ 14
- 0
src/Web/WebMVC/bundleconfig.json
View File
+ 26
- 0
src/Web/WebMVC/package-lock.json
View File
| @ -0,0 +1,26 @@ | |||
| { | |||
| "name": "asp.net", | |||
| "version": "1.0.0", | |||
| "lockfileVersion": 1, | |||
| "requires": true, | |||
| "dependencies": { | |||
| "@aspnet/signalr": { | |||
| "version": "1.0.0-preview2-final", | |||
| "resolved": "https://registry.npmjs.org/@aspnet/signalr/-/signalr-1.0.0-preview2-final.tgz", | |||
| "integrity": "sha512-XbqGbAG9Ow4L5Sc4n81A2S8lHSlxBNTjFm3WZQA94cIolPnW0bPK2u14UMooXRXxzjBtJViJMN/aoxWRwTWxig==" | |||
| }, | |||
| "jquery": { | |||
| "version": "3.3.1", | |||
| "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.3.1.tgz", | |||
| "integrity": "sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg==" | |||
| }, | |||
| "toastr": { | |||
| "version": "2.1.4", | |||
| "resolved": "https://registry.npmjs.org/toastr/-/toastr-2.1.4.tgz", | |||
| "integrity": "sha1-i0O+ZPudDEFIcURvLbjoyk6V8YE=", | |||
| "requires": { | |||
| "jquery": "3.3.1" | |||
| } | |||
| } | |||
| } | |||
| } | |||
+ 10
- 0
src/Web/WebMVC/package.json
View File
| @ -0,0 +1,10 @@ | |||
| { | |||
| "version": "1.0.0", | |||
| "name": "asp.net", | |||
| "private": true, | |||
| "devDependencies": {}, | |||
| "dependencies": { | |||
| "@aspnet/signalr": "^1.0.0-preview2-final", | |||
| "toastr": "^2.1.4" | |||
| } | |||
| } | |||