начал перестройку под бд пользователя.

src/TestingSystem/TasksDatabase.java

@@ -2,6 +2,7 @@ package TestingSystem;
 import Common.Database.SQLITE.SQLiteDatabase;
 import Common.Global;
 import GlobalData.Settings.SettingName;
+import SapforTestingSystem.SapforTasksPackage.SapforTasksPackagesDBTable;
 import TestingSystem.TSetting.TSetting;
 import TestingSystem.TSetting.TSettingsDBTable;
 import TestingSystem.TaskKey.TaskKey_2022;
@@ -28,10 +29,8 @@ public class TasksDatabase extends SQLiteDatabase {
     public TestCompilationTasksDBTable testCompilationTasks;
     public TestRunTasksDBTable testRunTasks;
     PreparedStatement selectPackageRunTasks = null;
-  //  PreparedStatement selectSapforPackageSapforTasks = null;
     //----------
-   // public SapforTasksPackagesDBTable sapforTasksPackages;
-   // public SapforTasksDBTable sapforTasks = null;
+    public SapforTasksPackagesDBTable sapforTasksPackages;
     //---------
     public TasksDatabase(String email) {
         super(Paths.get(Global.DataDirectory.getAbsolutePath(), email + "_" + tests_db_name + ".sqlite").toFile());
@@ -50,10 +49,7 @@ public class TasksDatabase extends SQLiteDatabase {
         addTable(testRunTasks = new TestRunTasksDBTable());
         addTable(packagesToKill = new TasksPackageToKillDBTable());
         //-----------
-        /*
         addTable(sapforTasksPackages = new SapforTasksPackagesDBTable());
-        addTable(sapforTasks = new SapforTasksDBTable());
-         */
     }
     @Override
     public void Init() throws Exception {
@@ -68,7 +64,6 @@ public class TasksDatabase extends SQLiteDatabase {
     public void prepareTablesStatements() throws Exception {
         super.prepareTablesStatements();
         selectPackageRunTasks = conn.prepareStatement("SELECT * FROM TestRunTask WHERE taskspackage_id = ?");
-       // selectSapforPackageSapforTasks = conn.prepareStatement("SELECT * FROM SapforTask WHERE sapfortaskspackage_id = ?");
     }
     @Override
     protected void disconnect() throws Exception {
@@ -76,12 +71,6 @@ public class TasksDatabase extends SQLiteDatabase {
             selectPackageRunTasks.close();
             selectPackageRunTasks = null;
         }
-        /*
-        if (selectSapforPackageSapforTasks != null) {
-            selectSapforPackageSapforTasks.close();
-            selectSapforPackageSapforTasks = null;
-        }
-         */
         super.disconnect();
     }
     public LinkedHashMap<Long, TestRunTask> getPackageRunTasks(String package_id) throws Exception {
@@ -94,30 +83,6 @@ public class TasksDatabase extends SQLiteDatabase {
         }
         return res;
     }
-    /*
-    вернуть когда перенесем на сервер.
-    public LinkedHashMap<Long, SapforTask> getSapforPackageTasks(String package_id) throws Exception {
-        LinkedHashMap<Long, SapforTask> res = new LinkedHashMap<>();
-        selectSapforPackageSapforTasks.setString(1, package_id);
-        resSet = selectSapforPackageSapforTasks.executeQuery();
-        while (resSet.next()) {
-            Pair<Long, SapforTask> record = readRecord(sapforTasks);
-            res.put(record.getKey(), record.getValue());
-        }
-        return res;
-    }
-     */
-    /*
-    public LinkedHashMap<Long, SapforTask> getSapforPackageTasks(String package_id) throws Exception {
-        LinkedHashMap<Long, SapforTask> res = new LinkedHashMap<>();
-        for (SapforTask task : sapforTasks.Data.values()) {
-            if (task.sapfortaskspackage_id.equals(package_id)) {
-                res.put(task.id, task);
-            }
-        }
-        return res;
-    }
-     */
     //------
     public TasksPackage getFirstActivePackage() {
         TasksPackage first_active = null;

src/TestingSystem/TestingServer.java

@@ -316,13 +316,15 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
         return groups;
     }
     public void StartSapforTests(SapforTasksPackage_info sapforTasksPackage_info) throws Exception {
+        SetCurrentAccountDB(sapforTasksPackage_info.email);
         //--
         SapforTasksPackage_json package_json = new SapforTasksPackage_json();
         for (String test_id : sapforTasksPackage_info.testsIds)
             package_json.tests.add(db.tests.get(test_id).description);
         //создание объекта набора задач. для бд.
         SapforTasksPackage sapforTasksPackage = new SapforTasksPackage(); //?может быть все же поменять ключ на сгенерированный из даты.
-       // db.Insert(sapforTasksPackage);
+        sapforTasksPackage.genName();
+        account_db.Insert(sapforTasksPackage);
         //создание рабочего пространства для пакетного режима
         File packageWorkspace = new File(Global.SapforPackagesDirectory, String.valueOf(sapforTasksPackage.id));
         Utils.CheckAndCleanDirectory(packageWorkspace);
@@ -375,7 +377,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
         sapforTasksPackage.sapfor_build_date = sapfor.buildDate;
         sapforTasksPackage.testsNames = String.join(";", package_json.tests);
         sapforTasksPackage.StartDate = new Date().getTime();
-       // db.Update(sapforTasksPackage);
+        account_db.Update(sapforTasksPackage);
     }
     @Override
     protected void Session() throws Exception {