From 81d6330660b4946353c8c8ab48077f4f1172bc5f Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Fri, 13 Oct 2023 02:06:46 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=BE=D0=BC=D0=B5=D0=B6=D1=83?=
 =?UTF-8?q?=D1=82=D0=BE=D1=87=D0=BD=D1=8B=D0=B9.=20=D0=B2=D1=81=D1=82?=
 =?UTF-8?q?=D1=80=D0=B0=D0=B8=D0=B2=D0=B0=D1=8E=20=D1=82=D0=B5=D1=81=D1=82?=
 =?UTF-8?q?=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D1=81=D0=B0?=
 =?UTF-8?q?=D0=BF=D1=84=D0=BE=D1=80=20=D0=B2=20=D1=81=D1=83=D1=89=D0=B5?=
 =?UTF-8?q?=D1=81=D1=82=D0=B2=D1=83=D1=8E=D1=89=D0=B8=D0=B9=20=D0=BF=D0=BB?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D1=80=D0=BE=D0=B2=D1=89=D0=B8=D0=BA.=20?=
 =?UTF-8?q?=D0=BF=D0=BE=D0=BA=D0=B0=20=D0=B5=D1=81=D1=82=D1=8C=20=D0=B1?=
 =?UTF-8?q?=D0=B0=D0=B3=D0=B8.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |  3 +-
 .../SapforTasksPackage.java                   |  1 +
 .../ServerSapforTestingPlanner.java           | 86 -------------------
 src/TestingSystem/TasksDatabase.java          |  3 +-
 src/TestingSystem/TestingPlanner.java         | 70 ++++++++++++++-
 src/TestingSystem/TestingServer.java          |  2 +
 6 files changed, 74 insertions(+), 91 deletions(-)
 delete mode 100644 src/SapforTestingSystem/ServerSapforTestingPlanner/ServerSapforTestingPlanner.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 04158075..f8e7465b 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,10 +8,11 @@
   <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/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/ServerSapforTestingPlanner/ServerSapforTestingPlanner.java" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/src/TestingSystem/TasksDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/TasksDatabase.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/TestingSystem/TestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/TestingPlanner.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/TestingSystem/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/TestingServer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/TestsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/TestsDatabase.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.java b/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.java
index cd066913..b92d9c68 100644
--- a/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.java
+++ b/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.java
@@ -17,6 +17,7 @@ public class SapforTasksPackage extends nDBObject {
     public long StartDate = 0; //дата начала выполнения
     public long ChangeDate = 0;//дата окончания выполнения
     //-
+    @Description("DEFAULT 'Queued'")
     public TasksPackageState state = TasksPackageState.Queued;
     // допустимые состояния
     //Queued
diff --git a/src/SapforTestingSystem/ServerSapforTestingPlanner/ServerSapforTestingPlanner.java b/src/SapforTestingSystem/ServerSapforTestingPlanner/ServerSapforTestingPlanner.java
deleted file mode 100644
index c66915c1..00000000
--- a/src/SapforTestingSystem/ServerSapforTestingPlanner/ServerSapforTestingPlanner.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package SapforTestingSystem.ServerSapforTestingPlanner;
-import Common.Constants;
-import Common.Utils.Utils;
-import Repository.Server.ServerCode;
-import Repository.Server.ServerExchangeUnit_2021;
-import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
-import TestingSystem.TasksPackage.TasksPackageState;
-import Visual_DVM_2021.Passes.PassException;
-import Visual_DVM_2021.Passes.TestingSystemPass;
-
-import java.io.File;
-import java.io.Serializable;
-import java.util.Date;
-public class ServerSapforTestingPlanner {
-    SapforTasksPackage sapforTasksPackage = null;
-    //---
-    int getSleepMillis() {
-        return 2000;
-    }
-    Object ServerCommand(ServerCode code_in, String arg, Serializable object_in) throws Exception {
-        TestingSystemPass<Object> pass = new TestingSystemPass<Object>() {
-            @Override
-            public String getDescription() {
-                return "";
-            }
-            @Override
-            protected void ServerAction() throws Exception {
-                Command(new ServerExchangeUnit_2021(code_in, arg, object_in));
-                target = response.object;
-            }
-        };
-        if (!pass.Do()) throw new PassException("Ошибка взаимодействия с сервером " + code_in);
-        return pass.target;
-    }
-    //---
-    void UpdatePackage(SapforTasksPackage package_in) throws Exception {
-        package_in.ChangeDate = new Date().getTime();
-        ServerCommand(ServerCode.EditObject, "", package_in);
-    }
-    void PackageStart() throws Exception {
-        File workspace = new File(sapforTasksPackage.workspace);
-        File script = new File(sapforTasksPackage.workspace, "start");
-        ProcessBuilder procBuilder = new ProcessBuilder(script.getAbsolutePath());
-        procBuilder.directory(workspace);
-        procBuilder.start();
-        sapforTasksPackage.state = TasksPackageState.RunningExecution;
-        UpdatePackage(sapforTasksPackage);
-    }
-    void CheckPackageState() throws Exception {
-        File done = new File(sapforTasksPackage.workspace, Constants.DONE);
-        File aborted = new File(sapforTasksPackage.workspace, Constants.ABORTED);
-        if (done.exists()) {
-            sapforTasksPackage.state = TasksPackageState.Done;
-            UpdatePackage(sapforTasksPackage);
-        } else if (aborted.exists()) {
-            sapforTasksPackage.state = TasksPackageState.Aborted;
-            UpdatePackage(sapforTasksPackage);
-        }
-    }
-    public void Perform() {
-        while (true) {
-            try {
-                //-
-                sapforTasksPackage = (SapforTasksPackage) ServerCommand(ServerCode.GetFirstActiveSapforTasksPackage, "", null);
-                switch (sapforTasksPackage.state) {
-                    case PackageStart:
-                        PackageStart();
-                        break;
-                    case RunningExecution:
-                        CheckPackageState();
-                        break;
-                    default:
-                        break;
-                }
-                //-
-            } catch (Exception ex) {
-                ex.printStackTrace();
-            } finally {
-                try {
-                    Utils.sleep(getSleepMillis());
-                } catch (Exception ignored) {
-                }
-            }
-        }
-    }
-}
diff --git a/src/TestingSystem/TasksDatabase.java b/src/TestingSystem/TasksDatabase.java
index f5dc9842..b33655e7 100644
--- a/src/TestingSystem/TasksDatabase.java
+++ b/src/TestingSystem/TasksDatabase.java
@@ -175,7 +175,8 @@ public class TasksDatabase extends SQLiteDatabase {
             }
             if (first_active != null) return first_active;
             if (first_queued != null) {
-                first_queued.state = TasksPackageState.TestsSynchronize;
+               // first_queued.state = TasksPackageState.TestsSynchronize; // ? vj
+                first_queued.state = TasksPackageState.RunningPreparation;
                 try {
                     Update(first_queued);
                 } catch (Exception ex) {
diff --git a/src/TestingSystem/TestingPlanner.java b/src/TestingSystem/TestingPlanner.java
index 60f5377e..f6379312 100644
--- a/src/TestingSystem/TestingPlanner.java
+++ b/src/TestingSystem/TestingPlanner.java
@@ -1,4 +1,5 @@
 package TestingSystem;
+import Common.Constants;
 import Common.Global;
 import Common.Utils.Utils;
 import GlobalData.Machine.Machine;
@@ -148,7 +149,7 @@ public class TestingPlanner {
     void emailPass(String email_in) {
         email = email_in;
         try {
-            System.out.println(email+" testing planner starts...");
+           // System.out.println(email+" testing planner starts...");
                 Pair<TasksPackage, LinkedHashMap<Long, TestCompilationTask>> p = (Pair<TasksPackage, LinkedHashMap<Long, TestCompilationTask>>) ServerCommand(ServerCode.GetFirstActiveAccountPackage);
                 sapforTasksPackage = (SapforTasksPackage) ServerCommand(ServerCode.GetFirstActiveSapforTasksPackage);
                 tasksPackage = null;
@@ -156,7 +157,7 @@ public class TestingPlanner {
                 tasksPackage = p.getKey();
                 packageTasks = p.getValue();
                 if (tasksPackage != null) {
-                    System.out.println("found dvm package: "+sapforTasksPackage.id);
+                  //  System.out.println("found dvm package: "+sapforTasksPackage.id);
                     String machine_url = tasksPackage.machine_address + ":" + tasksPackage.machine_port;
                     if (!machines.containsKey(machine_url))
                         machines.put(machine_url, new Machine(
@@ -187,7 +188,13 @@ public class TestingPlanner {
                     }
                 }else
                 if (sapforTasksPackage!=null){
-                    System.out.println("found sapfor package: "+sapforTasksPackage.id);
+                    System.out.println("found sapfor package: "+sapforTasksPackage.id+" state = "+sapforTasksPackage.state);
+                    try {
+                       PerformSapforPackage();
+                    } catch (Exception ex) {
+                        Print("Исключение при тестировании SAPROR");
+                        Print(ex.getMessage());
+                    }
                 }
         } catch (Exception ex) {
             Global.Log.PrintException(ex);
@@ -202,4 +209,61 @@ public class TestingPlanner {
     public String getPlanner() {
         return String.join("/", user.workspace, ConnectionPass.modules, ConnectionPass.planner);
     }
+    //--
+    void UpdateSapforPackage(SapforTasksPackage package_in) throws Exception {
+        package_in.ChangeDate = new Date().getTime();
+        ServerCommand(ServerCode.EditAccountObject, package_in);
+        //---------------
+        /*
+        if ((package_in.needsEmail == 1) &&
+                (package_in.state.equals(TasksPackageState.PackageStart) ||
+                        (package_in.state.equals(TasksPackageState.Done)))) {
+            EmailMessage message = new EmailMessage();
+            message.subject = "Состояние пакета задач " + Utils.Brackets(package_in.id) + " изменилось на " + Utils.Brackets(package_in.state.getDescription());
+            message.text = package_in.summary;
+            message.targets.add(email);
+            ServerCommand(ServerCode.Email, message);
+        }
+         */
+    }
+    void SapforPackageStart() throws Exception {
+        System.out.println("start sapfor package "+sapforTasksPackage.id);
+        File workspace = new File(sapforTasksPackage.workspace);
+        File script = new File(sapforTasksPackage.workspace, "start");
+        ProcessBuilder procBuilder = new ProcessBuilder(script.getAbsolutePath());
+        procBuilder.directory(workspace);
+        procBuilder.start();
+        sapforTasksPackage.state = TasksPackageState.RunningExecution;
+        UpdateSapforPackage(sapforTasksPackage);
+        System.out.println("done");
+    }
+    void CheckSapforPackageState() throws Exception {
+        System.out.println("check sapfor package "+sapforTasksPackage.id);
+        File done = new File(sapforTasksPackage.workspace, Constants.DONE);
+        File aborted = new File(sapforTasksPackage.workspace, Constants.ABORTED);
+        if (done.exists()) {
+            sapforTasksPackage.state = TasksPackageState.Done;
+            UpdateSapforPackage(sapforTasksPackage);
+            System.out.println("package done");
+        } else if (aborted.exists()) {
+            sapforTasksPackage.state = TasksPackageState.Aborted;
+            UpdateSapforPackage(sapforTasksPackage);
+            System.out.println("package aborted");
+        }else {
+            System.out.println("package running");
+        }
+    }
+    //--
+    public void PerformSapforPackage() throws Exception {
+        switch (sapforTasksPackage.state) {
+            case RunningPreparation:
+                SapforPackageStart();
+                break;
+            case RunningExecution:
+                CheckSapforPackageState();
+                break;
+            default:
+                break;
+        }
+    }
 }
diff --git a/src/TestingSystem/TestingServer.java b/src/TestingSystem/TestingServer.java
index e1d0c43c..52543ec6 100644
--- a/src/TestingSystem/TestingServer.java
+++ b/src/TestingSystem/TestingServer.java
@@ -28,6 +28,7 @@ import TestingSystem.Tasks.TestCompilationTask;
 import TestingSystem.Tasks.TestRunTask;
 import TestingSystem.Tasks.TestTask;
 import TestingSystem.TasksPackage.TasksPackage;
+import TestingSystem.TasksPackage.TasksPackageState;
 import TestingSystem.TasksPackageToKill.TasksPackageToKill;
 import TestingSystem.Test.Test;
 import TestingSystem.Test.TestInterface;
@@ -378,6 +379,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();
+        sapforTasksPackage.state = TasksPackageState.Queued;
         account_db.Update(sapforTasksPackage);
     }
     @Override