diff --git a/models/ReserveResultPojo.py b/models/ReserveResultPojo.py index cc99e5b..74b29b1 100755 --- a/models/ReserveResultPojo.py +++ b/models/ReserveResultPojo.py @@ -16,7 +16,6 @@ class PublishType(Enum): @dataclass_json @dataclass class ReserveResultPojo: - type: PublishType = PublishType.ERROR phone: str = "" message: str = "" url: str = "" @@ -41,11 +40,6 @@ class ReserveResultPojo: @staticmethod def from_firestore_dict(source): - publish_type = PublishType.ERROR - if 'type' in source: - publish_type = source['type'] - if publish_type: - publish_type = PublishType[publish_type] if 'phone' in source: phone = source['phone'] else: @@ -54,8 +48,6 @@ class ReserveResultPojo: url = source['url'] else: url = "" - if 'id' in source: - id = source['id'] if '_id' in source: id = source['_id'] else: @@ -74,7 +66,7 @@ class ReserveResultPojo: else: firstName = "" - result = ReserveResultPojo(type=publish_type, phone=phone, + result = ReserveResultPojo(phone=phone, url=url, email=email, firstName=firstName, lastName=lastName) if 'accepted' in source: @@ -121,7 +113,6 @@ class ReserveResultPojo: def to_firestore_dict(self): dest = { - u'type': self.type.value, u'id': self.id, u'phone': self.phone, u'firstName': self.firstName, diff --git a/workers/sender.py b/workers/sender.py index 089ee3f..aa95c55 100644 --- a/workers/sender.py +++ b/workers/sender.py @@ -44,7 +44,7 @@ class Sender: if url == "https://rendezvousparis.hermes.com/client/welcome": return id = url.split("/")[-1] - result = ReserveResultPojo(type=status, phone=contact.phone, message=status.value, url=url, + result = ReserveResultPojo(phone=contact.phone, message=status.value, url=url, firstName=contact.first_name, lastName=contact.last_name, email=contact.mail, passport=contact.passport, ccid=contact.ccid) result.ua = contact.ua