Merge from marketing banner mvc

Author: ramon-tomas-c

src/Services/Marketing/Marketing.API/Controllers/CampaignsController.cs

@@ -1,17 +1,18 @@
 namespace Microsoft.eShopOnContainers.Services.Marketing.API.Controllers
 {
-    using Infrastructure.Repositories;
-    using Microsoft.AspNetCore.Mvc;
-    using Microsoft.eShopOnContainers.Services.Marketing.API.Infrastructure;
-    using System.Threading.Tasks;
-    using Microsoft.eShopOnContainers.Services.Marketing.API.Model;
-    using Microsoft.EntityFrameworkCore;
-    using Microsoft.eShopOnContainers.Services.Marketing.API.Dto;
-    using System.Collections.Generic;
-    using Microsoft.AspNetCore.Authorization;
     using System;
     using System.Linq;
-    using Microsoft.Extensions.Options;
+    using System.Collections.Generic;
+    using Infrastructure.Repositories;
+    using AspNetCore.Mvc;
+    using Infrastructure;
+    using System.Threading.Tasks;
+    using Model;
+    using EntityFrameworkCore;
+    using Dto;
+    using AspNetCore.Authorization;
+    using Extensions.Options;
+    using Microsoft.eShopOnContainers.Services.Marketing.API.ViewModel;
 
     [Route("api/v1/[controller]")]
     [Authorize]
@@ -124,35 +125,41 @@ public async Task<IActionResult> Delete(int id)
         }
 
         [HttpGet("user/{userId:guid}")]
-        public async Task<IActionResult> GetCampaignsByUserId(Guid userId)
+        public async Task<IActionResult> GetCampaignsByUserId(Guid userId, int pageSize = 10, int pageIndex = 0)
         {
             var marketingData = await _marketingDataRepository.GetAsync(userId.ToString());
 
-            if (marketingData is null)
-            {
-                return NotFound();
-            }
-
             var campaignDtoList = new List<CampaignDTO>();
-
-            //Get User Location Campaign
-            foreach(var userLocation in marketingData.Locations)
+            
+            if (marketingData != null)
             {
+                var locationIdCandidateList = marketingData.Locations.Select(x => x.LocationId);
                 var userCampaignList = await _context.Rules
                     .OfType<UserLocationRule>()
                     .Include(c => c.Campaign)
-                    .Where(c => c.LocationId == userLocation.LocationId)
-                    .Select(c => c.Campaign)
-                    .ToListAsync();
+                    .Where(c => c.Campaign.From <= DateTime.Now
+                                && c.Campaign.To >= DateTime.Now
+                                && locationIdCandidateList.Contains(c.LocationId))
+                                    .Select(c => c.Campaign)
+                                    .ToListAsync();
 
                 if (userCampaignList != null && userCampaignList.Any())
                 {
                     var userCampaignDtoList = MapCampaignModelListToDtoList(userCampaignList);
                     campaignDtoList.AddRange(userCampaignDtoList);
                 }
+                
             }
 
-            return Ok(campaignDtoList);
+            var totalItems = campaignDtoList.Count();
+            campaignDtoList = campaignDtoList
+                .Skip(pageSize * pageIndex)
+                .Take(pageSize).ToList();
+
+            var model = new PaginatedItemsViewModel<CampaignDTO>(
+                pageIndex, pageSize, totalItems, campaignDtoList);
+
+            return Ok(model);
         }
 
 

src/Services/Marketing/Marketing.API/Infrastructure/MarketingContextSeed.cs

@@ -33,7 +33,7 @@ static List<Campaign> GetPreconfiguredMarketings()
             {
                 new Campaign
                 {
-                    Name = "Campaign Name 1",
+                    Name = ".NET Bot Black Hoodie 50% OFF",
                     Description = "Campaign Description 1",
                     From = DateTime.Now,
                     To = DateTime.Now.AddDays(7),
@@ -42,24 +42,24 @@ static List<Campaign> GetPreconfiguredMarketings()
                     {
                         new UserLocationRule
                         {
-                            Description = "UserLocationRule1",
+                            Description = "Campaign is only for United States users.",
                             LocationId = 1
                         }
                     }
                 },
                 new Campaign
                 {
-                    Name = "Campaign Name 2",
+                    Name = "Roslyn Red T-Shirt 3x2",
                     Description = "Campaign Description 2",
-                    From = DateTime.Now.AddDays(7),
+                    From = DateTime.Now.AddDays(-7),
                     To = DateTime.Now.AddDays(14),
                     PictureUri = "http://externalcatalogbaseurltobereplaced/api/v1/campaigns/2/pic",
                     Rules = new List<Rule>
                     {
                         new UserLocationRule
                         {
-                            Description = "UserLocationRule2",
-                            LocationId = 6
+                            Description = "Campaign is only for Seattle users.",
+                            LocationId = 3
                         }
                     }
                 }

src/Services/Marketing/Marketing.API/Pics/1.png

@@ -2,7 +2,6 @@
 {
     using System.Collections.Generic;
 
-
     public class PaginatedItemsViewModel<TEntity> where TEntity : class
     {
         public int PageIndex { get; private set; }
@@ -21,4 +20,4 @@ public PaginatedItemsViewModel(int pageIndex, int pageSize, long count, IEnumera
             this.Data = data;
         }
     }
-}
+}

src/Services/Marketing/Marketing.API/Pics/2.png

@@ -1,33 +1,54 @@
 namespace Microsoft.eShopOnContainers.WebMVC.Controllers
 {
-    using Microsoft.AspNetCore.Authorization;
-    using Microsoft.AspNetCore.Mvc;
-    using Microsoft.eShopOnContainers.WebMVC.Services;
-    using Microsoft.eShopOnContainers.WebMVC.ViewModels;
-    using System;
-    using System.Collections.Generic;
+    using AspNetCore.Authorization;
+    using AspNetCore.Mvc;
+    using Services;
+    using ViewModels;
     using System.Threading.Tasks;
+    using System;
+    using ViewModels.Pagination;
+    using global::WebMVC.ViewModels;
 
     [Authorize]
     public class CampaignsController : Controller
     {
-        private ICampaignService _campaignService;
+        private readonly ICampaignService _campaignService;
 
         public CampaignsController(ICampaignService campaignService) =>
             _campaignService = campaignService;
 
-        public async Task<IActionResult> Index()
+        public async Task<IActionResult> Index(int page = 0, int pageSize = 10)
         {
-            var campaignList = await _campaignService.GetCampaigns();
+            var campaignList = await _campaignService.GetCampaigns(pageSize, page);
+
+            var vm = new CampaignViewModel()
+            {
+                CampaignItems = campaignList.Data,
+                PaginationInfo = new PaginationInfo()
+                {
+                    ActualPage = page,
+                    ItemsPerPage = pageSize,
+                    TotalItems = campaignList.Count,
+                    TotalPages = (int)Math.Ceiling(((decimal)campaignList.Count / pageSize))
+                }
+            };
+
+            vm.PaginationInfo.Next = (vm.PaginationInfo.ActualPage == vm.PaginationInfo.TotalPages - 1) ? "is-disabled" : "";
+            vm.PaginationInfo.Previous = (vm.PaginationInfo.ActualPage == 0) ? "is-disabled" : "";
 
-            return View(campaignList);
+            return View(vm);
         }
 
         public async Task<IActionResult> Details(int id)
         {
             var campaignDto = await _campaignService.GetCampaignById(id);
 
-            var campaign = new Campaign
+            if (campaignDto is null)
+            {
+                return NotFound();
+            }
+
+            var campaign = new CampaignItem
             {
                 Id = campaignDto.Id,
                 Name = campaignDto.Name,