From 1a3ae260b6ccf39d8c521a880a6e8f0d65033050 Mon Sep 17 00:00:00 2001
From: PAN Lei <panleicim@gmail.com>
Date: Tue, 1 Mar 2022 00:26:04 +0100
Subject: [PATCH] create params.py

---
 ModemPool.py    |  4 ++--
 db/DbManager.py |  2 +-
 main.py         | 21 ++++++++++-----------
 params.py       | 39 ++++++++++++++++++++++-----------------
 4 files changed, 35 insertions(+), 31 deletions(-)

diff --git a/ModemPool.py b/ModemPool.py
index 3e8b0b8..dcead14 100644
--- a/ModemPool.py
+++ b/ModemPool.py
@@ -3,10 +3,10 @@ import time
 
 import serial
 from serial import Serial
-from db.DbManager import DataManager
 
 from error.SIMError import SIMError
 from logs.LogSender import LogSender, LOG_ERROR
+from params import firebase_store_manager
 from pojo.SimInfoPojo import SimInfoPojo
 from utils.excel_reader import ExcelHelper
 
@@ -21,7 +21,7 @@ class ModemPool:
         self._serial_list = []
         self._excel_helper = ExcelHelper()
         self._log_sender = LogSender()
-        self._db_manager = DataManager()
+        self._db_manager = firebase_store_manager
 
         for port in self._port_list:
             ser = serial.Serial(port, self.BAUDRATE, timeout=1)
diff --git a/db/DbManager.py b/db/DbManager.py
index 0d85a47..d3d29fe 100644
--- a/db/DbManager.py
+++ b/db/DbManager.py
@@ -21,7 +21,7 @@ class DataManager:
         pass
 
     def get_all_successful_items(self):
-        doc_ref = self._db.collection(u'2022-02-25')
+        doc_ref = self._db.collection(str(datetime.date.today()))
         return doc_ref
 
     def save_sim_info(self, simInfoPojo: SimInfoPojo):
diff --git a/main.py b/main.py
index 40d5567..d62e314 100644
--- a/main.py
+++ b/main.py
@@ -10,7 +10,7 @@ from ModemPool import ModemPool
 from card_pool import CardPool
 from commandor import Commandor
 from db.DbManager import DataManager
-from params import MODEM_POOL_PORTS, CARD_POOL_PORT
+from params import MODEM_POOL_PORTS, CARD_POOL_PORT, firebase_store_manager
 from pojo.ReserveResultPojo import ReserveResultPojo
 from utils.excel_reader import ExcelHelper
 from pojo.serial_modem import SerialModem
@@ -22,7 +22,6 @@ OTP_TIMEOUT = 60
 is_finished = False
 commandor = Commandor()
 
-db_manager = DataManager()
 card_pool = CardPool(CARD_POOL_PORT)
 
 
@@ -81,7 +80,7 @@ def create_modem_for_port(port: str) -> SerialModem:
 
 
 def timeout_occurred(serial_modem: SerialModem):
-    db_manager.save_timeout_contact(serial_modem.contact)
+    firebase_store_manager.save_timeout_contact(serial_modem.contact)
 
 
 def start_to_handle_sms(serial_modem: SerialModem):
@@ -151,7 +150,7 @@ def on_message_received(ch, method, properties, body):
     #     parse the received message
     result = ReserveResultPojo.from_json(body)
     print(result)
-    db_manager.save(result)
+    firebase_store_manager.save(result)
     # set the flag to True
     global is_finished
     is_finished = True
@@ -164,8 +163,8 @@ def start_listen():
 
 
 def read_all_the_phone_number():
-    slot_number = 1
-    slot_sum = 3
+    slot_number = 3
+    slot_sum = 32
     # card_pool.switch_to_slot(3)
 
     for i in range(slot_number, slot_sum + 1):
@@ -178,8 +177,8 @@ def read_all_the_phone_number():
 
 
 def start_book():
-    slot_number = 3
-    slot_sum = 3
+    slot_number = 1
+    slot_sum = 32
     for i in range(slot_number, slot_sum + 1):
         card_pool.reset()
         print("will switch to " + str(i))
@@ -198,6 +197,6 @@ if __name__ == '__main__':
     init_logger()
     logger = logging.getLogger()
     logger.addHandler(logging.StreamHandler(stream=sys.stdout))
-    # read_all_the_phone_number()
-    start_listen()
-    start_book()
+    read_all_the_phone_number()
+    # start_listen()
+    # start_book()
diff --git a/params.py b/params.py
index f75ba03..7b477e9 100644
--- a/params.py
+++ b/params.py
@@ -1,19 +1,24 @@
+from db.DbManager import DataManager
+
 MODEM_POOL_PORTS = [
-    "/dev/tty.usbmodem1431101",
-    "/dev/tty.usbmodem1431103",
-    "/dev/tty.usbmodem1431105",
-    "/dev/tty.usbmodem1431107",
-    "/dev/tty.usbmodem1431201",
-    "/dev/tty.usbmodem1431203",
-    "/dev/tty.usbmodem1431205",
-    "/dev/tty.usbmodem1431207",
-    "/dev/tty.usbmodem1431301",
-    ## "/dev/tty.usbmodem1431303",
-    "/dev/tty.usbmodem1431305",
-    "/dev/tty.usbmodem1431307",
-    "/dev/tty.usbmodem1431401",
-    "/dev/tty.usbmodem1431403",
-    "/dev/tty.usbmodem1431405",
-    "/dev/tty.usbmodem1431407"
+    "/dev/tty.usbmodem11101",
+    "/dev/tty.usbmodem11103",
+    "/dev/tty.usbmodem11105",
+    "/dev/tty.usbmodem11107",
+    "/dev/tty.usbmodem11201",
+    "/dev/tty.usbmodem11203",
+    "/dev/tty.usbmodem11205",
+    "/dev/tty.usbmodem11207",
+    "/dev/tty.usbmodem11301",
+    ## "/dev/tty.usbmodem11303",
+    "/dev/tty.usbmodem11305",
+    "/dev/tty.usbmodem11307",
+    "/dev/tty.usbmodem11401",
+    "/dev/tty.usbmodem11403",
+    "/dev/tty.usbmodem11405",
+    "/dev/tty.usbmodem11407"
 ]
-CARD_POOL_PORT = "/dev/tty.usbmodem1432101"
+CARD_POOL_PORT = "/dev/tty.usbmodem12101"
+
+firebase_store_manager = DataManager()
+