support data impulse

queue_message/appointmentrequestsender.py

@@ -13,6 +13,7 @@ from models.contact_pojo import ContactPojo
 from models.jsdata_le_pojo import JsDataLeTypePojo
 from models.jsdata_pojo import JsDataPojo
 from models.result_pojo import RequestResult
+from proxy_manager.proxy_manager import ProxyManager
 from queue_message.CookiesPublisher import CookiesPublisher
 from utiles import is_time_between
 from workers.captcha_result_getter import CaptchaResultGetter, HERMES_REGISTER
@@ -62,7 +63,7 @@ def is_open():
 
 
 class AppointmentRequestSender(threading.Thread):
-    def __init__(self, sub_contact_list: list, proxy_to_use_list, logger, cookiesPublisher: CookiesPublisher,
+    def __init__(self, sub_contact_list: list, logger, cookiesPublisher: CookiesPublisher,
                  just_send=False,
                  queue_name=REQUEST_DATA_QUEUE):
         super().__init__()
@@ -77,7 +78,7 @@ class AppointmentRequestSender(threading.Thread):
         self.initial_contact_list = sub_contact_list
         self.contact_list = sub_contact_list
         self.queue_name = queue_name
-        self.proxy_to_use_list = proxy_to_use_list
+        self.proxy_manager = ProxyManager(logger)
         self.already_read_emails = False
 
     def set_up_connection(self):
@@ -96,13 +97,6 @@ class AppointmentRequestSender(threading.Thread):
         self.logger.info("message count in queue is {}".format(_message_count))
         _received_object = body.decode("UTF-8")
         self.logger.info(f" [x] Received {_received_object}")
-        _port = random.randint(40001, 49999)
-        self.logger.info("generated port is {}".format(_port))
-        _chosen_proxy = random.choice(self.proxy_to_use_list)
-        _proxy_to_use = {}
-        _proxy_to_use["http"] = _chosen_proxy["http"].format(_port)
-        _proxy_to_use["https"] = _chosen_proxy["https"].format(_port)
-        print(_proxy_to_use)
         if "glrd" in _received_object:
             _received_dict = json.loads(_received_object)
             js_data = JsDataPojo(glrd=_received_dict['glrd'], glvd=_received_dict['glvd'], hc=_received_dict['hc'],
@@ -114,8 +108,6 @@ class AppointmentRequestSender(threading.Thread):
                                  rs_h=_received_dict['rs_h'],
                                  rs_w=_received_dict['rs_w'], rs_cd=_received_dict['rs_cd'])
             _received_cookies = _received_dict["cookiesStr"]
-            sender = Sender(_received_cookies, cookiesPublisher=self.cookiesPublisher, received_dict=_received_dict,
-                            proxy_to_use=_proxy_to_use, logger=self.logger)
             # remove already sent contacts
             if self.just_send:
                 self.contact_list = filter_contacts(self.contact_list, self.already_tried_contact_list)
@@ -128,6 +120,10 @@ class AppointmentRequestSender(threading.Thread):
                 self.logger.info("contact number is {}".format(len(self.contact_list)))
                 # self.contact_list = filter_contacts(self.contact_list)
                 for con in self.contact_list:
+                    _proxy_to_use = self.proxy_manager.get_proxy_for_appointment_request()
+                    print(_proxy_to_use)
+                    sender = Sender(_received_cookies, cookiesPublisher=self.cookiesPublisher, received_dict=_received_dict,
+                                    proxy_to_use=_proxy_to_use, logger=self.logger)
                     self.logger.info(con.mail)
                     if self.valid_csrf is None:
                         csrf_result = captchaResultGetter.get_csrf(