ayan.poddar/eShopOnContainers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'feature/display-marketing-banner-mvc' into dev

Browse Source
This commit is contained in:
Christian Arenas 2017-06-19 09:41:45 +02:00
commit 85b2085504
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/Services/Marketing/Marketing.API/Controllers/CampaignsController.cs
View File

@ -130,27 +130,25 @@
var marketingData = await _marketingDataRepository.GetAsync(userId.ToString()); var marketingData = await _marketingDataRepository.GetAsync(userId.ToString());
var campaignDtoList = new List<CampaignDTO>(); var campaignDtoList = new List<CampaignDTO>();
if (marketingData != null) if (marketingData != null)
{ {
//Get User Location Campaign var locationIdCandidateList = marketingData.Locations.Select(x => x.LocationId);
foreach (var userLocation in marketingData.Locations) var userCampaignList = await _context.Rules
{ .OfType<UserLocationRule>()
var userCampaignList = await _context.Rules .Include(c => c.Campaign)
.OfType<UserLocationRule>() .Where(c => c.Campaign.From <= DateTime.Now
.Include(c => c.Campaign) && c.Campaign.To >= DateTime.Now
.Where(c => c.Campaign.From <= DateTime.Now && locationIdCandidateList.Contains(c.LocationId))
&& c.Campaign.To >= DateTime.Now .Select(c => c.Campaign)
&& c.LocationId == userLocation.LocationId) .ToListAsync();
.Select(c => c.Campaign)
.ToListAsync();
if (userCampaignList != null && userCampaignList.Any()) if (userCampaignList != null && userCampaignList.Any())
{ {
var userCampaignDtoList = MapCampaignModelListToDtoList(userCampaignList); var userCampaignDtoList = MapCampaignModelListToDtoList(userCampaignList);
campaignDtoList.AddRange(userCampaignDtoList); campaignDtoList.AddRange(userCampaignDtoList);
}
} }
} }
var totalItems = campaignDtoList.Count(); var totalItems = campaignDtoList.Count();