Merge branch 'master' of bitbucket.org:panleicim/appointment_tool
This commit is contained in:
@@ -10,14 +10,14 @@ from builtins import list
|
||||
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
|
||||
IMAP_SERVER_SINA, AOL_IMAP_SERVER, create_imap
|
||||
from src.pojo.accepted_appointment_pojo import AcceptedAppointmentPojo
|
||||
from src.pojo.mail.mail_pojo import MailPojo
|
||||
|
||||
INVOICE_SUBJECT_fr = 'Votre facture'
|
||||
INVOICE_SUBJECT_EN = 'Your invoice'
|
||||
VALIDATION_URL_REGEX = """https:\/\/rendezvousparis.hermes.com\/client\/register\/[A-Z0-9]+\/validate.code=[A-Z0-9]+"""
|
||||
HERMES_INVOICE_EMAIL = "no-reply@ereceipt.hermes.com"
|
||||
HERMES_INVOICE_EMAIL = "no-reply@hermes.com"
|
||||
|
||||
date_format = "%d-%b-%Y" # DD-Mon-YYYY e.g., 3-Mar-2014
|
||||
|
||||
@@ -33,20 +33,9 @@ class InvoiceGetter():
|
||||
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 read_emails(self, mails_messages: list) -> list:
|
||||
imap = self.create_imap()
|
||||
imap = create_imap(self.login)
|
||||
|
||||
# authenticate
|
||||
type, dat = imap.login(self.login, self.password)
|
||||
@@ -128,7 +117,8 @@ def get_invoices():
|
||||
# get email address
|
||||
mail_list = MONGO_STORE_MANAGER.get_destination_emails()
|
||||
mail_list_to_check = []
|
||||
yesterday = str(datetime.date.today() - datetime.timedelta(days=1))
|
||||
# yesterday = str(datetime.date.today() - datetime.timedelta(days=2))
|
||||
yesterday = str(datetime.date.today())
|
||||
collection = MONGO_STORE_MANAGER.get_accepted_items_for_one_day(yesterday)
|
||||
for valid_appointment in collection:
|
||||
accepted_pojo = AcceptedAppointmentPojo.from_reserve(valid_appointment)
|
||||
|
||||
@@ -58,7 +58,7 @@ if __name__ == '__main__':
|
||||
# remove_invalid_email()
|
||||
|
||||
mail_list = MONGO_STORE_MANAGER.get_destination_emails()
|
||||
# excel_reader = ExcelHelper()ge
|
||||
# excel_reader = ExcelHelper()
|
||||
# mail_list = excel_reader.read_mails_and_pwd(file_name="/Users/lpan/Downloads/hotmail_list.xlsx")
|
||||
# mail_address1 = MailAddress(mail="christinnyua@gmx.net", password="q1J1HHY2sXN")
|
||||
# mail_list = [mail_address1]
|
||||
|
||||
@@ -156,7 +156,7 @@ def accept_appointment_found(accepted_result_list: list):
|
||||
for user in _all_register_account:
|
||||
if user.mail == result.email:
|
||||
result.account_password = user.password
|
||||
mailer.send_email(result, to_all=True)
|
||||
mailer.send_email(result, to_all=False)
|
||||
MONGO_STORE_MANAGER.update_reserve_result(reserve.id, ResultEnum.ACCEPTED, reserve.message)
|
||||
# sginal.send_result(result)
|
||||
|
||||
@@ -173,8 +173,10 @@ def find_confirmation_contacts_for_today():
|
||||
for _item in _all_appointments_today:
|
||||
for _mail in _all_mail_list:
|
||||
if _mail.mail == _item.mail:
|
||||
_mail_list_to_scan.append(_mail)
|
||||
if _item.url_validated is True:
|
||||
_mail_list_to_scan.append(_mail)
|
||||
break
|
||||
print("Found {} emails to scan".format(len(_mail_list_to_scan)))
|
||||
return _mail_list_to_scan
|
||||
|
||||
|
||||
|
||||
@@ -24,7 +24,7 @@ HERMES_EMAIL = "no-reply@hermes.com"
|
||||
EMAIL_ADDRESS_REGEX = r'\b[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Z|a-z]{2,7}\b'
|
||||
|
||||
date_format = "%d-%b-%Y" # DD-Mon-YYYY e.g., 3-Mar-2014
|
||||
REDIRECTION_MAILS = "chenpeijun@aol.com,hongjiang176@aol.com,ciyuexie@aol.com,rutger.62@aol.com,ciccidaniel@aol.com,armasgoodman@aol.com,wknd.gemerine@aol.com,rafmail1981@aol.com,tonovichivanenaki@aol.com,hetland.ari@aol.com,mateusiversen@aol.com,lacerdaraffaello@aol.com,anasida76@aol.com,liamolinari@aol.com,sen70zib@aol.com,mezeiderrick@aol.com,stanisl49avchic@aol.com,damcvrobaneuron@aol.com,suyzanna_fleona@aol.com,dxealing.dissa@aol.com,hogg.karen@aol.com,obocharovamarina@aol.com,buchholzjohann@aol.com,orn.cecchini@aol.com,percivaltorgersen@aol.com,candalgudrun@aol.com,filimonis.76@aol.com,bengann_100@aol.com,axelhanne@aol.com,tiffanylarochelle@aol.com,nicoleta.r@aol.com,eichenbaum.1963@aol.com,kotensasharev@aol.com,samognat32@aol.com,edem_headshot@aol.com,kozmakuzmich1960@aol.com,damonsvensson@aol.com,anders.riva@aol.com,caiminwei123@gmail.com,yulingguo086@gmail.com,yingxiaolu086@gmail.com,lijiazhen0035@gmail.com,fangp370@gmail.com,huangyayu10086@gmail.com,fuziyuan110@gmail.com,xinyingdu886@gmail.com,yasiaforever.1971@aol.com,lukaszfidalgo@aol.com,zaichi29@aol.com,prostotakitak.1974@aol.com,mo90nroe@aol.com,blonde.87@aol.com,dimidrol.1969@aol.com,duwei1998@gmx.com"
|
||||
REDIRECTION_MAILS = "chenpeijun@aol.com,hongjiang176@aol.com,ciyuexie@aol.com,rutger.62@aol.com,ciccidaniel@aol.com,armasgoodman@aol.com,wknd.gemerine@aol.com,rafmail1981@aol.com,tonovichivanenaki@aol.com,hetland.ari@aol.com,mateusiversen@aol.com,anasida76@aol.com,liamolinari@aol.com,sen70zib@aol.com,mezeiderrick@aol.com,stanisl49avchic@aol.com,damcvrobaneuron@aol.com,suyzanna_fleona@aol.com,dxealing.dissa@aol.com,hogg.karen@aol.com,obocharovamarina@aol.com,buchholzjohann@aol.com,orn.cecchini@aol.com,percivaltorgersen@aol.com,candalgudrun@aol.com,filimonis.76@aol.com,bengann_100@aol.com,axelhanne@aol.com,tiffanylarochelle@aol.com,nicoleta.r@aol.com,eichenbaum.1963@aol.com,kotensasharev@aol.com,samognat32@aol.com,edem_headshot@aol.com,kozmakuzmich1960@aol.com,damonsvensson@aol.com,anders.riva@aol.com,yasiaforever.1971@aol.com,zaichi29@aol.com,prostotakitak.1974@aol.com,mo90nroe@aol.com,blonde.87@aol.com,dimidrol.1969@aol.com,duwei1998@gmx.com"
|
||||
|
||||
|
||||
def check_email_address(email):
|
||||
|
||||
Reference in New Issue
Block a user