Changeset 9215 for branches/OaaS/HeuristicLab.Services.Optimization.Web/Controllers/OptimizationController.cs

Timestamp:

02/11/13 10:15:52 (11 years ago)

Author:

fschoepp

Message:

#1888:

• Janitor is now working as expected in Windows Azure
• Added basic support for experiments (draggable experiments)
• Added methods to save/read experiments from TableStorage
• The job status can now be retrieved by using the GetTasks/GetTaskData methods
• Added a class to convert JSON-objects to Algorithm instances
• Web page: Added experiment button to navigation

File:

• branches/OaaS/HeuristicLab.Services.Optimization.Web/Controllers/OptimizationController.cs (modified) (6 diffs)

branches/OaaS/HeuristicLab.Services.Optimization.Web/Controllers/OptimizationController.cs

@@ -11 +11 @@
 using HeuristicLab.Services.Optimization.Web.Models;
 using HeuristicLab.Services.Optimization.ControllerService.General;
+using HeuristicLab.Services.Optimization.Web.Helpers;
 
 namespace HeuristicLab.Services.Optimization.Web.Controllers
@@ -16 +17 @@
     [Authorize(Roles="Web User")]
     public class OptimizationController : Controller
-    {
-      public static readonly string DEFAULT_CONTROLLER_ENDPOINT = Configuration.ControllerEndpointName;
+    {     
+        private ControllerServiceHelper ControllerService {
+          get {
+            var helper = new ControllerServiceHelper(Session["pw"] as string);
+            if (!helper.Valid) {
+              Response.Redirect("/Account/Logon?ReturnUrl=%2fOptimization");
+            }
+            return helper;
+          }
+        }
 
-      public delegate T ControllerServiceDelegate<T>(IControllerService service);
-      public delegate void ControllerServiceDelegate(IControllerService service);
-
-      public T withControllerService<T>(ControllerServiceDelegate<T> del) {
-        if (Session["pw"] == null)
-          Response.Redirect("/Account/Logon");
-
-        using (var cf = new ChannelFactory<IControllerService>(DEFAULT_CONTROLLER_ENDPOINT)) {
-          var credentialBehaviour = cf.Endpoint.Behaviors.Find<ClientCredentials>();
-          credentialBehaviour.UserName.UserName = Membership.GetUser().UserName;
-          credentialBehaviour.UserName.Password = Session["pw"] as string;
-          var controllerProxy = cf.CreateChannel();
-          return del(controllerProxy);
-        }
-      }
-
-      public void withControllerService(ControllerServiceDelegate del) {
-        if (Session["pw"] == null)
-          Response.Redirect("/Account/Logon");
-
-        using (var cf = new ChannelFactory<IControllerService>(DEFAULT_CONTROLLER_ENDPOINT)) {          
-          var credentialBehaviour = cf.Endpoint.Behaviors.Find<ClientCredentials>();
-          credentialBehaviour.UserName.UserName = Membership.GetUser().UserName;
-          credentialBehaviour.UserName.Password = Session["pw"] as string;          
-          var controllerProxy = cf.CreateChannel();
-          del(controllerProxy);
-        }
-      }
         //
-        // GET: /Optimization/        
-
+        // GET: /Optimization/   
         public ActionResult Index()
         {
-          var optModel = withControllerService<OptimizationModel>((service) => {
+          var optModel = ControllerService.withControllerService<OptimizationModel>((service) => {
             OptimizationModel model = new OptimizationModel();
             model.Scenarios = service.GetOptimizationScenarios();
@@ -58 +38 @@
             model.Jobs = service.GetJobs(u);
             return model;
-          });
+          });          
           return View(optModel);
         }
 
         public ActionResult ProblemParameters(string scenario) {
-          var optScenario = withControllerService<OptimizationScenario>((service) => {
+          var optScenario = ControllerService.withControllerService<OptimizationScenario>((service) => {
             return service.GetOptimizationScenarioByName(scenario);
           });
@@ -77 +57 @@
 
         public ActionResult JobDetails(string jobId) {
-          Job job = withControllerService<Job>((service) => {
+          Job job = ControllerService.withControllerService<Job>((service) => {
             User u = new User() { Username = Membership.GetUser().UserName, Password = Session["pw"] as string };
             return service.GetJob(u, jobId);
           });
-          var runs = withControllerService<IList<Run>>((service) => {
+          var runs = ControllerService.withControllerService<IList<Run>>((service) => {
             User u = new User() { Username = Membership.GetUser().UserName, Password = Session["pw"] as string };
             return service.GetJobResults(u, jobId);
@@ -92 +72 @@
         [HttpPost]
         public ActionResult JobDetails(Job job) {
-          withControllerService((service) => {
+          ControllerService.withControllerService<bool>((service) => {
             User u = new User() { Username = Membership.GetUser().UserName, Password = Session["pw"] as string };
-            service.DeleteJob(u, job.Id);
+            return service.DeleteJob(u, job.Id);
           });
           return RedirectToAction("Index");
@@ -125 +105 @@
         [HttpPost]
         public ActionResult ScheduleJob(ScheduleJobModel jobModel) {
-          using (var cf = new ChannelFactory<IControllerService>(OptimizationController.DEFAULT_CONTROLLER_ENDPOINT)) {
-            var credentialBehaviour = cf.Endpoint.Behaviors.Find<ClientCredentials>();
-            credentialBehaviour.UserName.UserName = Membership.GetUser().UserName;
-            credentialBehaviour.UserName.Password = Session["pw"] as string;
-            var controllerProxy = cf.CreateChannel();
+          var success = ControllerService.withControllerService<bool>((service) => {
             User u = new User() { Username = Membership.GetUser().UserName, Password = Session["pw"] as string };
             var scenario = Session["scenario"] as OptimizationScenario;
             var details = new JobExecutionDetails() { Group = jobModel.Group, JobTitle = jobModel.Name, Repititions = jobModel.Repetitions };
-            controllerProxy.ScheduleOptimizationScenario(u, scenario, details);
-          }
+            return service.ScheduleOptimizationScenario(u, scenario, details);
+          });
           return RedirectToAction("Index");
         }