Merge branch 'feature/playwright' of bitbucket.org:panleicim/appointement_modem_pool into feature/playwright

export_valid_profiles.py

@@ -19,7 +19,7 @@ def get_random_id_number() -> str:
 
 
 def write_the_valid_profiles_to_excel():
-    day_list = ['2022-03-24','2022-03-25']
+    day_list = ['2022-03-23','2022-03-24','2022-03-25']
 
     collection = []
     for day in day_list:

modems/ModemPool.py

@@ -2,15 +2,12 @@ import re
 import time
 
 import serial
-from gsmmodem import GsmModem
-from serial import Serial
 
 from definitions import BAUDRATE
 from error.SIMError import SIMError
 from logs.LogSender import LOG_APPOINTMENT_SUCCESS, SUBJECT_SIM_INFO
 from params import firebase_store_manager, oracle_log_sender
 from pojo.SimInfoPojo import SimInfoPojo
-from pojo.serial_modem import SerialModem
 from utils.excel_reader import ExcelHelper
 from utils.operator import check_operator, Operator
 
@@ -65,7 +62,8 @@ class ModemPool:
                 if len(contact) > 0:
                     phone_number = contact[0].phone
                     self._db_manager.save_sim_info(
-                        SimInfoPojo(phone=str(phone_number), ccid=ccid, position=position, operator=operator.value))
+                        SimInfoPojo(phone=str(phone_number), ccid=ccid, position=position, sim_position=sim_position,
+                                    slot_position=slot_position, operator=operator.value))
                 else:
                     error_msg = "slot({}),sim({})".format(slot_position, sim_position)
                     oracle_log_sender.send_contact_not_found(error_msg)
@@ -91,7 +89,8 @@ class ModemPool:
 
                 if phone_number:
                     self._db_manager.save_sim_info(
-                        SimInfoPojo(phone=phone_number, ccid=ccid, position=position, operator=operator.value))
+                        SimInfoPojo(phone=phone_number, ccid=ccid, position=position, slot_position=slot_position,
+                                    sim_position=sim_position, operator=operator.value))
                     self._log_sender.send_log(phone_number, source=self.TAG, subject=SUBJECT_SIM_INFO,
                                               type=LOG_APPOINTMENT_SUCCESS)
                 #         write the number to sim card's phonebook