102 Commits

Author SHA1 Message Date
Ramón Tomás
9fee40e358 Created marketing campaigns view details 2017-06-19 09:46:48 +02:00
Christian Arenas
e80c5efdd3 Add details view and add marketing scope in mvc project and identity config 2017-06-16 01:20:03 +02:00
Christian Arenas
46db196633 Remove url from test 2017-06-15 19:23:33 +02:00
Christian Arenas
523d27a49f Add GetLocationByCampaignAndLocationRuleId route name 2017-06-14 18:25:46 +02:00
Christian Arenas
b3e5362865 Merge branch 'feature/marketing-read-model-data' into marketingcampaign
# Conflicts:
#	src/Services/Location/Locations.API/Model/Locations.cs
2017-06-14 16:26:28 +02:00
Christian Arenas
4ba9d66423 Add new environment variables values to appsettings 2017-06-14 16:21:46 +02:00
Christian Arenas
0024a23801 Add functional test: Check The user has an location campaign 2017-06-14 15:12:40 +02:00
Christian Arenas
486ba1872a Modify marketing functional test 2017-06-13 18:00:09 +02:00
Christian Arenas
794d366053 Merge branch 'feature/marketing-read-model-data' into marketingcampaign
# Conflicts:
#	src/Services/Location/Locations.API/Infrastructure/Services/LocationsService.cs
#	src/Services/Location/Locations.API/Model/UserLocation.cs
2017-06-13 17:38:07 +02:00
Christian Arenas
31fd93dafe Add Functional Test to marketing 2017-06-13 17:33:30 +02:00
Ramón Tomás
9bf5670020 Created Marketing read data model 2017-06-13 17:31:37 +02:00
Christian Arenas
e5a59a1bdf Merge branch 'feature/track-user-location-mongodb' into dev
# Conflicts:
#	src/Services/Ordering/Ordering.API/Infrastructure/AutofacModules/MediatorModule.cs
2017-06-13 11:26:47 +02:00
Christian Arenas
06f978bc97 Modify test. UserId is a Guid type 2017-06-12 20:18:11 +02:00
Ramón Tomás
4be61abdde Merge new creation ordering workflow 2017-06-12 13:52:23 +02:00
Ramón Tomás
0337932697 Merge locations feature branch 2017-06-09 12:43:46 +02:00
Ramón Tomás
ea6084db28 Added location.api integration tests 2017-06-09 12:16:57 +02:00
Ramón Tomás
05bd964f2b Adapt Locations.api to nosql db 2017-06-08 17:33:55 +02:00
Christian Arenas
6ff6864f91 Edit the integration test 2017-06-06 14:19:01 +02:00
Christian Arenas
ea8d893d4e change the FakeCampaignDto private object to an GetFakeCampaignDto funtion 2017-06-05 19:36:09 +02:00
Christian Arenas
3e47c840d5 Add integration test 2017-06-02 16:33:01 +02:00
Ramón Tomás
bae10b07b8 Created UserLocationModel
Map Position to Locations APi
Update current user location
2017-06-01 20:16:19 +02:00
Christian Arenas
1ac1dae9d3 Add Marketing.API project 2017-06-01 10:10:00 +02:00
Ramón Tomás
9d5cde2057 #2412-Create Location Microservice 2017-05-30 15:01:58 +02:00
Ramón Tomás
b84498d8ec Clean commented tests 2017-05-24 16:46:34 +02:00
Cesar De la Torre
2a7c1d740b Minor refactoring 2017-05-20 12:35:16 -07:00
igorsych
9e75504690 Newtonsoft.Json and MediatR with fixes of all based on MediatR classes
also from csproj files excluded direct specification of runtime to make compile happy if on a system we have higher version.
2017-05-19 18:03:05 +03:00
igorsych
85b61a2bfd Test packages update to the latest version
Redis and RabbitMQ also updated
Identity server changes reflectiong  ac59db6e16 commit
2017-05-19 09:02:05 +03:00
Ramón Tomás
87e57b9a44 Merge from Dev 2017-05-18 15:39:31 +02:00
Ramón Tomás
82109476ef Update order functional test 2017-05-18 15:27:51 +02:00
Ramón Tomás
6c9d2cdb31 Adapt test cases to new order flow
Create new service test cases
2017-05-18 08:40:35 +02:00
Ramón Tomás
4e79875d26 Merge 2017-05-16 09:31:45 +02:00
Ramón Tomás
afc247da67 Change SPA app to call basket for order checkout 2017-05-16 09:23:35 +02:00
Christian Arenas
1cdb541f30 Fix some test changes 2017-05-15 10:13:26 +02:00
Ramón Tomás
f79806e899 Created Ship order process in WebMVC app
Create Ship order command and handler in Ordering.api
Create Order management page in WebMVC app
2017-05-14 14:48:37 +02:00
Ramón Tomás
e4c8462f2b Fix merge 2017-05-11 16:33:11 +02:00
Ramón Tomás
21fe9b7be4 Create checkout call in webmvc
Created Cancel call in webmvc
2017-05-11 11:51:13 +02:00
Ramón Tomás
b8f01a9199 Fix failing tests 2017-05-10 11:26:45 +02:00
Ramón Tomás
46ee0db400 Merge branch 'dev' into order-processflow-redesign 2017-05-09 13:46:01 +02: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
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
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
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
Unai Zorrilla Castro
4ef6b63913 Review on 17/04/2017 2017-04-17 12:28:12 +02:00
dsanz
396ba60b72 Fix integration tests 2017-04-07 17:19:25 +02:00
dsanz
237c5424d8 Modify tests to use different settings for each microsevice 2017-04-07 16:12:58 +02:00
dsanz
e4474127f9 Fix tests. 2017-03-29 12:31:52 +02: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
dsanz
cea9600227 Refactoring of idempotent elements and logic. 2017-03-28 12:02:30 +02:00
dsanz
f974d5ea86 Fix test after changes in Catalog Controller 2017-03-27 10:31:25 +02:00