diff --git a/src/Services/Marketing/Marketing.API/Controllers/CampaignsController.cs b/src/Services/Marketing/Marketing.API/Controllers/CampaignsController.cs index f95ba8285..8003201ce 100644 --- a/src/Services/Marketing/Marketing.API/Controllers/CampaignsController.cs +++ b/src/Services/Marketing/Marketing.API/Controllers/CampaignsController.cs @@ -88,10 +88,11 @@ return NotFound(); } + campaignToUpdate.Name = campaignDto.Name; campaignToUpdate.Description = campaignDto.Description; campaignToUpdate.From = campaignDto.From; campaignToUpdate.To = campaignDto.To; - campaignToUpdate.Url = campaignDto.Url; + campaignToUpdate.PictureUri = campaignDto.PictureUri; await _context.SaveChangesAsync(); @@ -166,10 +167,11 @@ return new CampaignDTO { Id = campaign.Id, + Name = campaign.Name, Description = campaign.Description, From = campaign.From, To = campaign.To, - Url = campaign.Url, + PictureUri = campaign.PictureUri }; } @@ -178,10 +180,11 @@ return new Campaign { Id = campaignDto.Id, + Name = campaignDto.Name, Description = campaignDto.Description, From = campaignDto.From, To = campaignDto.To, - Url = campaignDto.Url + PictureUri = campaignDto.PictureUri }; } } diff --git a/src/Services/Marketing/Marketing.API/Infrastructure/MarketingContext.cs b/src/Services/Marketing/Marketing.API/Infrastructure/MarketingContext.cs index 65131663b..f530fae37 100644 --- a/src/Services/Marketing/Marketing.API/Infrastructure/MarketingContext.cs +++ b/src/Services/Marketing/Marketing.API/Infrastructure/MarketingContext.cs @@ -31,8 +31,8 @@ .ForSqlServerUseSequenceHiLo("campaign_hilo") .IsRequired(); - builder.Property(m => m.Description) - .HasColumnName("Description") + builder.Property(m => m.Name) + .HasColumnName("Name") .IsRequired(); builder.Property(m => m.From) @@ -47,6 +47,10 @@ .HasColumnName("Description") .IsRequired(); + builder.Property(m => m.PictureUri) + .HasColumnName("PictureUri") + .IsRequired(); + builder.HasMany(m => m.Rules) .WithOne(r => r.Campaign) .HasForeignKey(r => r.CampaignId) diff --git a/src/Services/Marketing/Marketing.API/Infrastructure/MarketingContextSeed.cs b/src/Services/Marketing/Marketing.API/Infrastructure/MarketingContextSeed.cs index de4322e48..304e20a1e 100644 --- a/src/Services/Marketing/Marketing.API/Infrastructure/MarketingContextSeed.cs +++ b/src/Services/Marketing/Marketing.API/Infrastructure/MarketingContextSeed.cs @@ -9,7 +9,7 @@ using System.Linq; using System.Threading.Tasks; - public class MarketingContextSeed + public static class MarketingContextSeed { public static async Task SeedAsync(IApplicationBuilder applicationBuilder, ILoggerFactory loggerFactory, int? retry = 0) { @@ -33,10 +33,11 @@ { new Campaign { - Description = "Campaign1", + Name = "Campaign Name 1", + Description = "Campaign Description 1", From = DateTime.Now, To = DateTime.Now.AddDays(7), - Url = "http://CampaignUrl.test/12f09ed3cef54187123f500ad", + PictureUri = "http://externalcatalogbaseurltobereplaced/api/v1/campaigns/1/pic", Rules = new List { new UserLocationRule @@ -48,10 +49,11 @@ }, new Campaign { - Description = "Campaign2", + Name = "Campaign Name 2", + Description = "Campaign Description 2", From = DateTime.Now.AddDays(7), To = DateTime.Now.AddDays(14), - Url = "http://CampaignUrl.test/02a59eda65f241871239000ff", + PictureUri = "http://externalcatalogbaseurltobereplaced/api/v1/campaigns/2/pic", Rules = new List { new UserLocationRule diff --git a/src/Services/Marketing/Marketing.API/Infrastructure/MarketingMigrations/20170609104915_Initial.Designer.cs b/src/Services/Marketing/Marketing.API/Infrastructure/MarketingMigrations/20170615163431_Init.Designer.cs similarity index 92% rename from src/Services/Marketing/Marketing.API/Infrastructure/MarketingMigrations/20170609104915_Initial.Designer.cs rename to src/Services/Marketing/Marketing.API/Infrastructure/MarketingMigrations/20170615163431_Init.Designer.cs index a9d63ee9b..b4696a8f3 100644 --- a/src/Services/Marketing/Marketing.API/Infrastructure/MarketingMigrations/20170609104915_Initial.Designer.cs +++ b/src/Services/Marketing/Marketing.API/Infrastructure/MarketingMigrations/20170615163431_Init.Designer.cs @@ -8,8 +8,8 @@ using Microsoft.eShopOnContainers.Services.Marketing.API.Infrastructure; namespace Microsoft.eShopOnContainers.Services.Marketing.API.Infrastructure.MarketingMigrations { [DbContext(typeof(MarketingContext))] - [Migration("20170609104915_Initial")] - partial class Initial + [Migration("20170615163431_Init")] + partial class Init { protected override void BuildTargetModel(ModelBuilder modelBuilder) { @@ -33,11 +33,17 @@ namespace Microsoft.eShopOnContainers.Services.Marketing.API.Infrastructure.Mark b.Property("From") .HasColumnName("From"); + b.Property("Name") + .IsRequired() + .HasColumnName("Name"); + + b.Property("PictureUri") + .IsRequired() + .HasColumnName("PictureUri"); + b.Property("To") .HasColumnName("To"); - b.Property("Url"); - b.HasKey("Id"); b.ToTable("Campaign"); diff --git a/src/Services/Marketing/Marketing.API/Infrastructure/MarketingMigrations/20170609104915_Initial.cs b/src/Services/Marketing/Marketing.API/Infrastructure/MarketingMigrations/20170615163431_Init.cs similarity index 93% rename from src/Services/Marketing/Marketing.API/Infrastructure/MarketingMigrations/20170609104915_Initial.cs rename to src/Services/Marketing/Marketing.API/Infrastructure/MarketingMigrations/20170615163431_Init.cs index d33fbb3d0..e4e33f060 100644 --- a/src/Services/Marketing/Marketing.API/Infrastructure/MarketingMigrations/20170609104915_Initial.cs +++ b/src/Services/Marketing/Marketing.API/Infrastructure/MarketingMigrations/20170615163431_Init.cs @@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore.Migrations; namespace Microsoft.eShopOnContainers.Services.Marketing.API.Infrastructure.MarketingMigrations { - public partial class Initial : Migration + public partial class Init : Migration { protected override void Up(MigrationBuilder migrationBuilder) { @@ -23,8 +23,9 @@ namespace Microsoft.eShopOnContainers.Services.Marketing.API.Infrastructure.Mark Id = table.Column(nullable: false), Description = table.Column(nullable: false), From = table.Column(nullable: false), - To = table.Column(nullable: false), - Url = table.Column(nullable: true) + Name = table.Column(nullable: false), + PictureUri = table.Column(nullable: false), + To = table.Column(nullable: false) }, constraints: table => { diff --git a/src/Services/Marketing/Marketing.API/Infrastructure/MarketingMigrations/MarketingContextModelSnapshot.cs b/src/Services/Marketing/Marketing.API/Infrastructure/MarketingMigrations/MarketingContextModelSnapshot.cs index 3cfc5fd66..bcac40659 100644 --- a/src/Services/Marketing/Marketing.API/Infrastructure/MarketingMigrations/MarketingContextModelSnapshot.cs +++ b/src/Services/Marketing/Marketing.API/Infrastructure/MarketingMigrations/MarketingContextModelSnapshot.cs @@ -32,11 +32,17 @@ namespace Microsoft.eShopOnContainers.Services.Marketing.API.Infrastructure.Mark b.Property("From") .HasColumnName("From"); + b.Property("Name") + .IsRequired() + .HasColumnName("Name"); + + b.Property("PictureUri") + .IsRequired() + .HasColumnName("PictureUri"); + b.Property("To") .HasColumnName("To"); - b.Property("Url"); - b.HasKey("Id"); b.ToTable("Campaign"); diff --git a/src/Services/Marketing/Marketing.API/Model/Campaign.cs b/src/Services/Marketing/Marketing.API/Model/Campaign.cs index c628b4a72..51a4c017c 100644 --- a/src/Services/Marketing/Marketing.API/Model/Campaign.cs +++ b/src/Services/Marketing/Marketing.API/Model/Campaign.cs @@ -7,13 +7,15 @@ { public int Id { get; set; } + public string Name { get; set; } + public string Description { get; set; } public DateTime From { get; set; } public DateTime To { get; set; } - public string Url { get; set; } + public string PictureUri { get; set; } public List Rules { get; set; }