Commit 86603b3f by Oleksandr Barabash

routine updates

parent c72b1baf
...@@ -260,6 +260,7 @@ async def v1_pa_message(request: Request) -> Response: ...@@ -260,6 +260,7 @@ async def v1_pa_message(request: Request) -> Response:
body = json_loads(request_text, dict()) body = json_loads(request_text, dict())
# Add TTL here! # Add TTL here!
pa_message = PAMessage.get_schema().load(body) pa_message = PAMessage.get_schema().load(body)
print(f"request body: {body}, pa_message: {pa_message}\r\n")
response = await BOT.send_message(pa_message) response = await BOT.send_message(pa_message)
Log.d(TAG, f"v1_pa_message::notification: '{response}'") Log.d(TAG, f"v1_pa_message::notification: '{response}'")
return make_response(200, "OK") return make_response(200, "OK")
......
...@@ -138,6 +138,8 @@ class TeamsMessagingExtensionsActionPreviewBot(TeamsActivityHandler): ...@@ -138,6 +138,8 @@ class TeamsMessagingExtensionsActionPreviewBot(TeamsActivityHandler):
# unknown dara type received # unknown dara type received
Log.e(TAG, "send_message::error:unknown card") Log.e(TAG, "send_message::error:unknown card")
response = await turn_context.send_activity(activity) response = await turn_context.send_activity(activity)
print("RESPONSE:", response, "id:", response.id,
"activity:", activity)
return future.set_result(response) return future.set_result(response)
else: else:
# TODO(s1z): add response!!! # TODO(s1z): add response!!!
...@@ -185,7 +187,8 @@ class TeamsMessagingExtensionsActionPreviewBot(TeamsActivityHandler): ...@@ -185,7 +187,8 @@ class TeamsMessagingExtensionsActionPreviewBot(TeamsActivityHandler):
attachments = [CardFactory.adaptive_card(card)] attachments = [CardFactory.adaptive_card(card)]
message = Activity(type=ActivityTypes.message, message = Activity(type=ActivityTypes.message,
attachments=attachments) attachments=attachments)
await turn_context.send_activity(message) response = await turn_context.send_activity(message)
print(f"notification response: {response}")
future.set_result(notification.id) future.set_result(notification.id)
except Exception as exception: except Exception as exception:
future.set_exception(exception) future.set_exception(exception)
......
...@@ -2,10 +2,8 @@ ...@@ -2,10 +2,8 @@
from dataclasses import dataclass, field from dataclasses import dataclass, field
from typing import Optional from typing import Optional
import marshmallow.validate
from entities.json.camel_case_mixin import CamelCaseMixin, timestamp_factory from entities.json.camel_case_mixin import CamelCaseMixin, timestamp_factory
from entities.json.ttl_record import TTLRecord from entities.json.ttl_record import ContentTTL
@dataclass @dataclass
...@@ -25,7 +23,7 @@ class Notification(CamelCaseMixin): ...@@ -25,7 +23,7 @@ class Notification(CamelCaseMixin):
title: Optional[str] = field(default=None) title: Optional[str] = field(default=None)
url: Optional[NotificationUrl] = field(default_factory=NotificationUrl) url: Optional[NotificationUrl] = field(default_factory=NotificationUrl)
acknowledge: Optional[bool] = field(default=False) acknowledge: Optional[bool] = field(default=False)
contentTTL: Optional[TTLRecord] = field(default=None) contentTTL: Optional[ContentTTL] = field(default=None)
def to_db(self) -> "NotificationCosmos": def to_db(self) -> "NotificationCosmos":
""" Create NotificationCosmos """ """ Create NotificationCosmos """
......
...@@ -3,7 +3,7 @@ from dataclasses import dataclass, field ...@@ -3,7 +3,7 @@ from dataclasses import dataclass, field
from typing import Optional, Union, List, Dict, Any from typing import Optional, Union, List, Dict, Any
from entities.json.camel_case_mixin import CamelCaseMixin, uuid_factory from entities.json.camel_case_mixin import CamelCaseMixin, uuid_factory
from entities.json.ttl_record import TTLRecord from entities.json.ttl_record import ContentTTL
@dataclass @dataclass
...@@ -13,4 +13,4 @@ class PAMessage(CamelCaseMixin): ...@@ -13,4 +13,4 @@ class PAMessage(CamelCaseMixin):
conversation_id: str conversation_id: str
tenant_id: str tenant_id: str
card: Optional[Any] = None card: Optional[Any] = None
contentTTL: Optional[TTLRecord] = None content_t_t_l: Optional[ContentTTL] = None
...@@ -6,7 +6,7 @@ from entities.json.camel_case_mixin import CamelCaseMixin ...@@ -6,7 +6,7 @@ from entities.json.camel_case_mixin import CamelCaseMixin
@dataclass @dataclass
class TTLRecord(CamelCaseMixin): class ContentTTL(CamelCaseMixin):
""" Notification TTL """ """ Notification TTL """
ttl: Optional[int] = field(default=None) ttl: Optional[int] = field(default=None)
content: Optional[Any] = field(default=None) content: Optional[Any] = field(default=None)
...@@ -272,7 +272,9 @@ class CosmosClient: ...@@ -272,7 +272,9 @@ class CosmosClient:
pa_message.id = uuid.uuid4().__str__() pa_message.id = uuid.uuid4().__str__()
schema = PAMessage.get_schema(unknown=EXCLUDE) schema = PAMessage.get_schema(unknown=EXCLUDE)
container = await self.get_pa_container() container = await self.get_pa_container()
saved_item = container.create_item(body=schema.dump(pa_message)) pa_message_dumped = schema.dump(pa_message)
print(f"pa_message_dumped: {pa_message_dumped}")
saved_item = container.create_item(body=pa_message_dumped)
return schema.load(saved_item) return schema.load(saved_item)
async def get_acknowledges_container(self) -> ContainerProxy: async def get_acknowledges_container(self) -> ContainerProxy:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment