From a1b7bec28201a507075df92de815294f1411633a Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Fri, 27 Oct 2023 00:20:42 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                           |  3 +-
 .../Json/SapforTasksResults_json.java         | 31 +++++++++++++++++++
 .../SapforTasksPackageInterface.java          | 27 +++++++++++++---
 .../SapforTasksPackageSupervisor.java         | 29 ++---------------
 4 files changed, 57 insertions(+), 33 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 011ed5cb..142e049b 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,8 +8,9 @@
   <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/PackageModeSupervisor/PackageModeSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/PackageModeSupervisor/PackageModeSupervisor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/Json/SapforTasksResults_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/Json/SapforTasksResults_json.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/SapforTestingSystem/Json/SapforTasksResults_json.java b/src/SapforTestingSystem/Json/SapforTasksResults_json.java
index f92d3d57..8ff17a7b 100644
--- a/src/SapforTestingSystem/Json/SapforTasksResults_json.java
+++ b/src/SapforTestingSystem/Json/SapforTasksResults_json.java
@@ -1,7 +1,9 @@
 package SapforTestingSystem.Json;
+import GlobalData.Tasks.TaskState;
 import SapforTestingSystem.SapforTask.SapforTask;
 import com.google.gson.annotations.Expose;
 
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Vector;
 public class SapforTasksResults_json {
@@ -11,4 +13,33 @@ public class SapforTasksResults_json {
     public long EndDate = 0;
     @Expose
     public List<SapforTask> tasks = new Vector<>();
+    public LinkedHashMap<TaskState, LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>>> getSortedTasks() {
+        LinkedHashMap<TaskState, LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>>> res = new LinkedHashMap<>();
+        //рассортировать задачи по конфигурациям.
+        for (TaskState state : TaskState.values()) {
+            LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>> tasksByFlags = new LinkedHashMap<>();
+            res.put(state, tasksByFlags);
+            //--
+            for (SapforTask task : tasks) {
+                if (task.state.equals(state)) {
+                    LinkedHashMap<String, Vector<SapforTask>> groups_tasks = null;
+                    if (tasksByFlags.containsKey(task.flags)) {
+                        groups_tasks = tasksByFlags.get(task.flags);
+                    } else {
+                        groups_tasks = new LinkedHashMap<>();
+                        tasksByFlags.put(task.flags, groups_tasks);
+                    }
+                    Vector<SapforTask> tasks = null;
+                    if (groups_tasks.containsKey(task.group_description)) {
+                        tasks = groups_tasks.get(task.group_description);
+                    } else {
+                        tasks = new Vector<>();
+                        groups_tasks.put(task.group_description, tasks);
+                    }
+                    tasks.add(task);
+                }
+            }
+        }
+        return res;
+    }
 }
diff --git a/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java b/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java
index ad169834..20f262c5 100644
--- a/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java
+++ b/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java
@@ -2,6 +2,8 @@ package SapforTestingSystem.SapforTasksPackage;
 import Common.Constants;
 import Common.Global;
 import Common.Utils.Utils;
+import SapforTestingSystem.Json.SapforConfiguration_json;
+import SapforTestingSystem.Json.SapforTasksPackage_json;
 import SapforTestingSystem.Json.SapforTasksResults_json;
 
 import javax.swing.tree.DefaultMutableTreeNode;
@@ -11,10 +13,25 @@ public class SapforTasksPackageInterface {
         return new File(Global.SapforPackagesDirectory, package_in.id + ".zip");
     }
     public static DefaultMutableTreeNode getTree(SapforTasksPackage package_in) throws Exception {
-        File results_json_file = new File(package_in.workspace, Constants.results_json);
-        SapforTasksResults_json results_json =
-                (SapforTasksResults_json) Utils.jsonFromFile(results_json_file,
-                        SapforTasksResults_json.class);
-        return null;
+        SapforTasksPackage_json package_json = getJson(package_in);
+        SapforTasksResults_json results = getResults(package_in);
+        DefaultMutableTreeNode root = new DefaultMutableTreeNode(package_in.id);
+        for (SapforConfiguration_json configuration : package_json.configurations) {
+            DefaultMutableTreeNode node = new DefaultMutableTreeNode(configuration.flags);
+
+
+            root.add(node);
+        }
+        return root;
+    }
+    public static SapforTasksPackage_json getJson(SapforTasksPackage package_in) throws Exception {
+        File json_file = new File(package_in.workspace, Constants.package_json);
+        return (SapforTasksPackage_json) Utils.jsonFromFile(json_file,
+                SapforTasksPackage_json.class);
+    }
+    public static SapforTasksResults_json getResults(SapforTasksPackage package_in) throws Exception {
+        File json_file = new File(package_in.workspace, Constants.results_json);
+        return (SapforTasksResults_json) Utils.jsonFromFile(json_file,
+                SapforTasksResults_json.class);
     }
 }
diff --git a/src/SapforTestingSystem/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java b/src/SapforTestingSystem/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java
index 842e2e46..a039c9d0 100644
--- a/src/SapforTestingSystem/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java
+++ b/src/SapforTestingSystem/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java
@@ -180,33 +180,7 @@ public class SapforTasksPackageSupervisor {
         if (results_json_file.exists()) {
             SapforTasksResults_json results_json = (SapforTasksResults_json) Utils.jsonFromFile(results_json_file, SapforTasksResults_json.class);
             summary_lines.add("Всего задач: " + results_json.tasks.size());
-            LinkedHashMap<TaskState, LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>>> sortedTasks = new LinkedHashMap<>();
-            //рассортировать задачи по конфигурациям.
-            for (TaskState state : TaskState.values()) {
-                LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>> tasksByFlags = new LinkedHashMap<>();
-                sortedTasks.put(state, tasksByFlags);
-                //--
-                for (SapforTask task : results_json.tasks) {
-                    task.sapfortaskspackage_id = sapforTasksPackage.id;
-                    if (task.state.equals(state)) {
-                        LinkedHashMap<String, Vector<SapforTask>> groups_tasks = null;
-                        if (tasksByFlags.containsKey(task.flags)) {
-                            groups_tasks = tasksByFlags.get(task.flags);
-                        } else {
-                            groups_tasks = new LinkedHashMap<>();
-                            tasksByFlags.put(task.flags, groups_tasks);
-                        }
-                        Vector<SapforTask> tasks = null;
-                        if (groups_tasks.containsKey(task.group_description)) {
-                            tasks = groups_tasks.get(task.group_description);
-                        } else {
-                            tasks = new Vector<>();
-                            groups_tasks.put(task.group_description, tasks);
-                        }
-                        tasks.add(task);
-                    }
-                }
-            }
+            LinkedHashMap<TaskState, LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>>> sortedTasks = results_json.getSortedTasks();
             //--
             for (TaskState state : sortedTasks.keySet()) {
                 LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>> tasksByFlags = sortedTasks.get(state);
@@ -222,6 +196,7 @@ public class SapforTasksPackageSupervisor {
                                 count += tasks.size();
                                 for (SapforTask task : tasks) {
                                     task.versionsDescription = task.getVersionsChain();
+                                    task.sapfortaskspackage_id = sapforTasksPackage.id;
                                     flagsLines.add(
                                             "тест: " +
                                                     Utils.Brackets(task.test_description) + " " +