diff --git a/src/db/mongo_manager.py b/src/db/mongo_manager.py index 30422cf..37350e4 100755 --- a/src/db/mongo_manager.py +++ b/src/db/mongo_manager.py @@ -327,7 +327,8 @@ class MongoDbManager: return result_list def save_links_to_validate(self, link: str, mail_address: str, _all_contact_list: list, - _item: Union[ReserveResultPojo, None], contact_serial_map_list): + _item: Union[ReserveResultPojo, None], contact_serial_map_list, + default_serial="bitbrowser"): collection_to_use = self.db[LINKS_TO_VALIDATE] updated_at = time.strftime("%H:%M:%S", time.localtime()) _ip_country = "FR" @@ -339,7 +340,10 @@ class MongoDbManager: if len(serial) == 0: for contact in contact_serial_map_list: if contact.mail == mail_address: - serial = contact.serial + if contact.serial is not None and len(contact.serial) > 0: + serial = contact.serial + else: + serial = default_serial _model = contact.model break @@ -347,6 +351,8 @@ class MongoDbManager: for _contact in _all_contact_list: if _contact.mail == mail_address: _ip_country = _contact.ip_country + if len(serial) == 0: + serial = default_serial if len(mail_address) > 0: collection_to_use.replace_one(filter={'_id': mail_address, }, replacement={ diff --git a/src/notification/AcceptedResultPojo.py b/src/notification/AcceptedResultPojo.py index 802cf29..902bb48 100644 --- a/src/notification/AcceptedResultPojo.py +++ b/src/notification/AcceptedResultPojo.py @@ -10,11 +10,9 @@ from src.pojo.ReserveResultPojo import ReserveResultPojo @dataclass class AcceptedResultPojo: - def __init__(self, msg: str, slot_position, sim_position, passport, email, name, phone, ccid: str, url, + def __init__(self, msg: str, passport, email, name, phone, ccid: str, url, created_at: str, validated_at: str): self.message = msg - self.slot_position = slot_position - self.sim_position = sim_position self.passport = "{}".format(passport) self.email = email self.name = name @@ -39,13 +37,12 @@ def get_accepted_result_from(reserve_pojo: ReserveResultPojo, mongo_db_manager: if reserve_pojo is None: # send email even there are no reserve info - return AcceptedResultPojo("", slot_position=0, sim_position=0, + return AcceptedResultPojo("", passport="", email="", phone="", name="", ccid="", url="", created_at="", validated_at="") else: - toReturn = AcceptedResultPojo(reserve_pojo.message, slot_position=reserve_pojo.slot_position, - sim_position=reserve_pojo.sim_position, + toReturn = AcceptedResultPojo(reserve_pojo.message, passport=reserve_pojo.passport, email=reserve_pojo.mail, phone=reserve_pojo.phone, name="{} {}".format(reserve_pojo.last_name, reserve_pojo.first_name), ccid=reserve_pojo.ccid, diff --git a/src/passport/card_MRZutile.py b/src/passport/card_MRZutile.py index ee77239..edc20c4 100755 --- a/src/passport/card_MRZutile.py +++ b/src/passport/card_MRZutile.py @@ -1,18 +1,18 @@ from mrz.generator.td1 import TD1CodeGenerator -first_name = "Lei" -last_name = "PAN" -document_number = "HP3E1P59N" -birth_day = "841215" -# sex = "F" -sex = "M" +first_name = "mingchai" +last_name = "ao" +document_number = "A161BSOUG" +birth_day = "970321" +sex = "F" +# sex = "M" # optinal_data = "MFMLMANK<<<