Changeset 4426 for trunk

Timestamp:

09/18/10 04:03:28 (14 years ago)

Author:

swagner

Message:

Worked on OKB data model and services (#1174)

Location:

trunk/sources/HeuristicLab.Services.OKB/3.3

Files:

• AdminService.cs (modified) (3 diffs)
• Interfaces/IAdminService.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Services.OKB/3.3/AdminService.cs

@@ -20 +20 @@
 #endregion
 
+using System.Collections.Generic;
 using System.Data.Linq;
 using System.Linq;
@@ -31 +32 @@
   [ServiceBehavior(IncludeExceptionDetailInFaults = true)]
   public class AdminService : IAdminService {
-    public void AddAlgorithmClass(AlgorithmClass algorithmClass) {
-      using (OKBDataContext okb = new OKBDataContext()) {
-        okb.AlgorithmClasses.InsertOnSubmit(new AlgorithmClass() {
-          Name = algorithmClass.Name,
-          Description = algorithmClass.Description
-        });
-        okb.SubmitChanges();
-      }
-    }
-    public AlgorithmClass[] GetAlgorithmClasses() {
+    public AlgorithmClass GetAlgorithmClass(long algorithmClassId) {
+      using (OKBDataContext okb = new OKBDataContext()) {
+        return okb.AlgorithmClasses.FirstOrDefault(a => a.Id == algorithmClassId);
+      }
+    }
+    public IEnumerable<AlgorithmClass> GetAlgorithmClasses() {
       using (OKBDataContext okb = new OKBDataContext()) {
         return okb.AlgorithmClasses.ToArray();
       }
     }
-    public void UpdateAlgorithmClass(AlgorithmClass algorithmClass) {
-      using (OKBDataContext okb = new OKBDataContext()) {
-        AlgorithmClass original = okb.AlgorithmClasses.First(a => a.Id == algorithmClass.Id);
-        original.Name = algorithmClass.Name;
-        original.Description = algorithmClass.Description;
+    public void StoreAlgorithmClass(AlgorithmClass algorithmClass) {
+      using (OKBDataContext okb = new OKBDataContext()) {
+        AlgorithmClass original = okb.AlgorithmClasses.FirstOrDefault(a => a.Id == algorithmClass.Id);
+        if (original == null) {
+          okb.AlgorithmClasses.InsertOnSubmit(new AlgorithmClass() {
+            Name = algorithmClass.Name,
+            Description = algorithmClass.Description
+          });
+        } else {
+          original.Name = algorithmClass.Name;
+          original.Description = algorithmClass.Description;
+        }
         okb.SubmitChanges();
       }
@@ -60 +64 @@
     }
 
-    public void AddAlgorithm(Algorithm algorithm) {
-      using (OKBDataContext okb = new OKBDataContext()) {
-        okb.Algorithms.InsertOnSubmit(new Algorithm() {
-          AlgorithmClassId = algorithm.AlgorithmClassId,
-          PlatformId = algorithm.PlatformId,
-          Name = algorithm.Name,
-          Description = algorithm.Description
-        });
-        okb.SubmitChanges();
-      }
-    }
-    public Algorithm[] GetAlgorithms() {
+    public Algorithm GetAlgorithm(long algorithmId) {
+      using (OKBDataContext okb = new OKBDataContext()) {
+        return okb.Algorithms.FirstOrDefault(a => a.Id == algorithmId);
+      }
+    }
+    public IEnumerable<Algorithm> GetAlgorithms() {
       using (OKBDataContext okb = new OKBDataContext()) {
         return okb.Algorithms.ToArray();
       }
     }
-    public void UpdateAlgorithm(Algorithm algorithm) {
-      using (OKBDataContext okb = new OKBDataContext()) {
-        Algorithm original = okb.Algorithms.First(a => a.Id == algorithm.Id);
-        original.AlgorithmClassId = algorithm.AlgorithmClassId;
-        original.PlatformId = algorithm.PlatformId;
-        original.Name = algorithm.Name;
-        original.Description = algorithm.Description;
+    public void StoreAlgorithm(Algorithm algorithm) {
+      using (OKBDataContext okb = new OKBDataContext()) {
+        Algorithm original = okb.Algorithms.FirstOrDefault(a => a.Id == algorithm.Id);
+        if (original == null) {
+          okb.Algorithms.InsertOnSubmit(new Algorithm() {
+            Name = algorithm.Name,
+            Description = algorithm.Description
+          });
+        } else {
+          original.Name = algorithm.Name;
+          original.Description = algorithm.Description;
+        }
         okb.SubmitChanges();
       }

trunk/sources/HeuristicLab.Services.OKB/3.3/Interfaces/IAdminService.cs

@@ -20 +20 @@
 #endregion
 
+using System.Collections.Generic;
 using System.Net.Security;
 using System.ServiceModel;
@@ -31 +32 @@
   public interface IAdminService {
     [OperationContract]
-    void AddAlgorithmClass(AlgorithmClass algorithmClass);
+    AlgorithmClass GetAlgorithmClass(long algorithmClassId);
     [OperationContract]
-    AlgorithmClass[] GetAlgorithmClasses();
+    IEnumerable<AlgorithmClass> GetAlgorithmClasses();
     [OperationContract]
-    void UpdateAlgorithmClass(AlgorithmClass algorithmClass);
+    void StoreAlgorithmClass(AlgorithmClass algorithmClass);
     [OperationContract]
     void DeleteAlgorithmClass(long algorithmClassId);
 
     [OperationContract]
-    void AddAlgorithm(Algorithm algorithm);
+    Algorithm GetAlgorithm(long algorithmId);
     [OperationContract]
-    Algorithm[] GetAlgorithms();
+    IEnumerable<Algorithm> GetAlgorithms();
     [OperationContract]
-    void UpdateAlgorithm(Algorithm algorithm);
+    void StoreAlgorithm(Algorithm algorithm);
     [OperationContract]
     void DeleteAlgorithm(long algorithmId);