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

Timestamp:

06/12/13 16:34:04 (12 years ago)

Author:

spimming

Message:

#1888:

• Added new BillingService methods
• Disabled proxy generation and lazy loading!
• Extended see method with additional test data
• Added properties to order and invoice model
• initial commit of BillingEngine module

Location:

branches/OaaS/HeuristicLab.Services.Optimization.Billing

Files:

• App.config (modified) (1 diff)
• BillingEngine (added)
• BillingEngine/BillingEngine.cs (added)
• BillingEngine/InvoiceTemplate.txt (added)
• BillingEngine/PlainTextInvoiceFormattingEngine.cs (added)
• Business/BillingService.cs (modified) (4 diffs)
• Business/MockupBillingService.cs (modified) (1 diff)
• DataAccess/BillingContext.cs (modified) (2 diffs)
• DataAccess/BillingDao.cs (modified) (2 diffs)
• HeuristicLab.Services.Optimization.Billing.csproj (modified) (4 diffs)
• Interfaces/IInvoiceFormattingEngine.cs (added)
• Interfaces/IOptimizationBilling.cs (modified) (4 diffs)
• Model/Model.cs (modified) (2 diffs)

branches/OaaS/HeuristicLab.Services.Optimization.Billing/App.config

@@ -8 +8 @@
     <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=4.4.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
   </configSections>
+  <appSettings>
+    <add key="BillingEngineInterval" value ="00:01:00"/>
+  </appSettings>
   <entityFramework>
     <defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework" />

branches/OaaS/HeuristicLab.Services.Optimization.Billing/Business/BillingService.cs

@@ -29 +29 @@
     }
 
+    public IList<Product> GetProductByName(string productName) {
+      //TODO: Authentication
+      //TODO: Enable Transaction
+      return BillingDao.FindProdcutBy(prod => prod.Name == productName).ToList();
+    }
+
     #endregion
 
@@ -42 +48 @@
       //TODO: Authentication
       //TODO: Enable Transaction
-      return BillingDao.FindOrderBy(order => order.State == state).ToList();
+      return BillingDao.FindOrderBy(order => order.StateValue == (int)state).ToList();
     }
 
@@ -50 +56 @@
       User user = GetUser(userName);
       return BillingDao.FindOrderBy(order => order.User == user).ToList();
+    }
+
+    public void UpdateOrder(Order order) {
+      throw new System.NotImplementedException();
     }
 
@@ -79 +89 @@
     }
 
+    public IList<UsageRecord> GetUsageRecords(string username, System.DateTime from, System.DateTime to) {
+      throw new System.NotImplementedException();
+    }
+
     #endregion
 

branches/OaaS/HeuristicLab.Services.Optimization.Billing/Business/MockupBillingService.cs

@@ -118 +118 @@
       return null;
     }
+
+    #region IOptimizationBilling Members
+
+
+    public IList<Model.Product> GetProductByName(string productName) {
+      throw new NotImplementedException();
+    }
+
+    public void UpdateOrder(Model.Order order) {
+      throw new NotImplementedException();
+    }
+
+    public IList<Model.UsageRecord> GetUsageRecords(string username, DateTime from, DateTime to) {
+      throw new NotImplementedException();
+    }
+
+    #endregion
   }
 }

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

@@ -28 +28 @@
     public BillingContext(string connectionString)
       : base(connectionString) {
-
+      this.Configuration.LazyLoadingEnabled = false;
+      this.Configuration.ProxyCreationEnabled = false;
     }
 
@@ -96 +97 @@
       protected override void Seed(BillingContext context) {
         Product p1 = new Product() {
-          Name = "Optimization-as-a-Service - Experiment execution",
+          Name = "OaaS BAsic Service Charge",
           Description = "Create and run your experiments within HeuristicLab Hive",
-          ProductId = 1,
-          Price = 10.0,
+          Price = 20.0,
           ProductType = "Optimization Service"
         };
+
+        Product p2 = new Product() {
+          Name = "Oaas Usage Charges",
+          Description = "Charges for OaaS based on usage data",
+          Price = 0.0,
+          ProductType = "Optimization Service"
+        };
+
+        Product p3 = new Product() {
+          Name = "Oaas Support Package",
+          Description = "Charges for OaaS based on usage data",
+          Price = 50.0,
+          ProductType = "Optimization Service"
+        };
+
         p1 = context.Products.Add(p1);
+        p2 = context.Products.Add(p2);
+        p3 = context.Products.Add(p3);
 
         User u1 = new Model.User() { Name = "spimming" };

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

@@ -2 +2 @@
 using System;
 using System.Collections.Generic;
+using System.Data.Entity;
 using System.Linq;
 using System.Linq.Expressions;
@@ -105 +106 @@
     public IEnumerable<Order> FindOrderBy(Expression<Func<Order, bool>> predicate) {
       using (var context = CreateContext()) {
-        var orders = context.Orders.Where(predicate).ToList();
+        var orders = context.Orders
+          .Include(o => o.OrderLines)
+          .Include(o => o.User)
+          .Include(o => o.Invoices)
+          .Include(o => o.OrderLines.Select(ol => ol.Product))
+          .Where(predicate).ToList();
         return orders;
       }

branches/OaaS/HeuristicLab.Services.Optimization.Billing/HeuristicLab.Services.Optimization.Billing.csproj

@@ -40 +40 @@
     <Reference Include="System.Core" />
     <Reference Include="System.Data.Entity" />
+    <Reference Include="System.Drawing" />
     <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -48 +50 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="BillingEngine\BillingEngine.cs" />
+    <Compile Include="BillingEngine\PlainTextInvoiceFormattingEngine.cs" />
     <Compile Include="Business\BillingService.cs" />
     <Compile Include="Business\BillingServiceProvider.cs" />
@@ -54 +58 @@
     <Compile Include="Interfaces\IEntity.cs" />
     <Compile Include="Interfaces\IGenericDao.cs" />
+    <Compile Include="Interfaces\IInvoiceFormattingEngine.cs" />
     <Compile Include="Interfaces\IOptimizationBilling.cs" />
     <Compile Include="Business\MockupBillingService.cs" />
@@ -63 +68 @@
     <None Include="packages.config" />
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Content Include="BillingEngine\InvoiceTemplate.txt">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

branches/OaaS/HeuristicLab.Services.Optimization.Billing/Interfaces/IOptimizationBilling.cs

@@ -1 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Net.Security;
 using System.ServiceModel;
@@ -9 +10 @@
     [OperationContract]
     IList<Product> GetProducts();
+    IList<Product> GetProductByName(string productName);
 
     // payment methods via enumeration
@@ -18 +20 @@
     IList<Order> GetOrdersByState(OrderState state);
     IList<Order> GetOrders(string userName);
+    void UpdateOrder(Order order);
+
+    IList<Invoice> GetInvoices(string userName);
 
     User GetUser(string userName);
@@ -23 +28 @@
 
     IList<UsageRecord> GetUsageRecords(string userName);
-    IList<Invoice> GetInvoices(string userName);
+    IList<UsageRecord> GetUsageRecords(string username, DateTime from, DateTime to);
+
   }
 }

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

@@ -92 +92 @@
     public DateTime? ActiveSince { get; set; }
     public DateTime? ActiveUntil { get; set; }
+    public DateTime? LastBillableDay { get; set; }
+    public DateTime? NextBillableDay { get; set; }
 
     public virtual User User { get; set; }
@@ -130 +132 @@
     public long UserId { get; set; }
     public long OrderId { get; set; }
+    public DateTime InvoiceDate { get; set; }
     public DateTime Due { get; set; }
     public int StatusValue { get; set; }
+    public double Total { get; set; }
+    public double Tax { get; set; }
     public string InvoiceDocument { get; set; }