Changeset 12484 for branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Statistics/3.3/WebApi

Timestamp:

06/19/15 18:06:19 (10 years ago)

Author:

dglaser

Message:

#2388: Updated Hive, DataAccess and WebApp

HeuristicLab.Services.Hive.DataAccess:

• Updated database statistics schema

HeuristicLab.Services.Hive:

• Fixed event flag in HiveJanitor Service
• Improved UpdateTaskFactsTable in the HiveStatisticsGenerator

HeuristicLab.Services.WebApp:

• Updated Statistics DataController to match the new statistics schema

Location:

branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Statistics/3.3/WebApi

Files:

• DataController.cs (modified) (4 diffs)
• DataTransfer/Task.cs (modified) (2 diffs)

branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/DataController.cs

@@ -41 +41 @@
       get { return ServiceLocator.Instance.UserManager; }
     }
+    private IRoleVerifier RoleVerifier {
+      get { return ServiceLocator.Instance.RoleVerifier; }
+    }
+    private IAuthorizationManager AuthorizationManager {
+      get { return ServiceLocator.Instance.AuthorizationManager; }
+    }
 
     public IEnumerable<DTO.Job> GetJobs() {
@@ -47 +53 @@
 
     public IEnumerable<DTO.Job> GetJobsByUserId(Guid id) {
+      if (id != UserManager.CurrentUserId) {
+        RoleVerifier.AuthenticateForAnyRole(HiveRoles.Administrator);
+      }
       using (var pm = PersistenceManager) {
         return pm.UseTransaction(() => {
@@ -62 +71 @@
       using (var pm = PersistenceManager) {
         return pm.UseTransaction(() => {
+          var dimJobDao = pm.JobDao;
           var factTaskDao = pm.FactTaskDao;
+          var job = dimJobDao.GetById(id);
+          if (job != null && job.OwnerUserId != UserManager.CurrentUserId) {
+            RoleVerifier.AuthenticateForAllRoles(HiveRoles.Administrator);
+          }
           return factTaskDao.GetByJobId(id).Select(x => new DTO.Task {
-            TotalRuntime = x.TotalRuntime,
-            TotalWaitingTime = x.TotalWaitingTime,
-            TotalTransferTime = x.TotalTransferTime,
+            Id = x.TaskId,
+            CalculatingTime = x.CalculatingTime,
+            WaitingTime = x.WaitingTime,
+            TransferTime = x.TransferTime,
+            InitialWaitingTime = x.InitialWaitingTime,
             NumCalculationRuns = x.NumCalculationRuns,
             NumRetries = x.NumRetries,
@@ -72 +88 @@
             MemoryRequired = x.MemoryRequired,
             Priority = x.Priority,
+            State = x.TaskState.ToString(),
             LastClientId = x.LastClientId,
             StartTime = x.StartTime,
-            EndTime = x.EndTime
+            EndTime = x.EndTime,
+            Exception = x.Exception
           }).ToList();
         });

branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/DataTransfer/Task.cs

@@ -24 +24 @@
 namespace HeuristicLab.Services.WebApp.Statistics.WebApi.DataTransfer {
   public class Task {
-    public double TotalRuntime { get; set; }
-    public double TotalWaitingTime { get; set; }
-    public double TotalTransferTime { get; set; }
+    public Guid Id { get; set; }
+    public double CalculatingTime { get; set; }
+    public double WaitingTime { get; set; }
+    public double TransferTime { get; set; }
+    public double InitialWaitingTime { get; set; }
     public int NumCalculationRuns { get; set; }
     public int NumRetries { get; set; }
@@ -32 +34 @@
     public int MemoryRequired { get; set; }
     public int Priority { get; set; }
+    public string State { get; set; }
     public Guid? LastClientId { get; set; }
-    public DateTime StartTime { get; set; }
+    public DateTime? StartTime { get; set; }
     public DateTime? EndTime { get; set; }
+    public string Exception { get; set; }
   }
 }