Bootcamp mail's sender address added

Author: shpi0

gmail.properties

@@ -17,6 +17,9 @@ mail.from=root@localhost
 #почта с которой приходят заявки от javalearn (Это [email protected])
 mail.javaLearn=[email protected]
 
+#почта с которой приходят заявки bootcamp
+mail.bootCamp=[email protected]
+
 #Последовательная настройка електронной почты для отправки сообщений
 
 #1)Открыть почтовый клиент, перейти в настройки обозначеный знаком шестерёнки ->

src/main/java/com/ewp/crm/configs/GMailMailConfigImpl.java

@@ -21,6 +21,7 @@ public class GMailMailConfigImpl implements MailConfig {
     private String debug;
     private String imapServer;
     private String mailJavalearn;
+    private String mailBootCamp;
 
     private static Logger logger = LoggerFactory.getLogger(GMailMailConfigImpl.class);
 
@@ -36,9 +37,10 @@ public GMailMailConfigImpl(Environment env) {
             debug = env.getRequiredProperty("mail.debug");
             imapServer = env.getRequiredProperty("mail.imap.server");
             mailJavalearn = env.getRequiredProperty("mail.javaLearn");
+            mailBootCamp = env.getRequiredProperty("mail.bootCamp");
             if (login.isEmpty() || password.isEmpty() || mailFrom.isEmpty() || socketFactoryClass.isEmpty() ||
                     socketFactoryFallback.isEmpty() || protocol.isEmpty() ||
-                    debug.isEmpty() || imapServer.isEmpty() || mailJavalearn.isEmpty()) {
+                    debug.isEmpty() || imapServer.isEmpty() || mailJavalearn.isEmpty() || mailBootCamp.isEmpty()) {
                 throw new NoSuchFieldException();
             }
         } catch (IllegalStateException | NoSuchFieldException e) {
@@ -82,4 +84,8 @@ public String getImapServer() {
     public String getMailJavalearn() {
         return mailJavalearn;
     }
+
+    public String getMailBootCamp() {
+        return mailBootCamp;
+    }
 }

src/main/java/com/ewp/crm/configs/GoogleEmailConfig.java

@@ -52,6 +52,7 @@ public class GoogleEmailConfig {
     private String debug;
     private String imapServer;
     private String mailJavaLearn;
+    private String mailBootCamp;
 
     private final BeanFactory beanFactory;
     private final ClientService clientService;
@@ -81,6 +82,7 @@ public GoogleEmailConfig(MailSendService prepareAndSend, MailConfig mailConfig,
         login = mailConfig.getLogin();
         password = mailConfig.getPassword();
         mailFrom = mailConfig.getMailFrom();
+        mailBootCamp = mailConfig.getMailBootCamp();
         socketFactoryClass = mailConfig.getSocketFactoryClass();
         socketFactoryFallback = mailConfig.getSocketFactoryFallback();
         protocol = mailConfig.getProtocol();
@@ -199,14 +201,17 @@ public DirectChannel directChannel() {
     private SearchTerm fromAndNotSeenTerm(Flags supportedFlags, Folder folder) {
         Optional<InternetAddress> internetAddress = Optional.empty();
         Optional<InternetAddress> javaLearnAddress = Optional.empty();
+        Optional<InternetAddress> bootCampAddress = Optional.empty();
         try {
             internetAddress = Optional.of(new InternetAddress(mailFrom));
             javaLearnAddress = Optional.of(new InternetAddress(mailJavaLearn));
+            bootCampAddress = Optional.of(new InternetAddress(mailBootCamp));
         } catch (AddressException e) {
             logger.error("Can't parse email address \"from\"", e);
         }
         FromTerm fromTerm = new FromTerm(internetAddress.orElse(new InternetAddress()));
         FromTerm fromJavaLearnTerm = new FromTerm(javaLearnAddress.orElse(new InternetAddress()));
-        return new AndTerm(new OrTerm(fromTerm, fromJavaLearnTerm), new FlagTerm(new Flags(Flags.Flag.SEEN), false));
+        FromTerm fromBootCampTerm = new FromTerm(bootCampAddress.orElse(new InternetAddress()));
+        return new AndTerm(new OrTerm(new FromTerm[]{fromTerm, fromJavaLearnTerm, fromBootCampTerm}), new FlagTerm(new Flags(Flags.Flag.SEEN), false));
     }
 }

src/main/java/com/ewp/crm/configs/inteface/MailConfig.java

@@ -10,4 +10,5 @@ public interface MailConfig {
     String getDebug();
     String getImapServer();
     String getMailJavalearn();
+    String getMailBootCamp();
 }