Merge branch 'marketingcampaign' into dev

Author: christian147

…tions/20170602122539_Initial.Designer.cs …tions/20170609104915_Initial.Designer.cssrc/Services/Marketing/Marketing.API/Infrastructure/MarketingMigrations/20170602122539_Initial.Designer.cs renamed to src/Services/Marketing/Marketing.API/Infrastructure/MarketingMigrations/20170609104915_Initial.Designer.cs src/Services/Marketing/Marketing.API/Infrastructure/MarketingMigrations/20170602122539_Initial.Designer.cs renamed to src/Services/Marketing/Marketing.API/Infrastructure/MarketingMigrations/20170609104915_Initial.Designer.cs

@@ -100,7 +100,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
             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);

…tingMigrations/20170602122539_Initial.cs …tingMigrations/20170609104915_Initial.cssrc/Services/Marketing/Marketing.API/Infrastructure/MarketingMigrations/20170602122539_Initial.cs renamed to src/Services/Marketing/Marketing.API/Infrastructure/MarketingMigrations/20170609104915_Initial.cs src/Services/Marketing/Marketing.API/Infrastructure/MarketingMigrations/20170602122539_Initial.cs renamed to src/Services/Marketing/Marketing.API/Infrastructure/MarketingMigrations/20170609104915_Initial.cs

@@ -9,25 +9,19 @@ public abstract class Rule
         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; }
     }
 }