multitenant support added

bots/messaging_extension_action_preview_bot.py

@@ -83,13 +83,13 @@ class TeamsMessagingExtensionsActionPreviewBot(TeamsActivityHandler):
 
         # reset parameters
         notification.id = uuid.uuid4().__str__()
-        notification.tenant_id = AppConfig.TENANT_ID
+        notification.tenant_id = notification.tenant_id or AppConfig.TENANT_ID
 
         async def routine():
             """ async routine """
             try:
                 reference = await self.cosmos_client.get_conversation(
-                    notification.destination
+                    notification
                 )
             except ItemNotFound:
                 future.set_exception(ConversationNotFound("not found"))
@@ -142,12 +142,13 @@ class TeamsMessagingExtensionsActionPreviewBot(TeamsActivityHandler):
             try:
                 account = turn_context.activity.from_property
                 acks = await self.cosmos_client.get_acknowledge_items(
-                    mx.notification_id
+                    mx.notification_id, mx.tenant_id
                 )
                 if len(acks) > 0:
                     return
 
                 await self.cosmos_client.create_acknowledge(mx.notification_id,
+                                                            mx.tenant_id,
                                                             account)
                 notification = await self.cosmos_client.get_notification(
                     mx.notification_id
@@ -186,12 +187,12 @@ class TeamsMessagingExtensionsActionPreviewBot(TeamsActivityHandler):
         return await self.on_mx_task_default(turn_context)
 
     async def on_mx_task_notification_url(self, turn_context: TurnContext,
-                                          notification_id: str) \
-            -> TaskModuleResponse:
+                                          mx: MedX) -> TaskModuleResponse:
         """ On MX Task fetch Notification URL """
         try:
             notification = await self.cosmos_client.get_notification(
-                notification_id=notification_id
+                notification_id=mx.notification_id,
+                tenant_id=mx.tenant_id or AppConfig.TENANT_ID
             )
             link = notification.url.link
             if link is not None:
@@ -238,8 +239,6 @@ class TeamsMessagingExtensionsActionPreviewBot(TeamsActivityHandler):
             # 1. save action to DB
             # 2. return URL
             initiator = turn_context.activity.from_property.name
-            await self.cosmos_client.create_initiation(initiator,
-                                                       mx.notification_id)
-            return await self.on_mx_task_notification_url(turn_context,
-                                                          mx.notification_id)
+            await self.cosmos_client.create_initiation(initiator, mx)
+            return await self.on_mx_task_notification_url(turn_context, mx)
         return await self.on_mx_task_default(turn_context)

entities/json/acknowledge_schema.py

@@ -8,6 +8,7 @@ class AcknowledgeSchema(CamelCaseSchema):
     """ Notification Schema """
     id = fields.String(required=True, allow_none=True)  # database message id
     notification_id = fields.String(required=True)
+    tenant_id = fields.String(required=True)
     username = fields.String(required=True)
     user_aad_id = fields.String(required=True)
     timestamp = fields.Integer(required=True)

entities/json/initiation.py

@@ -11,5 +11,6 @@ class Initiation(CamelCaseMixin):
     """ Notification Dataclass """
     initiator: str  # User name
     notification_id: str  # Notification ID
+    tenant_id: str  # Tenant ID
     timestamp: Optional[int] = field(default=None)
     id: Optional[str] = field(default=None)  # Unique Initiation ID

entities/json/medx.py

@@ -21,3 +21,4 @@ class MedX(CamelCaseMixin):
     """ MedX data """
     type: str
     notification_id: Optional[str]
+    tenant_id: Optional[str]

entities/json/notification.py

@@ -24,6 +24,7 @@ class Notification(CamelCaseMixin):
     title: Optional[str] = field(default=None)
     url: Optional[NotificationUrl] = field(default_factory=NotificationUrl)
     acknowledge: Optional[bool] = field(default=False)
+    tenant_id: Optional[str] = field(default=None)
 
     def to_db(self) -> "NotificationCosmos":
         """ Create NotificationCosmos """
@@ -33,7 +34,8 @@ class Notification(CamelCaseMixin):
                                   message=self.message,
                                   title=self.title,
                                   url=self.url,
-                                  acknowledge=self.acknowledge)
+                                  acknowledge=self.acknowledge,
+                                  tenant_id=self.tenant_id)
 
 
 # noinspection PyDataclass
@@ -42,5 +44,4 @@ class NotificationCosmos(Notification):
     """ Notification Dataclass """
     # We have to add these fields
     id: Optional[str] = field(default=None)
-    tenant_id: Optional[str] = field(default=None)
     timestamp: Optional[int] = field(default_factory=timestamp_factory)

utils/cosmos_client.py

@@ -12,11 +12,13 @@ from botbuilder.core import TurnContext
 from botbuilder.schema import ChannelAccount
 from marshmallow import EXCLUDE
 
+from config import AppConfig
 from entities.json.acknowledge import Acknowledge
 from entities.json.acknowledge_schema import AcknowledgeSchema
 from entities.json.camel_case_mixin import timestamp_factory
 from entities.json.conversation_reference import ConversationReference
 from entities.json.initiation import Initiation
+from entities.json.medx import MedX
 from entities.json.notification import NotificationCosmos
 
 
@@ -114,8 +116,8 @@ class CosmosClient:
 
         return await self.execute_blocking(bl)
 
-    async def get_acknowledge_items(self, notification_id)\
-            -> List[Acknowledge]:
+    async def get_acknowledge_items(self, notification_id: str,
+                                    _tenant_id: str) -> List[Acknowledge]:
         """ Get Acknowledge Items """
         container = await self.get_acknowledges_container()
 
@@ -263,12 +265,13 @@ class CosmosClient:
             CosmosDBConfig.Initiations.PARTITION_KEY
         )
 
-    async def create_acknowledge(self, notification_id: str,
+    async def create_acknowledge(self, notification_id: str, tenant_id: str,
                                  account: ChannelAccount) -> Dict[str, Any]:
         """ Add acknowledge to the DB """
         container = await self.get_acknowledges_container()
         notification = AcknowledgeSchema().dump(dict(
             notification_id=notification_id,
+            tenant_id=tenant_id or AppConfig.TENANT_ID,
             username=account.name,
             user_aad_id=account.aad_object_id,
             timestamp=timestamp_factory()
@@ -280,30 +283,32 @@ class CosmosClient:
         """ Get Acknowledge object """
         try:
             container = await self.get_acknowledges_container()
-            items = await self.query_items(container, notification_id)
-            return Acknowledge.get_schema(unknown=EXCLUDE).load(items)
+            # items = await self.query_items(container, notification_id)
+            # return Acknowledge.get_schema(unknown=EXCLUDE).load(items)
         except ItemNotFound:
             return None
 
-    async def get_conversation(self, conversation_id: str)\
+    async def get_conversation(self, notification: NotificationCosmos)\
             -> ConversationReference:
         """ Get Conversation Reference """
         from config import AppConfig
 
         container = await self.get_conversations_container()
-        item = await self.get_item(container, conversation_id,
-                                   AppConfig.TENANT_ID)
+        item = await self.get_item(
+            container, notification.destination,
+            notification.tenant_id or AppConfig.TENANT_ID
+        )
         return ConversationReference.get_schema(unknown=EXCLUDE)\
                                     .load(item).to_ms_reference()
 
-    async def get_notification(self, notification_id: str)\
+    async def get_notification(self, notification_id: str, tenant_id: str)\
             -> NotificationCosmos:
         """ Get Notification """
         from config import AppConfig
 
         container = await self.get_notifications_container()
         item = await self.get_item(container, notification_id,
-                                   AppConfig.TENANT_ID)
+                                   tenant_id or AppConfig.TENANT_ID)
         return NotificationCosmos.get_schema(unknown=EXCLUDE).load(item)
 
     async def create_conversation_reference(self, turn_context: TurnContext)\
@@ -331,12 +336,13 @@ class CosmosClient:
                 return
             raise SaveItemError(e.http_error_message)
 
-    async def create_initiation(self, initiator: str,
-                                notification_id: str) -> None:
+    async def create_initiation(self, initiator: str, mx: MedX) -> None:
         """ Save initiation """
+        from config import AppConfig
         container = await self.get_initiation_container()
         initiation = Initiation(initiator=initiator,
                                 timestamp=timestamp_factory(),
-                                notification_id=notification_id)
+                                notification_id=mx.notification_id,
+                                tenant_id=mx.tenant_id or AppConfig.TENANT_ID)
         data = Initiation.get_schema().dump(initiation)
         await self.create_item(container, body=data)