Eduard Tomas
d9b9578e48
Merge remote-tracking branch 'origin/dev' into netcore2
...
# Conflicts:
# docker-compose.dcproj
# docker-compose.vs.debug.yml
# docker-compose.vs.release.yml
# src/BuildingBlocks/EventBus/EventBus/EventBus.csproj
# src/Services/Marketing/Marketing.API/Startup.cs
# src/Web/WebMVC/Startup.cs
# src/Web/WebMVC/WebMVC.csproj
2017-07-11 12:01:45 +02:00
Christian Arenas
06cbab4731
Merge branch 'feature/marketing-details-azure-function' into dev
...
# Conflicts:
# docker-compose.vs.debug.yml
# docker-compose.vs.release.yml
# eShopOnContainers-ServicesAndWebApps.sln
# src/Services/Location/Locations.API/Startup.cs
# src/Services/Marketing/Marketing.API/Controllers/CampaignsController.cs
# src/Services/Marketing/Marketing.API/Marketing.API.csproj
# src/Services/Marketing/Marketing.API/Startup.cs
# src/Web/WebMVC/appsettings.json
# src/Web/WebSPA/AppSettings.cs
# test/Services/FunctionalTests/Services/Marketing/MarketingScenarios.cs
2017-07-07 11:56:57 +02:00
dsanz
8051114da9
Add Azure Storage check in Catalog health checks.
2017-07-06 11:38:45 +02:00
Ramón Tomás
525040b9b6
Created Azure functions for details campaign
...
Adapt MVC app to azure function details campaign
Adapt SPA app to azure function details campaign
2017-06-30 16:31:22 +02:00
Eduard Tomas
d65a112535
References updated to preview-2
...
code adjustements to work with preview-2
2017-06-29 18:36:57 +02:00
Eduard Tomas
10d03a68e3
Merge remote-tracking branch 'eShopOnAzure/dev' into dev
...
# Conflicts:
# docker-compose.override.yml
# src/Services/Catalog/Catalog.API/CatalogSettings.cs
# src/Services/Catalog/Catalog.API/Controllers/CatalogController.cs
# src/Services/Catalog/Catalog.API/Controllers/PicController.cs
# src/Services/Catalog/Catalog.API/Infrastructure/CatalogContextSeed.cs
# src/Services/Catalog/Catalog.API/settings.json
# src/Services/Ordering/Ordering.API/Startup.cs
2017-06-28 12:40:21 +02:00
Ramón Tomás
a56f99f684
Fix merge
2017-06-26 18:05:02 +02:00
Ramón Tomás
a3e63c11aa
Merge from eShopOnContainers Dev
2017-06-26 13:51:49 +02:00
Shaun Walker
445101b376
data and UI customization enhancements
2017-06-20 12:54:32 -07:00
Ramón Tomás
4be61abdde
Merge new creation ordering workflow
2017-06-12 13:52:23 +02:00
Eduard Tomas
b42fe3527a
Resilience enhancements.
...
MVC app now waits other containers
2017-06-01 14:32:22 +02:00
Christian Arenas
18167186c9
Apply EventBusConnectionChanges
2017-05-30 17:59:57 +02:00
Christian Arenas
ed0e548e2d
minor naming
2017-05-26 01:35:44 +02:00
Christian Arenas
e454940801
environment variable renaming
2017-05-24 19:23:14 +02:00
Christian Arenas
9a100c9a27
Remove retry policy from DefaultServiceBusPersisterConnection parameter
2017-05-24 18:59:29 +02:00
Christian Arenas
04b35492c3
Add SubscriptionClientName EnvironmentVariable
2017-05-24 16:25:41 +02:00
Christian Arenas
3acd556c5c
- Declare new ServiceBus instance with "AzureServiceBus" boolean condition DI
...
- Add ServiceBusConnection and AzureServiceBus variables in settings
- Add EventBusServiceBus dependencies
2017-05-24 15:33:05 +02:00
igorsych
4790981e80
swagger/ui to swagger url fix
2017-05-23 16:39:22 +03:00
igorsych
c1320f4445
swagger update https://github.com/domaindrivendev/Swashbuckle.AspNetCore
2017-05-19 08:11:32 +03:00
Ramón Tomás
87e57b9a44
Merge from Dev
2017-05-18 15:39:31 +02:00
Christian Arenas
dc7b1098dd
- Change Integration Command to Integration Events
...
- Rename OrderStockNotConfirmedIntegrationEvent to OrderStockRejectedIntegrationEvent
2017-05-18 11:43:19 +02:00
Christian Arenas
0ee173cd34
naming changes
2017-05-17 11:57:02 +02:00
Christian Arenas
f3b6444e63
minor changes
2017-05-17 00:40:40 +02:00
Christian Arenas
0ac19b8b37
Fix bad namespace from CommandHandler
2017-05-15 19:18:00 +02:00
Christian Arenas
830d0597d7
Add OrderStockConfirmed and ProductPriceChanged IntegrationEvent
2017-05-15 19:05:47 +02:00
Eduard Tomas
7fc63fe196
Messagebus dispatch messages in its own scope
2017-05-11 13:44:38 +02:00
Eduard Tomas
95af2d9a02
Autorefresh on healthchecks with config timeout
2017-05-09 13:54:45 +02:00
Christian Arenas
c5cca8f320
Merge branch 'order-processflow-redesign' of https://github.com/dotnet-architecture/eShopOnContainers into order-processflow-redesign
...
# Conflicts:
# eShopOnContainers-ServicesAndWebApps.sln
2017-05-08 13:59:59 +02:00
Eduard Tomas
79f8f1b949
EventBus refactor.
...
Instead to register EventHandlers we register Func<EventHandlers> which solves scope problems (having transient/scoped objects owned by singletons)
2017-05-03 10:59:36 +02:00
Cesar De la Torre
6f8cd174c7
Refactoring to better terms
2017-04-29 21:58:11 -07:00
Unai Zorrilla Castro
44e39a685c
Added IRabbitMQPersisterConnection and more resilient work on rabbitmq event bus
2017-04-20 10:53:17 +02:00
Unai Zorrilla Castro
4ef6b63913
Review on 17/04/2017
2017-04-17 12:28:12 +02:00
Eduard Tomas
756cb3dafa
Merge branch 'master' into dev
...
# Conflicts:
# src/Mobile/eShopOnContainers/eShopOnContainers.Core/eShopOnContainers.Core.csproj
# src/Services/Catalog/Catalog.API/Startup.cs
# src/Services/Ordering/Ordering.API/Infrastructure/AutofacModules/MediatorModule.cs
# src/Web/WebMVC/Startup.cs
2017-04-05 17:05:14 +02:00
Ramón Tomás
6803781bf8
Merge from Dev
2017-04-05 11:12:49 +02:00
Ramón Tomás
3c909ff392
Refactor transaction and publishing in integration events
2017-04-03 13:13:40 +02:00
Eduard Tomas
202882aa7c
Fixed healthcheck errors
2017-03-31 12:47:56 +02:00
Cesar De la Torre
fa541444c7
Fixed bug in HealthChecks so the Catalog.API microservice checks the SQL database.
...
Also, added more UrlChecks to the MVC app so it checks all its dependencies.
Plus minor bugs/missing code in docker-compose.pro.yml that was evolved in the .override.yml
2017-03-30 18:25:19 -07:00
dsanz
35cc2f9d7b
Merge branch 'dev'
...
# Conflicts:
# src/Services/Basket/Basket.API/Model/IBasketRepository.cs
# src/Services/Basket/Basket.API/Model/RedisBasketRepository.cs
# src/Services/Catalog/Catalog.API/Startup.cs
# src/Services/Ordering/Ordering.API/Application/Commands/CreateOrderCommandHandler.cs
# src/Services/Ordering/Ordering.Infrastructure/Repositories/OrderRepository.cs
# test/Services/UnitTest/Ordering/Application/NewOrderCommandHandlerTest.cs
2017-03-29 11:43:30 +02:00
Ramón Tomás
3ef2aeff9a
Fix issue after merge
2017-03-28 16:37:48 +02:00
Ramón Tomás
fd0a30d62a
Merge from Dev
2017-03-28 16:37:36 +02:00
Ramón Tomás
e08fe895a3
Added MVC and SPA Apps to healthChecker
...
Added styles to view
2017-03-28 16:16:01 +02:00
Ramón Tomás
2119ae19bd
Fix startup after merge
2017-03-27 15:24:29 +02:00
Ramón Tomás
a14b7e580f
Merge from Dev
2017-03-27 15:00:46 +02:00
Ramón Tomás
3a7a14bdb7
Created global filters for web apis
...
Fix bug BadRequest response after creating order
2017-03-27 14:05:28 +02:00
dsanz
d8d1e5a8b2
Remove unused code
2017-03-27 11:55:54 +02:00
dsanz
395768d574
Merge branch 'dev' into IntegrationEventLogService-refactor
...
# Conflicts:
# src/Services/Catalog/Catalog.API/Controllers/CatalogController.cs
# src/Services/Catalog/Catalog.API/Startup.cs
2017-03-27 10:18:41 +02:00
Cesar De la Torre
0d78461a08
Implemented EF Core DB connections resiliency with explicit retries and execution strategy when using multiple DbContexts
2017-03-26 18:00:04 -07:00
dsanz
0372fada82
IntegrationEventLogService refactoring
2017-03-24 12:37:44 +01:00
Eduard Tomas
561ba3b1ec
1st version of healthcheck & webstatus
2017-03-23 19:10:55 +01:00
dsanz
6e4d9461de
Add shared scope transaction between updating catalog product priceand store ProductPriceChangedIntegrationEvent. Added service to encapsulate logic for storage of integration event logs.
2017-03-23 13:24:17 +01:00
