From 904f15c1512f256ef68bd4e52422aa4c9fe9d5a2 Mon Sep 17 00:00:00 2001 From: Lei PAN Date: Fri, 8 Jul 2022 15:19:30 +0200 Subject: [PATCH] optimizations --- src/check_results.py | 13 ++++++------- src/notification/mailer.py | 8 +++++--- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/check_results.py b/src/check_results.py index 0f2f3c2..4e41578 100644 --- a/src/check_results.py +++ b/src/check_results.py @@ -94,12 +94,11 @@ class ResultChecker: else: print("status is ACCEPTED") status = ResultEnum.ACCEPTED - if need_send_email: - # send email - try: - mailer.send_email(get_accepted_result_from(reserve_pojo)) - except Exception as err: - print(err) + # send email + try: + mailer.send_email(get_accepted_result_from(reserve_pojo), to_all=need_send_email) + except Exception as err: + print(err) reserve_pojo.accepted = status firestore_collection.document(reserve_pojo.id).update({u'accepted': status.name}) MONGO_STORE_MANAGER.update_reserve_result(reserve_pojo.id, status) @@ -114,7 +113,7 @@ def check_results(headless=False): print("size is " + str(len(reserve_list))) start_check(reserve_list, firestore_collection, headless, need_send_email=False) reserve_list = MONGO_STORE_MANAGER.get_all_successful_items_for_day() - start_check(reserve_list, firestore_collection, headless, need_send_email=True) + # start_check(reserve_list, firestore_collection, headless, need_send_email=True) def start_check(reserve_list, firestore_collection, headless: bool, need_send_email: bool): diff --git a/src/notification/mailer.py b/src/notification/mailer.py index 3c3bc89..6914f9c 100644 --- a/src/notification/mailer.py +++ b/src/notification/mailer.py @@ -25,9 +25,11 @@ class Mailer: aws_access_key_id="AKIAU67WLKZUXEHXDJB5", aws_secret_access_key=secret) - def send_email(self, result: AcceptedResultPojo): - recipients = ['panleicim@gmail.com', 'kamenonly@gmail.com', 'tangliang0411@gmail.com'] - # recipients = ['panleicim@gmail.com'] + def send_email(self, result: AcceptedResultPojo, to_all: bool = False): + if to_all: + recipients = ['panleicim@gmail.com', 'kamenonly@gmail.com', 'tangliang0411@gmail.com'] + else: + recipients = ['panleicim@gmail.com'] mytemplate = Template(filename=config.ROOT_DIR + "/templates/appointment_results.html") self.logger.info("send email to " + str(recipients))