From 106626eb9ae322c4fb6483dc55e0df5a5f029ad0 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Thu, 14 Dec 2023 23:00:50 +0300
Subject: [PATCH] =?UTF-8?q?=D0=B0=D0=BA=D1=82=D1=83=D0=B0=D0=BB=D0=B8?=
 =?UTF-8?q?=D0=B7=D0=B0=D1=86=D0=B8=D1=8F=20=D0=B4=D0=B2=D0=BC=20=D0=BF?=
 =?UTF-8?q?=D0=B0=D0=BA=D0=B5=D1=82=D0=BE=D0=B2=20=D0=BD=D0=B0=20=D0=BD?=
 =?UTF-8?q?=D0=BE=D0=B2=D1=8B=D1=85=20=D0=BE=D0=B1=D1=8A=D0=B5=D0=BA=D1=82?=
 =?UTF-8?q?=D0=B0=D1=85.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |  6 ++-
 src/Repository/Server/ServerCode.java         |  4 +-
 src/TestingSystem/Common/TestingServer.java   | 22 ++++++++++-
 .../Passes/All/ActualizeDVMPackages.java      | 39 ++++++-------------
 .../Passes/All/ActualizePackages.java         |  2 +-
 5 files changed, 39 insertions(+), 34 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 2225b267..b739ec67 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,8 +8,10 @@
   <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/TestingSystem/DVM/DVMTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTestingPlanner.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/files/Planner/Supervisor.h" beforeDir="false" afterPath="$PROJECT_DIR$/src/files/Planner/Supervisor.h" 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/ActualizeDVMPackages.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ActualizeDVMPackages.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ActualizePackages.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ActualizePackages.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/Repository/Server/ServerCode.java b/src/Repository/Server/ServerCode.java
index 479d3ec7..01870556 100644
--- a/src/Repository/Server/ServerCode.java
+++ b/src/Repository/Server/ServerCode.java
@@ -87,7 +87,7 @@ public enum ServerCode {
     ActualizeDVMPackages,
    // PublishTestProject
     GetFirstActiveDVMPackage,
-    DVMPackageNeedsKill
+    DVMPackageNeedsKill,  // не доделано.
+    UpdateActiveDVMPackages
     ;
-
 }
diff --git a/src/TestingSystem/Common/TestingServer.java b/src/TestingSystem/Common/TestingServer.java
index fb4f812c..d02abb95 100644
--- a/src/TestingSystem/Common/TestingServer.java
+++ b/src/TestingSystem/Common/TestingServer.java
@@ -102,7 +102,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
     //--->>
     @Override
     protected void startAdditionalThreads() {
-      //  testingThread.start();
+        //  testingThread.start();
         testingThread_2023.start();
     }
     protected TestingPlanner_OLD testingPlannerOLD = new TestingPlanner_OLD();
@@ -382,6 +382,10 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
             case DVMPackageNeedsKill:
                 DVMPackageNeedsKill();
                 break;
+            case UpdateActiveDVMPackages:
+                Print("Получить данные по пакетам DVM");
+                UpdateActiveDVMPackages();
+                break;
             default:
                 throw new RepositoryRefuseException("Неподдерживаемый код: " + code);
         }
@@ -400,7 +404,6 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
         }
         response.object = res_;
          */
-
     }
     public void UpdateTestTasks() throws Exception {
         Vector<TestCompilationTask> compilationTasks = (Vector<TestCompilationTask>) request.object;
@@ -679,6 +682,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
         }
     }
     //---------------------------------------------------------------------------------------------->>>
+    //устарели. убрать.
     void ActualizeDVMPackages() throws Exception {
         Vector<Pair<Long, TasksPackageState>> keys_pairs = (Vector<Pair<Long, TasksPackageState>>) request.object;
         //--
@@ -733,4 +737,18 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
         //--
     }
     //--
+    //---
+    void UpdateActiveDVMPackages() throws Exception {
+        Vector<Pair<Integer, TasksPackageState>> keys_pairs = (Vector<Pair<Integer, TasksPackageState>>) request.object;
+        Vector<DVMPackage> res = new Vector<>();
+        //--
+        for (Pair<Integer, TasksPackageState> p : keys_pairs) {
+            if (db.dvmPackages.containsKey(p.getKey())) {
+                DVMPackage tasksPackage = db.dvmPackages.get(p.getKey());
+                if (!p.getValue().equals(tasksPackage.state))
+                    res.add(tasksPackage);
+            }
+        }
+        response.object = res;
+    }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/ActualizeDVMPackages.java b/src/Visual_DVM_2021/Passes/All/ActualizeDVMPackages.java
index a68006a1..3fd34ded 100644
--- a/src/Visual_DVM_2021/Passes/All/ActualizeDVMPackages.java
+++ b/src/Visual_DVM_2021/Passes/All/ActualizeDVMPackages.java
@@ -4,6 +4,7 @@ import Common.Global;
 import Common.UI.UI;
 import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
+import TestingSystem.DVM.DVMPackage.DVMPackage;
 import TestingSystem.DVM.Tasks.TestRunTask;
 import TestingSystem.DVM.TasksPackage.TasksPackage;
 import TestingSystem.DVM.TasksPackage.TasksPackageState;
@@ -11,7 +12,7 @@ import Visual_DVM_2021.Passes.Server.TestingSystemPass;
 import javafx.util.Pair;
 
 import java.util.Vector;
-public class ActualizeDVMPackages extends TestingSystemPass<Vector<Pair<Long, TasksPackageState>>> {
+public class ActualizeDVMPackages extends TestingSystemPass<Vector<Pair<Integer, TasksPackageState>>> {
     @Override
     protected boolean needsAnimation() {
         return false;
@@ -19,42 +20,26 @@ public class ActualizeDVMPackages extends TestingSystemPass<Vector<Pair<Long, Ta
     @Override
     protected boolean canStart(Object... args) throws Exception {
         target = new Vector<>();
-        for (TasksPackage tasksPackage : Global.testingServer.account_db.packages.Data.values()) {
-            if (tasksPackage.state.isActive())
-                target.add(new Pair<>(tasksPackage.id, tasksPackage.state));
+        for (DVMPackage dvmPackage : Global.testingServer.db.dvmPackages.Data.values()) {
+            if (dvmPackage.state.isActive())
+                target.add(new Pair(dvmPackage.id, dvmPackage.state));
         }
         return !target.isEmpty();
     }
     @Override
     protected void ServerAction() throws Exception {
-        Command(new ServerExchangeUnit_2021(ServerCode.ActualizeDVMPackages, Current.getAccount().email, target));
+        Command(new ServerExchangeUnit_2021(ServerCode.UpdateActiveDVMPackages, "", target));
     }
     @Override
     protected void performDone() throws Exception {
-        int i = 0;
-        Vector<Pair<TasksPackage, Vector<TestRunTask>>> res = (Vector<Pair<TasksPackage, Vector<TestRunTask>>>) response.object;
-        Global.testingServer.account_db.BeginTransaction();
-        for (Pair<TasksPackage, Vector<TestRunTask>> pair : res) {
-            TasksPackage tasksPackage = pair.getKey();
-            Global.testingServer.account_db.UpdateWithCheck(tasksPackage);
-            if (tasksPackage.state.equals(TasksPackageState.Done)) {
-                ++i;
-                for (TestRunTask task : pair.getValue()) {
-                    Global.testingServer.account_db.UpdateWithCheck(task);
-                }
-            }
-        }
-        Global.testingServer.account_db.Commit();
-        /*
-        if (i == target.size()) {
-            UI.testingBar.autorefreshButton.doClick();
-            System.out.println("All packages are not active");
-        }
-         */
+        Vector<DVMPackage> res = (Vector<DVMPackage>) response.object;
+        Global.testingServer.db.BeginTransaction();
+        for (DVMPackage dvmPackage : res)
+            Global.testingServer.db.UpdateWithCheck(dvmPackage);
+        Global.testingServer.db.Commit();
     }
     @Override
     protected void showDone() throws Exception {
-        Global.testingServer.account_db.packages.RefreshUI();
-        Global.testingServer.account_db.testRunTasks.ShowUI();
+        Global.testingServer.db.dvmPackages.RefreshUI();
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/ActualizePackages.java b/src/Visual_DVM_2021/Passes/All/ActualizePackages.java
index 958da771..06f8efb7 100644
--- a/src/Visual_DVM_2021/Passes/All/ActualizePackages.java
+++ b/src/Visual_DVM_2021/Passes/All/ActualizePackages.java
@@ -9,6 +9,6 @@ public class ActualizePackages extends Pass_2021 {
     @Override
     protected void body() throws Exception {
         passes.get(PassCode_2021.ActualizeDVMPackages).Do();
-        passes.get(PassCode_2021.ActualizeSAPFORPackages).Do();
+     //   passes.get(PassCode_2021.ActualizeSAPFORPackages).Do();
     }
 }