Changeset 10013

Timestamp:

10/01/13 13:18:19 (11 years ago)

Author:

spimming

Message:

#1888:

• enabled transactions
• enabled tracing output
• set correct invoice data
• saving invoices

Location:

branches/OaaS

Files:

• HeuristicLab 3.3 Services.sln (modified) (1 diff)
• HeuristicLab.Services.Hive.DataAccess/3.3/Settings.Designer.cs (modified) (2 diffs)
• HeuristicLab.Services.Hive.Scaler/HeuristicLab.Services.Optimization.Scaler.csproj (modified) (1 diff)
• HeuristicLab.Services.Optimization.Billing.Test/App.config (modified) (1 diff)
• HeuristicLab.Services.Optimization.Billing.Test/DDLScript.sql (modified) (1 diff)
• HeuristicLab.Services.Optimization.Billing.Test/HeuristicLab.Services.Optimization.Billing.Test.csproj (modified) (1 diff)
• HeuristicLab.Services.Optimization.Billing.Test/Program.cs (modified) (2 diffs)
• HeuristicLab.Services.Optimization.Billing/BillingEngine/AzureInvoiceDao.cs (added)
• HeuristicLab.Services.Optimization.Billing/BillingEngine/BillingEngine.cs (modified) (7 diffs)
• HeuristicLab.Services.Optimization.Billing/BillingEngine/FileSystemInvoiceDao.cs (added)
• HeuristicLab.Services.Optimization.Billing/BillingEngine/PlainTextInvoiceFormattingEngine.cs (modified) (4 diffs)
• HeuristicLab.Services.Optimization.Billing/Business/BillingService.cs (modified) (6 diffs)
• HeuristicLab.Services.Optimization.Billing/Business/TransactionManager.cs (added)
• HeuristicLab.Services.Optimization.Billing/HeuristicLab.Services.Optimization.Billing.csproj (modified) (3 diffs)
• HeuristicLab.Services.Optimization.Billing/Interfaces/IInvoiceDao.cs (added)
• HeuristicLab.Services.Optimization.Billing/Interfaces/ITransactionManager.cs (added)
• HeuristicLab.Services.Optimization.Billing/Model/Model.cs (modified) (1 diff)

branches/OaaS/HeuristicLab 3.3 Services.sln

@@ -197 +197 @@
     {F685556B-F6EB-4143-8E7E-662D00FDD299}.Release|x86.Build.0 = Release|x86
     {034C2EE4-E303-4E45-98AB-F0074EC83B81}.Debug|Any CPU.ActiveCfg = Debug
-    {034C2EE4-E303-4E45-98AB-F0074EC83B81}.Debug|Any CPU.Build.0 = Debug
     {034C2EE4-E303-4E45-98AB-F0074EC83B81}.Debug|Mixed Platforms.ActiveCfg = Debug
     {034C2EE4-E303-4E45-98AB-F0074EC83B81}.Debug|Mixed Platforms.Build.0 = Debug

branches/OaaS/HeuristicLab.Services.Hive.DataAccess/3.3/Settings.Designer.cs

@@ -2 +2 @@
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.269
+//     Runtime Version:4.0.30319.18047
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
@@ -27 +27 @@
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.ConnectionString)]
-        [global::System.Configuration.DefaultSettingValueAttribute("Data Source=pok6rtjc5c.database.windows.net;Initial Catalog=HeuristicLab.Hive-3.3" +
+        [global::System.Configuration.DefaultSettingValueAttribute("Data Source=y1hi1qbs9d.database.windows.net;Initial Catalog=HeuristicLab.Hive-3.3" +
             ";User ID=cloudia;Password=d1fFntitafvX;Enlist=False")]
         public string HeuristicLab_Hive_LinqConnectionString {

branches/OaaS/HeuristicLab.Services.Hive.Scaler/HeuristicLab.Services.Optimization.Scaler.csproj

@@ -89 +89 @@
       <SubType>Designer</SubType>
     </None>
-    <None Include="packages.config" />
+    <None Include="packages.config">
+      <SubType>Designer</SubType>
+    </None>
   </ItemGroup>
   <ItemGroup>

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

@@ -1 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0"?>
 <configuration>
   <configSections>
     <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
-    <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=4.4.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+    <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"/>
+    <add key="BillingEngineInterval" value="00:01:00"/>
+    <add key="LongRunningDbCommandTimeout" value="00:05:00"/>
+    <add key="StorageConnectionString" value="ADJUST_ME"/>
   </appSettings>
   <connectionStrings>
-    <add name="BillingContext" connectionString="ADJUST_ME" providerName="System.Data.SqlClient" />
+    <add name="BillingContext" connectionString="ADJUST_ME" providerName="System.Data.SqlClient"/>
   </connectionStrings>
   <entityFramework>
-    <defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework" />
+    <defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework"/>
   </entityFramework>
-</configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>

branches/OaaS/HeuristicLab.Services.Optimization.Billing.Test/DDLScript.sql

@@ -18 +18 @@
     [Due] [datetime] not null,
     [StatusValue] [int] not null,
+    [SubTotal] [float] not null,
     [Total] [float] not null,
     [Tax] [float] not null,

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

@@ -12 +12 @@
     <AssemblyName>HeuristicLab.Services.Optimization.Billing.Test</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>

branches/OaaS/HeuristicLab.Services.Optimization.Billing.Test/Program.cs

@@ -9 +9 @@
 namespace HeuristicLab.Services.Optimization.Billing.Test {
   class Program {
-    private static BillingEngine.BillingEngine billingEngine;
+    private static HeuristicLab.Services.Optimization.Billing.BillingEngine.BillingEngine billingEngine;
     private static Thread billingEngineThread;
 
@@ -15 +15 @@
       string ddlScript;
       using (var context = new BillingContext()) {
-        System.Data.Entity.Database.SetInitializer(new HeuristicLab.Services.Optimization.Billing.DataAccess.BillingContext.BillingContextInitiliazer());
         ddlScript = (((IObjectContextAdapter)context).ObjectContext.CreateDatabaseScript());
       }

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

@@ -6 +6 @@
 using System.Linq;
 using System.Threading;
+using System.Transactions;
 using HeuristicLab.Services.Optimization.Billing.Business;
 using HeuristicLab.Services.Optimization.Billing.Interfaces;
@@ -51 +52 @@
     public void Run() {
       while (!stop) {
+        TransactionOptions options = new TransactionOptions();
+        options.IsolationLevel = IsolationLevel.ReadUncommitted;
+        TransactionScope transaction = new TransactionScope(TransactionScopeOption.Required, options);
         try {
           Trace.WriteLine("[BillingEngine] Start billing cycle");
@@ -58 +62 @@
           Trace.WriteLine(string.Format("[BillingEngine] Processing {0} active orders.", activeOrders.Count));
           foreach (Order order in activeOrders) {
+            Trace.WriteLine(string.Format("[BillingEngine] Processing order with id: {0}", order.OrderId));
+
             if (!order.NextBillableDay.HasValue) {
               // An invoice has never been generated from this order 
@@ -64 +70 @@
             }
 
-            if (order.NextBillableDay >= currentDate) {
-              // TODO: Embed everything in a transaction
-
+            if (order.NextBillableDay <= currentDate) {
               // Collect Usage Data
+              Trace.WriteLine("[BillingEngine] Collecting usage data");
               //IList<UsageRecord> usageRecrods = BillingService.GetUsageRecords(order.User.Name, order.LastBillableDay.Value, currentDate);
 
               // Collect Invoice Data
+              Trace.WriteLine("[BillingEngine] Collecting invoice data");
               Invoice invoice = new Invoice();
               invoice.Order = order;
@@ -96 +102 @@
               // Bill Post Processing: Apply Discounts or Promotions
               // add discounts, sum up items to sub-total, calc. tax -> total current charges
-              // maybe use windows workflow foundation for this task 
+              // maybe use rule execution feature from the windows workflow foundation for this task 
+              Trace.WriteLine("[BillingEngine] Bill post preccessing");
+              double subTotal = 0.0;
+              foreach (InvoiceLine invoiceLine in invoice.InvoiceLines) {
+                subTotal += invoiceLine.ProductPrice;
+              }
+              invoice.SubTotal = subTotal;
+              invoice.Tax = invoice.SubTotal * 0.2;
+              invoice.Total = invoice.SubTotal + invoice.Tax;
 
-              // Invoice Formatting Engine: Generate Invoice 
+              // Invoice Formatting Engine: Generate Invoice
+              Trace.WriteLine("[BillingEngine] Generating invoice document");
               invoice.InvoiceDocument = InvoiceFormattingEngine.Generate(invoice);
 
@@ -104 +119 @@
               billingService.UpdateOrder(order);
               billingService.SaveInvoice(invoice);
+
+              transaction.Complete();
             }
           }
@@ -112 +129 @@
           Trace.WriteLine(string.Format("[BillingEngine] The following exception occured: {0}", e.ToString()));
         }
+        finally {
+          transaction.Dispose();
+        }
+
         waitHandle.WaitOne(interval);
       }

branches/OaaS/HeuristicLab.Services.Optimization.Billing/BillingEngine/PlainTextInvoiceFormattingEngine.cs

@@ -3 +3 @@
 using System.IO;
 using System.Linq;
+using System.Text.RegularExpressions;
 using System.Windows.Forms;
 using HeuristicLab.Services.Optimization.Billing.Interfaces;
@@ -20 +21 @@
     private PlainTextInvoiceFormat invoiceFormat;
     private string invoiceOutputPath;
+    private IInvoiceDao invoiceDao;
+
+    private IInvoiceDao InvoiceDao {
+      get {
+        if (invoiceDao == null) {
+          invoiceDao = new FileSystemInvoiceDao();
+        }
+        return invoiceDao;
+      }
+    }
 
     public PlainTextInvoiceFormattingEngine()
@@ -82 +93 @@
       invoiceText = invoiceText.Replace("{INVOICE_TOTAL}", invoice.Total.ToString("C2").PadLeft(14));
 
+      // remove all escape sequences and replace directory separator with a hyphen 
+      string customerName = Regex.Replace(invoice.User.ContactInformation.OrganizationName, "\\r\\n|\\[bnrt]", "");
+      customerName = customerName.Replace("/", "-");
+
       if (invoiceFormat == PlainTextInvoiceFormat.RTF) {
-        invoiceOutputPath = string.Format("{0}_{1}_{2}.rtf", invoice.InvoiceId, invoice.InvoiceDate.ToString("yyyMMdd"), "{CUSTOMER}");
+        invoiceOutputPath = string.Format("{0}_{1}_{2}.rtf", invoice.InvoiceId, invoice.InvoiceDate.ToString("yyyMMdd"), customerName);
 
         RichTextBox richTextBox = new RichTextBox();
@@ -90 +105 @@
         richTextBox.SelectionFont = new Font("Consolas", 10, FontStyle.Regular);
 
-        File.WriteAllText(invoiceOutputPath, richTextBox.Rtf);
+        //File.WriteAllText(invoiceOutputPath, richTextBox.Rtf);
+        InvoiceDao.SaveDocument(invoiceOutputPath, richTextBox.Rtf);
       } else if (invoiceFormat == PlainTextInvoiceFormat.TXT) {
-        invoiceOutputPath = string.Format("{0}_{1}_{2}.txt", invoice.InvoiceId, invoice.InvoiceDate.ToString("yyyMMdd"), "{CUSTOMER}");
+        invoiceOutputPath = string.Format("{0}_{1}_{2}.txt", invoice.InvoiceId, invoice.InvoiceDate.ToString("yyyMMdd"), customerName);
 
-        File.WriteAllText(invoiceOutputPath, invoiceText);
+        //File.WriteAllText(invoiceOutputPath, invoiceText);
+        InvoiceDao.SaveDocument(invoiceOutputPath, invoiceText);
       } else if (invoiceFormat == PlainTextInvoiceFormat.PDF) {
         throw new Exception("PDF invoice format is currently not supported");

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

@@ -19 +19 @@
     }
 
+    private ITransactionManager transaction;
+    private ITransactionManager Transaction {
+      get {
+        if (transaction == null) transaction = new TransactionManager();
+        return transaction;
+      }
+    }
+
     #endregion
 
@@ -25 +33 @@
     public IList<Product> GetProducts() {
       //TODO: Authentication
-      //TODO: Enable Transaction
-      return BillingDao.FindAllProducts().ToList();
+      return Transaction.UseTransaction(() => {
+        return BillingDao.FindAllProducts().ToList();
+      });
     }
 
     public IList<Product> GetProductByName(string productName) {
       //TODO: Authentication
-      //TODO: Enable Transaction
-      return BillingDao.FindProdcutBy(prod => prod.Name == productName).ToList();
+      return Transaction.UseTransaction(() => {
+        return BillingDao.FindProdcutBy(prod => prod.Name == productName).ToList();
+      });
     }
 
@@ -41 +51 @@
     public void SaveOrder(Order order) {
       //TODO: Authentication
-      //TODO: Enable Transaction
-      BillingDao.InsertOrUpdateOrder(order);
+      Transaction.UseTransaction(() => {
+        BillingDao.InsertOrUpdateOrder(order);
+      });
     }
 
     public IList<Order> GetOrdersByState(OrderState state) {
       //TODO: Authentication
-      //TODO: Enable Transaction
-      return BillingDao.FindOrderBy(order => order.StateValue == (int)state).ToList();
+      return Transaction.UseTransaction(() => {
+        return BillingDao.FindOrderBy(order => order.StateValue == (int)state).ToList();
+      });
     }
 
     public IList<Order> GetOrders(string userName) {
       //TODO: Authentication
-      //TODO: Enable Transaction
-      User user = GetUser(userName);
-      return BillingDao.FindOrderBy(order => order.User == user).ToList();
+      return Transaction.UseTransaction(() => {
+        User user = GetUser(userName);
+        return BillingDao.FindOrderBy(order => order.User == user).ToList();
+      });
     }
 
     public void UpdateOrder(Order order) {
       //TODO: Authentication
-      //TODO: Enable Transaction
-      BillingDao.InsertOrUpdateOrder(order);
+      Transaction.UseTransaction(() => {
+        BillingDao.InsertOrUpdateOrder(order);
+      });
     }
 
@@ -70 +84 @@
     public User GetUser(string userName) {
       //TODO: Authentication
-      //TODO: Enable Transaction
-      return BillingDao.FindUserBy(u => u.Name == userName).First();
+      return Transaction.UseTransaction(() => {
+        return BillingDao.FindUserBy(u => u.Name == userName).First();
+      });
     }
 
     public void SaveUser(User user) {
       //TODO: Authentication
-      //TODO: Enable Transaction
-      BillingDao.InsertOrUpdateUser(user);
+      Transaction.UseTransaction(() => {
+        BillingDao.InsertOrUpdateUser(user);
+      });
     }
 
@@ -86 +102 @@
     public IList<UsageRecord> GetUsageRecords(string userName) {
       //TODO: Authentication
-      //TODO: Enable Transaction
-      User user = GetUser(userName);
-      return BillingDao.FindUsageRecordsBy(ur => ur.User == user).ToList();
+      return Transaction.UseTransaction(() => {
+        User user = GetUser(userName);
+        return BillingDao.FindUsageRecordsBy(ur => ur.User == user).ToList();
+      });
     }
 
@@ -101 +118 @@
     public IList<Invoice> GetInvoices(string userName) {
       //TODO: Authentication
-      //TODO: Enable Transaction
-      User user = GetUser(userName);
-      return BillingDao.FindInvoiceBy(inv => inv.User == user).ToList();
+      return Transaction.UseTransaction(() => {
+        User user = GetUser(userName);
+        return BillingDao.FindInvoiceBy(inv => inv.User == user).ToList();
+      });
     }
 
     public void SaveInvoice(Invoice invoice) {
       //TODO: Authentication
-      //TODO: Enable Transaction
-      BillingDao.InsertOrUpdateInvoice(invoice);
+      Transaction.UseTransaction(() => {
+        BillingDao.InsertOrUpdateInvoice(invoice);
+      });
     }
 

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

@@ -35 +35 @@
       <HintPath>..\packages\EntityFramework.5.0.0\lib\net40\EntityFramework.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.WindowsAzure.StorageClient, Version=1.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
@@ -42 +43 @@
     <Reference Include="System.Drawing" />
     <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Transactions" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml.Linq" />
@@ -50 +52 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="BillingEngine\AzureInvoiceDao.cs" />
     <Compile Include="BillingEngine\BillingEngine.cs" />
+    <Compile Include="BillingEngine\FileSystemInvoiceDao.cs" />
     <Compile Include="BillingEngine\PlainTextInvoiceFormattingEngine.cs" />
     <Compile Include="Business\BillingService.cs" />
     <Compile Include="Business\BillingServiceProvider.cs" />
+    <Compile Include="Business\TransactionManager.cs" />
     <Compile Include="DataAccess\BillingContext.cs" />
     <Compile Include="DataAccess\BillingDao.cs" />
     <Compile Include="Interfaces\IEntity.cs" />
     <Compile Include="Interfaces\IGenericDao.cs" />
+    <Compile Include="Interfaces\IInvoiceDao.cs" />
     <Compile Include="Interfaces\IInvoiceFormattingEngine.cs" />
     <Compile Include="Interfaces\IObjectWithState.cs" />
     <Compile Include="Interfaces\IOptimizationBilling.cs" />
     <Compile Include="Business\MockupBillingService.cs" />
+    <Compile Include="Interfaces\ITransactionManager.cs" />
     <Compile Include="Model\Model.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

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

@@ -151 +151 @@
     public DateTime Due { get; set; }
     public int StatusValue { get; set; }
+    public double SubTotal { get; set; }
     public double Total { get; set; }
     public double Tax { get; set; }