Merge branch 'feature/check_email_validation'

src/mail/mail_address_validator.py

@@ -0,0 +1,69 @@
+import imaplib
+from concurrent.futures.thread import ThreadPoolExecutor
+
+from src.db.mongo_manager import MONGO_STORE_MANAGER
+from src.mail.mail_constants import DOMAIN_163, DOMAIN_YAHOO, DOMAIN_SINA, IMAP_SERVER_163, YAHOO_IMAP_SERVER, \
+    IMAP_SERVER_SINA, AOL_IMAP_SERVER
+from src.pojo.mail.mail_pojo import MailAddress
+
+
+class MailAddressValidator():
+    def __init__(self, login, password):
+        self.login = login
+        self.password = password
+
+    @staticmethod
+    def show_folders(imap):
+        for i in imap.list()[1]:
+            l = i.decode().split(' "/" ')
+            print(l[0] + " = " + l[1])
+
+    def create_imap(self):
+        # create an IMAP4 class with SSL
+        if DOMAIN_163 in self.login:
+            imap = imaplib.IMAP4_SSL(IMAP_SERVER_163)
+        elif DOMAIN_YAHOO in self.login:
+            imap = imaplib.IMAP4_SSL(YAHOO_IMAP_SERVER)
+        elif DOMAIN_SINA in self.login:
+            imap = imaplib.IMAP4_SSL(IMAP_SERVER_SINA)
+        else:
+            imap = imaplib.IMAP4_SSL(AOL_IMAP_SERVER)
+        return imap
+
+    def is_valid_email_address(self) -> bool:
+        # authenticate
+        imap = self.create_imap()
+        isValid = True
+        try:
+            type, dat = imap.login(self.login, self.password)
+            print("type is " + type)
+            imap.logout()
+        except Exception as error:
+            print(error)
+            isValid = False
+
+        return isValid
+
+    def check_and_save_to_db(self):
+        if not self.is_valid_email_address():
+            MONGO_STORE_MANAGER.insert_invalid_mail(MailAddress(self.login, self.password))
+            print("{} is not valid".format(self.login))
+
+
+def remove_invalid_email():
+    invalid = MONGO_STORE_MANAGER.get_invalid_emails()
+    for mail in invalid:
+        MONGO_STORE_MANAGER.remove_email_from_destination_email_list(mail)
+
+
+def find_and_update_invalid_emails():
+    mail_list = MONGO_STORE_MANAGER.get_destination_emails()
+    with ThreadPoolExecutor(max_workers=20) as executor:
+        for mail in mail_list:
+            valiator = MailAddressValidator(mail.mail, mail.password)
+            executor.submit(valiator.check_and_save_to_db)
+
+
+if __name__ == '__main__':
+    # remove_invalid_email()
+    find_and_update_invalid_emails()

src/mail/mail_confirmation.py

@@ -9,22 +9,17 @@ from builtins import list
 
 from src.db.mirgration.migration_tools import migre_accepted_appointment
 from src.db.mongo_manager import MONGO_STORE_MANAGER
+from src.mail.mail_constants import DOMAIN_163, DOMAIN_YAHOO, DOMAIN_SINA, IMAP_SERVER_163, YAHOO_IMAP_SERVER, \
+    IMAP_SERVER_SINA, AOL_IMAP_SERVER
 from src.notification.AcceptedResultPojo import get_accepted_result_from
 from src.notification.mailer import Mailer
 from src.pojo.ResultEnum import ResultEnum
 from src.pojo.mail.mail_pojo import MailPojo, MailAddress
 
-AOL_IMAP_SERVER = "imap.aol.com"
-IMAP_SERVER_163 = "imap.163.com"
-IMAP_SERVER_SINA = "imap.sina.com"
-YAHOO_IMAP_SERVER = "imap.mail.yahoo.com"
 CONFIRMATION_SUBJECT_FR = 'Votre rendez-vous est'
 CONFIRMATION_SUBJECT_EN = 'appointment is confirmed'
 HERMES_EMAIL = "no-reply@hermes.com"
-DOMAIN_YAHOO = "yahoo.com"
-DOMAIN_SINA = "sina.com"
 
-DOMAIN_163 = "163.com"
 date_format = "%d-%b-%Y"  # DD-Mon-YYYY e.g., 3-Mar-2014
 
 
@@ -154,6 +149,9 @@ def read_mails_and_find_confirmation_contacts():
                 elif "10:30" in message_body and (item.email == mail.mail_address or item.email in message_body):
                     item.message = message_body
                     accepted_appointment_list.append(item)
+                elif "11:30" in message_body and (item.email == mail.mail_address or item.email in message_body):
+                    item.message = message_body
+                    accepted_appointment_list.append(item)
             print(mail.mail_address)
             print(mail.subject)
             print(mail.body)

src/mail/mail_constants.py

@@ -0,0 +1,9 @@
+DOMAIN_YAHOO = "yahoo.com"
+DOMAIN_SINA = "sina.com"
+
+DOMAIN_163 = "163.com"
+
+AOL_IMAP_SERVER = "imap.aol.com"
+IMAP_SERVER_163 = "imap.163.com"
+IMAP_SERVER_SINA = "imap.sina.com"
+YAHOO_IMAP_SERVER = "imap.mail.yahoo.com"

src/mail/mail_reader.py

@@ -11,24 +11,19 @@ from builtins import list
 from src import params
 from src.db.mongo_manager import MONGO_STORE_MANAGER
 from src.logs.AppLogging import init_logger
+from src.mail.mail_constants import DOMAIN_163, DOMAIN_YAHOO, DOMAIN_SINA, IMAP_SERVER_163, YAHOO_IMAP_SERVER, \
+    IMAP_SERVER_SINA, AOL_IMAP_SERVER
 from src.pojo.mail.mail_pojo import MailPojo, MailAddress
 from src.proxy.proxy_type import ProxyType
 from src.utils.timeutiles import is_time_between
 from src.workers.link_validator import LinkValidator
 from datetime import time
 
-AOL_IMAP_SERVER = "imap.aol.com"
-YAHOO_IMAP_SERVER = "imap.mail.yahoo.com"
-IMAP_SERVER_163 = "imap.163.com"
-IMAP_SERVER_SINA = "imap.sina.com"
 VALIDATION_URL_SUBJECT_fr = 'Validation de votre demande de rendez-vous'
 VALIDATION_URL_SUBJECT_EN = 'Please confirm your appointment'
 VALIDATION_URL_REGEX = """https:\/\/rendezvousparis.hermes.com\/client\/register\/[A-Z0-9]+\/validate.code=[A-Z0-9]+"""
 HERMES_EMAIL = "no-reply@hermes.com"
 
-DOMAIN_163 = "163.com"
-DOMAIN_SINA = "sina.com"
-DOMAIN_YAHOO = "yahoo.com"
 date_format = "%d-%b-%Y"  # DD-Mon-YYYY e.g., 3-Mar-2014
 REDIRECTION_MAILS = "appointment2022@aol.com, chenpeijun@aol.com,hongjiang176@aol.com,ciyuexie@aol.com"