67 Commits

Author SHA1 Message Date
Cesar De la Torre
740caee4ae Minor changes to the GracePeriodManager: Moved to the Ordering folder as it is part of the same BOUNDED CONTEXT or Ordering BUSINESS MICROSERVICE. Also, changed a log description when querying the database 2017-07-10 13:32:22 -07:00
Christian Arenas
03f23eafa4 Merge branch 'load-testing' into dev
# Conflicts:
#	eShopOnContainers-ServicesAndWebApps.sln
#	src/Services/Identity/Identity.API/Configuration/Config.cs
#	src/Web/WebMVC/appsettings.json
2017-07-10 14:40:26 +02:00
dsanz
8051114da9 Add Azure Storage check in Catalog health checks. 2017-07-06 11:38:45 +02:00
Christian Arenas
6a0001b9c6 Add new LoadTest project, add new Catalog integration test and add new webMVC load test 2017-06-28 17:59:59 +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
514254818f make Docker-Compose the Default Project in the solution 2017-06-21 15:27:42 -07:00
Christian Arenas
dd3237245d Modify CreatedAtAction parameter, It has an error 2017-06-15 00:52:18 +02:00
Christian Arenas
523d27a49f Add GetLocationByCampaignAndLocationRuleId route name 2017-06-14 18:25:46 +02:00
Ramón Tomás
4be61abdde Merge new creation ordering workflow 2017-06-12 13:52:23 +02:00
Christian Arenas
606f23e394 Merge branch 'dev' of https://github.com/dotnet-architecture/eShopOnContainers into dev
# Conflicts:
#	eShopOnContainers-ServicesAndWebApps.sln
2017-06-09 13:07:09 +02:00
Christian Arenas
ce89241f65 fix merge error 2017-06-09 13:05:09 +02:00
Ramón Tomás
0337932697 Merge locations feature branch 2017-06-09 12:43:46 +02:00
Christian Arenas
dfae447f68 Merge branch 'marketingcampaign' into dev
# Conflicts:
#	eShopOnContainers-ServicesAndWebApps.sln
2017-06-09 12:13:21 +02:00
Ramón Tomás
3a10038d71 Fix bug antiforgery decryption issue when deploying in a k8s cluster
Changed in-memory grant store in idsrv to persist in db
2017-06-08 17:45:07 +02:00
Ramón Tomás
d657428e78 Merge from Dev 2017-06-02 13:22:40 +02:00
Christian Arenas
37af8a0e82 Merge remote-tracking branch 'origin/dev' into marketingcampaing
# Conflicts:
#	eShopOnContainers-ServicesAndWebApps.sln
2017-06-01 20:19:33 +02:00
Eduard Tomas
b42fe3527a Resilience enhancements.
MVC app now waits other containers
2017-06-01 14:32:22 +02:00
Christian Arenas
6082359f08 Add docker support 2017-06-01 10:10:20 +02:00
Ramón Tomás
9d5cde2057 #2412-Create Location Microservice 2017-05-30 15:01:58 +02:00
Ramón Tomás
e8dbf0c160 Rename grace period service in docker-compose files 2017-05-25 11:37:24 +02:00
Ramón Tomás
8c2af8c048 Clean Basket event is launched once basket is converted to order and before starting creating order.
Change grace period time  to 1 minute
Remove unecessary clean basket methods on client
2017-05-24 16:09:03 +02:00
Christian Arenas
aa7556a1bd Create EventBusServiceBus project and add EventBusServiceBus/ServiceBusPersisterConnection to project 2017-05-24 15:34:55 +02:00
Christian Arenas
4371e4860b Merge branch 'order-processflow-redesign' of https://github.com/dotnet-architecture/eShopOnContainers into order-processflow-redesign 2017-05-09 13:52:45 +02:00
Ramón Tomás
46ee0db400 Merge branch 'dev' into order-processflow-redesign 2017-05-09 13:46:01 +02:00
Christian Arenas
7fe643f06a Merge branch 'order-processflow-redesign' of https://github.com/dotnet-architecture/eShopOnContainers into order-processflow-redesign
# Conflicts:
#	eShopOnContainers-ServicesAndWebApps.sln
#	src/Services/Basket/Basket.API/Controllers/BasketController.cs
#	src/Services/Basket/Basket.API/Startup.cs
2017-05-08 15:11:31 +02:00
Christian Arenas
af24e35b66 Merge branch 'order-processflow-redesign' of https://github.com/dotnet-architecture/eShopOnContainers into order-processflow-redesign
# Conflicts:
#	eShopOnContainers-ServicesAndWebApps.sln
#	src/Services/Basket/Basket.API/Controllers/BasketController.cs
#	src/Services/Basket/Basket.API/Startup.cs
2017-05-08 15:03:33 +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
Christian Arenas
cde4c3a258 Create a SagaManager events 2017-05-08 10:48:06 +02:00
Cesar De la Torre
b1c0c72ec7 CreateOrder refactored so return code lines are more compact 2017-05-03 18:36:52 -07:00
Eduard Tomas
3f95dcc75e sln update 2017-05-03 12:54:23 +02:00
Eduard Tomas
ed641df444 Merge branch 'master' into order-processflow-redesign
# Conflicts:
#	eShopOnContainers-ServicesAndWebApps.sln
2017-05-03 12:33:51 +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
Eduard Tomas
829f13aff0 Updated healthcheck lib 2017-05-02 10:29:24 +02:00
Ramón Tomás
8a19fad3a5 Created Payment.api microservice 2017-04-28 15:04:38 +02:00
Ramón Tomás
f48a503885 Fix issue error when building the SPA app from the CLI #164 2017-04-13 10:51:19 +02:00
dsanz
6ca7f25669 Renaming of the resilience.http project 2017-04-06 16:59:17 +02:00
dsanz
6ac5a8cc70 Move Polly implementation to Building block project 2017-03-30 15:05:19 +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
Eduard Tomas
561ba3b1ec 1st version of healthcheck & webstatus 2017-03-23 19:10:55 +01:00
dsanz
7a63490558 Add the sql implementation for the storage of Integration events. 2017-03-22 16:10:46 +01:00
Cesar De la Torre
dd7de1be52 Removed not used Common folder from the Solution 2017-03-20 12:18:30 -07:00
dsanz
ca029618e6 Fix for issue #57 When re-building the solution sometimes the FunctionalTests.csproj fails trying to find the Catalog.API.dll 2017-03-20 10:03:55 +01:00
dsanz
c8df9a232a Refactoring integration events: move event bus implementation to building block projects. 2017-03-16 13:30:01 +01:00
Ramón Tomás
1e47a3378f Merge domain events to DEV 2017-03-14 19:04:59 +01:00
Ramón Tomás
c8f0776f1f Added domain events in Ordering Api 2017-03-14 18:02:28 +01:00
DESKTOP-V1VLQ15\dsanz
23fcfd0dc4 Fix merge issue. 2017-03-14 12:17:05 +01:00
DESKTOP-V1VLQ15\dsanz
f1ffb95abf Merge branch 'dev' into integration-events-rmq
# Conflicts:
#	docker-compose.override.yml
#	eShopOnContainers-ServicesAndWebApps.sln
2017-03-14 11:50:28 +01:00