Changeset 5511 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.DataAccess/3.4/Convert.cs

Timestamp:

02/17/11 14:47:56 (13 years ago)

Author:

cneumuel

Message:

#1233

• added StateLog to log state transitions of hive jobs
• added permissions to hive experiments (in data access layer, no UI for that yet)
• extended unit tests

File:

• branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.DataAccess/3.4/Convert.cs (modified) (6 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.DataAccess/3.4/Convert.cs

@@ -33 +33 @@
         Id = source.JobId,
         CoresNeeded = source.CoresNeeded,
-        DateCalculated = source.DateCalculated,
-        DateCreated = source.DateCreated,
-        DateFinished = source.DateFinished,
-        Exception = source.Exception,
-        ExecutionTime = source.ExecutionTime,
+        ExecutionTime = string.IsNullOrEmpty(source.ExecutionTime) ? TimeSpan.Zero : TimeSpan.Parse(source.ExecutionTime),
         MemoryNeeded = source.MemoryNeeded,
         ParentJobId = source.ParentJobId,
         Priority = source.Priority,
-        SlaveId = source.SlaveId,
-        JobState = source.JobState,
-        UserId = source.UserId,
         PluginsNeededIds = source.RequiredPlugins.Select(x => x.PluginId).ToList(),
-        LastHeartbeat = source.LastHeartbeat        
+        LastHeartbeat = source.LastHeartbeat,
+        State = source.State,
+        StateLog = source.StateLogs.Select(x => Convert.ToDto(x)).OrderBy(x => x.DateTime).ToList()
       };
     }
@@ -57 +52 @@
         target.JobId = source.Id;
         target.CoresNeeded = source.CoresNeeded;
-        target.DateCalculated = source.DateCalculated;
-        target.DateCreated = source.DateCreated;
-        target.DateFinished = source.DateFinished;
-        target.Exception = source.Exception;
-        target.ExecutionTime = source.ExecutionTime;
+        target.ExecutionTime = source.ExecutionTime.ToString();
         target.MemoryNeeded = source.MemoryNeeded;
         target.ParentJobId = source.ParentJobId;
         target.Priority = source.Priority;
-        target.SlaveId = source.SlaveId;
-        target.JobState = source.JobState;
-        target.UserId = source.UserId;
         target.LastHeartbeat = source.LastHeartbeat;
+        target.State = source.State;
+        if (target.StateLogs == null) target.StateLogs = new EntitySet<StateLog>();
+        target.StateLogs.AddRange(source.StateLog.Select(x => Convert.ToEntity(x)).OrderBy(x => x.DateTime));
         // RequiredPlugins are added by Dao
       }
@@ -91 +82 @@
     #endregion
 
+    #region StateLog
+    public static DT.StateLog ToDto(StateLog source) {
+      if (source == null) return null;
+      return new DT.StateLog { Id = source.StateLogId, DateTime = source.DateTime, Exception = source.Exception, JobId = source.JobId, SlaveId = source.SlaveId, State = source.State, UserId = source.UserId };
+    }
+    public static StateLog ToEntity(DT.StateLog source) {
+      if (source == null) return null;
+      var entity = new StateLog(); ToEntity(source, entity);
+      return entity;
+    }
+    public static void ToEntity(DT.StateLog source, StateLog target) {
+      if ((source != null) && (target != null)) {
+        target.StateLogId = source.Id; target.DateTime = source.DateTime; target.Exception = source.Exception; target.JobId = source.JobId; target.SlaveId = source.SlaveId; target.State = source.State; target.UserId = source.UserId;
+      }
+    }
+    #endregion
+
     #region HiveExperiment
     public static DT.HiveExperiment ToDto(HiveExperiment source) {
       if (source == null) return null;
-      return new DT.HiveExperiment { Id = source.HiveExperimentId, Description = source.Description, Name = source.Name, RootJobId = source.RootJobId, UserId = source.UserId, DateCreated = source.DateCreated, ResourceNames = source.ResourceIds };
+      return new DT.HiveExperiment { Id = source.HiveExperimentId, Description = source.Description, Name = source.Name, RootJobId = source.RootJobId, OwnerUserId = source.OwnerUserId, DateCreated = source.DateCreated, ResourceNames = source.ResourceIds, LastAccessed = source.LastAccessed };
     }
     public static HiveExperiment ToEntity(DT.HiveExperiment source) {
@@ -103 +111 @@
     public static void ToEntity(DT.HiveExperiment source, HiveExperiment target) {
       if ((source != null) && (target != null)) {
-        target.HiveExperimentId = source.Id; target.Description = source.Description; target.Name = source.Name; target.RootJobId = source.RootJobId; target.UserId = source.UserId; target.DateCreated = source.DateCreated; target.ResourceIds = source.ResourceNames;
+        target.HiveExperimentId = source.Id; target.Description = source.Description; target.Name = source.Name; target.RootJobId = source.RootJobId; target.OwnerUserId = source.OwnerUserId; target.DateCreated = source.DateCreated; target.ResourceIds = source.ResourceNames; target.LastAccessed = source.LastAccessed;
+      }
+    }
+    #endregion
+
+    #region HiveExperimentPermission
+    public static DT.HiveExperimentPermission ToDto(HiveExperimentPermission source) {
+      if (source == null) return null;
+      return new DT.HiveExperimentPermission { HiveExperimentId = source.HiveExperimentId, GrantedUserId = source.GrantedUserId, GrantedByUserId = source.GrantedByUserId, Permission = source.Permission };
+    }
+    public static HiveExperimentPermission ToEntity(DT.HiveExperimentPermission source) {
+      if (source == null) return null;
+      var entity = new HiveExperimentPermission(); ToEntity(source, entity);
+      return entity;
+    }
+    public static void ToEntity(DT.HiveExperimentPermission source, HiveExperimentPermission target) {
+      if ((source != null) && (target != null)) {
+        target.HiveExperimentId = source.HiveExperimentId; target.GrantedUserId = source.GrantedUserId; target.GrantedByUserId = source.GrantedByUserId; target.Permission = source.Permission;
       }
     }
@@ -145 +170 @@
     public static DT.Slave ToDto(Slave source) {
       if (source == null) return null;
-      return new DT.Slave { 
-        Id = source.ResourceId, 
-        ParentResourceId = source.ParentResourceId, 
+      return new DT.Slave {
+        Id = source.ResourceId,
+        ParentResourceId = source.ParentResourceId,
         Cores = source.Cores,
-        CpuSpeed = source.CpuSpeed, 
-        FreeCores = source.FreeCores, 
-        FreeMemory = source.FreeMemory, 
-        IsAllowedToCalculate = source.IsAllowedToCalculate, 
-        Memory = source.Memory, 
-        Name = source.Name, 
-        SlaveState = source.SlaveState, 
-        CpuArchitecture = source.CpuArchitecture, 
+        CpuSpeed = source.CpuSpeed,
+        FreeCores = source.FreeCores,
+        FreeMemory = source.FreeMemory,
+        IsAllowedToCalculate = source.IsAllowedToCalculate,
+        Memory = source.Memory,
+        Name = source.Name,
+        SlaveState = source.SlaveState,
+        CpuArchitecture = source.CpuArchitecture,
         OperatingSystem = source.OperatingSystem,
         LastHeartbeat = source.LastHeartbeat
@@ -170 +195 @@
         target.ResourceId = source.Id;
         target.ParentResourceId = source.ParentResourceId;
-        target.Cores = source.Cores; 
+        target.Cores = source.Cores;
         target.CpuSpeed = source.CpuSpeed;
         target.FreeCores = source.FreeCores;
-        target.FreeMemory = source.FreeMemory; 
+        target.FreeMemory = source.FreeMemory;
         target.IsAllowedToCalculate = source.IsAllowedToCalculate;
         target.Memory = source.Memory;
-        target.Name = source.Name; 
-        target.SlaveState = source.SlaveState; 
-        target.CpuArchitecture = source.CpuArchitecture; 
+        target.Name = source.Name;
+        target.SlaveState = source.SlaveState;
+        target.CpuArchitecture = source.CpuArchitecture;
         target.OperatingSystem = source.OperatingSystem;
         target.LastHeartbeat = source.LastHeartbeat;