Changeset 3612 for trunk/sources/HeuristicLab.Services.Deployment

Timestamp:

05/04/10 20:16:21 (14 years ago)

Author:

gkronber

Message:

Implemented change requests of reviewers. #989 (Implement review comments in plugin infrastructure)

Location:

trunk/sources/HeuristicLab.Services.Deployment/3.3

Files:

• Admin.cs (modified) (1 diff)
• IAdmin.cs (modified) (1 diff)
• PluginStore.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.Services.Deployment/3.3/Admin.cs

@@ -38 +38 @@
     }
     [PrincipalPermission(SecurityAction.Demand, Role = "Managers")]
+    public void DeleteProduct(ProductDescription product) {
+      var store = new PluginStore();
+      store.Delete(product);
+    }
+    [PrincipalPermission(SecurityAction.Demand, Role = "Managers")]
     public void DeployPlugin(PluginDescription plugin, byte[] zipFile) {
       var store = new PluginStore();

trunk/sources/HeuristicLab.Services.Deployment/3.3/IAdmin.cs

@@ -35 +35 @@
 
     [OperationContract]
+    void DeleteProduct(ProductDescription product);
+
+    [OperationContract]
     void DeployPlugin(PluginDescription plugin, byte[] zipFile);
   }

trunk/sources/HeuristicLab.Services.Deployment/3.3/PluginStore.cs

@@ -111 +111 @@
       }
     }
-
-    #endregion
-
-    #region insert/update product
+    public void Delete(ProductDescription productDescription) {
+      using (var ctx = new PluginStoreClassesDataContext()) {
+        try {
+          using (var transaction = new TransactionScope()) {
+            var productEntity = GetExistingProduct(ctx, productDescription.Name, productDescription.Version);
+
+            DeleteProductPlugins(ctx, productEntity);
+            ctx.Products.DeleteOnSubmit(productEntity);
+
+            ctx.SubmitChanges();
+            transaction.Complete();
+          }
+        }
+        catch (SqlException ex) {
+          throw new ArgumentException("Something went wrong while trying to delete product", ex);
+        }
+        catch (InvalidOperationException ex) {
+          throw new ArgumentException("Something went wrong while trying to delete product", ex);
+        }
+      }
+    }
+
+    #endregion
+
+    #region insert/update/delete product
     private void InsertOrUpdateProduct(PluginStoreClassesDataContext ctx, ProductDescription product) {
       var productEntity = (from p in ctx.Products
@@ -126 +147 @@
       }
 
-      DeleteOldPlugins(ctx, productEntity);
+      DeleteProductPlugins(ctx, productEntity);
 
       foreach (var plugin in product.Plugins) {
@@ -137 +158 @@
     }
 
-    private void DeleteOldPlugins(PluginStoreClassesDataContext ctx, Product productEntity) {
+    private void DeleteProductPlugins(PluginStoreClassesDataContext ctx, Product productEntity) {
       var oldPlugins = (from p in ctx.ProductPlugins
                         where p.ProductId == productEntity.Id
@@ -253 +274 @@
     }
 
+    private Product GetExistingProduct(PluginStoreClassesDataContext ctx, string name, Version version) {
+      return (from p in ctx.Products
+              where p.Name == name
+              where p.Version == version.ToString()
+              select p).Single();
+    }
+
     private IEnumerable<Plugin> GetDependencies(PluginStoreClassesDataContext ctx, Plugin plugin) {
       return from pair in ctx.Dependencies