diff --git a/models/ReserveResultPojo.py b/models/ReserveResultPojo.py index fdb0361..63e5588 100755 --- a/models/ReserveResultPojo.py +++ b/models/ReserveResultPojo.py @@ -29,6 +29,7 @@ class ReserveResultPojo: slot_position = None sim_position = None ccid: str = "" + model: str = "" source_from: str = socket.gethostname() store_type = 0 url_validated = None @@ -122,8 +123,7 @@ class ReserveResultPojo: u'email': self.email, u'passport': self.passport, u'url': self.url, - # u'sim_position': self.sim_position, - # u'slot_position': self.slot_position, + u'model': self.model, u'source_from': self.source_from, u'hostName': self.source_from, u'created_at': self.created_at, diff --git a/workers/sender.py b/workers/sender.py index f5b0236..3fbb433 100644 --- a/workers/sender.py +++ b/workers/sender.py @@ -38,7 +38,8 @@ class Sender: self.proxy_to_use = proxy_to_use self.cookie.load(self.cookie_str) - def publish_message_to_queue(self, contact: ContactPojo, status: PublishType, url: str, store_type: str): + def publish_message_to_queue(self, contact: ContactPojo, status: PublishType, url: str, store_type: str, + model: str = ""): # create the message if url == "https://rendezvousparis.hermes.com/client/welcome": return @@ -59,11 +60,12 @@ class Sender: result.proxy = "data_impulse" result.id = id result.store_type = store_type + result.model = model result.created_at = time.strftime("%H:%M:%S", time.localtime()) collection_name = str(datetime.date.today()) MONGO_STORE_MANAGER.insert_reserve_result(collection_name=collection_name, reserve=result) - def apply_redirect(self, response, old_headers, contact, js_data, selected_store): + def apply_redirect(self, response, old_headers, contact, js_data, selected_store, model=""): # /client/register/5XD2E2 _res_headers = response.headers _location = _res_headers['location'] @@ -87,7 +89,7 @@ class Sender: contact.current_ip = get_address_ip(proxy_to_use=self.proxy_to_use) _appointment_url = _redirect_url self.publish_message_to_queue(contact, status=PublishType.SUCCESS, url=_appointment_url, - store_type=selected_store) + store_type=selected_store, model=model) self.cookie.load(_cookies_to_set) new_cookies = {k: v.value for k, v in self.cookie.items()} new_coolies_str = "" @@ -175,7 +177,7 @@ class Sender: # add to mongodb self.logger.info(response.text) self.apply_redirect(response=response, old_headers=headers, contact=contact, js_data=js_data, - selected_store=_selected_store) + selected_store=_selected_store, model=model) # self.logger.info("{}:{}".format(contact.mail, response.url)) # contact.ua = js_data.ua # contact.current_ip = get_address_ip(proxy_to_use=proxy_to_use)