From 6ba2fdb55a4675d85602d597b791506f00c3f237 Mon Sep 17 00:00:00 2001 From: PAN Lei Date: Wed, 17 Apr 2024 12:27:53 +0200 Subject: [PATCH 1/5] reformat the mail template --- src/mail/mail_confirmation.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/mail/mail_confirmation.py b/src/mail/mail_confirmation.py index 4a6ad09..a48d541 100755 --- a/src/mail/mail_confirmation.py +++ b/src/mail/mail_confirmation.py @@ -14,7 +14,6 @@ from src.notification.SignalSender import SignalSender from src.notification.mailer import Mailer from src.pojo.ResultEnum import ResultEnum from src.pojo.mail.mail_pojo import MailPojo, MailAddress -from src.utils.excel_reader import ExcelHelper CONFIRMATION_SUBJECT_FR = 'rendez-vous est' CONFIRMATION_SUBJECT_EN = 'confirmed' @@ -154,7 +153,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=False) + mailer.send_email(result, to_all=True) MONGO_STORE_MANAGER.update_reserve_result(reserve.id, ResultEnum.ACCEPTED, reserve.message) # sginal.send_result(result) From 332f0e4426d9af548d9197169b5701a8362c6060 Mon Sep 17 00:00:00 2001 From: PAN Lei Date: Sat, 20 Apr 2024 12:16:25 +0200 Subject: [PATCH 2/5] reformat the mail template --- src/workers/wget_tags.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/workers/wget_tags.py b/src/workers/wget_tags.py index f7ca569..ff21420 100644 --- a/src/workers/wget_tags.py +++ b/src/workers/wget_tags.py @@ -1,6 +1,7 @@ TAGS_JS_FILE_URL = "https://d.digital.hermes/tags.js" +import wget + def download_tags_file(url): - import wget _file_name = wget.download(url) print(_file_name) From e9779f52e730e2f105e501bdb25eeb0be1dab9f4 Mon Sep 17 00:00:00 2001 From: PAN Lei Date: Mon, 22 Apr 2024 14:45:35 +0200 Subject: [PATCH 3/5] support gmx.net mails --- src/mail/mail_constants.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/mail/mail_constants.py b/src/mail/mail_constants.py index d18710a..4806d16 100755 --- a/src/mail/mail_constants.py +++ b/src/mail/mail_constants.py @@ -14,6 +14,7 @@ DOMAN_BTVM_NE_JP = "btvm.ne.jp" DOMAN_AURORA_DTI_NE_JP = "aurora.dti.ne.jp" DOMAN_GMAIL = "gmail.com" DOMAIN_GMX = "gmx.com" +DOMAIN_GMX_NET = "gmx.net" DOMAIN_GMX_FR = "gmx.fr" DOMAIN_GMX_US = "gmx.us" DOMAIN_GMX_CH = "gmx.ch" @@ -45,7 +46,7 @@ BTVM_NE_JP = "imap.btvm.ne.jp" SEREVER_GMAIL = "imap.gmail.com" SERVER_IMAGE_ONET = "imap.poczta.onet.pl" SERVER_GMX = "imap.gmx.com" -SERVER_GMX_NET ="imap.gmx.net" +SERVER_GMX_NET = "imap.gmx.net" SERVER_PISS_MAIL = "mail.pissmail.com" INBOX_LV = "mail.inbox.lv" @@ -100,7 +101,7 @@ def create_imap(login: str): imap = imaplib.IMAP4(MARS_DTI_NE_JP_SERVER, port=143) elif DOMAIN_NAVER in login: imap = imaplib.IMAP4_SSL(NAVER_SERVER, port=993) - elif DOMAIN_GMX_DE in login: + elif DOMAIN_GMX_DE in login or DOMAIN_GMX_NET in login: imap = imaplib.IMAP4_SSL(SERVER_GMX_NET, port=993) elif DOMAIN_INBOX_LV in login: imap = imaplib.IMAP4_SSL(INBOX_LV, port=993) From fdba247d3571a54377ae01b3a200fc0464b4125c Mon Sep 17 00:00:00 2001 From: PAN Lei Date: Mon, 22 Apr 2024 22:34:02 +0200 Subject: [PATCH 4/5] rm duplicated items while generating contact list --- src/person_name/contact_manager.py | 50 ++++++++++++++++++++---------- 1 file changed, 34 insertions(+), 16 deletions(-) diff --git a/src/person_name/contact_manager.py b/src/person_name/contact_manager.py index 0980d4e..dbe7548 100755 --- a/src/person_name/contact_manager.py +++ b/src/person_name/contact_manager.py @@ -8,7 +8,7 @@ from src.utils.excel_reader import read_contacts, fr_phone_number_prefix, get_ra def upload_contacts_list(): - _contacts_to_book = read_contacts("/Users/lpan/Desktop/contact_list_2024-04-15.xlsx") + _contacts_to_book = read_contacts("/Users/lpan/Desktop/contact_list_2024-04-18.xlsx") return _contacts_to_book @@ -19,7 +19,7 @@ def fix_phone_number_format(file_path): if _contact.phone[0:2] not in fr_phone_number_prefix: print(_contact) _contact.phone = get_random_fr_phone_numbers() - write_new_contacts_to_excel(_contact_list, file_name="09_04_to_test") + write_new_contacts_to_excel(_contact_list, file_name="22_04_to_test") def write_new_contacts_to_excel(valid_contacts: list, file_name=str(datetime.date.today())): @@ -46,7 +46,7 @@ def write_new_contacts_to_excel(valid_contacts: list, file_name=str(datetime.dat workbook.close() -def generate_valid_contact_list_for_day(sement_number = 1): +def generate_valid_contact_list_for_day(sement_number=1): _valid_contact_list = MONGO_STORE_MANAGER.get_all_successful_items_for_day() _all_contacts = MONGO_STORE_MANAGER.get_all_contacts_to_book() _contact_to_save = [] @@ -63,14 +63,29 @@ def generate_valid_contact_list_for_day(sement_number = 1): if _contact.url_validated: if _contact.last_name is not None and len(_contact.last_name) > 0: - _contact_to_save.append(_contact) - write_new_contacts_to_excel(_contact_to_save) - for i in range(0, sement_number): - _step = int(len(_contact_to_save) / sement_number) - _sublist = _contact_to_save[i * _step:_step * (i + 1)] - _file_name = str(datetime.date.today()) +"_"+ str(i+1) - write_new_contacts_to_excel(_sublist,file_name=_file_name) + _need_to_save = True + # remove the duplicated items + for _added_item in _contact_to_save: + if (_added_item.mail == _contact.mail + and _added_item.phone == _contact.phone + and _added_item.passport == _contact.passport + and _added_item.last_name == _contact.last_name + and _added_item.first_name == _contact.first_name): + _need_to_save = False + if _need_to_save: + _contact_to_save.append(_contact) + # if _contact.mail == "talasapdne@gmx.de": + # print(_contact.__hash__()) + # if _contact not in _contact_to_save: + # _contact_to_save.add(_contact) + _contact_to_save_list = _contact_to_save + write_new_contacts_to_excel(_contact_to_save_list) + for i in range(0, sement_number): + _step = int(len(_contact_to_save_list) / sement_number) + _sublist = _contact_to_save_list[i * _step:_step * (i + 1)] + _file_name = str(datetime.date.today()) + "_" + str(i + 1) + write_new_contacts_to_excel(_sublist, file_name=_file_name) def merge_contact_list_files(file_list: list, final_file_name="merged_contact_list"): @@ -97,11 +112,14 @@ def generate_all_contact_list(): if __name__ == '__main__': # contacts_to_book = upload_contacts_list() # MONGO_STORE_MANAGER.upload_contact_list(contacts_to_book) - generate_valid_contact_list_for_day(sement_number=3) + generate_valid_contact_list_for_day(sement_number=2) # generate_all_contact_list() # merge_contact_list_files( - # ["/Users/lpan/Desktop/contact_list_2024-04-10.xlsx", - # "/Users/lpan/Desktop/contact_list_2024-04-09.xlsx", - # "/Users/lpan/Desktop/contact_list_2024-04-06.xlsx", - # "/Users/lpan/Desktop/contact_list_2024-04-04.xlsx"]) - # fix_phone_number_format("/Users/lpan/Desktop/09_04_to_test.xlsx") + # ["/Users/lpan/Desktop/20_04_to_test_1.xlsx", + # "/Users/lpan/Desktop/19_04_to_test.xlsx", + # "/Users/lpan/Desktop/17_18_04_to_test.xlsx", + # "/Users/lpan/Desktop/09_04_to_test.xlsx", + # "/Users/lpan/Desktop/31_03_to_test.xlsx", + # "/Users/lpan/Desktop/12_04_to_test.xlsx", + # "/Users/lpan/Desktop/16_04_to_test.xlsx"]) + # fix_phone_number_format("/Users/lpan/Desktop/22_04_to_test.xlsx") From fe276eab5aaca2ec688c1c951a12bcb6201d8085 Mon Sep 17 00:00:00 2001 From: PAN Lei Date: Mon, 22 Apr 2024 23:03:50 +0200 Subject: [PATCH 5/5] add hash method for ReserveResultPojo.py --- src/pojo/ReserveResultPojo.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/pojo/ReserveResultPojo.py b/src/pojo/ReserveResultPojo.py index bea5e62..c09626e 100644 --- a/src/pojo/ReserveResultPojo.py +++ b/src/pojo/ReserveResultPojo.py @@ -39,6 +39,9 @@ class ReserveResultPojo: validated_at = None ip_address = None + def __hash__(self): + return hash("{}_{}_{}_{}_{}".format(self.mail, self.first_name, self.last_name, self.phone, self.passport)) + @staticmethod def from_firestore_dict(source): publish_type = PublishType.ERROR