diff --git a/src/utils/contacts/generate_contact_list_to_register.py b/src/utils/contacts/generate_contact_list_to_register.py index c3b88d8..6ed8af0 100644 --- a/src/utils/contacts/generate_contact_list_to_register.py +++ b/src/utils/contacts/generate_contact_list_to_register.py @@ -4,6 +4,12 @@ import random import xlsxwriter from src.db.mongo_manager import MONGO_STORE_MANAGER +from src.pojo import ReserveResultPojo +from src.pojo.users.regisered_user_pojo import RegisteredUserPojo + + +def has_email(registeredUserPojo: RegisteredUserPojo, reserveResultPojo: ReserveResultPojo): + return registeredUserPojo.mail == reserveResultPojo.mail def generate_list_to_register(): @@ -12,10 +18,7 @@ def generate_list_to_register(): _contact_list_to_register = [] for _contact in _valid_contact_list: _to_add = True - for _registered_user in _already_registered_list: - if _contact.mail == _registered_user.mail: - _to_add = False - break + _to_add = not any(has_email(_registered_user, _contact) for _registered_user in _already_registered_list) if _to_add: _contact_list_to_register.append(_contact) _all_contacts = MONGO_STORE_MANAGER.get_all_contacts_to_book() @@ -27,7 +30,11 @@ def generate_list_to_register(): _contact.phone = _true_contact.phone _contact.passport = _true_contact.passport _contact.first_name = _true_contact.first_name - return _contact_list_to_register + _contact_list_to_create = [] + for _contact in _contact_list_to_register: + if _contact.last_name is not None and len(_contact.last_name) > 0: + _contact_list_to_create.append(_contact) + return _contact_list_to_create def write_new_contacts_to_register_to_excel(valid_contacts: list, file_name=str(datetime.date.today())): @@ -60,4 +67,4 @@ def write_new_contacts_to_register_to_excel(valid_contacts: list, file_name=str( if __name__ == '__main__': - write_new_contacts_to_register_to_excel(generate_list_to_register()) \ No newline at end of file + write_new_contacts_to_register_to_excel(generate_list_to_register())