From bb671c5166d0312b2efd8eb541e1a9271a76ac62 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Tue, 24 Sep 2024 23:34:41 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                           | 19 ++++++++++++-------
 properties                                    |  2 +-
 src/Common/Constants.java                     |  7 ++++++-
 src/Common/Global.java                        |  4 ----
 src/Common/Utils/Utils.java                   |  9 ++++++++-
 .../BugReport/BugReportInterface.java         | 13 ++++---------
 src/Repository/RepositoryServer.java          |  5 ++---
 src/Repository/Server/ComponentsServer.java   |  8 +++-----
 .../SAPFOR/SapforTestingPlanner.java          |  3 +--
 .../Passes/All/AppendBugReportField.java      |  2 +-
 .../Passes/All/PublishBugReport.java          |  2 +-
 .../Passes/All/UpdateBugReportField.java      |  2 +-
 12 files changed, 40 insertions(+), 36 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f8a28215..4666b0d9 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,12 +8,17 @@
   <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/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/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartSelectedSAPFORConfigurations.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartSelectedSAPFORConfigurations.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/TestPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/TestPass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" 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/Common/Utils/Utils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Utils/Utils.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Repository/BugReport/BugReportInterface.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/BugReport/BugReportInterface.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/ComponentsServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Server/ComponentsServer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTestingPlanner.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AppendBugReportField.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AppendBugReportField.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishBugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishBugReport.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/UpdateBugReportField.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/UpdateBugReportField.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -112,10 +117,10 @@
       <recent name="C:\Users\misha\Documents\visual_sapfor_2023\libs" />
     </key>
     <key name="MoveMembersDialog.RECENTS_KEY">
+      <recent name="Common.Constants" />
       <recent name="Common.Utils.Utils" />
       <recent name="Repository.Component.Sapfor.Sapfor" />
       <recent name="TestingSystem.Group.GroupsDBTable" />
-      <recent name="Common.Constants" />
       <recent name="SapforTestingSystem.SapforTask.SapforTask" />
     </key>
     <key name="MoveFile.RECENT_KEYS">
diff --git a/properties b/properties
index 2de37e80..2e627f77 100644
--- a/properties
+++ b/properties
@@ -37,6 +37,6 @@
   "TestingKernels": 64,
   "AutoCheckTesting": true,
   "CheckTestingIntervalSeconds": 10,
-  "EmailOnTestingProgress": false,
+  "EmailOnTestingProgress": true,
   "eraseTestingWorkspaces": true
 }
\ No newline at end of file
diff --git a/src/Common/Constants.java b/src/Common/Constants.java
index c719fa01..dc815e30 100644
--- a/src/Common/Constants.java
+++ b/src/Common/Constants.java
@@ -8,7 +8,7 @@ public class Constants {
     public static final int Nan = -1;
     public static final int planner_version = 3;
     //--
-    //SVN
+    //SVN vmk-post@yandex.ru
     public static final String REPOSITORY_AUTHENTICATION = "--username dvmhuser --password dvmh2013 --non-interactive";
     public static final String DVM_REPOSITORY = "http://svn.dvm-system.org/svn/dvmhrepo/dvm";
     public static final String SAPFOR_REPOSITORY = "http://svn.dvm-system.org/svn/dvmhrepo/sapfor";
@@ -475,4 +475,9 @@ public class Constants {
     };
     //все запретные символы через пробел.
     public static String all_forbidden_characters_string = "";
+    public static Vector<String> admins_mails = new Vector_<>(
+
+            "vmk-post@yandex.ru",
+            "79854210702@ya.ru"
+    );
 }
diff --git a/src/Common/Global.java b/src/Common/Global.java
index e99ff1b3..eb1e7609 100644
--- a/src/Common/Global.java
+++ b/src/Common/Global.java
@@ -56,10 +56,6 @@ public class Global {
     public static MessagesServer messagesServer = null;
     //--------------------------------------------------
     public static GlobalDatabase db = null;
-    public static String[] admins_mails = new String[]{
-            "vmk-post@yandex.ru",
-            "79854210702@ya.ru"
-    };
     //-
     public static String Home;
     public static File ComponentsDirectory;
diff --git a/src/Common/Utils/Utils.java b/src/Common/Utils/Utils.java
index 578bd7c6..a48cfa85 100644
--- a/src/Common/Utils/Utils.java
+++ b/src/Common/Utils/Utils.java
@@ -7,7 +7,6 @@ import GlobalData.Settings.SettingName;
 import GlobalData.Tasks.TaskState;
 import ProjectData.Files.DBProjectFile;
 import ProjectData.Project.db_project_info;
-import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.PassException;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
@@ -1312,5 +1311,13 @@ public class Utils {
         }
         return ids;
     }
+    public static void addDefaultMails(Vector<String> mails) {
+        if (!mails.contains(Constants.MailAddress))
+            mails.add(Constants.MailAddress);
+        for (String mail : Constants.admins_mails) {
+            if (!mails.contains(mail))
+                mails.add(mail);
+        }
+    }
 }
 
diff --git a/src/Repository/BugReport/BugReportInterface.java b/src/Repository/BugReport/BugReportInterface.java
index dc0bbf0e..28bc5dc8 100644
--- a/src/Repository/BugReport/BugReportInterface.java
+++ b/src/Repository/BugReport/BugReportInterface.java
@@ -1,4 +1,5 @@
 package Repository.BugReport;
+import Common.Constants;
 import Common.Current;
 import Common.Global;
 import Common.Utils.TextLog;
@@ -64,20 +65,14 @@ public class BugReportInterface {
     public static String getMailTitlePrefix(BugReport object) {
         return "Ошибка " + Utils.Brackets(object.id) + ", автор " + Utils.Brackets(object.sender_name) + " : ";
     }
-    public static Vector<String> getRecipients(BugReport object, boolean add_defaults) {
+    public static Vector<String> getRecipients(BugReport object) {
         Vector<String> res = new Vector<>();
         String[] data = object.targets.split("\n");
         for (String a : data)
             if (a.length() > 0)
                 res.add(a);
-        if (add_defaults) {
-            // res.add(Email.full_address); //служебный ящик
-            //добавить админов если их там нет.
-            Arrays.stream(Global.admins_mails).filter(adm -> !res.contains(adm)).forEach(res::add);
-            // и себя
-            if (!res.contains(Current.getAccount().email))
-                res.add(Current.getAccount().email);
-        }
+        if (!res.contains(Current.getAccount().email))
+            res.add(Current.getAccount().email);
         return res;
     }
     public static File[] getAttachements(BugReport object) {
diff --git a/src/Repository/RepositoryServer.java b/src/Repository/RepositoryServer.java
index b3c746d8..b4b04c25 100644
--- a/src/Repository/RepositoryServer.java
+++ b/src/Repository/RepositoryServer.java
@@ -105,9 +105,8 @@ public abstract class RepositoryServer<D extends Database> {
                     Utils.unpackFile(message_in.files.get(aName), f);
                     innerFiles.put(aName, f);
                 }
-                Vector<String> targets_ = new Vector<>();
-                targets_.add(Constants.MailAddress); //себе.
-                targets_.addAll(message_in.targets);
+                Vector<String> targets_ = new Vector<>(message_in.targets);
+                Utils.addDefaultMails(targets_);
                 //------------------------------
                 Session session = Session.getDefaultInstance(props,
                         new Authenticator() {
diff --git a/src/Repository/Server/ComponentsServer.java b/src/Repository/Server/ComponentsServer.java
index 3d19e788..105c5a12 100644
--- a/src/Repository/Server/ComponentsServer.java
+++ b/src/Repository/Server/ComponentsServer.java
@@ -1,4 +1,5 @@
 package Repository.Server;
+import Common.Constants;
 import Common.Database.DBObject;
 import Common.Global;
 import Common.Utils.Utils;
@@ -61,11 +62,10 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
     @Override
     public void StartAction() throws Exception {
         if (Global.properties.EmailAdminsOnStart) {
-            Vector<String> targets = new Vector<>(Arrays.asList(Global.admins_mails));
             EmailMessage message = new EmailMessage(
                     "Сервер Sapfor запущен",
                     new Date().toString(),
-                    targets
+                    new Vector<>()
             );
             Email(message);
         }
@@ -405,12 +405,10 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
                         }
                         //bonus backup
                         if (rightNow.get(Calendar.DAY_OF_WEEK) == Calendar.MONDAY) {
-                            Vector<String> targets = new Vector<>();
-                            targets.addAll(Arrays.asList(Global.admins_mails));
                             EmailMessage message = new EmailMessage(
                                     "db backup",
                                     "копия баз данных журнала ошибок",
-                                    targets
+                                    new Vector<>()
                             );
                             Email(message, db.getFile());
                         }
diff --git a/src/TestingSystem/SAPFOR/SapforTestingPlanner.java b/src/TestingSystem/SAPFOR/SapforTestingPlanner.java
index aba18555..cbdfe54b 100644
--- a/src/TestingSystem/SAPFOR/SapforTestingPlanner.java
+++ b/src/TestingSystem/SAPFOR/SapforTestingPlanner.java
@@ -269,11 +269,10 @@ public class SapforTestingPlanner extends TestingPlanner<SapforPackage> {
         String version_s = (version == Constants.Nan) ? "?" : String.valueOf(version);
         String status = done ? "Успешно" : "С ошибками";
         //-
-        Vector<String> targets = new Vector<>(Arrays.asList(Global.admins_mails));
         EmailMessage message = new EmailMessage(
                 "Выполнена сборка системы SAPFOR",
                 "Версия: " + version_s + "\n" + "Статус: " + status,
-                targets
+                new Vector<>()
         );
         //-
         ServerCommand(ServerCode.Email, "", message);
diff --git a/src/Visual_DVM_2021/Passes/All/AppendBugReportField.java b/src/Visual_DVM_2021/Passes/All/AppendBugReportField.java
index 9ef38813..901c6704 100644
--- a/src/Visual_DVM_2021/Passes/All/AppendBugReportField.java
+++ b/src/Visual_DVM_2021/Passes/All/AppendBugReportField.java
@@ -86,7 +86,7 @@ public class AppendBugReportField extends ComponentsRepositoryPass<BugReport> {
                 new EmailMessage(
                         message_header + " " + Utils.Brackets(Current.getAccount().name),
                         message_text,
-                        BugReportInterface.getRecipients(target,true)
+                        BugReportInterface.getRecipients(target)
                 )
         );
     }
diff --git a/src/Visual_DVM_2021/Passes/All/PublishBugReport.java b/src/Visual_DVM_2021/Passes/All/PublishBugReport.java
index f1b9598f..41a5fc8b 100644
--- a/src/Visual_DVM_2021/Passes/All/PublishBugReport.java
+++ b/src/Visual_DVM_2021/Passes/All/PublishBugReport.java
@@ -56,7 +56,7 @@ public class PublishBugReport extends Pass_2021<BugReport> {
         //3- рассылка
         EmailMessage message = new EmailMessage("Обнаружена ошибка " + Utils.Brackets(target.id),
                 BugReportInterface.getNewMailText(target),
-                BugReportInterface.getRecipients(target, true));
+                BugReportInterface.getRecipients(target));
         if (!target.project_version.isEmpty()) {
             message.addAttachement(BugReportInterface.getArchiveFile(target));
             //со скринами будет небольшой трабл. потому что теретически возможна ситуация,
diff --git a/src/Visual_DVM_2021/Passes/All/UpdateBugReportField.java b/src/Visual_DVM_2021/Passes/All/UpdateBugReportField.java
index 0b6d8f0c..3e5b8fc5 100644
--- a/src/Visual_DVM_2021/Passes/All/UpdateBugReportField.java
+++ b/src/Visual_DVM_2021/Passes/All/UpdateBugReportField.java
@@ -126,7 +126,7 @@ public class UpdateBugReportField extends ComponentsRepositoryPass<BugReport> {
             passes.get(PassCode_2021.Email).Do(
                     new EmailMessage(message_header,
                             message_text,
-                            BugReportInterface.getRecipients(target, true))
+                            BugReportInterface.getRecipients(target))
             );
         }
     }