Changeset 8545 for branches/OaaS/HeuristicLab.Services.Optimization.Web/Controllers

Timestamp:

08/30/12 16:09:34 (12 years ago)

Author:

fschoepp

Message:

#1888:

• Controller is now capable of gathering Hive Jobs
• Hive Jobs will be mapped to independent Job-Class (shared between Controller and Frontend)
• HiveScenarioManager is capable of gathering Hive Jobs + their results
• Job Results will be mapped to string properties
• Frontend renders all Results after opening the job details
• Misc: Frontend now passes User-object to Controller so that it is able to connect to the Hive Service (hardcoded values removed)

Location:

branches/OaaS/HeuristicLab.Services.Optimization.Web

Files:

• . (modified) (1 prop)
• Controllers/OptimizationController.cs (modified) (4 diffs)

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

@@ -9 +9 @@
 using System.ServiceModel.Description;
 using System.Web.Security;
+using HeuristicLab.Services.Optimization.Web.Models;
 
 namespace HeuristicLab.Services.Optimization.Web.Controllers
@@ -16 +17 @@
     {
       public const string DEFAULT_CONTROLLER_ENDPOINT = "WSHttpBinding_IControllerService";
+
+      public delegate T ControllerServiceDelegate<T>(IControllerService service);
+      public delegate void ControllerServiceDelegate(IControllerService service);
+
+      public T withControllerService<T>(ControllerServiceDelegate<T> del) {
+        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();
+          return del(controllerProxy);
+        }
+      }
+
+      public void withControllerService(ControllerServiceDelegate del) {
+        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();
+          del(controllerProxy);
+        }
+      }
         //
         // GET: /Optimization/        
@@ -21 +45 @@
         public ActionResult Index()
         {
-          IEnumerable<OptimizationScenario> scenarios;
-          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();
-            scenarios = controllerProxy.GetOptimizationScenarios();
-          }
-          return View(scenarios);
+          var optModel = withControllerService<OptimizationModel>((service) => {
+            OptimizationModel model = new OptimizationModel();
+            model.Scenarios = service.GetOptimizationScenarios();
+            User u = new User() { Username = Membership.GetUser().UserName, Password = Session["pw"] as string };
+            model.Jobs = service.GetJobs(u);
+            return model;
+          });
+          return View(optModel);
         }
 
         public ActionResult ProblemParameters(string scenario) {
-          OptimizationScenario optScenario;          
-          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();
-            optScenario = controllerProxy.GetOptimizationScenarioByName(scenario);
-            Session["scenario"] = optScenario;
-          }
+          var optScenario = withControllerService<OptimizationScenario>((service) => {
+            return service.GetOptimizationScenarioByName(scenario);
+          });
+          Session["scenario"] = optScenario;
           return View(optScenario.InputParameters);
+        }
+
+        public ActionResult JobDetails(string jobId) {
+          Job job = 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) => {
+            User u = new User() { Username = Membership.GetUser().UserName, Password = Session["pw"] as string };
+            return service.GetJobResults(u, jobId);
+          });
+          JobDetailsModel jdm = new JobDetailsModel() { Job = job, Runs = runs };
+          return View(jdm);
+        }
+
+        [HttpPost]
+        public ActionResult JobDetails(Job job) {
+          withControllerService((service) => {
+            User u = new User() { Username = Membership.GetUser().UserName, Password = Session["pw"] as string };
+            service.DeleteJob(u, job.Id);
+          });
+          return RedirectToAction("Index");
         }
 
@@ -76 +116 @@
             credentialBehaviour.UserName.Password = Session["pw"] as string;
             var controllerProxy = cf.CreateChannel();
-            controllerProxy.ScheduleOptimizationScenario(Session["scenario"] as OptimizationScenario);
+            User u = new User() { Username = Membership.GetUser().UserName, Password = Session["pw"] as string };
+            controllerProxy.ScheduleOptimizationScenario(u, Session["scenario"] as OptimizationScenario);
           }
           return RedirectToAction("Index");