58 Commits

Author SHA1 Message Date
Christian Arenas
a89918c581 Modify CreatedAtAction parameter, It has an error 2017-06-15 00:52:18 +02:00
Christian Arenas
0a2cd15d61 Add GetLocationByCampaignAndLocationRuleId route name 2017-06-14 18:25:46 +02:00
Ramón Tomás
152bc9fd01 Merge new creation ordering workflow 2017-06-12 13:52:23 +02:00
Christian Arenas
34badc79fe 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
76f0df6a0e fix merge error 2017-06-09 13:05:09 +02:00
Ramón Tomás
a198b12117 Merge locations feature branch 2017-06-09 12:43:46 +02:00
Christian Arenas
5d3d27fce4 Merge branch 'marketingcampaign' into dev
# Conflicts:
#	eShopOnContainers-ServicesAndWebApps.sln
2017-06-09 12:13:21 +02:00
Ramón Tomás
6c855e57c5 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
31ca759662 Merge from Dev 2017-06-02 13:22:40 +02:00
Christian Arenas
8d3ae671a8 Merge remote-tracking branch 'origin/dev' into marketingcampaing
# Conflicts:
#	eShopOnContainers-ServicesAndWebApps.sln
2017-06-01 20:19:33 +02:00
Eduard Tomas
694253d4e9 Resilience enhancements.
MVC app now waits other containers
2017-06-01 14:32:22 +02:00
Christian Arenas
4b86ca0a77 Add docker support 2017-06-01 10:10:20 +02:00
Ramón Tomás
83166cde12 #2412-Create Location Microservice 2017-05-30 15:01:58 +02:00
Ramón Tomás
51c25c985e Rename grace period service in docker-compose files 2017-05-25 11:37:24 +02:00
Ramón Tomás
889d3c86e7 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
6c0838399b 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
1cf7df3a8f Merge branch 'dev' into order-processflow-redesign 2017-05-09 13:46:01 +02:00
Christian Arenas
39feb0171a 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
acccddb96e 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
8d09abbb75 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
6f7605776d Create a SagaManager events 2017-05-08 10:48:06 +02:00
Cesar De la Torre
e5217c1756 CreateOrder refactored so return code lines are more compact 2017-05-03 18:36:52 -07:00
Eduard Tomas
755d1802a2 sln update 2017-05-03 12:54:23 +02:00
Eduard Tomas
0c18168dc3 Merge branch 'master' into order-processflow-redesign
# Conflicts:
#	eShopOnContainers-ServicesAndWebApps.sln
2017-05-03 12:33:51 +02:00
Eduard Tomas
a09d7fd3a5 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
22cc8daa65 Updated healthcheck lib 2017-05-02 10:29:24 +02:00
Ramón Tomás
d2dc0351e9 Created Payment.api microservice 2017-04-28 15:04:38 +02:00
Ramón Tomás
6420357e07 Fix issue error when building the SPA app from the CLI #164 2017-04-13 10:51:19 +02:00
dsanz
5cdb5afa2d 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
dsanz
18a402044e Add basic first implementation of Event bus with rabbitMQ 2017-03-09 15:56:34 +01:00
dsanz
74ab90cff2 Add functional tests project and ordering intial tests 2017-03-07 13:46:27 +01:00
Cesar De la Torre
e8c5eb1eb5 Fix bug/issue in SPA when building from build-container and it is not compatible in Linux with previous SPS content, so needs to run npm rebuild node-sass first 2017-03-06 15:32:15 -08:00
dsanz
e2187167ba Add project for functional tests 2017-03-06 17:00:00 +01:00
dsanz
8e30659ed2 Tests folder renaming 2017-03-06 16:39:47 +01:00
dsanz
1dd1ccf80b Rename of the functional tests to integration 2017-03-06 16:29:24 +01:00
Ramón Tomás
e7ec7260bb Added ordering unit tests 2017-03-03 17:51:32 +01:00
etomas
dc8ae55c7a Renaming WebSpa
Fixes #51
2017-02-22 09:16:31 +01:00
etomas
c7e362ac67 Docker files ready for the Visual Studio Docker Tools
Everything works as exepcted except SPA version which need further adjustments
2017-02-14 18:11:51 +01:00