Merge branch 'master' of bitbucket.org:panleicim/appointement_modem_pool

check_results.py

@@ -23,18 +23,34 @@ class ResultEnum(Enum):
 
 
 # check result with playright
-def check_result_page(url) -> ResultEnum:
+def check_result_page(url, phone_number: str) -> ResultEnum:
     with sync_playwright() as p:
-        return run(p, url)
+        return run(p, url, phone_number)
 
 
-def run(playwright, url) -> ResultEnum:
+def run(playwright, url, phone_number: str) -> ResultEnum:
     browser = playwright.firefox.launch(headless=False)
     url_to_check = url.replace("register/", "")
     url_to_check = url_to_check + "?lang=fr"
     content = None
+    random_id_number = str(phone_number)[1:len(str(phone_number))]
+    proxy_username = "panleicim-cc-fr-sid-" + random_id_number
+    print("proxy_username is " + proxy_username)
+    proxy = {
+        "server": params.PROXY_SERVER,
+        "username": proxy_username,
+        "password": params.PROXY_PASSWORD
+    }
     while content is None:
-        content = load_page(browser, url_to_check)
+        content = load_page(browser, url_to_check, proxy)
+        random_id_number = get_random_id_number_for_proxy()
+        proxy_username = "panleicim-cc-fr-sid-" + random_id_number
+        print("proxy_username is " + proxy_username)
+        proxy = {
+            "server": params.PROXY_SERVER,
+            "username": proxy_username,
+            "password": params.PROXY_PASSWORD
+        }
     print(content)
     browser.close()
     if SORRY_SENTENCE in content:
@@ -48,14 +64,8 @@ def run(playwright, url) -> ResultEnum:
         return ResultEnum.ACCEPTED
 
 
-def load_page(browser, url) -> Union[str, None]:
+def load_page(browser, url, proxy) -> Union[str, None]:
     try:
-        PROXY_USERNAME = "panleicim-cc-fr-sid-" + get_random_id_number_for_proxy()
-        proxy = {
-            "server": params.PROXY_SERVER,
-            "username": PROXY_USERNAME,
-            "password": params.PROXY_PASSWORD
-        }
         firefox_user_agents = filter(lambda user_agent: "firefox" in user_agent.lower(), user_agent_list)
         firefox_user_agents_list = list(firefox_user_agents)
         user_agent = random.choice(firefox_user_agents_list)
@@ -83,7 +93,7 @@ if __name__ == '__main__':
         if reserve_pojo.accepted:
             print("status is " + reserve_pojo.accepted)
         if reserve_pojo.accepted is None:
-                # or ResultEnum.PENDING.value == reserve_pojo.accepted:
+                #or ResultEnum.PENDING.value == reserve_pojo.accepted:
-            result = check_result_page(reserve_pojo.url)
+            result = check_result_page(reserve_pojo.url, reserve_pojo.phone)
             collection.document(reserve_pojo.id).update({u'accepted': result.name})
     print(count)

wait_for_sms.py

@@ -84,7 +84,7 @@ def init_modems() -> list:
 
 def start_waiting_sms():
     # logger = logging.getLogger()
-    slot_number = 12
+    slot_number = 1
     slot_sum = 32
     for i in range(slot_number, slot_sum + 1):
         card_pool.reset()