diff --git a/src/notification/AcceptedResultPojo.py b/src/notification/AcceptedResultPojo.py index 3b3a87d..839268f 100644 --- a/src/notification/AcceptedResultPojo.py +++ b/src/notification/AcceptedResultPojo.py @@ -9,7 +9,8 @@ from src.pojo.ReserveResultPojo import ReserveResultPojo @dataclass class AcceptedResultPojo: - def __init__(self, msg: str, slot_position, sim_position, passport, email, name, phone, ccid: str, url): + def __init__(self, msg: str, slot_position, sim_position, passport, email, name, phone, ccid: str, url, + created_at: str, validated_at: str): self.sms_msg = msg self.slot_position = slot_position self.sim_position = sim_position @@ -19,6 +20,8 @@ class AcceptedResultPojo: self.phone = phone self.ccid = ccid self.url = url + self.created_at = created_at + self.validated_at = validated_at def get_accepted_result_from(sim_info: ReserveResultPojo) -> AcceptedResultPojo: @@ -27,9 +30,9 @@ def get_accepted_result_from(sim_info: ReserveResultPojo) -> AcceptedResultPojo: return AcceptedResultPojo("", slot_position=0, sim_position=0, passport="", email="", phone="", name="", ccid="", - url="") + url="", created_at="", validated_at="") else: return AcceptedResultPojo("", slot_position=sim_info.slot_position, sim_position=sim_info.sim_position, passport=sim_info.passport, email=sim_info.email, phone=sim_info.phone, name="{} {}".format(sim_info.lastName, sim_info.firstName), ccid=sim_info.ccid, - url=sim_info.url) + url=sim_info.url, created_at=sim_info.created_at, validated_at=sim_info.validated_at) diff --git a/src/pojo/ReserveResultPojo.py b/src/pojo/ReserveResultPojo.py index 6df01e4..86be458 100644 --- a/src/pojo/ReserveResultPojo.py +++ b/src/pojo/ReserveResultPojo.py @@ -33,6 +33,8 @@ class ReserveResultPojo: source_from: str = config.LOG_SOURCE store_type = 0 url_validated = None + created_at = None + validated_at = None @staticmethod def from_firestore_dict(source): @@ -42,7 +44,7 @@ class ReserveResultPojo: if publish_type: publish_type = PublishType[publish_type] phone = source['phone'] - message ="" + message = "" url = source['url'] id = source['id'] email = source['email'] @@ -75,6 +77,12 @@ class ReserveResultPojo: if 'url_validated' in source: url_validated = source['url_validated'] result.url_validated = bool(url_validated) + if 'created_at' in source: + created_at = source['created_at'] + result.created_at = created_at + if 'validated_at' in source: + validated_at = source['validated_at'] + result.validated_at = validated_at result.id = id return result diff --git a/src/pojo/accepted_appointment_pojo.py b/src/pojo/accepted_appointment_pojo.py index 9b752b1..7774e82 100644 --- a/src/pojo/accepted_appointment_pojo.py +++ b/src/pojo/accepted_appointment_pojo.py @@ -19,6 +19,8 @@ class AcceptedAppointmentPojo(ReserveResultPojo): self.email = reserve.email self.phone = reserve.phone self.source_from = reserve.source_from + self.created_at = reserve.created_at + self.validated_at = reserve.validated_at @staticmethod def from_reserve(reserve: ReserveResultPojo): @@ -41,6 +43,8 @@ class AcceptedAppointmentPojo(ReserveResultPojo): u'accepted': self.accepted, u'day': self.day, u'accepted_at': self.accepted_at, + u'created_at': self.created_at, + u'validated_at': self.validated_at, } return dest diff --git a/src/pojo/captcha_error_contact_pojo.py b/src/pojo/captcha_error_contact_pojo.py index 1b155d8..39a20c7 100644 --- a/src/pojo/captcha_error_contact_pojo.py +++ b/src/pojo/captcha_error_contact_pojo.py @@ -1,23 +1,17 @@ -from sqlalchemy import Column, String, Integer, DateTime, func -from sqlalchemy.orm import declarative_base - - -Base = declarative_base() - ERROR_TYPE_CAPTCHA = 1 TOO_MANY_REQUEST_ERROR = 2 -class ContactInErrorPojo(Base): +class ContactInErrorPojo: __tablename__ = "contacts_in_error" - id = Column(Integer, primary_key=True, autoincrement=True) - mail: str = Column(String) - phone: str = Column(String) - passport: str = Column(String) - last_name: str = Column(String) - first_name: str = Column(String) - ccid: str = Column(String) - position: int = Column(Integer) - error_type = Column(Integer) - update_at = Column(DateTime, onupdate=func.now()) - create_at = Column(DateTime, default=func.now()) \ No newline at end of file + id: int + mail: str + phone: str + passport: str + last_name: str + first_name: str + ccid: str + position: int + error_type: int + update_at: str + create_at: str