From 2a209bc94ec53fd5309cf5e01aca4c0703ba9370 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Wed, 6 Dec 2023 01:50:11 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=BE=D1=85=D0=BE=D0=B4=20=D0=B4?=
 =?UTF-8?q?=D0=BB=D1=8F=20=D0=BC=D0=B0=D1=81=D1=81=D0=BE=D0=B2=D0=BE=D0=B3?=
 =?UTF-8?q?=D0=BE=20=D1=83=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F=20?=
 =?UTF-8?q?=D0=BE=D0=B1=D1=8A=D0=B5=D0=BA=D1=82=D0=BE=D0=B2=20=D0=B2=20?=
 =?UTF-8?q?=D1=81=D0=B5=D1=80=D0=B2=D0=B5=D1=80=D0=B0.=20=D0=BC=D0=B0?=
 =?UTF-8?q?=D1=81=D1=81=D0=BE=D0=B2=D0=BE=D0=B5=20=D1=83=D0=B4=D0=B0=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B3=D1=80=D1=83=D0=BF=D0=BF.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 12 +--
 properties                                    |  2 +-
 src/Repository/RepositoryServer.java          | 52 ++++++++-----
 src/Repository/Server/ComponentsServer.java   |  2 +-
 src/Repository/Server/ServerCode.java         |  1 +
 src/TestingSystem/Common/TestingServer.java   | 16 ++--
 .../Passes/All/DeleteGroup.java               |  4 +-
 .../Passes/DeleteServerObjects.java           | 75 +++++++++++++++++++
 8 files changed, 127 insertions(+), 37 deletions(-)
 create mode 100644 src/Visual_DVM_2021/Passes/DeleteServerObjects.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 521bfa2b..a0b75c3a 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,14 +7,14 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSubscriberWorkspace.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/DeleteServerObjects.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/SubscriberWorkspacesMenuBar/SubscriberWorkspacesMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/SubscriberWorkspacesMenuBar/SubscriberWorkspacesMenuBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Repository/Subscribes/SubsribersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Subscribes/SubsribersDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SynchronizeBugReports.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SynchronizeBugReports.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/CallbackForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/CallbackForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Repository/RepositoryServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/RepositoryServer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Repository/Server/ComponentsServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Server/ComponentsServer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Repository/Server/ServerCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Server/ServerCode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteGroup.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteGroup.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/properties b/properties
index 89acc64f..149e2b6d 100644
--- a/properties
+++ b/properties
@@ -28,5 +28,5 @@
   "TestingKernels": 64,
   "AutoCheckTesting": false,
   "CheckTestingIntervalSeconds": 10,
-  "EmailOnTestingProgress": true
+  "EmailOnTestingProgress": false
 }
\ No newline at end of file
diff --git a/src/Repository/RepositoryServer.java b/src/Repository/RepositoryServer.java
index cf52d85a..0ea02cf5 100644
--- a/src/Repository/RepositoryServer.java
+++ b/src/Repository/RepositoryServer.java
@@ -173,8 +173,6 @@ public abstract class RepositoryServer<D extends Database> {
     public boolean canDelete(DBObject object) throws Exception {
         return true;
     }
-    public void DeleteAction(DBObject object) throws Exception {
-    }
     public void StartAction() throws Exception {
     }
     public void Start() throws Exception {
@@ -249,13 +247,7 @@ public abstract class RepositoryServer<D extends Database> {
                                     dbObject = (DBObject) request.object;
                                     Print("Удалить объект " + dbObject.getPK());
                                     db.DeleteWithCheck(dbObject);
-                                    DeleteAction(dbObject);
-                                    response = new ServerExchangeUnit_2021(ServerCode.OK);
-                                    break;
-                                case DeleteObjectByPK:
-                                    Print("Удалить объект по ключу");
-                                    Pair<Class, Object> to_delete = (Pair<Class, Object>) request.object;
-                                    DeleteAction(db.DeleteByPK(to_delete.getKey(), to_delete.getValue()));
+                                    afterDeleteAction(dbObject);
                                     response = new ServerExchangeUnit_2021(ServerCode.OK);
                                     break;
                                 case GetObjectCopyByPK:
@@ -277,6 +269,12 @@ public abstract class RepositoryServer<D extends Database> {
                                 case PublishObjects:
                                     PublishObjects();
                                     break;
+                                case DeleteObjectByPK:
+                                    DeleteObjectByPK();
+                                    break;
+                                case DeleteObjectsByPK:
+                                    DeleteObjectsByPK();
+                                    break;
                                 //</editor-fold>
                                 case EXIT:
                                     Print("ЗАВЕРШИТЬ РАБОТУ СЕРВЕРА");
@@ -323,30 +321,48 @@ public abstract class RepositoryServer<D extends Database> {
             }
         }
     }
+    //--
+    protected Database getDefaultDatabase(){
+        return db;
+    }
+    //--
     private void PublishObject() throws Exception {
         response = new ServerExchangeUnit_2021(ServerCode.OK);
         DBObject dbObject = (DBObject) request.object;
         beforePublishAction(dbObject);
-        response.object = publishObject(dbObject);
+        response.object = (Serializable) getDefaultDatabase().InsertS(dbObject).getPK();
         afterPublishAction(dbObject);
     }
     private void PublishObjects() throws Exception {
         response = new ServerExchangeUnit_2021(ServerCode.OK);
         Vector<DBObject> objects = (Vector<DBObject>) request.object;
-        for (DBObject dbObject: objects){
-            System.out.println(db);
+        Database database = getDefaultDatabase();
+        for (DBObject dbObject : objects) {
             beforePublishAction(dbObject);
-            response.object = publishObject(dbObject);
-            System.out.println(response.object);
+            response.object = (Serializable) database.InsertS(dbObject).getPK();
             afterPublishAction(dbObject);
         }
-        //ключи не возвращаем. пока не нужны.
-    }
-    protected Serializable publishObject(DBObject object) throws Exception {
-        return (Serializable) db.InsertS(object).getPK();
     }
     protected void beforePublishAction(DBObject object) throws Exception {
     }
     protected void afterPublishAction(DBObject object) throws Exception {
     }
+    //------------------------------
+    private void DeleteObjectByPK() throws Exception {
+        Print("Удалить объект по ключу");
+        Pair<Class, Object> to_delete = (Pair<Class, Object>) request.object;
+        afterDeleteAction(getDefaultDatabase().DeleteByPK(to_delete.getKey(), to_delete.getValue()));
+        response = new ServerExchangeUnit_2021(ServerCode.OK);
+    }
+    private void DeleteObjectsByPK() throws Exception {
+        Print("Удалить объекты по ключам");
+        Pair<Class, Vector<Object>> to_delete = (Pair<Class, Vector<Object>>) request.object;
+        Database database = getDefaultDatabase();
+        for (Object object : to_delete.getValue()) {
+            afterDeleteAction(database.DeleteByPK(to_delete.getKey(), object));
+        }
+        response = new ServerExchangeUnit_2021(ServerCode.OK);
+    }
+    public void afterDeleteAction(DBObject object) throws Exception {
+    }
 }
diff --git a/src/Repository/Server/ComponentsServer.java b/src/Repository/Server/ComponentsServer.java
index c9b1f70d..90dff244 100644
--- a/src/Repository/Server/ComponentsServer.java
+++ b/src/Repository/Server/ComponentsServer.java
@@ -38,7 +38,7 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
         return 7995;
     }
     @Override
-    public void DeleteAction(DBObject object) throws Exception {
+    public void afterDeleteAction(DBObject object) throws Exception {
         if (object instanceof BugReport) {
             BugReport bugReport = (BugReport) object;
             if (!bugReport.project_version.isEmpty())
diff --git a/src/Repository/Server/ServerCode.java b/src/Repository/Server/ServerCode.java
index 11d6b8ef..f7274be1 100644
--- a/src/Repository/Server/ServerCode.java
+++ b/src/Repository/Server/ServerCode.java
@@ -33,6 +33,7 @@ public enum ServerCode {
     GetObjectCopyByPK,
     GetObjectsCopiesByPK,
     DeleteObjects,
+    DeleteObjectsByPK,
     CheckObjectExistense, //
     //--
     EditAccountObject,
diff --git a/src/TestingSystem/Common/TestingServer.java b/src/TestingSystem/Common/TestingServer.java
index e23eacce..d5463847 100644
--- a/src/TestingSystem/Common/TestingServer.java
+++ b/src/TestingSystem/Common/TestingServer.java
@@ -1,6 +1,7 @@
 package TestingSystem.Common;
 import Common.Constants;
 import Common.Database.DBObject;
+import Common.Database.Database;
 import Common.Global;
 import Common.Utils.Utils;
 import GlobalData.Account.Account;
@@ -38,7 +39,6 @@ import org.apache.commons.io.FileUtils;
 
 import javax.swing.Timer;
 import java.io.File;
-import java.io.Serializable;
 import java.nio.file.Paths;
 import java.util.*;
 
@@ -73,7 +73,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
         }
     }
     @Override
-    public void DeleteAction(DBObject object) throws Exception {
+    public void afterDeleteAction(DBObject object) throws Exception {
         if (object instanceof Test) {
             Test test = (Test) object;
             Utils.forceDeleteWithCheck(test.getArchive());
@@ -340,7 +340,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
                 Print("Удалить объект по ключу из базы пользователя " + request.arg);
                 SetCurrentAccountDB(request.arg);
                 Pair<Class, Object> to_delete = (Pair<Class, Object>) request.object;
-                DeleteAction(account_db.DeleteByPK(to_delete.getKey(), to_delete.getValue()));
+                afterDeleteAction(account_db.DeleteByPK(to_delete.getKey(), to_delete.getValue()));
                 response = new ServerExchangeUnit_2021(ServerCode.OK);
                 break;
             case GetActualSapforPackageData:
@@ -542,12 +542,10 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
     }
     //-------------------------------------------------------------------------------------->>>
     @Override
-    protected Serializable publishObject(DBObject object) throws Exception {
-        if (request.arg == null) return super.publishObject(object);
-        else {
-            SetCurrentAccountDB(request.arg);
-            return (Serializable) account_db.InsertS(object).getPK();
-        }
+    protected Database getDefaultDatabase() {
+        if (request.arg == null) return super.getDefaultDatabase();
+        SetCurrentAccountDB(request.arg);
+        return account_db;
     }
     @Override
     public void beforePublishAction(DBObject object) throws Exception {
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteGroup.java b/src/Visual_DVM_2021/Passes/All/DeleteGroup.java
index dd1f1462..f9431d70 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteGroup.java
+++ b/src/Visual_DVM_2021/Passes/All/DeleteGroup.java
@@ -2,8 +2,8 @@ package Visual_DVM_2021.Passes.All;
 import Common.Global;
 import TestingSystem.Common.Group.Group;
 import TestingSystem.Common.TestingServer;
-import Visual_DVM_2021.Passes.Server.DeleteServerObject;
-public class DeleteGroup extends DeleteServerObject<TestingServer, Group> {
+import Visual_DVM_2021.Passes.DeleteServerObjects;
+public class DeleteGroup extends DeleteServerObjects<TestingServer, Group> {
     public DeleteGroup() {
         super(Global.testingServer, Group.class);
     }
diff --git a/src/Visual_DVM_2021/Passes/DeleteServerObjects.java b/src/Visual_DVM_2021/Passes/DeleteServerObjects.java
new file mode 100644
index 00000000..aabfb50a
--- /dev/null
+++ b/src/Visual_DVM_2021/Passes/DeleteServerObjects.java
@@ -0,0 +1,75 @@
+package Visual_DVM_2021.Passes;
+import Common.Current;
+import Common.Database.DBObject;
+import Common.Database.DBTable;
+import Common.Database.Database;
+import Common.UI.UI;
+import Repository.RepositoryServer;
+import Repository.Server.ServerCode;
+import Repository.Server.ServerExchangeUnit_2021;
+import Visual_DVM_2021.Passes.Server.RepositoryPass;
+import javafx.util.Pair;
+
+import java.util.Vector;
+public class DeleteServerObjects <S extends RepositoryServer, D extends DBObject> extends RepositoryPass<S, Vector<Object>> {
+    protected Class<D> d; //класс объектов.
+    //---
+    @Override
+    public String getIconPath() {
+        return "/icons/Delete.png";
+    }
+    @Override
+    public String getButtonText() {
+        return "";
+    }
+    //---
+    protected Database getDb() {
+        return server.db;
+    }
+    protected String getEmail(){return null;}
+    //---
+    public DeleteServerObjects(S server_in, Class<D> d_in) {
+        super(server_in);
+        d = d_in;
+    }
+    @Override
+    protected boolean canStart(Object... args) throws Exception {
+        DBTable table =getDb().tables.get(d);
+        if (table.getCheckedCount()>0) {
+            target = table.getCheckedKeys();
+            return UI.Warning(table.getCheckedCount()+" объектов будет удален(о).");
+        }
+        else {
+            if (Current.Check(Log, table.CurrentName())){
+                target = new Vector<>();
+                target.add(table.getCurrent().getPK());
+                return getDb().tables.get(d).CheckCurrent(Log) && getDb().tables.get(d).ShowDeleteObjectDialog(table.getCurrent());
+            }
+            return false;
+        }
+    }
+    //Очищаем все связанные таблицы, чтобы не допустить перерисовки во время удаления объекта.
+    @Override
+    protected void showPreparation() throws Exception {
+        getDb().tables.get(d).ClearUI();
+        for (Class dep : getDb().tables.get(d).getFKDependencies().keySet()) {
+            switch (getDb().tables.get(d).getFKDependencies().get(dep).data) {
+                case NONE:
+                case DROP:
+                    break;
+                case DELETE:
+                    getDb().tables.get(dep).ClearUI();
+                    break;
+            }
+        }
+    }
+    @Override
+    protected void ServerAction() throws Exception {
+        Command(new ServerExchangeUnit_2021(ServerCode.DeleteObjectsByPK, getEmail(),new Pair<>(d, target)));
+    }
+    @Override
+    protected void performFinish() throws Exception {
+        super.performFinish();
+        passes.get(getDb().getSynchronizePassCode()).Do();
+    }
+}