126 Commits

Author SHA1 Message Date
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
Ramón Tomás
9bf5670020 Created Marketing read data model 2017-06-13 17:31:37 +02:00
Christian Arenas
432994d113 Create GetCampaignByUserId in CampaignsController 2017-06-13 14:33:16 +02:00
Christian Arenas
4a60d97d4d Add RuleType in MarketingContext 2017-06-13 14:32:53 +02:00
Christian Arenas
8d170fe83f Modify RuleType class 2017-06-13 14:32:08 +02:00
Christian Arenas
0586fe5abd add new migration 2017-06-09 12:50:26 +02:00
Christian Arenas
ce56a42bd1 Redesign marketing campaign api in two different controllers (campaigns/locations) 2017-06-06 14:18:46 +02:00
Christian Arenas
56c07aaafa Edit campaigns controller 2017-06-06 10:26:11 +02:00
Christian Arenas
3c81115603 Edit mapper methods 2017-06-05 23:20:46 +02:00
Christian Arenas
ea8d893d4e change the FakeCampaignDto private object to an GetFakeCampaignDto funtion 2017-06-05 19:36:09 +02:00
Christian Arenas
b5f90cf7b4 Create RuleType class to manage RuleTypeEnum 2017-06-03 01:00:55 +02:00
Christian Arenas
a8178fbbb4 remove unused dbset 2017-06-03 00:59:58 +02:00
Christian Arenas
385f1f094a fix error merge 2017-06-02 16:36:16 +02:00
Christian Arenas
82182e3184 cleanup 2017-06-02 16:35:21 +02:00
Christian Arenas
c349596ca7 Merge branch 'marketingcampaign' of https://github.com/dotnet-architecture/eShopOnContainers into marketingcampaign
# Conflicts:
#	src/Services/Marketing/Marketing.API/Controllers/CampaignsController.cs
2017-06-02 16:34:37 +02:00
Christian Arenas
6dcc6f84bc initialitze the list in constructor 2017-06-02 16:32:50 +02:00
Christian Arenas
4c59c5ebe4 Add migration folder 2017-06-02 16:32:24 +02:00
Christian Arenas
3440427da3 modify context 2017-06-02 16:31:48 +02:00
Christian Arenas
c132d944d7 update inital migration 2017-06-02 16:31:35 +02:00
Christian Arenas
1bd13747f4 Add exceptions filters 2017-06-02 16:31:03 +02:00
Christian Arenas
a5aea54cc8 Add dtos 2017-06-02 16:30:39 +02:00
Christian Arenas
8494e77687 add version 1 to Campaigns web api 2017-06-01 22:19:07 +02:00
Christian Arenas
83b229f4a1 rename file name 2017-06-01 22:13:19 +02:00
Christian Arenas
f993c8c33d Remove unused class 2017-06-01 20:26:10 +02:00
Christian Arenas
32247c503d Add marketing api 2017-06-01 20:15:21 +02:00
Christian Arenas
1ac1dae9d3 Add Marketing.API project 2017-06-01 10:10:00 +02:00