From 8f5945e560bdc881c8f6485e9d00640fa9f1b01c Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Fri, 6 Oct 2023 21:01:52 +0300
Subject: [PATCH] fix

---
 .idea/workspace.xml                           | 10 +++----
 .../PerformSapforTask.java                    |  3 +++
 src/TestingSystem/TestingServer.java          |  6 +++++
 .../Passes/All/DeleteSapforScenario.java      | 26 ++++++++++++++++++-
 4 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index aba7b94e..4c1d5409 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,13 +8,9 @@
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/GlobalData/GlobalDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/GlobalDatabase.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforConfiguration/SapforConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforConfiguration/SapforConfigurationDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforScenario/SapforScenariosDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforScenario/SapforScenariosDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartSapforTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartSapforTests.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartSapforTestsOnServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartSapforTestsOnServer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SynchronizeTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SynchronizeTests.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/PerformSapforTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/PerformSapforTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/TestingServer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSapforScenario.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSapforScenario.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/SapforTestingSystem/PerformSapforTask.java b/src/SapforTestingSystem/PerformSapforTask.java
index 4d868b0c..7e1f2740 100644
--- a/src/SapforTestingSystem/PerformSapforTask.java
+++ b/src/SapforTestingSystem/PerformSapforTask.java
@@ -169,5 +169,8 @@ public class PerformSapforTask extends Pass_2021<SapforTask> {
             } else
                 break;
         }
+        //теперь строим деревья версий.
+
+
     }
 }
diff --git a/src/TestingSystem/TestingServer.java b/src/TestingSystem/TestingServer.java
index 2443787c..a6e2788c 100644
--- a/src/TestingSystem/TestingServer.java
+++ b/src/TestingSystem/TestingServer.java
@@ -185,6 +185,12 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
                             ((ServerSapfor) object).home_path
                     )
             );
+        } else if (object instanceof SapforScenario) {
+            Utils.forceDeleteWithCheck(
+                    new File(
+                            ((SapforScenario) object).workspace
+                    )
+            );
         }
     }
     @Override
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteSapforScenario.java b/src/Visual_DVM_2021/Passes/All/DeleteSapforScenario.java
index 326bc125..546eb5e3 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteSapforScenario.java
+++ b/src/Visual_DVM_2021/Passes/All/DeleteSapforScenario.java
@@ -2,8 +2,12 @@ package Visual_DVM_2021.Passes.All;
 import Common.Database.Database;
 import Common.Global;
 import Common.Utils.Utils;
+import Repository.Server.ServerCode;
+import Repository.Server.ServerExchangeUnit_2021;
 import SapforTestingSystem.SapforScenario.SapforScenario;
 import Visual_DVM_2021.Passes.DeleteObjectPass;
+import Visual_DVM_2021.Passes.Pass_2021;
+import Visual_DVM_2021.Passes.TestingSystemPass;
 
 import java.io.File;
 public class DeleteSapforScenario extends DeleteObjectPass<SapforScenario> {
@@ -12,7 +16,7 @@ public class DeleteSapforScenario extends DeleteObjectPass<SapforScenario> {
     }
     @Override
     protected Database getDb() {
-        return Global.db;
+        return Global.testingServer.db;
     }
     @Override
     protected void performPreparation() throws Exception {
@@ -27,4 +31,24 @@ public class DeleteSapforScenario extends DeleteObjectPass<SapforScenario> {
         super.body();
         Utils.delete_with_check(new File(target.workspace));
     }
+    @Override
+    protected void performDone() throws Exception {
+        super.performDone();
+        Pass_2021 serverPass = new TestingSystemPass<SapforScenario>() {
+            @Override
+            public String getDescription() {
+                return "Удаление сценария задач SAPFOR с сервера";
+            }
+            @Override
+            protected boolean canStart(Object... args) throws Exception {
+                target = (SapforScenario) args[0];
+                return true;
+            }
+            @Override
+            protected void ServerAction() throws Exception {
+                Command(new ServerExchangeUnit_2021(ServerCode.DeleteObject, "", target));
+            }
+        };
+        serverPass.Do(target);
+    }
 }