change error schema
This commit is contained in:
+6
-5
@@ -8,6 +8,7 @@ from playwright.sync_api import sync_playwright
|
|||||||
|
|
||||||
import params
|
import params
|
||||||
from logs.LogSender import TYPE_EVENT_CHECK_RESULTS, LOG_SUBJECT_EVENT
|
from logs.LogSender import TYPE_EVENT_CHECK_RESULTS, LOG_SUBJECT_EVENT
|
||||||
|
from notification.AcceptedResultPojo import get_accepted_result_from
|
||||||
from notification.mailer import Mailer
|
from notification.mailer import Mailer
|
||||||
from pojo.ReserveResultPojo import ReserveResultPojo
|
from pojo.ReserveResultPojo import ReserveResultPojo
|
||||||
from pojo.ResultEnum import ResultEnum
|
from pojo.ResultEnum import ResultEnum
|
||||||
@@ -101,11 +102,11 @@ class ResultChecker:
|
|||||||
else:
|
else:
|
||||||
print("status is ACCEPTED")
|
print("status is ACCEPTED")
|
||||||
status = ResultEnum.ACCEPTED
|
status = ResultEnum.ACCEPTED
|
||||||
# send email
|
# send email
|
||||||
# try:
|
try:
|
||||||
# mailer.send_email(get_accepted_result_from(reserve_pojo))
|
mailer.send_email(get_accepted_result_from(reserve_pojo))
|
||||||
# except Exception as err:
|
except Exception as err:
|
||||||
# print(err)
|
print(err)
|
||||||
collection.document(reserve_pojo.id).update({u'accepted': status.name})
|
collection.document(reserve_pojo.id).update({u'accepted': status.name})
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -24,7 +24,8 @@ class LocalDbManager:
|
|||||||
metadata = MetaData(db_engine)
|
metadata = MetaData(db_engine)
|
||||||
# Create a table with the appropriate Columns
|
# Create a table with the appropriate Columns
|
||||||
Table(ContactInErrorPojo.__tablename__, metadata,
|
Table(ContactInErrorPojo.__tablename__, metadata,
|
||||||
Column('mail', String, primary_key=True, nullable=False),
|
Column('id', Integer, primary_key=True, autoincrement=True),
|
||||||
|
Column('mail', String),
|
||||||
Column('phone', String),
|
Column('phone', String),
|
||||||
Column('passport', String),
|
Column('passport', String),
|
||||||
Column('last_name', String),
|
Column('last_name', String),
|
||||||
|
|||||||
@@ -7,12 +7,13 @@ from pojo.contact_pojo import ContactPojo
|
|||||||
Base = declarative_base()
|
Base = declarative_base()
|
||||||
|
|
||||||
ERROR_TYPE_CAPTCHA = 1
|
ERROR_TYPE_CAPTCHA = 1
|
||||||
|
TOO_MANY_REQUEST_ERROR = 2
|
||||||
|
|
||||||
|
|
||||||
class ContactInErrorPojo(Base):
|
class ContactInErrorPojo(Base):
|
||||||
__tablename__ = "contacts_in_error"
|
__tablename__ = "contacts_in_error"
|
||||||
|
id = Column(Integer, primary_key=True, autoincrement=True)
|
||||||
mail: str = Column(String, primary_key=True)
|
mail: str = Column(String)
|
||||||
phone: str = Column(String)
|
phone: str = Column(String)
|
||||||
passport: str = Column(String)
|
passport: str = Column(String)
|
||||||
last_name: str = Column(String)
|
last_name: str = Column(String)
|
||||||
@@ -38,6 +39,6 @@ def get_captcha_error_contact_from_contact(contact: ContactPojo, error_type: int
|
|||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
conact = ContactPojo(mail="panleici3m@gmail.com", phone_number="649114592", ccid="", position=0,
|
contact = ContactPojo(mail="panleici3m@gmail.com", phone_number="649114592", ccid="", position=0,
|
||||||
passport_number="3322111", first_name="Lei", last_name="PAAaN")
|
passport_number="3322111", first_name="Lei", last_name="PAAaN")
|
||||||
definitions.local_db_manager.insert_or_update(get_captcha_error_contact_from_contact(conact, ERROR_TYPE_CAPTCHA))
|
definitions.local_db_manager.insert_or_update(get_captcha_error_contact_from_contact(contact, ERROR_TYPE_CAPTCHA))
|
||||||
|
|||||||
@@ -12,7 +12,8 @@ import definitions
|
|||||||
import params
|
import params
|
||||||
from pojo.ModeEnum import ModeEnum
|
from pojo.ModeEnum import ModeEnum
|
||||||
from pojo.ReserveResultPojo import ReserveResultPojo, PublishType
|
from pojo.ReserveResultPojo import ReserveResultPojo, PublishType
|
||||||
from pojo.captcha_error_contact_pojo import get_captcha_error_contact_from_contact, ERROR_TYPE_CAPTCHA
|
from pojo.captcha_error_contact_pojo import get_captcha_error_contact_from_contact, ERROR_TYPE_CAPTCHA, \
|
||||||
|
TOO_MANY_REQUEST_ERROR
|
||||||
from pojo.contact_pojo import ContactPojo
|
from pojo.contact_pojo import ContactPojo
|
||||||
from workers.SolveCaptch import SolveCaptcha
|
from workers.SolveCaptch import SolveCaptcha
|
||||||
|
|
||||||
@@ -250,6 +251,8 @@ class CommandorPage:
|
|||||||
elif TOO_MANY_REQUEST_ERROR_MESSAGE in erro_content:
|
elif TOO_MANY_REQUEST_ERROR_MESSAGE in erro_content:
|
||||||
# this email has been already used
|
# this email has been already used
|
||||||
if not self.is_finished:
|
if not self.is_finished:
|
||||||
|
definitions.local_db_manager.insert_or_update(
|
||||||
|
get_captcha_error_contact_from_contact(self.contact, TOO_MANY_REQUEST_ERROR))
|
||||||
params.oracle_log_sender.send_too_many_error(self.contact)
|
params.oracle_log_sender.send_too_many_error(self.contact)
|
||||||
self.is_finished = True
|
self.is_finished = True
|
||||||
self.termine()
|
self.termine()
|
||||||
@@ -306,9 +309,6 @@ class CommandorPage:
|
|||||||
except Exception as error:
|
except Exception as error:
|
||||||
self.logger.error(error)
|
self.logger.error(error)
|
||||||
|
|
||||||
def clear_app_data(self):
|
|
||||||
pass
|
|
||||||
|
|
||||||
def fill_otp(self, otp: str):
|
def fill_otp(self, otp: str):
|
||||||
self.page.focus(OTP_FIELD_ID)
|
self.page.focus(OTP_FIELD_ID)
|
||||||
time.sleep(get_random_wait_time())
|
time.sleep(get_random_wait_time())
|
||||||
@@ -369,15 +369,12 @@ def on_success(result: ReserveResultPojo):
|
|||||||
|
|
||||||
|
|
||||||
def launch_page():
|
def launch_page():
|
||||||
PROXY_USERNAME = "panleicim-res-fr-" + params.get_random_id_number_for_proxy()
|
|
||||||
print("proxy_username is " + PROXY_USERNAME)
|
|
||||||
proxy = {
|
proxy = {
|
||||||
"server": params.BRIGHT_DATA_PROXY_SERVER,
|
"server": params.BRIGHT_DATA_PROXY_SERVER,
|
||||||
"username": params.BRIGHT_DATA_PROXY_USERNAME,
|
"username": params.BRIGHT_DATA_PROXY_USERNAME,
|
||||||
"password": params.BRIGHT_DATA_PROXY_PASSWORD
|
"password": params.BRIGHT_DATA_PROXY_PASSWORD
|
||||||
}
|
}
|
||||||
passport_number = get_random_id_number()
|
passport_number = get_random_id_number()
|
||||||
print("passport_number is " + passport_number)
|
|
||||||
contact = ContactPojo(phone_number="+33758912245", passport_number=passport_number, last_name="XU",
|
contact = ContactPojo(phone_number="+33758912245", passport_number=passport_number, last_name="XU",
|
||||||
first_name="xingzhen",
|
first_name="xingzhen",
|
||||||
mail="ColbyPatel653@gmail.com", ccid="", position=0)
|
mail="ColbyPatel653@gmail.com", ccid="", position=0)
|
||||||
|
|||||||
Reference in New Issue
Block a user