791 Commits

Author SHA1 Message Date
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
Eduard Tomas
50f904f74a Fixing registers missing and routes 2017-05-08 13:36:31 +02:00
Christian Arenas
04b5577e99 Fix some errors 2017-05-08 11:32:57 +02:00
Christian Arenas
cde4c3a258 Create a SagaManager events 2017-05-08 10:48:06 +02:00
Cesar De la Torre
3e5d38dae1 Merge pull request #181 from BillWagner/use-IEnumerable-dynamic
Use IEnumerable<dynamic> instead of dynamic for collections
2017-05-05 15:53:44 -07:00
Eduard Tomas
2af88e74c8 Merge remote-tracking branch 'eShopOnContainers/dev' into dev
# Conflicts:
#	README.md
#	docs/Enterprise-Application-Patterns-using-XamarinForms.pdf
#	docs/architecting-and-developing-containerized-and-microservice-based-net-applications-ebook-early-draft.pdf
2017-05-05 10:05:51 +02:00
Ramón Tomás
c79336cda2 Merge branch 'dev' of https://github.com/dotnet-architecture/eShopOnContainers into dev 2017-05-05 09:45:18 +02:00
Cesar De la Torre
c247261929 Minor refactoring for the CreateOrder Web API method and the Entity base class 2017-05-04 12:29:00 -07:00
BillWagner
223dcda0cb add back the async state machine
Because of the using blocks, these one line methods need the async
modifier so that the that async state machiner is created. Otherwise, if
the method does not complete synchronously, the connection is closed
before the database has returned its results.
2017-05-04 10:36:23 -04:00
Bill Wagner
d97ae6d6ae Fix API signatures for collections
The methods that return collections should return
Task<IEnumerable<dynamic>> not Task<dynamic>
2017-05-04 10:36:23 -04:00
Ramón Tomás
fa048c22c1 Merge from Dev 2017-05-04 11:57:49 +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
bfe86c1cba Refactor to event bus to support dynamic subscriptions to events
Checkout HTTP entrypoint in Basket API
2017-05-03 16:34:41 +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
11495156e1 Merge branch 'dev' 2017-05-03 12:04:43 +02:00
Eduard Tomas
0d7e6a16aa Merge branch 'refactor-event-bus' into dev 2017-05-03 11:00:03 +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
4b1467a7b9 Fixing the CreateOrderCommand so it is 100% immutable. It shouldn't have the AddOrderItem() method. In any case, it was not really used but in the tets, since this Command is serialized in the client side, then deserialized in the service level. 2017-05-02 17:42:59 -07:00
Eduard Tomas
829f13aff0 Updated healthcheck lib 2017-05-02 10:29:24 +02:00
Cesar De la Torre
1df0019981 Minor comment typo changeed 2017-05-01 17:56:33 -07:00
Cesar De la Torre
6f8cd174c7 Refactoring to better terms 2017-04-29 21:58:11 -07:00
Cesar De la Torre
ed7970802a Revert "Fix API signatures for collections" 2017-04-29 15:30:17 -07:00
Bill Wagner
995cc890ff Fix API signatures for collections
The methods that return collections should return
Task<IEnumerable<dynamic>> not Task<dynamic>
2017-04-28 09:25:24 -04:00
Ramón Tomás
8a19fad3a5 Created Payment.api microservice 2017-04-28 15:04:38 +02:00
Ramón Tomás
3f3b9b09e9 Moved Integrationevent to Application folder
Created basic structure for order process saga
2017-04-28 14:25:52 +02:00
Eduard Tomas
3153bf7654 Added missing IdSvr certificate! 2017-04-25 11:05:15 +02:00
Eduard Tomas
952bd41e39 Merge of eShopOnContainers/master branch into master
/docs not merged (won't be on this repo).
2017-04-24 12:25:10 +02:00
Eduard Tomas
46a030b095 Merge branch 'reviews/rabbitmq' 2017-04-24 12:18:16 +02:00
Steve Smith
a8536b0f3e Cleaning up and fixing typos 2017-04-22 15:14:42 -04:00
Ramón Tomás
6c6532c0f4 Merge from Dev 2017-04-21 15:46:15 +02:00
Geert Van Laethem
3d8fadece4 Fixed two typos to the filter 2017-04-20 13:27:52 +02:00
Unai Zorrilla Castro
44e39a685c Added IRabbitMQPersisterConnection and more resilient work on rabbitmq event bus 2017-04-20 10:53:17 +02:00
Eduard Tomas
c85e880dad Catalog.API methods following more rest conventions:
Create/Update routed by POST/PUT & Location header returned
A new GET endpoint for returning single item by id created to honour Location header of previous methods.
2017-04-18 17:58:52 +02:00
Eduard Tomas
6ea2e1ed8b Merge branch 'reviews/uzorrilla' into dev
# Conflicts:
#	src/Services/Basket/Basket.API/Model/RedisBasketRepository.cs
2017-04-18 15:34:31 +02:00
Unai Zorrilla Castro
4ef6b63913 Review on 17/04/2017 2017-04-17 12:28:12 +02:00
Charles Lowell
1eae6a9ea2 Merge branch 'master' 2017-04-11 12:20:39 -07:00
Cesar De la Torre
63eed87292 Merge pull request #142 from chlowell/hosting-changes
Set application discriminators, work around Redis client issue
2017-04-08 11:15:28 -07:00
dsanz
ccde4a09f4 Remove commented code 2017-04-07 15:23:05 +02:00
Cesar De la Torre
a07a88f9c4 Added DDD comment about the Address Id as "Shadow property" as a Value Object shouldn't have an ID in the domain model. 2017-04-06 11:47:10 -07:00
dsanz
c16941cf25 Fix warnings 2017-04-06 11:59:11 +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
Eduard Tomàs
70fc4c90ca Merge pull request #156 from dotnet/idsvr-new-config
Idsvr new config
2017-04-05 16:07:47 +02:00
Eduard Tomas
d00588ae37 Updated IdSvr for Xamarin-UWP signin related problems 2017-04-05 15:53:04 +02:00
André Passos
f337898143
upgrade to Identity Server 4 rtm 2017-04-05 09:23:22 -03:00
Eduard Tomas
be440a9a02 Removing PaymentMethod property from order 2017-04-05 13:15:27 +02:00
Ramón Tomás
6803781bf8 Merge from Dev 2017-04-05 11:12:49 +02:00
Ramón Tomás
00f7226f30 Rename OrderingIntegrationEvent service methods
Remove clean basket instruction from SPA client
2017-04-05 11:07:26 +02:00