Merge branch 'master' into feature/recaptha

check_results.py

@@ -8,7 +8,7 @@ from playwright.sync_api import sync_playwright
 
 import params
 from logs.LogSender import TYPE_EVENT_CHECK_RESULTS, LOG_SUBJECT_EVENT
-from pojo.ReserveResultPojo import ReserveResultPojo, PublishType
+from pojo.ReserveResultPojo import ReserveResultPojo
 from pojo.ResultEnum import ResultEnum
 
 SORRY_SENTENCE_FR = "nous sommes sincèrement désolés de n'avoir pu vous satisfaire cette fois-ci"
@@ -82,7 +82,6 @@ class ResultChecker:
         print(content)
         self.browser.close()
         print("Stopped worker in ", threading.current_thread().name)
-        status = None
         if SORRY_SENTENCE_FR in content:
             print("status is REFUSED")
             status = ResultEnum.REFUSED
@@ -112,18 +111,10 @@ if __name__ == '__main__':
     # collection = db_manager.get_successful_item_for_day_by_status("2022-05-17", ResultEnum.ACCEPTED)
     collection = db_manager.get_all_successful_items()
     count = 0
-    # result_pojo = ReserveResultPojo(type=PublishType.SUCCESS, phone="0649614591", email="panleicim@gmail.com",
-    #                                 message="SUCCESS", firstName="Lei", lastName="PAN", url='https://api.ipify.org')
     result_list = []
     for appointment in collection.stream():
         reserve_pojo = ReserveResultPojo.from_firestore_dict(appointment.to_dict())
         result_list.append(reserve_pojo)
-    # result_list.append(result_pojo)
-    # for result in result_list:
-    #     if result.accepted is None or ResultEnum.PENDING.value == result.accepted:
-    #         ResultChecker().run(result, collection)
-    #     else:
-    #         print("status is " + result.accepted)
 
     with ThreadPoolExecutor(max_workers=5) as executor:
         for reserve in result_list:

pojo/ResultEnum.py

@@ -4,4 +4,4 @@ from enum import Enum
 class ResultEnum(Enum):
     ACCEPTED = "ACCEPTED"
     REFUSED = "REFUSED"
-    PENDING = "PENDING"
+    PENDING = "PENDING"

workers/commandor_page.py

@@ -91,7 +91,7 @@ class CommandorPage:
                 "username": proxy_username,
                 "password": params.PROXY_PASSWORD
             }
-        self.fill_fields()
+        # self.fill_fields()
         # wait the captha element
         # wait for sms_code field
         # self.clickOnValidBtn()
@@ -118,6 +118,7 @@ class CommandorPage:
             self.termine()
 
     def fill_fields(self):
+        self.logger.info("will call fill_fields for " + str(self.contact.phone))
         self._set_name(self.contact.last_name, self.contact.first_name)
         self._setPhoneCountryAndStore()
         self._setPhoneNumber(self.contact.phone)
@@ -183,13 +184,13 @@ class CommandorPage:
         try:
             if self.store_type == 0:
                 self.page.evaluate("""()=>{
-                document.getElementById("phone_country").focus();
+                //document.getElementById("phone_country").focus();
                 document.getElementById("phone_country").value = \"FR\" }""")
             else:
                 store_to_choose = self.store_map[self.store_type]
                 self.page.evaluate("""(store_to_choose)=>{
                 document.getElementById("prefer").value = store_to_choose;
-                document.getElementById("phone_country").focus();
+                //document.getElementById("phone_country").focus();
                 document.getElementById("phone_country").value = \"FR\" }""", store_to_choose)
         except Exception as error:
             self.logger.error(error)
@@ -208,7 +209,7 @@ class CommandorPage:
             self.page.evaluate("""(name)=>   {
             let surname = document.getElementById("surname");
             if(surname.value.length == 0){
-                        surname.focus();
+                        // surname.focus();
             surname.value = name.lastName;
                             document.getElementById("name").focus();
             document.getElementById("name").value = name.firstName