Changeset 15630 for branches/HiveProjectManagement/HeuristicLab.Services.Hive/3.3/Converter.cs

Timestamp:

01/18/18 15:08:25 (6 years ago)

Author:

jzenisek

Message:

#2839

• updated Heartbeat processing (regarding: checking against AssignedJobResources and handling of the updated Job deletion routine)
• updated Job deletion routine(still in progress at GenerateStatistics)

File:

• branches/HiveProjectManagement/HeuristicLab.Services.Hive/3.3/Converter.cs (modified) (4 diffs)

branches/HiveProjectManagement/HeuristicLab.Services.Hive/3.3/Converter.cs

@@ -121 +121 @@
         OwnerUserId = source.OwnerUserId,
         DateCreated = source.DateCreated,
-        ProjectId = source.ProjectId
+        ProjectId = source.ProjectId,
+        State = source.State.ToDto()
       };
     }
@@ -140 +141 @@
       target.DateCreated = source.DateCreated;
       target.ProjectId = source.ProjectId;
+      target.State = source.State.ToEntity();
     }
     #endregion
@@ -242 +244 @@
     #endregion
 
-    #region State
+    #region TaskState
     public static DT.TaskState ToDto(this DA.TaskState source) {
       switch (source) {
@@ -268 +270 @@
         case DT.TaskState.Waiting: return DA.TaskState.Waiting;
         default: return DA.TaskState.Failed;
+      }
+    }
+    #endregion
+
+    #region JobState
+    public static DT.JobState ToDto(this DA.JobState source) {
+      switch (source) {
+        case DA.JobState.Online: return DT.JobState.Online;
+        case DA.JobState.StatisticsPending: return DT.JobState.StatisticsPending;
+        case DA.JobState.DeletionPending: return DT.JobState.DeletionPending;
+        default: return DT.JobState.Online;
+      }
+    }
+
+    public static DA.JobState ToEntity(this DT.JobState source) {
+      switch (source) {
+        case DT.JobState.Online: return DA.JobState.Online;
+        case DT.JobState.StatisticsPending: return DA.JobState.StatisticsPending;
+        case DT.JobState.DeletionPending: return DA.JobState.DeletionPending;
+        default: return DA.JobState.Online;
       }
     }