From 7a9c70f3962d7ae5885f02bcaf70c814b3f06d4e Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Wed, 19 Feb 2025 14:34:42 +0300
Subject: [PATCH] =?UTF-8?q?=D1=83=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=B5=20=D1=83=D1=87=D0=B5=D1=82=D0=BD=D0=BE=D0=B9=20=D0=B7?=
 =?UTF-8?q?=D0=B0=D0=BF=D0=B8=D1=81=D0=B8=20=D1=81=20=D1=81=D0=B5=D1=80?=
 =?UTF-8?q?=D0=B2=D0=B5=D1=80=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |  4 +---
 .../ComponentsServer/ComponentsServer.java    | 10 ++++++--
 .../UserAccount/UI/UserAccountsForm.java      |  3 ++-
 .../Passes/All/DeleteUserAccount.java         | 24 +++++++++++++++++++
 src/_VisualDVM/Passes/PassCode.java           |  5 +++-
 .../Repository/Server/ServerCode.java         |  5 +++-
 6 files changed, 43 insertions(+), 8 deletions(-)
 create mode 100644 src/_VisualDVM/Passes/All/DeleteUserAccount.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 6fb16d17..7cd8ccf9 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,13 +7,11 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishUserAccount.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteUserAccount.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/ComponentsServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/ComponentsServer.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/UserAccount/UI/UserAccountsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/UserAccount/UI/UserAccountsForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/UserAccount/UserAccount.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/UserAccount/UserAccount.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/PassCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/PassCode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/PublishServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/PublishServerObject.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ServerCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ServerCode.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
diff --git a/src/_VisualDVM/ComponentsServer/ComponentsServer.java b/src/_VisualDVM/ComponentsServer/ComponentsServer.java
index 6507f6bd..ba20774c 100644
--- a/src/_VisualDVM/ComponentsServer/ComponentsServer.java
+++ b/src/_VisualDVM/ComponentsServer/ComponentsServer.java
@@ -131,6 +131,9 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
         if (object instanceof BugReport) {
             BugReport bugReport = (BugReport) object;
             if (!bugReport.project_version.isEmpty()) Utils_.forceDeleteWithCheck(bugReport.getArchiveFile());
+        }else if (object instanceof UserAccount){
+            UserAccount account = (UserAccount) object;
+            Utils_.forceDeleteWithCheck(account.getServerKeyFile());
         }
     }
     @Override
@@ -349,7 +352,6 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
     void PublishUserAccount() throws Exception {
         DBObject dbObject = (DBObject) request.object;
         response.object = (Serializable) credentials_db.InsertS(dbObject).getPK();
-        //--
         credentials_db.userAccounts.get(response.object).generateKey();
     }
     void EditUserAccount() throws Exception {
@@ -357,7 +359,8 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
         credentials_db.UpdateWithCheck(new_object);
     }
     void DeleteUserAccount() throws Exception {
-
+        Pair<Class, Object> to_delete = (Pair<Class, Object>) request.object;
+        afterDeleteAction(credentials_db.DeleteByPK(to_delete.getKey(), to_delete.getValue()));
     }
     //--
     @Override
@@ -422,6 +425,9 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
             case DVMConvertProject:
                 DVMConvertProject();
                 break;
+            case DeleteUserAccount:
+                DeleteUserAccount();
+                break;
             default:
                 throw new RepositoryRefuseException("Неподдерживаемый код: " + code);
         }
diff --git a/src/_VisualDVM/ComponentsServer/UserAccount/UI/UserAccountsForm.java b/src/_VisualDVM/ComponentsServer/UserAccount/UI/UserAccountsForm.java
index ca23ce7c..8a7d2c73 100644
--- a/src/_VisualDVM/ComponentsServer/UserAccount/UI/UserAccountsForm.java
+++ b/src/_VisualDVM/ComponentsServer/UserAccount/UI/UserAccountsForm.java
@@ -51,7 +51,8 @@ public class UserAccountsForm extends DataSetControlForm<UserAccount> {
     protected DataMenuBar createMenuBar() {
         return new DataMenuBar(dataSource.getPluralDescription(), PassCode.SynchronizeCredentials,
                 PassCode.PublishUserAccount,
-                PassCode.EditUserAccount);
+                PassCode.EditUserAccount,
+                PassCode.DeleteUserAccount);
     }
     @Override
     protected DBObjectDialog getDialog() {
diff --git a/src/_VisualDVM/Passes/All/DeleteUserAccount.java b/src/_VisualDVM/Passes/All/DeleteUserAccount.java
new file mode 100644
index 00000000..7fc1f7e8
--- /dev/null
+++ b/src/_VisualDVM/Passes/All/DeleteUserAccount.java
@@ -0,0 +1,24 @@
+package _VisualDVM.Passes.All;
+import Common.Database.Database;
+import _VisualDVM.ComponentsServer.ComponentsServer;
+import _VisualDVM.ComponentsServer.UserAccount.UserAccount;
+import _VisualDVM.Global;
+import _VisualDVM.Passes.Server.DeleteServerObject;
+import _VisualDVM.Repository.Server.SafeServerExchangeUnit;
+import _VisualDVM.Repository.Server.ServerCode;
+import _VisualDVM.ServerObjectsCache.VisualCaches;
+import javafx.util.Pair;
+public class DeleteUserAccount extends DeleteServerObject<ComponentsServer, UserAccount> {
+    public DeleteUserAccount() {
+        super(Global.componentsServer, UserAccount.class);
+    }
+    @Override
+    protected Database getDb() {
+        return server.credentials_db;
+    }
+    @Override
+    protected void ServerAction() throws Exception {
+        Command(new SafeServerExchangeUnit(ServerCode.DeleteUserAccount, "",
+                new Pair<>(target.getClass(), target.getPK())));
+    }
+}
diff --git a/src/_VisualDVM/Passes/PassCode.java b/src/_VisualDVM/Passes/PassCode.java
index c52e647a..f6a6be8e 100644
--- a/src/_VisualDVM/Passes/PassCode.java
+++ b/src/_VisualDVM/Passes/PassCode.java
@@ -357,7 +357,8 @@ public enum PassCode implements PassCode_ {
     ConfirmEmail,
     SynchronizeCredentials,
     PublishUserAccount,
-    EditUserAccount
+    EditUserAccount,
+    DeleteUserAccount
     ;
     //--
     @Override
@@ -367,6 +368,8 @@ public enum PassCode implements PassCode_ {
                 return "Добавление учётной записи";
             case EditUserAccount:
                 return "Редактирование учётной записи";
+            case DeleteUserAccount:
+                return "Удаление учётной записи";
             case SynchronizeCredentials:
                 return "Синхронизация учётных записей";
             case ConfirmEmail:
diff --git a/src/_VisualDVM/Repository/Server/ServerCode.java b/src/_VisualDVM/Repository/Server/ServerCode.java
index 692974c0..eb9d14ab 100644
--- a/src/_VisualDVM/Repository/Server/ServerCode.java
+++ b/src/_VisualDVM/Repository/Server/ServerCode.java
@@ -66,9 +66,12 @@ public enum ServerCode {
     GetUserAccountByKey,
     GetUserAccountByEmail,
     EditUserAccount,
-    PublishUserAccount;
+    PublishUserAccount,
+    DeleteUserAccount;
     public String getDescription(){
         switch (this){
+            case DeleteUserAccount:
+                return "Удаление учётной записи на сервере";
             case PublishUserAccount:
                 return "Создание учётной записи на сервере";
             case EditUserAccount: