From 6378a04841272039fbe575bec8e8e70005e5c17b Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Thu, 21 Dec 2023 19:32:26 +0300
Subject: [PATCH] =?UTF-8?q?fix=20=D0=B1=D0=B0=D0=B3=D0=B0=20=D1=81=20?=
 =?UTF-8?q?=D0=BE=D1=82=D0=BA=D0=BB=D1=8E=D1=87=D0=B5=D0=BD=D0=BD=D0=BE?=
 =?UTF-8?q?=D0=B9=20=D1=80=D0=B0=D1=81=D1=81=D1=8B=D0=BB=D0=BA=D0=BE=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                         |  3 +-
 src/Repository/RepositoryServer.java        | 79 ++++++++++-----------
 src/Repository/Server/ComponentsServer.java | 13 ++++
 3 files changed, 53 insertions(+), 42 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index dea4563b..4ccf06c6 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,7 +8,8 @@
   <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/Common/TestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPlanner.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" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/Repository/RepositoryServer.java b/src/Repository/RepositoryServer.java
index 0ea02cf5..7287e807 100644
--- a/src/Repository/RepositoryServer.java
+++ b/src/Repository/RepositoryServer.java
@@ -80,7 +80,10 @@ public abstract class RepositoryServer<D extends Database> {
             Log.close();
         }
     }
+    protected void checkTargets(EmailMessage message_in) {
+    }
     public void Email(EmailMessage message_in, File... directAttachements) throws Exception {
+        checkTargets(message_in);
         Thread thread = new Thread(() -> {
             System.out.println("EMAIL THREAD STARTED");
             try {
@@ -115,49 +118,46 @@ public abstract class RepositoryServer<D extends Database> {
                         });
                 for (String target : targets_) {
                     System.out.println("target=" + target);
-                    if (needsEmail(target)) {
-                        System.out.println("needs email");
-                        boolean done = false;
-                        int attempts = 5;
-                        while (!done && (attempts > 0)) {
-                            try {
-                                MimeMessage message = new MimeMessage(session);
-                                message.setFrom(new InternetAddress(Constants.MailAddress));
-                                message.setRecipients(Message.RecipientType.CC, InternetAddress.parse(target));
-                                message.setSubject(message_in.subject);
-                                Multipart multipart = new MimeMultipart();
-                                MimeBodyPart textBodyPart = new MimeBodyPart();
-                                textBodyPart.setText(message_in.text);
-                                multipart.addBodyPart(textBodyPart);
-                                for (String aName : innerFiles.keySet()) {
+                    boolean done = false;
+                    int attempts = 5;
+                    while (!done && (attempts > 0)) {
+                        try {
+                            MimeMessage message = new MimeMessage(session);
+                            message.setFrom(new InternetAddress(Constants.MailAddress));
+                            message.setRecipients(Message.RecipientType.CC, InternetAddress.parse(target));
+                            message.setSubject(message_in.subject);
+                            Multipart multipart = new MimeMultipart();
+                            MimeBodyPart textBodyPart = new MimeBodyPart();
+                            textBodyPart.setText(message_in.text);
+                            multipart.addBodyPart(textBodyPart);
+                            for (String aName : innerFiles.keySet()) {
+                                MimeBodyPart attachmentBodyPart = new MimeBodyPart();
+                                DataSource source = new FileDataSource(innerFiles.get(aName));
+                                attachmentBodyPart.setDataHandler(new DataHandler(source));
+                                attachmentBodyPart.setFileName(aName);
+                                multipart.addBodyPart(attachmentBodyPart);
+                            }
+                            for (File f : directAttachements) {
+                                if (f.exists()) {
                                     MimeBodyPart attachmentBodyPart = new MimeBodyPart();
-                                    DataSource source = new FileDataSource(innerFiles.get(aName));
+                                    DataSource source = new FileDataSource(f);
                                     attachmentBodyPart.setDataHandler(new DataHandler(source));
-                                    attachmentBodyPart.setFileName(aName);
+                                    attachmentBodyPart.setFileName(f.getName());
                                     multipart.addBodyPart(attachmentBodyPart);
                                 }
-                                for (File f : directAttachements) {
-                                    if (f.exists()) {
-                                        MimeBodyPart attachmentBodyPart = new MimeBodyPart();
-                                        DataSource source = new FileDataSource(f);
-                                        attachmentBodyPart.setDataHandler(new DataHandler(source));
-                                        attachmentBodyPart.setFileName(f.getName());
-                                        multipart.addBodyPart(attachmentBodyPart);
-                                    }
-                                }
-                                message.setContent(multipart);
-                                Transport.send(message);
-                                System.out.println("message sent");
-                                done = true;
-                            } catch (Exception ex) {
-                                System.out.println("Исключение во время отправки сообщения абоненту " + Utils.Brackets(target));
-                                ex.printStackTrace();
-                                Utils.sleep(1000);
-                            } finally {
-                                attempts--;
                             }
+                            message.setContent(multipart);
+                            Transport.send(message);
+                            System.out.println("message sent");
+                            done = true;
+                        } catch (Exception ex) {
+                            System.out.println("Исключение во время отправки сообщения абоненту " + Utils.Brackets(target));
+                            ex.printStackTrace();
+                            Utils.sleep(1000);
+                        } finally {
+                            attempts--;
                         }
-                    } else System.out.println("does not need email");
+                    }
                 }
             } catch (Exception ex) {
                 System.out.println("Исключение во время выполнения рассылки.");
@@ -167,9 +167,6 @@ public abstract class RepositoryServer<D extends Database> {
         });
         thread.start();
     }
-    public boolean needsEmail(String email) {
-        return true;
-    }
     public boolean canDelete(DBObject object) throws Exception {
         return true;
     }
@@ -322,7 +319,7 @@ public abstract class RepositoryServer<D extends Database> {
         }
     }
     //--
-    protected Database getDefaultDatabase(){
+    protected Database getDefaultDatabase() {
         return db;
     }
     //--
diff --git a/src/Repository/Server/ComponentsServer.java b/src/Repository/Server/ComponentsServer.java
index 90dff244..317a195b 100644
--- a/src/Repository/Server/ComponentsServer.java
+++ b/src/Repository/Server/ComponentsServer.java
@@ -38,6 +38,19 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
         return 7995;
     }
     @Override
+    protected void checkTargets(EmailMessage message_in) {
+        Vector<String> checkedTargets = new Vector<>();
+        for (String email: message_in.targets){
+            if (db.subscribers.containsKey(email)){
+                Subscriber subscriber = db.subscribers.get(email);
+                if (subscriber.mailOn>0){
+                    checkedTargets.add(email);
+                }
+            }
+        }
+        message_in.targets = checkedTargets;
+    }
+    @Override
     public void afterDeleteAction(DBObject object) throws Exception {
         if (object instanceof BugReport) {
             BugReport bugReport = (BugReport) object;