Changeset 9579 for branches/OaaS/HeuristicLab.Services.Optimization.Billing

Timestamp:

06/04/13 14:57:46 (12 years ago)

Author:

spimming

Message:

#1888:

• Revised model classes
• Modified relationship definitions according to model types

Location:

branches/OaaS/HeuristicLab.Services.Optimization.Billing

Files:

• DataAccess/BillingContext.cs (modified) (7 diffs)
• Model/Model.cs (modified) (2 diffs)

branches/OaaS/HeuristicLab.Services.Optimization.Billing/DataAccess/BillingContext.cs

@@ -13 +13 @@
     public DbSet<Invoice> Invoices { get; set; }
     public DbSet<InvoiceLine> InvoiceLines { get; set; }
+    public DbSet<UsageRecord> UsageRecords { get; set; }
 
     // enum PaymentMethod
@@ -33 +34 @@
       modelBuilder.Configurations.Add(new InvoiceLineConfiguration());
       modelBuilder.Configurations.Add(new UsageRecordConfiguration());
-      modelBuilder.Configurations.Add(new UsageRecordLineConfiguration());
 
       modelBuilder.Conventions.Remove<OneToManyCascadeDeleteConvention>();
@@ -45 +45 @@
       internal OrderConfiguration() {
         this.HasRequired(o => o.User).WithMany().HasForeignKey(o => o.UserId);
-        //this.HasMany<Invoice>(o => o.Invoices).WithRequired().HasForeignKey(i => i.OrderId);
         // TODO: OrderState?
       }
@@ -52 +51 @@
     private class OrderLineConfiguration : EntityTypeConfiguration<OrderLine> {
       internal OrderLineConfiguration() {
-        this.HasRequired(ol => ol.Order).WithMany().HasForeignKey(ol => ol.OrderId);
+        this.HasRequired(ol => ol.Order).WithMany(o => o.OrderLines).HasForeignKey(ol => ol.OrderId).WillCascadeOnDelete(true);
         this.HasRequired(ol => ol.Product).WithMany().HasForeignKey(ol => ol.ProductId);
       }
@@ -60 +59 @@
       internal InvoiceConfiguration() {
         this.HasRequired(i => i.User).WithMany().HasForeignKey(i => i.UserId);
-        this.HasRequired(i => i.Order).WithMany().HasForeignKey(i => i.OrderId);
+        this.HasRequired(i => i.Order).WithMany(o => o.Invoices).HasForeignKey(i => i.OrderId);
       }
     }
@@ -66 +65 @@
     private class InvoiceLineConfiguration : EntityTypeConfiguration<InvoiceLine> {
       internal InvoiceLineConfiguration() {
-        this.HasRequired(il => il.Invoice).WithMany().HasForeignKey(il => il.InvoiceId);
+        this.HasRequired(il => il.Invoice).WithMany(i => i.InvoiceLines).HasForeignKey(il => il.InvoiceId).WillCascadeOnDelete(true);
         this.HasRequired(il => il.Product).WithMany().HasForeignKey(il => il.ProductId);
       }
@@ -74 +73 @@
       internal UsageRecordConfiguration() {
         this.HasRequired(ur => ur.User).WithMany().HasForeignKey(ur => ur.UserId);
-      }
-    }
-
-    private class UsageRecordLineConfiguration : EntityTypeConfiguration<UsageRecordLine> {
-      internal UsageRecordLineConfiguration() {
-        this.HasRequired(url => url.UsageRecord).WithMany().HasForeignKey(url => url.UsageRecordId);
+        this.HasRequired(ur => ur.Product).WithMany().HasForeignKey(ur => ur.ProductId);
       }
     }

branches/OaaS/HeuristicLab.Services.Optimization.Billing/Model/Model.cs

@@ -81 +81 @@
     public virtual User User { get; set; }
     public virtual Order Order { get; set; }
+    public virtual IList<InvoiceLine> InvoiceLines { get; set; }
   }
 
@@ -97 +98 @@
     public long UsageRecordId { get; set; }
     public long UserId { get; set; }
+    public long ProductId { get; set; }
+    public DateTime Begin { get; set; }
+    public DateTime End { get; set; }
+    public int ServiceIdentifier { get; set; }
+    public int ResourceIdentifier { get; set; }
 
     public virtual User User { get; set; }
-    public virtual IList<UsageRecordLine> UsageRecordLines { get; set; }
-  }
-
-  public class UsageRecordLine {
-    public long UsageRecordLineId { get; set; }
-    public long UsageRecordId { get; set; }
-    public DateTime Begin { get; set; }
-    public DateTime End { get; set; }
-
-    public virtual UsageRecord UsageRecord { get; set; }
+    public virtual Product Product { get; set; }
   }
 }