Merge branch 'marketingcampaign' into dev

This commit is contained in:
Christian Arenas 2017-06-09 12:51:31 +02:00
commit 0efe093b3f
4 changed files with 3 additions and 9 deletions

View File

@ -8,7 +8,7 @@ using Microsoft.eShopOnContainers.Services.Marketing.API.Infrastructure;
namespace Microsoft.eShopOnContainers.Services.Marketing.API.Infrastructure.MarketingMigrations namespace Microsoft.eShopOnContainers.Services.Marketing.API.Infrastructure.MarketingMigrations
{ {
[DbContext(typeof(MarketingContext))] [DbContext(typeof(MarketingContext))]
[Migration("20170602122539_Initial")] [Migration("20170609104915_Initial")]
partial class Initial partial class Initial
{ {
protected override void BuildTargetModel(ModelBuilder modelBuilder) protected override void BuildTargetModel(ModelBuilder modelBuilder)
@ -101,7 +101,7 @@ namespace Microsoft.eShopOnContainers.Services.Marketing.API.Infrastructure.Mark
modelBuilder.Entity("Microsoft.eShopOnContainers.Services.Marketing.API.Model.Rule", b => modelBuilder.Entity("Microsoft.eShopOnContainers.Services.Marketing.API.Model.Rule", b =>
{ {
b.HasOne("Microsoft.eShopOnContainers.Services.Marketing.API.Model.Campaign") b.HasOne("Microsoft.eShopOnContainers.Services.Marketing.API.Model.Campaign", "Campaign")
.WithMany("Rules") .WithMany("Rules")
.HasForeignKey("CampaignId") .HasForeignKey("CampaignId")
.OnDelete(DeleteBehavior.Cascade); .OnDelete(DeleteBehavior.Cascade);

View File

@ -100,7 +100,7 @@ namespace Microsoft.eShopOnContainers.Services.Marketing.API.Infrastructure.Mark
modelBuilder.Entity("Microsoft.eShopOnContainers.Services.Marketing.API.Model.Rule", b => modelBuilder.Entity("Microsoft.eShopOnContainers.Services.Marketing.API.Model.Rule", b =>
{ {
b.HasOne("Microsoft.eShopOnContainers.Services.Marketing.API.Model.Campaign") b.HasOne("Microsoft.eShopOnContainers.Services.Marketing.API.Model.Campaign", "Campaign")
.WithMany("Rules") .WithMany("Rules")
.HasForeignKey("CampaignId") .HasForeignKey("CampaignId")
.OnDelete(DeleteBehavior.Cascade); .OnDelete(DeleteBehavior.Cascade);

View File

@ -9,25 +9,19 @@
public Campaign Campaign { get; set; } public Campaign Campaign { get; set; }
public string Description { get; set; } public string Description { get; set; }
public abstract int RuleTypeId { get;}
} }
public class UserProfileRule : Rule public class UserProfileRule : Rule
{ {
public override int RuleTypeId => (int)RuleTypeEnum.UserProfileRule;
} }
public class PurchaseHistoryRule : Rule public class PurchaseHistoryRule : Rule
{ {
public override int RuleTypeId => (int)RuleTypeEnum.PurchaseHistoryRule;
} }
public class UserLocationRule : Rule public class UserLocationRule : Rule
{ {
public override int RuleTypeId => (int)RuleTypeEnum.UserLocationRule;
public int LocationId { get; set; } public int LocationId { get; set; }
} }
} }