From b6d106aeb7c36c2835b0ec6da0648fba0f43c4a8 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Sat, 16 Nov 2024 21:10:17 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BA=D0=B0=D1=81=D0=BA=D0=B0=D0=B4=D0=BD?=
 =?UTF-8?q?=D0=BE=D0=B5=20=D1=83=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5?=
 =?UTF-8?q?=20=D0=B8=D0=BD=D1=84=D0=BE=D1=80=D0=BC=D0=B0=D1=86=D0=B8=D0=B8?=
 =?UTF-8?q?=20=D0=BE=20=D1=82=D0=B5=D1=81=D1=82=D0=B0=D1=85=20=D0=B2=D0=BA?=
 =?UTF-8?q?=D0=BE=D0=BD=D1=84=D0=B8=D0=B3=D1=83=D1=80=D0=B0=D1=86=D0=B8?=
 =?UTF-8?q?=D0=B8=20=D0=BF=D1=80=D0=B8=20=D1=83=D0=B4=D0=B0=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B8=20=D1=82=D0=B5=D1=81=D1=82=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Common/Configuration/Configuration.java   | 17 +++++++++++++++
 .../TestingSystem/Common/TestingServer.java   | 21 +++++++++++++++++--
 2 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/src/_VisualDVM/TestingSystem/Common/Configuration/Configuration.java b/src/_VisualDVM/TestingSystem/Common/Configuration/Configuration.java
index 0e18fe18..92ba3b0c 100644
--- a/src/_VisualDVM/TestingSystem/Common/Configuration/Configuration.java
+++ b/src/_VisualDVM/TestingSystem/Common/Configuration/Configuration.java
@@ -11,6 +11,7 @@ import _VisualDVM.TestingSystem.Common.Group.Json.GroupsJson;
 import _VisualDVM.TestingSystem.Common.Settings.Json.SettingsArrayJson;
 import _VisualDVM.TestingSystem.Common.Settings.Json.SettingsJson;
 import _VisualDVM.TestingSystem.Common.Settings.Settings;
+import _VisualDVM.TestingSystem.Common.Test.Json.TestJson;
 import _VisualDVM.TestingSystem.Common.Test.Json.TestsJson;
 import _VisualDVM.TestingSystem.Common.Test.Test;
 import com.sun.org.glassfish.gmbal.Description;
@@ -141,6 +142,22 @@ public class Configuration extends riDBObject {
         }
         return flag;
     }
+    public boolean tryDeleteTest(Test test) {
+        boolean flag = false;
+        ConfigurationCache unpacked = new ConfigurationCache(this);
+        List<TestJson> actualTests = new Vector<>();
+        for (TestJson testJson : unpacked.testsJson.array) {
+            if (testJson.id == test.id)
+                flag = true;
+            else actualTests.add(testJson);
+        }
+        if (flag) {
+            unpacked.testsJson.array = actualTests;
+            packedTestsJson = Utils_.gson.toJson(unpacked.testsJson);
+        }
+        return flag;
+    }
+
     /*
     public void updateTest(Test test){
         ConfigurationCache unpacked = new ConfigurationCache(this);
diff --git a/src/_VisualDVM/TestingSystem/Common/TestingServer.java b/src/_VisualDVM/TestingSystem/Common/TestingServer.java
index 8070d7c4..1af5e8af 100644
--- a/src/_VisualDVM/TestingSystem/Common/TestingServer.java
+++ b/src/_VisualDVM/TestingSystem/Common/TestingServer.java
@@ -118,7 +118,8 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
                     db.Update(sapforConfiguration);
                 }
             }
-        } else if (object instanceof DVMSettings) {
+        }
+        else if (object instanceof DVMSettings) {
             DVMSettings dvmSettings = (DVMSettings) object;
             //-
             for (DVMConfiguration dvmConfiguration : db.dvmConfigurations.Data.values()) {
@@ -126,7 +127,8 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
                     db.Update(dvmConfiguration);
                 }
             }
-        } else if (object instanceof SapforSettings) {
+        }
+        else if (object instanceof SapforSettings) {
             SapforSettings sapforSettings = (SapforSettings) object;
             for (SapforConfiguration sapforConfiguration : db.sapforConfigurations.Data.values()) {
                 if (sapforConfiguration.tryUpdateSettings(sapforSettings)) {
@@ -141,6 +143,19 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
             Test test = (Test) object;
             Utils_.forceDeleteWithCheck(test.getArchive());
             Utils_.forceDeleteWithCheck(test.getServerPath());
+            //--
+            //-
+            for (DVMConfiguration dvmConfiguration : db.dvmConfigurations.Data.values()) {
+                if (dvmConfiguration.tryDeleteTest(test)) {
+                    db.Update(dvmConfiguration);
+                }
+            }
+            for (SapforConfiguration sapforConfiguration : db.sapforConfigurations.Data.values()) {
+                if (sapforConfiguration.tryDeleteTest(test)) {
+                    db.Update(sapforConfiguration);
+                }
+            }
+            //--
         } else if (object instanceof Group) {
             Group group = (Group) object;
             Vector<Test> tests = new Vector<>();
@@ -156,11 +171,13 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
             //--
             for (DVMConfiguration dvmConfiguration : db.dvmConfigurations.Data.values()) {
                 if (dvmConfiguration.tryDeleteGroup(group)) {
+                    //todo удалить все тесты связанные с группой из конфигурации
                     db.Update(dvmConfiguration);
                 }
             }
             for (SapforConfiguration sapforConfiguration : db.sapforConfigurations.Data.values()) {
                 if (sapforConfiguration.tryDeleteGroup(group)) {
+                    //todo удалить все тесты связанные с группой из конфигурации
                     db.Update(sapforConfiguration);
                 }
             }