diff --git a/src/db/mongo_manager.py b/src/db/mongo_manager.py index ff59746..64be987 100644 --- a/src/db/mongo_manager.py +++ b/src/db/mongo_manager.py @@ -175,10 +175,11 @@ class MongoDbManager: result_list.append(reserve) return result_list - def update_reserve_result(self, reserve_id: str, result: ResultEnum): + def update_reserve_result(self, reserve_id: str, result: ResultEnum, message: str = ""): collection_name = str(datetime.date.today()) collection = self.db[collection_name] - collection.find_one_and_update({'_id': reserve_id}, {"$set": {"accepted": result.name}}, upsert=False) + collection.find_one_and_update({'_id': reserve_id}, {"$set": {"accepted": result.name, "message": message}}, + upsert=False) def update_reserve_result_for_collection(self, reserve_id: str, result: ResultEnum, collection_name: str): collection = self.db[collection_name] diff --git a/src/mail/mail_confirmation.py b/src/mail/mail_confirmation.py index 692d8fb..78674ad 100644 --- a/src/mail/mail_confirmation.py +++ b/src/mail/mail_confirmation.py @@ -126,7 +126,7 @@ def accept_appointment_found(accepted_result_list: list): mailer = Mailer() for reserve in accepted_result_list: mailer.send_email(get_accepted_result_from(reserve), to_all=True) - MONGO_STORE_MANAGER.update_reserve_result(reserve.id, ResultEnum.ACCEPTED) + MONGO_STORE_MANAGER.update_reserve_result(reserve.id, ResultEnum.ACCEPTED, reserve.message) if len(accepted_result_list) > 0: migre_accepted_appointment(str(datetime.date.today())) diff --git a/src/pojo/ReserveResultPojo.py b/src/pojo/ReserveResultPojo.py index 82ef346..91f25ff 100644 --- a/src/pojo/ReserveResultPojo.py +++ b/src/pojo/ReserveResultPojo.py @@ -44,18 +44,20 @@ class ReserveResultPojo: if publish_type: publish_type = PublishType[publish_type] phone = source['phone'] - message = "" url = source['url'] id = source['id'] email = source['email'] lastName = source['lastName'] firstName = source['firstName'] result = ReserveResultPojo(type=publish_type, phone=phone, - message=message, url=url, email=email, + url=url, email=email, firstName=firstName, lastName=lastName) if 'accepted' in source: accepted = source['accepted'] result.accepted = accepted + if 'message' in source: + message = source['message'] + result.message = message if 'source' in source: source_from = source['source'] result.source_from = source_from diff --git a/src/pojo/accepted_appointment_pojo.py b/src/pojo/accepted_appointment_pojo.py index 7774e82..8698ed8 100644 --- a/src/pojo/accepted_appointment_pojo.py +++ b/src/pojo/accepted_appointment_pojo.py @@ -63,11 +63,14 @@ class AcceptedAppointmentPojo(ReserveResultPojo): lastName = source['lastName'] firstName = source['firstName'] result = ReserveResultPojo(type=publish_type, phone=phone, - message="", url=url, email=email, + url=url, email=email, firstName=firstName, lastName=lastName) if 'accepted' in source: accepted = source['accepted'] result.accepted = accepted + if 'message' in source: + message = source['message'] + result.message = message if 'source' in source: source_from = source['source'] result.source_from = source_from