diff --git a/src/Services/Marketing/Marketing.API/Controllers/CampaignsController.cs b/src/Services/Marketing/Marketing.API/Controllers/CampaignsController.cs index 6bad7ddd4..e6d64efe8 100644 --- a/src/Services/Marketing/Marketing.API/Controllers/CampaignsController.cs +++ b/src/Services/Marketing/Marketing.API/Controllers/CampaignsController.cs @@ -141,7 +141,9 @@ var userCampaignList = await _context.Rules .OfType() .Include(c => c.Campaign) - .Where(c => c.LocationId == userLocation.LocationId) + .Where(c => c.Campaign.From >= DateTime.Now + && c.Campaign.To <= DateTime.Now + && c.LocationId == userLocation.LocationId) .Select(c => c.Campaign) .ToListAsync(); diff --git a/src/Services/Marketing/Marketing.API/Infrastructure/MarketingContextSeed.cs b/src/Services/Marketing/Marketing.API/Infrastructure/MarketingContextSeed.cs index 304e20a1e..fc8c02b4c 100644 --- a/src/Services/Marketing/Marketing.API/Infrastructure/MarketingContextSeed.cs +++ b/src/Services/Marketing/Marketing.API/Infrastructure/MarketingContextSeed.cs @@ -33,7 +33,7 @@ { 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 @@ { 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 { new UserLocationRule { - Description = "UserLocationRule2", - LocationId = 6 + Description = "Campaign is only for Seattle users.", + LocationId = 3 } } } diff --git a/src/Services/Marketing/Marketing.API/Pics/1.png b/src/Services/Marketing/Marketing.API/Pics/1.png index 5350904a5..22a6a946f 100644 Binary files a/src/Services/Marketing/Marketing.API/Pics/1.png and b/src/Services/Marketing/Marketing.API/Pics/1.png differ diff --git a/src/Services/Marketing/Marketing.API/Pics/2.png b/src/Services/Marketing/Marketing.API/Pics/2.png index bea45d825..e23063bc4 100644 Binary files a/src/Services/Marketing/Marketing.API/Pics/2.png and b/src/Services/Marketing/Marketing.API/Pics/2.png differ diff --git a/src/Services/Marketing/Marketing.API/Pics/3.png b/src/Services/Marketing/Marketing.API/Pics/3.png deleted file mode 100644 index 23a826c76..000000000 Binary files a/src/Services/Marketing/Marketing.API/Pics/3.png and /dev/null differ diff --git a/src/Services/Marketing/Marketing.API/Pics/4.png b/src/Services/Marketing/Marketing.API/Pics/4.png deleted file mode 100644 index d91b75f88..000000000 Binary files a/src/Services/Marketing/Marketing.API/Pics/4.png and /dev/null differ diff --git a/src/Services/Marketing/Marketing.API/Pics/5.png b/src/Services/Marketing/Marketing.API/Pics/5.png deleted file mode 100644 index 82a50e5d6..000000000 Binary files a/src/Services/Marketing/Marketing.API/Pics/5.png and /dev/null differ diff --git a/src/Services/Marketing/Marketing.API/Pics/6.png b/src/Services/Marketing/Marketing.API/Pics/6.png deleted file mode 100644 index bb3bc8b12..000000000 Binary files a/src/Services/Marketing/Marketing.API/Pics/6.png and /dev/null differ