diff --git a/contact.xlsx b/contact.xlsx index 4623e89..ea94098 100644 Binary files a/contact.xlsx and b/contact.xlsx differ diff --git a/db/DbManager.py b/db/DbManager.py index bf60153..19fffb6 100644 --- a/db/DbManager.py +++ b/db/DbManager.py @@ -25,11 +25,11 @@ class DataManager: cred = credentials.Certificate(definitions.ROOT_DIR + "/appointment.json") self._app = firebase_admin.initialize_app(cred) self._db = firestore.client() - contact_collection = self._db.collection(CONTACT_COLLECTION_NAME) - self._contact_list = [] - for contact in contact_collection.stream(): - contact_pojo = ContactPojo.from_firestore_dict(contact.to_dict()) - self._contact_list.append(contact_pojo) + # contact_collection = self._db.collection(CONTACT_COLLECTION_NAME) + # self._contact_list = [] + # for contact in contact_collection.stream(): + # contact_pojo = ContactPojo.from_firestore_dict(contact.to_dict()) + # self._contact_list.append(contact_pojo) def get_all_error_items(self): pass diff --git a/export_valid_profiles.py b/export_valid_profiles.py index 13b8650..a5e3e9f 100644 --- a/export_valid_profiles.py +++ b/export_valid_profiles.py @@ -1,3 +1,6 @@ +import random +import string + import xlsxwriter import params @@ -5,28 +8,39 @@ from pojo.ReserveResultPojo import ReserveResultPojo from pojo.contact_pojo import ContactPojo from utils.excel_reader import ExcelHelper +def get_random_id_number ()-> str: + # write_the_valid_profiles_to_excel() + S = 7 # number of characters in the string. + # call random.choices() string module to find the string in Uppercase + numeric data. + ran = ''.join(random.choices(string.digits, k = S)) + id_number = "94"+str(ran) + print("The randomly generated string is : 94" + str(ran)) # print the random data + return id_number + def write_the_valid_profiles_to_excel(): day_list = ['2022-03-04', '2022-03-07', '2022-03-08', '2022-03-09', '2022-03-10', '2022-03-11', '2022-03-14', '2022-03-15', '2022-03-16'] + collection = [] for day in day_list: collection.extend(params.firebase_store_manager.get_all_successful_items_for_day(day).stream()) valid_contacts = [] - exist_contacts = ExcelHelper().read_contacts() + # exist_contacts = ExcelHelper().read_contacts() for valid_appointment in collection: reserve_pojo = ReserveResultPojo.from_firestore_dict(valid_appointment.to_dict()) # check whether the contact exists already exist = [contact for contact in valid_contacts if contact.mail == reserve_pojo.email] if len(exist) == 0: - contact = ContactPojo(reserve_pojo.phone, passport_number=reserve_pojo.passport, + contact = ContactPojo(reserve_pojo.phone, passport_number=get_random_id_number(), last_name=reserve_pojo.lastName, first_name=reserve_pojo.firstName, ccid="", mail=reserve_pojo.email, position=0) - if contact.passport == None or len(contact.passport) == 0: - old_contact = [item for item in exist_contacts if item.mail == contact.mail] - if len(old_contact) > 0: - contact.passport = old_contact[0].passport + # contact.passport = get_random_id_number() + # if contact.passport == None or len(contact.passport) == 0: + # old_contact = [item for item in exist_contacts if item.mail == contact.mail] + # if len(old_contact) > 0: + # contact.passport = old_contact[0].passport print(contact) valid_contacts.append(contact) @@ -53,5 +67,7 @@ def write_the_valid_profiles_to_excel(): workbook.close() + if __name__ == '__main__': - write_the_valid_profiles_to_excel() + # get_random_id_number() + write_the_valid_profiles_to_excel() \ No newline at end of file diff --git a/main.py b/main.py index d91e973..b10cd2c 100644 --- a/main.py +++ b/main.py @@ -113,9 +113,9 @@ def handle_sms(sms): logger.info("will close used modem") current_gsm_modem.close() else: - logger.info("the sms is not for RDV") + logger.info("The sms is not for RDV") else: - logger.info("the sms is not for today") + logger.info("The sms is not for today") def init_modems() -> list: diff --git a/modems/card_pool.py b/modems/card_pool.py index 5edd279..e8a8c9e 100644 --- a/modems/card_pool.py +++ b/modems/card_pool.py @@ -5,8 +5,6 @@ import serial import params from logs.LogSender import LOG_SUBJECT_EVENT, TYPE_EVENT_CHANGE_SLOT -PORT = "/dev/tty.usbmodem1432101" - BAUDRATE = 115200 @@ -45,7 +43,7 @@ class CardPool: if __name__ == '__main__': - card_pool = CardPool(PORT) + card_pool = CardPool(params.CARD_POOL_PORT) # print(card_pool.find_current_slot()) card_pool.reset() # card_pool.switch_to_next() diff --git a/valid_profile.xlsx b/valid_profile.xlsx index 45e7b9d..a7a5574 100644 Binary files a/valid_profile.xlsx and b/valid_profile.xlsx differ