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

Check when the user doesn't have any location in database

Browse Source
This commit is contained in:
Christian Arenas 2017-06-19 00:34:00 +02:00
parent db4403b75c
commit ed97efaf61
3 changed files with 21 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,12 +7,12 @@
using AspNetCore.Mvc;
using Infrastructure;
using System.Threading.Tasks;
using Catalog.API.ViewModel;
using Model;
using EntityFrameworkCore;
using Dto;
using AspNetCore.Authorization;
using Extensions.Options;
using Microsoft.eShopOnContainers.Services.Marketing.API.ViewModel;
[Route("api/v1/[controller]")]
[Authorize]
@ -129,13 +129,10 @@
{
var marketingData = await _marketingDataRepository.GetAsync(userId.ToString());
if (marketingData is null)
{
return NotFound();
}
var campaignDtoList = new List<CampaignDTO>();
if (marketingData != null)
{
//Get User Location Campaign
foreach (var userLocation in marketingData.Locations)
{
@ -154,6 +151,7 @@
campaignDtoList.AddRange(userCampaignDtoList);
}
}
}
var totalItems = campaignDtoList.Count();
campaignDtoList = campaignDtoList

3
src/Services/Marketing/Marketing.API/ViewModel/PaginatedItemsViewModel.cs
View File

@ -1,8 +1,7 @@
namespace Microsoft.eShopOnContainers.Services.Catalog.API.ViewModel
namespace Microsoft.eShopOnContainers.Services.Marketing.API.ViewModel
{
using System.Collections.Generic;
public class PaginatedItemsViewModel<TEntity> where TEntity : class
{
public int PageIndex { get; private set; }

4
src/Web/WebMVC/Controllers/CampaignsController.cs
View File

@ -1,6 +1,3 @@
using Microsoft.EntityFrameworkCore.Query.Internal;
using WebMVC.ViewModels;
namespace Microsoft.eShopOnContainers.WebMVC.Controllers
{
using AspNetCore.Authorization;
@ -10,6 +7,7 @@ namespace Microsoft.eShopOnContainers.WebMVC.Controllers
using System.Threading.Tasks;
using System;
using ViewModels.Pagination;
using global::WebMVC.ViewModels;
[Authorize]
public class CampaignsController : Controller