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

Timestamp:

06/04/13 16:30:39 (12 years ago)

Author:

fschoepp

Message:

#1888:

• Added an overview for users to inspect their orders
• Order Administrators may now suspend or reactivate orders
• When creating an order, its necessary to enter payment information (paypal, credit card,...) before
• Also, the billing period and type must be entered during the creation of an order.

Location:

branches/OaaS/HeuristicLab.Services.Optimization.Billing

Files:

• Business/BillingService.cs (modified) (1 diff)
• Business/MockupBillingService.cs (modified) (4 diffs)
• Interfaces/IOptimizationBilling.cs (modified) (1 diff)
• Model/Model.cs (modified) (4 diffs)

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

@@ -46 +46 @@
 
     #endregion
+
+
+    public IList<Order> GetOrders(string userName) {
+      throw new System.NotImplementedException();
+    }
+
+
+    public User GetUser(string userName) {
+      throw new System.NotImplementedException();
+    }
+
+    public void SaveUser(User user) {
+      throw new System.NotImplementedException();
+    }
   }
 }

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

@@ -9 +9 @@
     private static IDictionary<string, IList<Model.Order>> userToOrders;
     private static IList<Model.Order> allOrders;
+    private static IDictionary<string, Model.User> users;
+    private static long maxId = 1;
 
     static MockupBillingService() {
@@ -29 +31 @@
       userToOrders = new Dictionary<string, IList<Model.Order>>();
       allOrders = new List<Model.Order>();
+      users = new Dictionary<string, Model.User>();
     }
 
@@ -38 +41 @@
       IList<Model.Order> orders;
       if (!userToOrders.TryGetValue(order.User.Name, out orders)) {
-        userToOrders[order.User.Name] = orders = new List<Model.Order>();
+        userToOrders[order.User.Name] = orders = new List<Model.Order>();        
       }
-      orders.Add(order);
-      allOrders.Add(order);
+      var oldOrder = (from o in orders where o.OrderId == order.OrderId select o).FirstOrDefault();
+      if (oldOrder == null) {
+        order.OrderId = maxId++;
+        orders.Add(order);
+        allOrders.Add(order);
+      }
+      else {
+        oldOrder.Invoices = order.Invoices;
+        oldOrder.OrderLines = order.OrderLines;
+        oldOrder.OrderStateId = order.OrderStateId;
+        oldOrder.State = order.State;
+        oldOrder.ActiveSince = order.ActiveSince;
+        oldOrder.ActiveUntil = order.ActiveUntil;
+        oldOrder.BillingPeriod = order.BillingPeriod;
+        oldOrder.BillingType = order.BillingType;
+      }
     }
 
@@ -47 +64 @@
       return (from o in allOrders where o.State == state select o).ToList();
     }
+
+
+    public IList<Model.Order> GetOrders(string userName) {
+      return (from o in allOrders where o.User.Name == userName select o).ToList();
+    }
+
+
+    public Model.User GetUser(string userName) {
+      Model.User user;
+      if (!users.TryGetValue(userName, out user))
+        return null;
+      return user;
+    }
+
+    public void SaveUser(Model.User user) {
+      users[user.Name] = user;
+    }
   }
 }

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

@@ -17 +17 @@
     [OperationContract]
     IList<Order> GetOrdersByState(OrderState state);
+    IList<Order> GetOrders(string userName);
+
+    User GetUser(string userName);
+    void SaveUser(User user);
   }
 }

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

@@ -15 +15 @@
   }
 
+  public class PaymentInformation {
+    public long PaymentInformationId { get; set; }
+    public string CardNumber { get; set; }
+    public PaymentMethod PaymentMethod { get; set; }
+    public string AdditionalInformation { get; set; }
+  }
+
   public enum PaymentMethod {
     Cheque,
@@ -21 +28 @@
     PayPal,
     Diners
+  }
+
+  public enum BillingType {
+    Pre,
+    Post
+  }
+
+  public enum BillingPeriod {
+    Weekly,
+    Monthly,
+    Yearly
   }
 
@@ -34 +52 @@
     public long UserId { get; set; }
     public string Name { get; set; }
+    public virtual IList<PaymentInformation> PaymentInformation { get; set; }
   }
 
@@ -47 +66 @@
     public long OrderId { get; set; }
     public long UserId { get; set; }
-    public string BillingType { get; set; }
+    public BillingType BillingType { get; set; }
     public long OrderStateId { get; set; }
-    public string BillingPeriod { get; set; }
-    public DateTime ActiveSince { get; set; }
-    public DateTime ActiveUntil { get; set; }
+    public BillingPeriod BillingPeriod { get; set; }
+    public DateTime? ActiveSince { get; set; }
+    public DateTime? ActiveUntil { get; set; }