From 82a6f4b879de7340651c1af79cec9010ca001210 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Tue, 21 Nov 2023 17:44:59 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B1=D0=B0=D0=B3=D0=B0=20=D1=81=20?=
 =?UTF-8?q?=D0=B8=D0=B4=20=D0=BF=D0=B0=D0=BA=D0=B5=D1=82=D0=BE=D0=B2.=20?=
 =?UTF-8?q?=D1=82=D0=B5=D0=BF=D0=B5=D1=80=D1=8C=20=D0=BE=D0=BD=D0=B8=20?=
 =?UTF-8?q?=D0=BE=D0=B1=D1=89=D0=B8=D0=B9=20=D0=B4=D0=BB=D1=8F=20=D0=B2?=
 =?UTF-8?q?=D1=81=D0=B5=D1=85=20=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2?=
 =?UTF-8?q?=D0=B0=D1=82=D0=B5=D0=BB=D0=B5=D0=B9,=20=D0=BF=D0=BE=D1=8D?=
 =?UTF-8?q?=D1=82=D0=BE=D0=BC=D1=83=20=D0=BD=D0=B5=20=D0=B1=D1=83=D0=B4?=
 =?UTF-8?q?=D0=B5=D1=82=20=D0=BF=D0=B5=D1=80=D0=B5=D1=81=D0=B5=D1=87=D0=B0?=
 =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D0=B2=20=D0=BF=D0=B0=D0=BF=D0=BA=D0=B0?=
 =?UTF-8?q?=D1=85.=20v++?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 21 ++++++-
 src/Common/Constants.java                     |  4 +-
 src/Common/Global.java                        |  2 +-
 src/GlobalData/Settings/SettingName.java      |  4 ++
 src/Repository/Component/Visualiser.java      |  2 +-
 src/Repository/RepositoryServer.java          | 36 ++++++------
 src/Repository/Server/ServerCode.java         | 10 ++--
 src/TestingSystem/Common/TasksDatabase.java   |  4 +-
 .../TasksPackageToKill.java                   |  2 +-
 src/TestingSystem/Common/TestingServer.java   | 55 +++++++++++++------
 src/TestingSystem/Common/TestsDatabase.java   | 18 +++---
 src/TestingSystem/DVM/Tasks/TestTask.java     |  2 +-
 .../DVM/TasksPackage/TasksPackage.java        | 10 +++-
 .../DVM/TasksPackage/TasksPackageDBTable.java |  4 +-
 .../SAPFOR/SapforTask/SapforTask.java         |  2 +-
 .../SapforTasksPackage.java                   |  9 ++-
 .../SapforTasksPackagesDBTable.java           |  6 +-
 .../Passes/All/AbortSapforTaskPackage.java    |  2 +-
 .../Passes/All/AbortTaskPackage.java          |  2 +-
 .../Server/DeleteServerAccountObject.java     |  4 +-
 .../Server/PublishServerAccountObject.java    |  6 +-
 .../Passes/Server/PublishServerObject.java    |  5 +-
 .../Passes/Server/RepositoryPass.java         |  9 ---
 23 files changed, 132 insertions(+), 87 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 49d8b3a5..05fb03df 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,9 +8,28 @@
   <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/Common/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Constants.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Global.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Global.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/Settings/SettingName.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Settings/SettingName.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Repository/Component/Visualiser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/Visualiser.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/ServerCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Server/ServerCode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TasksDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TasksDatabase.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TasksPackageToKill/TasksPackageToKill.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TasksPackageToKill/TasksPackageToKill.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/TestingSystem/Common/TestsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestsDatabase.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/Tasks/TestTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/Tasks/TestTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/TasksPackage/TasksPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/TasksPackage/TasksPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/TasksPackage/TasksPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/TasksPackage/TasksPackageDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTask/SapforTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTask/SapforTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/SapforTasksPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/SapforTasksPackage.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/SapforTasksPackagesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/SapforTasksPackagesDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/InstallServerSapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/InstallServerSapfor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AbortSapforTaskPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AbortSapforTaskPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AbortTaskPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AbortTaskPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/DeleteServerAccountObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/DeleteServerAccountObject.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/PublishServerAccountObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/PublishServerAccountObject.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/PublishServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/PublishServerObject.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/RepositoryPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/RepositoryPass.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/Common/Constants.java b/src/Common/Constants.java
index 84ccc784..6c622f98 100644
--- a/src/Common/Constants.java
+++ b/src/Common/Constants.java
@@ -58,8 +58,8 @@ public class Constants {
     public static final String attachments = "attachments";
     public static final String statistic = "statistic";
     public static final String unknown_metric = " — ";
-    public static final String old_tests_db_name = "tests2024";
-    public static final String tests_db_name = "tests2025";
+    public static final String old_tests_db_name = "tests2025";
+    public static final String tests_db_name = "tests2026";
     public static final String dateNaN = "NaN";
     //пробный коммит. изменение комментария.++
     //кронтаб и перезагрузка
diff --git a/src/Common/Global.java b/src/Common/Global.java
index 3613eed8..49fbf1a6 100644
--- a/src/Common/Global.java
+++ b/src/Common/Global.java
@@ -115,7 +115,7 @@ public class Global {
         Utils.CheckDirectory(StsDirectory = Paths.get(Home, Sts).toFile());
         Utils.CheckDirectory(TestsDirectory = Paths.get(Home, Tests).toFile());
         Utils.CheckDirectory(PerformanceAnalyzerDirectory = Paths.get(Home, PerformanceAnalyzer).toFile());
-        Utils.CheckDirectory(SapforPackagesDirectory = Paths.get(Home, "SapforPackages").toFile());
+        Utils.CheckAndCleanDirectory(SapforPackagesDirectory = Paths.get(Home, "SapforPackages").toFile());
     }
     public static void CheckServerDirectories() {
         Utils.CheckDirectory(ComponentsDirectory = Paths.get(Home, components).toFile());
diff --git a/src/GlobalData/Settings/SettingName.java b/src/GlobalData/Settings/SettingName.java
index e48bec99..fc674037 100644
--- a/src/GlobalData/Settings/SettingName.java
+++ b/src/GlobalData/Settings/SettingName.java
@@ -41,6 +41,10 @@ public enum SettingName {
     Email, //для тестирования. потом.
     Pause, //стоит ли тестрование на паузе.
     Queue, //хз нужна ли. будет пересказ пакета в проходе.
+    //---
+    DVMPackageMaxId,
+    SAPFORPackageId,
+    //---
     TaskMaxId, //вместо TaskCounter
     SapforTaskMaxId, //для тестирования Сапфора.
     //отображения галок в деревьях.
diff --git a/src/Repository/Component/Visualiser.java b/src/Repository/Component/Visualiser.java
index d69b79c8..0d7a37ca 100644
--- a/src/Repository/Component/Visualiser.java
+++ b/src/Repository/Component/Visualiser.java
@@ -62,7 +62,7 @@ public class Visualiser extends Component {
     //http://www.seostella.com/ru/article/2012/02/05/formatirovanie-daty-v-java.html
     @Override
     public void GetVersionInfo() {
-        version = 1029;
+        version = 1030;
         String pattern = "MMM dd yyyy HH:mm:ss";
         DateFormat df = new SimpleDateFormat(pattern, Locale.ENGLISH);
         date_text = df.format(getClassBuildTime());
diff --git a/src/Repository/RepositoryServer.java b/src/Repository/RepositoryServer.java
index 64d0e2c1..c5a781d6 100644
--- a/src/Repository/RepositoryServer.java
+++ b/src/Repository/RepositoryServer.java
@@ -2,7 +2,7 @@ package Repository;
 import Common.Constants;
 import Common.Database.DBObject;
 import Common.Database.Database;
-import Common.Database.rDBObject;
+import Common.Database.iDBObject;
 import Common.Global;
 import Common.Utils.InterruptThread;
 import Common.Utils.Utils;
@@ -171,7 +171,9 @@ public abstract class RepositoryServer<D extends Database> {
     public boolean needsEmail(String email) {
         return true;
     }
-    public void PublishAction(DBObject object) throws Exception {
+    public void beforePublishAction(DBObject object) throws Exception {
+    }
+    public void afterPublishAction(DBObject object) throws Exception {
     }
     public boolean canDelete(DBObject object) throws Exception {
         return true;
@@ -236,14 +238,6 @@ public abstract class RepositoryServer<D extends Database> {
                                     break;
                                 //</editor-fold>
                                 //<editor-fold desc="Главная база данных">
-                                case PublishObject:
-                                    dbObject = (DBObject) request.object;
-                                    Print("Опубликовать объект " + dbObject.getPK());
-                                    db.InsertWithCheck(dbObject);
-                                    PublishAction(dbObject);
-                                    response = new ServerExchangeUnit_2021(ServerCode.OK);
-                                    response.object = (Serializable) dbObject.getPK();
-                                    break;
                                 case CheckObjectExistense:
                                     p = (Pair<Class, Object>) request.object;
                                     Print("Проверить существование объекта класса " + p.getKey().toString() + " с ключом " + p.getValue());
@@ -256,7 +250,7 @@ public abstract class RepositoryServer<D extends Database> {
                                     db.UpdateWithCheck(new_object);
                                     response = new ServerExchangeUnit_2021(ServerCode.OK);
                                     break;
-                                case DeleteObject:
+                                case DeleteObject:  //устарело. потом убрать. сейчас на это баг репорты повязаны.
                                     dbObject = (DBObject) request.object;
                                     Print("Удалить объект " + dbObject.getPK());
                                     db.DeleteWithCheck(dbObject);
@@ -297,13 +291,13 @@ public abstract class RepositoryServer<D extends Database> {
                                     response = new ServerExchangeUnit_2021(ServerCode.OK);
                                     break;
                                 //------------------------
-                                case PublishAIObject:
+                                case PublishObject:
                                     dbObject = (DBObject) request.object;
-                                    Print("Опубликовать объект с автоинкрементным ключом");
-                                    db.Insert(dbObject); //проверка не нужна,АИ гарантирует что ключ уникален.
-                                    PublishAction(dbObject);
+                                    beforePublishAction(dbObject);
+                                    PublishObject(dbObject);
+                                    afterPublishAction(dbObject);
                                     response = new ServerExchangeUnit_2021(ServerCode.OK);
-                                    response.object = (Serializable) dbObject.getPK(); //чтобы пользователь знал, какой ключ.
+                                    response.object = (Serializable) dbObject.getPK();
                                     break;
                                 //</editor-fold>
                                 case EXIT:
@@ -351,7 +345,13 @@ public abstract class RepositoryServer<D extends Database> {
             }
         }
     }
-    public void CopyAction(rDBObject src, rDBObject dst) throws Exception {
+    public void PublishObject(DBObject dbObject) throws Exception {
+        if (dbObject instanceof iDBObject) {
+            Print("Опубликовать объект");
+            db.Insert(dbObject);
+        } else {
+            Print("Опубликовать объект с автоинкрементным ключом");
+            db.InsertWithCheck(dbObject); //проверка не нужна,АИ гарантирует что ключ уникален.
+        }
     }
-    //--
 }
diff --git a/src/Repository/Server/ServerCode.java b/src/Repository/Server/ServerCode.java
index 4c5e2ac8..da54d414 100644
--- a/src/Repository/Server/ServerCode.java
+++ b/src/Repository/Server/ServerCode.java
@@ -28,7 +28,6 @@ public enum ServerCode {
     RefreshDVMTests, //- для админа. получение тестов из репозитория.
     PublishSapforPackageTasks,
     //-
-    PublishObject,
     EditObject,
     DeleteObject, //--------------------УСТАРЕЛО. УБРАТЬ.
     GetObjectCopyByPK,
@@ -78,8 +77,9 @@ public enum ServerCode {
     //-
     OLD,
     //-
-    PublishAIObject, //публикация объекта с автоинкрементом.
-    PublishAccountAIObject,
-    PublishTestProject,
-    GetActualSapforPackageData
+    PublishAccount,
+    GetActualSapforPackageData,
+    //--
+    PublishObject,
+    PublishTestProject
 }
diff --git a/src/TestingSystem/Common/TasksDatabase.java b/src/TestingSystem/Common/TasksDatabase.java
index 9e584fcf..529b86c9 100644
--- a/src/TestingSystem/Common/TasksDatabase.java
+++ b/src/TestingSystem/Common/TasksDatabase.java
@@ -70,9 +70,9 @@ public class TasksDatabase extends SQLiteDatabase {
         }
         super.disconnect();
     }
-    public LinkedHashMap<Long, TestRunTask> getPackageRunTasks(int package_id) throws Exception {
+    public LinkedHashMap<Long, TestRunTask> getPackageRunTasks(long package_id) throws Exception {
         LinkedHashMap<Long, TestRunTask> res = new LinkedHashMap<>();
-        selectPackageRunTasks.setInt(1, package_id);
+        selectPackageRunTasks.setLong(1, package_id);
         resSet = selectPackageRunTasks.executeQuery();
         while (resSet.next()) {
             Pair<Long, TestRunTask> record = readRecord(testRunTasks);
diff --git a/src/TestingSystem/Common/TasksPackageToKill/TasksPackageToKill.java b/src/TestingSystem/Common/TasksPackageToKill/TasksPackageToKill.java
index e6a0cba4..eff355cf 100644
--- a/src/TestingSystem/Common/TasksPackageToKill/TasksPackageToKill.java
+++ b/src/TestingSystem/Common/TasksPackageToKill/TasksPackageToKill.java
@@ -4,5 +4,5 @@ import Common.Database.iDBObject;
 import com.sun.org.glassfish.gmbal.Description;
 public class TasksPackageToKill extends iDBObject {
     @Description("DEFAULT -1")
-    public int packageId = Constants.Nan;
+    public long packageId = Constants.Nan;
 }
diff --git a/src/TestingSystem/Common/TestingServer.java b/src/TestingSystem/Common/TestingServer.java
index a9cddf4f..a401a29a 100644
--- a/src/TestingSystem/Common/TestingServer.java
+++ b/src/TestingSystem/Common/TestingServer.java
@@ -1,11 +1,13 @@
 package TestingSystem.Common;
 import Common.Constants;
 import Common.Database.DBObject;
+import Common.Database.iDBObject;
 import Common.Global;
 import Common.Utils.Utils;
 import GlobalData.Account.Account;
 import GlobalData.Machine.Machine;
 import GlobalData.RemoteFile.RemoteFile;
+import GlobalData.Settings.SettingName;
 import GlobalData.Tasks.TaskState;
 import GlobalData.User.User;
 import ProjectData.LanguageName;
@@ -38,7 +40,6 @@ import org.apache.commons.io.FileUtils;
 
 import javax.swing.*;
 import java.io.File;
-import java.io.Serializable;
 import java.nio.file.Paths;
 import java.util.Arrays;
 import java.util.Comparator;
@@ -76,7 +77,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
         }
     }
     @Override
-    public void PublishAction(DBObject object) throws Exception {
+    public void afterPublishAction(DBObject object) throws Exception {
         if (object instanceof TasksPackage) {
             //объект уже вставлен.
             TasksPackage tasksPackage = (TasksPackage) object;
@@ -94,7 +95,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
                                 Print("принять задачу на компиляцию " + group_id + ":" + test_id + ":" + task.flags);
                                 //Теперь эту задачу надо поставить в очередь. и вернуть пользователю, уже с id
                                 task.state = TaskState.Waiting;
-                                task.id = db.IncMaxTaskId();
+                                task.id = db.IncKey(SettingName.TaskMaxId);
                                 task.taskspackage_id = tasksPackage.id;
                                 task.makefile_text = group.GenerateMakefile(project, tasksPackage.dvm_drv, task.flags);
                                 task.test_home = tasksPackage.user_workspace + "/projects/" + test_id;
@@ -106,7 +107,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
                                 account_db.Insert(task);
                                 if (task.runTasks != null) {
                                     for (TestRunTask rt : task.runTasks) {
-                                        rt.id = db.IncMaxTaskId();
+                                        rt.id = db.IncKey(SettingName.TaskMaxId);
                                         rt.taskspackage_id = tasksPackage.id;
                                         rt.testcompilationtask_id = task.id;
                                         rt.remote_workspace =
@@ -263,9 +264,9 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
                 account_db.BeginTransaction();
                 for (Object object : tasks) {
                     SapforTask task = (SapforTask) object;
-                    task.id = db.IncSapforMaxTaskId();
+                    task.id = db.IncKey(SettingName.SapforTaskMaxId);
                     if (account_db.InsertWithCheck_(task) != null)
-                        PublishAction(task);
+                        afterPublishAction(task);
                 }
                 account_db.Commit();
                 response = new ServerExchangeUnit_2021(ServerCode.OK);
@@ -302,11 +303,11 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
                 break;
             case CheckPackageToKill:
                 SetCurrentAccountDB(request.arg);
-                int packageId = (int) request.object;
+                long packageId = (long) request.object;
                 response = new ServerExchangeUnit_2021(ServerCode.OK);
                 boolean res_ = false;
                 for (TasksPackageToKill tasksPackageToKill : account_db.packagesToKill.Data.values()) {
-                    if (tasksPackageToKill.packageId==packageId) {
+                    if (tasksPackageToKill.packageId == packageId) {
                         res_ = true;
                         break;
                     }
@@ -335,7 +336,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
                 account_db.BeginTransaction();
                 for (Object object : objects__)
                     if (account_db.InsertWithCheck_((DBObject) object) != null)
-                        PublishAction((DBObject) object);
+                        afterPublishAction((DBObject) object);
                 account_db.Commit();
                 response = new ServerExchangeUnit_2021(ServerCode.OK);
                 break;
@@ -429,15 +430,6 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
                 DeleteAction(account_db.DeleteByPK(to_delete.getKey(), to_delete.getValue()));
                 response = new ServerExchangeUnit_2021(ServerCode.OK);
                 break;
-            case PublishAccountAIObject:
-                Print("Опубликовать объект с автоинкрементным ключом для пользователя " + request.arg);
-                SetCurrentAccountDB(request.arg);
-                dbObject = (DBObject) request.object;
-                account_db.Insert(dbObject); //проверка не нужна,АИ гарантирует что ключ уникален.
-                PublishAction(dbObject);
-                response = new ServerExchangeUnit_2021(ServerCode.OK);
-                response.object = (Serializable) dbObject.getPK(); //чтобы пользователь знал, какой ключ.
-                break;
             case GetActualSapforPackageData:
                 Print("Запросить актуальные данные пакета");
                 sapforTasksPackage = (SapforTasksPackage) request.object;
@@ -592,4 +584,31 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
         }
         return res;
     }
+    @Override
+    public void PublishObject(DBObject dbObject) throws Exception {
+        if (request.arg == null)
+            super.PublishObject(dbObject);
+        else {
+            SetCurrentAccountDB(request.arg);
+            if (dbObject instanceof iDBObject) {
+                Print("Опубликовать объект для пользователя " + request.arg);
+                account_db.Insert(dbObject);
+            } else {
+                Print("Опубликовать объект с автоинкрементным ключом " + request.arg);
+                account_db.InsertWithCheck(dbObject); //проверка не нужна,АИ гарантирует что ключ уникален.
+            }
+        }
+    }
+    @Override
+    public void beforePublishAction(DBObject object) throws Exception {
+        if (object instanceof TasksPackage) {
+            TasksPackage tasksPackage = (TasksPackage) object;
+            tasksPackage.id = db.IncKey(SettingName.DVMPackageMaxId);
+        } else {
+            if (object instanceof SapforTasksPackage) {
+                SapforTasksPackage sapforTasksPackage = (SapforTasksPackage) object;
+                sapforTasksPackage.id = db.IncKey(SettingName.SAPFORPackageId);
+            }
+        }
+    }
 }
diff --git a/src/TestingSystem/Common/TestsDatabase.java b/src/TestingSystem/Common/TestsDatabase.java
index df085161..8df05028 100644
--- a/src/TestingSystem/Common/TestsDatabase.java
+++ b/src/TestingSystem/Common/TestsDatabase.java
@@ -39,8 +39,15 @@ public class TestsDatabase extends SQLiteDatabase {
     }
     @Override
     public void Init() throws Exception {
+        if (!settings.containsKey(SettingName.DVMPackageMaxId))
+            Insert(new TSetting(SettingName.DVMPackageMaxId, 0));
+        //-
+        if (!settings.containsKey(SettingName.SAPFORPackageId))
+            Insert(new TSetting(SettingName.SAPFORPackageId, 0));
+        //-
         if (!settings.containsKey(SettingName.TaskMaxId))
             Insert(new TSetting(SettingName.TaskMaxId, 0));
+        //-
         if (!settings.containsKey(SettingName.SapforTaskMaxId))
             Insert(new TSetting(SettingName.SapforTaskMaxId, 0));
     }
@@ -48,15 +55,8 @@ public class TestsDatabase extends SQLiteDatabase {
     public PassCode_2021 getSynchronizePassCode() {
         return PassCode_2021.SynchronizeTests;
     }
-    public long IncMaxTaskId() throws Exception {
-        TSetting setting = settings.get(SettingName.TaskMaxId);
-        long res = setting.value;
-        setting.value++;
-        Update(setting);
-        return res;
-    }
-    public long IncSapforMaxTaskId() throws Exception {
-        TSetting setting = settings.get(SettingName.SapforTaskMaxId);
+    public long IncKey(SettingName settingName) throws Exception{
+        TSetting setting = settings.get(settingName);
         long res = setting.value;
         setting.value++;
         Update(setting);
diff --git a/src/TestingSystem/DVM/Tasks/TestTask.java b/src/TestingSystem/DVM/Tasks/TestTask.java
index a810c74e..b2d36b6d 100644
--- a/src/TestingSystem/DVM/Tasks/TestTask.java
+++ b/src/TestingSystem/DVM/Tasks/TestTask.java
@@ -15,7 +15,7 @@ public class TestTask extends DBObject {
     @Description("PRIMARY KEY, UNIQUE")
     public long id = Constants.Nan;
     @Description("DEFAULT '-1'")
-    public int taskspackage_id = Constants.Nan;
+    public long taskspackage_id = Constants.Nan;
     @Description("DEFAULT -1")
     public int group_id = Constants.Nan;
     @Description("DEFAULT ''")
diff --git a/src/TestingSystem/DVM/TasksPackage/TasksPackage.java b/src/TestingSystem/DVM/TasksPackage/TasksPackage.java
index bb006e91..68f9daeb 100644
--- a/src/TestingSystem/DVM/TasksPackage/TasksPackage.java
+++ b/src/TestingSystem/DVM/TasksPackage/TasksPackage.java
@@ -1,13 +1,15 @@
 package TestingSystem.DVM.TasksPackage;
+import Common.Constants;
 import Common.Database.DBObject;
-import Common.Database.riDBObject;
 import GlobalData.Machine.MachineType;
 import TestingSystem.DVM.Tasks.TestCompilationTask;
 import com.sun.org.glassfish.gmbal.Description;
 
 import java.util.LinkedHashMap;
 import java.util.Vector;
-public class TasksPackage extends riDBObject {
+public class TasksPackage extends DBObject {
+    @Description("PRIMARY KEY, UNIQUE")
+    public long id = Constants.Nan;
     public String pid=""; //сишная часть.
     public String summary = "";
     //---
@@ -38,6 +40,10 @@ public class TasksPackage extends riDBObject {
     //нужно только для публикации задач.
     public LinkedHashMap<Integer, LinkedHashMap<Integer, Vector<TestCompilationTask>>> sorted_tasks = new LinkedHashMap<>();
     @Override
+    public Object getPK() {
+        return id;
+    }
+    @Override
     public void SynchronizeFields(DBObject src) {
         super.SynchronizeFields(src);
         TasksPackage tasksPackage = (TasksPackage) src;
diff --git a/src/TestingSystem/DVM/TasksPackage/TasksPackageDBTable.java b/src/TestingSystem/DVM/TasksPackage/TasksPackageDBTable.java
index 1e815647..57c6cb82 100644
--- a/src/TestingSystem/DVM/TasksPackage/TasksPackageDBTable.java
+++ b/src/TestingSystem/DVM/TasksPackage/TasksPackageDBTable.java
@@ -10,10 +10,10 @@ import java.util.LinkedHashMap;
 
 import static Common.UI.Tables.TableRenderers.RendererDate;
 import static Common.UI.Tables.TableRenderers.RendererStatusEnum;
-public class TasksPackageDBTable extends iDBTable<TasksPackage> {
+public class TasksPackageDBTable extends DBTable<Long,TasksPackage> {
 
     public TasksPackageDBTable() {
-        super(TasksPackage.class);
+        super(Long.class,TasksPackage.class);
     }
     @Override
     public Current CurrentName() {
diff --git a/src/TestingSystem/SAPFOR/SapforTask/SapforTask.java b/src/TestingSystem/SAPFOR/SapforTask/SapforTask.java
index c327221c..3e84b41e 100644
--- a/src/TestingSystem/SAPFOR/SapforTask/SapforTask.java
+++ b/src/TestingSystem/SAPFOR/SapforTask/SapforTask.java
@@ -25,7 +25,7 @@ public class SapforTask extends DBObject {
     public int sapfor_configuration_id = Constants.Nan;
     @Expose
     @Description("DEFAULT '-1'")
-    public int sapfortaskspackage_id = Constants.Nan;
+    public long sapfortaskspackage_id = Constants.Nan;
     //------------------------------------->>
     @Description("DEFAULT ''")
     @Expose
diff --git a/src/TestingSystem/SAPFOR/SapforTasksPackage/SapforTasksPackage.java b/src/TestingSystem/SAPFOR/SapforTasksPackage/SapforTasksPackage.java
index ac40dbd3..20630982 100644
--- a/src/TestingSystem/SAPFOR/SapforTasksPackage/SapforTasksPackage.java
+++ b/src/TestingSystem/SAPFOR/SapforTasksPackage/SapforTasksPackage.java
@@ -1,7 +1,6 @@
 package TestingSystem.SAPFOR.SapforTasksPackage;
 import Common.Constants;
 import Common.Database.DBObject;
-import Common.Database.riDBObject;
 import Common.Global;
 import Common.Utils.Utils;
 import TestingSystem.DVM.TasksPackage.TasksPackageState;
@@ -12,7 +11,9 @@ import com.sun.org.glassfish.gmbal.Description;
 import java.io.File;
 import java.nio.file.Paths;
 import java.util.Comparator;
-public class SapforTasksPackage extends riDBObject {
+public class SapforTasksPackage extends DBObject {
+    @Description("PRIMARY KEY, UNIQUE")
+    public long id = Constants.Nan;
     @Description("DEFAULT ''")
     public String testsNames = "";//имена тестов через ; для отображения
     //---
@@ -72,6 +73,10 @@ public class SapforTasksPackage extends riDBObject {
         }
     }
     @Override
+    public Object getPK() {
+        return id;
+    }
+    @Override
     public void SynchronizeFields(DBObject src) {
         super.SynchronizeFields(src);
         SapforTasksPackage p = (SapforTasksPackage) src;
diff --git a/src/TestingSystem/SAPFOR/SapforTasksPackage/SapforTasksPackagesDBTable.java b/src/TestingSystem/SAPFOR/SapforTasksPackage/SapforTasksPackagesDBTable.java
index eda10640..9de303a5 100644
--- a/src/TestingSystem/SAPFOR/SapforTasksPackage/SapforTasksPackagesDBTable.java
+++ b/src/TestingSystem/SAPFOR/SapforTasksPackage/SapforTasksPackagesDBTable.java
@@ -9,9 +9,9 @@ import java.util.LinkedHashMap;
 
 import static Common.UI.Tables.TableRenderers.RendererDate;
 import static Common.UI.Tables.TableRenderers.RendererStatusEnum;
-public class SapforTasksPackagesDBTable extends iDBTable<SapforTasksPackage> {
+public class SapforTasksPackagesDBTable extends DBTable<Long,SapforTasksPackage> {
     public SapforTasksPackagesDBTable() {
-        super(SapforTasksPackage.class);
+        super(Long.class,SapforTasksPackage.class);
     }
     @Override
     public Current CurrentName() {
@@ -31,7 +31,7 @@ public class SapforTasksPackagesDBTable extends iDBTable<SapforTasksPackage> {
             @Override
             protected void AdditionalInitColumns() {
              //   columns.get(0).setVisible(false);
-                columns.get(2).setMaxWidth(100);
+                columns.get(2).setMaxWidth(200);
                 columns.get(5).setRenderer(RendererDate);
                 columns.get(6).setRenderer(RendererDate);
                 columns.get(7).setRenderer(RendererStatusEnum);
diff --git a/src/Visual_DVM_2021/Passes/All/AbortSapforTaskPackage.java b/src/Visual_DVM_2021/Passes/All/AbortSapforTaskPackage.java
index 10c83394..badff7d5 100644
--- a/src/Visual_DVM_2021/Passes/All/AbortSapforTaskPackage.java
+++ b/src/Visual_DVM_2021/Passes/All/AbortSapforTaskPackage.java
@@ -36,6 +36,6 @@ public class AbortSapforTaskPackage extends TestingSystemPass<SapforTasksPackage
     }
     @Override
     protected void ServerAction() throws Exception {
-        Command(new ServerExchangeUnit_2021(ServerCode.PublishAccountAIObject, Current.getAccount().email, tasksPackageToKill));
+        Command(new ServerExchangeUnit_2021(ServerCode.PublishObject, Current.getAccount().email, tasksPackageToKill));
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/AbortTaskPackage.java b/src/Visual_DVM_2021/Passes/All/AbortTaskPackage.java
index 166b6df1..d2869ed8 100644
--- a/src/Visual_DVM_2021/Passes/All/AbortTaskPackage.java
+++ b/src/Visual_DVM_2021/Passes/All/AbortTaskPackage.java
@@ -36,7 +36,7 @@ public class AbortTaskPackage extends TestingSystemPass<TasksPackage> {
     }
     @Override
     protected void ServerAction() throws Exception {
-        Command(new ServerExchangeUnit_2021(ServerCode.PublishAccountAIObject, Current.getAccount().email, tasksPackageToKill));
+        Command(new ServerExchangeUnit_2021(ServerCode.PublishObject, Current.getAccount().email, tasksPackageToKill));
     }
 }
 
diff --git a/src/Visual_DVM_2021/Passes/Server/DeleteServerAccountObject.java b/src/Visual_DVM_2021/Passes/Server/DeleteServerAccountObject.java
index bd9bd90b..f0e1db91 100644
--- a/src/Visual_DVM_2021/Passes/Server/DeleteServerAccountObject.java
+++ b/src/Visual_DVM_2021/Passes/Server/DeleteServerAccountObject.java
@@ -1,13 +1,13 @@
 package Visual_DVM_2021.Passes.Server;
 import Common.Current;
+import Common.Database.DBObject;
 import Common.Database.Database;
-import Common.Database.riDBObject;
 import Common.Global;
 import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
 import TestingSystem.Common.TestingServer;
 import javafx.util.Pair;
-public class DeleteServerAccountObject<D extends riDBObject> extends DeleteServerObject<TestingServer, D> {
+public class DeleteServerAccountObject<D extends DBObject> extends DeleteServerObject<TestingServer, D> {
     public DeleteServerAccountObject(Class<D> d_in) {
         super(Global.testingServer, d_in);
     }
diff --git a/src/Visual_DVM_2021/Passes/Server/PublishServerAccountObject.java b/src/Visual_DVM_2021/Passes/Server/PublishServerAccountObject.java
index 199c134d..d1d4a307 100644
--- a/src/Visual_DVM_2021/Passes/Server/PublishServerAccountObject.java
+++ b/src/Visual_DVM_2021/Passes/Server/PublishServerAccountObject.java
@@ -3,8 +3,6 @@ import Common.Current;
 import Common.Database.DBObject;
 import Common.Database.Database;
 import Common.Global;
-import Repository.Server.ServerCode;
-import Repository.Server.ServerExchangeUnit_2021;
 import TestingSystem.Common.TestingServer;
 public class PublishServerAccountObject<D extends DBObject> extends PublishServerObject<TestingServer, D> {
     public PublishServerAccountObject(Class<D> d_in) {
@@ -15,7 +13,7 @@ public class PublishServerAccountObject<D extends DBObject> extends PublishServe
         return Global.testingServer.account_db;
     }
     @Override
-    protected void ServerAction() throws Exception {
-        Command(new ServerExchangeUnit_2021(ServerCode.PublishAccountAIObject, Current.getAccount().email, target));
+    protected String getEmail() {
+        return Current.getAccount().email;
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/Server/PublishServerObject.java b/src/Visual_DVM_2021/Passes/Server/PublishServerObject.java
index e4e0f081..fea58125 100644
--- a/src/Visual_DVM_2021/Passes/Server/PublishServerObject.java
+++ b/src/Visual_DVM_2021/Passes/Server/PublishServerObject.java
@@ -3,6 +3,8 @@ import Common.Current;
 import Common.Database.DBObject;
 import Common.Database.riDBObject;
 import Repository.RepositoryServer;
+import Repository.Server.ServerCode;
+import Repository.Server.ServerExchangeUnit_2021;
 public class PublishServerObject<S extends RepositoryServer, D extends DBObject> extends ServerObjectPass<S, D> {
     public Object pk = null;
     public PublishServerObject(S server_in, Class<D> d_in) {
@@ -27,10 +29,11 @@ public class PublishServerObject<S extends RepositoryServer, D extends DBObject>
         }
         return false;
     }
+    protected String getEmail(){return null;}
     //--
     @Override
     protected void ServerAction() throws Exception {
-        PublishObject(target);
+        Command(new ServerExchangeUnit_2021(ServerCode.PublishObject, getEmail(), target));
         pk = response.object;
     }
     @Override
diff --git a/src/Visual_DVM_2021/Passes/Server/RepositoryPass.java b/src/Visual_DVM_2021/Passes/Server/RepositoryPass.java
index b267dc75..2fdc7d0e 100644
--- a/src/Visual_DVM_2021/Passes/Server/RepositoryPass.java
+++ b/src/Visual_DVM_2021/Passes/Server/RepositoryPass.java
@@ -1,7 +1,6 @@
 package Visual_DVM_2021.Passes.Server;
 import Common.Constants;
 import Common.Database.DBObject;
-import Common.Database.iDBObject;
 import Common.Global;
 import Common.Utils.Utils;
 import Repository.RepositoryRefuseException;
@@ -119,14 +118,6 @@ public abstract class RepositoryPass<S extends RepositoryServer, T> extends Pass
         } else
             super.CheckException(ex);
     }
-    ///--- ОБЪЕКТЫ ГЛАВНОЙ БАЗЫ ----------------
-    public void PublishObject(DBObject object) throws Exception {
-        Command(new ServerExchangeUnit_2021(
-                ((object instanceof iDBObject) ? ServerCode.PublishAIObject : ServerCode.PublishObject),
-                "",
-                object
-        ));
-    }
     public void EditObject(DBObject object) throws Exception {
         Command(new ServerExchangeUnit_2021(ServerCode.EditObject, "", object));
     }