From 0586fe5abdb488c3766d03dbb1cc87c7c72aef39 Mon Sep 17 00:00:00 2001 From: Christian Arenas Date: Fri, 9 Jun 2017 12:50:26 +0200 Subject: [PATCH] add new migration --- ...itial.Designer.cs => 20170609104915_Initial.Designer.cs} | 4 ++-- ...{20170602122539_Initial.cs => 20170609104915_Initial.cs} | 0 .../MarketingMigrations/MarketingContextModelSnapshot.cs | 2 +- src/Services/Marketing/Marketing.API/Model/Rule.cs | 6 ------ 4 files changed, 3 insertions(+), 9 deletions(-) rename src/Services/Marketing/Marketing.API/Infrastructure/MarketingMigrations/{20170602122539_Initial.Designer.cs => 20170609104915_Initial.Designer.cs} (98%) rename src/Services/Marketing/Marketing.API/Infrastructure/MarketingMigrations/{20170602122539_Initial.cs => 20170609104915_Initial.cs} (100%) diff --git a/src/Services/Marketing/Marketing.API/Infrastructure/MarketingMigrations/20170602122539_Initial.Designer.cs b/src/Services/Marketing/Marketing.API/Infrastructure/MarketingMigrations/20170609104915_Initial.Designer.cs similarity index 98% rename from src/Services/Marketing/Marketing.API/Infrastructure/MarketingMigrations/20170602122539_Initial.Designer.cs rename to src/Services/Marketing/Marketing.API/Infrastructure/MarketingMigrations/20170609104915_Initial.Designer.cs index 5a5a6b66d..a9d63ee9b 100644 --- a/src/Services/Marketing/Marketing.API/Infrastructure/MarketingMigrations/20170602122539_Initial.Designer.cs +++ b/src/Services/Marketing/Marketing.API/Infrastructure/MarketingMigrations/20170609104915_Initial.Designer.cs @@ -8,7 +8,7 @@ using Microsoft.eShopOnContainers.Services.Marketing.API.Infrastructure; namespace Microsoft.eShopOnContainers.Services.Marketing.API.Infrastructure.MarketingMigrations { [DbContext(typeof(MarketingContext))] - [Migration("20170602122539_Initial")] + [Migration("20170609104915_Initial")] partial class Initial { 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 => { - b.HasOne("Microsoft.eShopOnContainers.Services.Marketing.API.Model.Campaign") + b.HasOne("Microsoft.eShopOnContainers.Services.Marketing.API.Model.Campaign", "Campaign") .WithMany("Rules") .HasForeignKey("CampaignId") .OnDelete(DeleteBehavior.Cascade); diff --git a/src/Services/Marketing/Marketing.API/Infrastructure/MarketingMigrations/20170602122539_Initial.cs b/src/Services/Marketing/Marketing.API/Infrastructure/MarketingMigrations/20170609104915_Initial.cs similarity index 100% rename from src/Services/Marketing/Marketing.API/Infrastructure/MarketingMigrations/20170602122539_Initial.cs rename to src/Services/Marketing/Marketing.API/Infrastructure/MarketingMigrations/20170609104915_Initial.cs diff --git a/src/Services/Marketing/Marketing.API/Infrastructure/MarketingMigrations/MarketingContextModelSnapshot.cs b/src/Services/Marketing/Marketing.API/Infrastructure/MarketingMigrations/MarketingContextModelSnapshot.cs index 865daa028..3cfc5fd66 100644 --- a/src/Services/Marketing/Marketing.API/Infrastructure/MarketingMigrations/MarketingContextModelSnapshot.cs +++ b/src/Services/Marketing/Marketing.API/Infrastructure/MarketingMigrations/MarketingContextModelSnapshot.cs @@ -100,7 +100,7 @@ namespace Microsoft.eShopOnContainers.Services.Marketing.API.Infrastructure.Mark 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") .HasForeignKey("CampaignId") .OnDelete(DeleteBehavior.Cascade); diff --git a/src/Services/Marketing/Marketing.API/Model/Rule.cs b/src/Services/Marketing/Marketing.API/Model/Rule.cs index e02128fa6..6f9f23ef5 100644 --- a/src/Services/Marketing/Marketing.API/Model/Rule.cs +++ b/src/Services/Marketing/Marketing.API/Model/Rule.cs @@ -9,25 +9,19 @@ public Campaign Campaign { get; set; } public string Description { get; set; } - - public abstract int RuleTypeId { get;} } public class UserProfileRule : Rule { - public override int RuleTypeId => (int)RuleTypeEnum.UserProfileRule; } public class PurchaseHistoryRule : Rule { - public override int RuleTypeId => (int)RuleTypeEnum.PurchaseHistoryRule; } public class UserLocationRule : Rule { - public override int RuleTypeId => (int)RuleTypeEnum.UserLocationRule; - public int LocationId { get; set; } } } \ No newline at end of file