leadguru-jobs 0.668.0__tar.gz → 0.669.0__tar.gz

{leadguru_jobs-0.668.0 → leadguru_jobs-0.669.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: leadguru_jobs
-Version: 0.668.0
+Version: 0.669.0
 Summary: LGT jobs builds
 Author-email: developer@leadguru.co
 Classifier: Development Status :: 5 - Production/Stable

{leadguru_jobs-0.668.0 → leadguru_jobs-0.669.0}/leadguru_jobs.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: leadguru_jobs
-Version: 0.668.0
+Version: 0.669.0
 Summary: LGT jobs builds
 Author-email: developer@leadguru.co
 Classifier: Development Status :: 5 - Production/Stable

{leadguru_jobs-0.668.0 → leadguru_jobs-0.669.0}/lgt_jobs/lgt_data/models/notifications/notification.py

@@ -52,9 +52,77 @@ class Notification(DictionaryModel):
 
 
 class IncomingMessageNotification(Notification):
+
+    other_leads_text = ' and other leads.'
+    name_html_item = '''
+    <div style="display: inline-block; padding-left: 2px" class="lead_names">
+        <img alt="Lead Photo" src="$$USER_IMAGE$$" width="24" height="24"
+                style="background-color: #FFFFFE !important; display: inline-block; vertical-align: top; width: 24px; 
+                max-width: 24px; min-width: 24px; font-family: 'Outfit', Helvetica, Arial, sans-serif; color: #FFFFFE; 
+                border-radius: 50%; font-size: 16px;" border="0">
+                <span style="font-weight: 600;">$$USER_NAME$$</span>
+    </div>
+    '''
+    view_message_html_item = '''
+    <td align="right" class="pr-text-dark" style="width: 100%">
+        <a href="$$VIEW_MESSAGE_URL$$" target="_blank"style="color: #3579F6; font-family: 'Outfit', Helvetica, Arial, 
+        sans-serif; font-size: 14px; font-weight: 500; line-height: 20px; text-decoration: none; 
+        display: inline-block;">View message <img alt="View message" src="{{ IMAGE_ARROW_BLUE.src }}" width="16" 
+        height="16" style="display: inline-block; vertical-align: middle; width: 16px; max-width: 16px; 
+        min-width: 16px; margin: 0 -1px 4px 7px" border="0"></a> 
+    </td>'''
+
+    unread_message_html_item = '''
+    <tr>
+                                            <td bgcolor="#FFFFFE" align="left" style="padding-top: 16px;"
+                                                class="pr-bg-dark pr-text-dark">
+                                                <table role="presentation" width="100%" border="0" cellspacing="0" cellpadding="0">
+                                                    <tr>
+                                                        <td bgcolor="#FFFFFE" align="left"
+                                                            class="pr-bg-dark pr-text-dark"
+                                                            style="color: #262730; font-family: 'Outfit', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: 400; line-height: 20px;">
+                                                            <table role="presentation" border="0" cellspacing="0" cellpadding="0"
+                                                                   style="border-collapse: separate !important;">
+                                                                <tr>
+                                                                    <td align="center" bgcolor="#FFFFFE" style="border-radius: 50% !important;">
+                                                                        <img alt="Lead Photo" src="$$USER_IMAGE$$" width="24"
+                                                                             height="24"
+                                                                             style="display: inline-block; vertical-align: middle; width: 24px; max-width: 24px; min-width: 24px; font-family: 'Outfit', Helvetica, Arial, sans-serif; color: #FFFFFE; border-radius: 50%; font-size: 16px;"
+                                                                             border="0">
+                                                                    </td>
+                                                                    <td align="center"
+                                                                        class="pr-text-dark"
+                                                                        style="white-space: nowrap; color: #262730; font-family: 'Outfit', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: 600; line-height: 20px; padding-left: 4px">
+                                                                        $$USER_NAME$$
+                                                                    </td>
+                                                                    $$VIEW_MESSAGE_BUTTON$$  
+                                                                </tr>
+                                                            </table>
+                                                        </td>
+                                                    </tr>
+
+                                                    <tr>
+                                                        <td align="left" style="padding-top: 8px">
+                                                            <table role="presentation" border="0" cellspacing="0" cellpadding="0"
+                                                                   style="border-collapse: separate !important;">
+                                                                <tr>
+                                                                    <td align="left" bgcolor="#F6F6F8"
+                                                                        class="sec-bg-dark pr-text-dark"
+                                                                        style="color: #262730; font-family: 'Outfit', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: 400; line-height: 20px; padding: 12px; border-radius: 0 12px 12px 12px; background-color: #F6F6F8">
+                                                                        $$MESSAGE_TEXT$$
+                                                                    </td>
+                                                                </tr>
+                                                            </table>
+                                                        </td>
+                                                    </tr>
+                                                </table>
+                                            </td>
+                                        </tr>
+    '''
+
     @staticmethod
     def get_button_name() -> str:
-        return 'View message'
+        return 'Go to Chat'
 
     @staticmethod
     def get_button_url(sender_id: str, source_id: str) -> str:
@@ -67,19 +135,38 @@ class IncomingMessageNotification(Notification):
             return 'Unread messages from your lead'
         return 'Unread message from your lead'
 
-    def get_notification_text(self, users: list):
-        if self.type == NotificationType.INSTANTLY:
-            return f'{users[-1]} has just sent you a message.'
-        elif self.type == NotificationType.UNREAD_FOR_FEW_MINUTES:
-            return f'{users[-1]} sent you a message {self.minute} minutes ago.'
-        elif (self.type == NotificationType.ONCE_A_DAY or self.type == NotificationType.ONCE_A_WEEK) and users:
-            match len(users):
-                case 1:
-                    return f'You have unread message(s) from {users[0]}.'
-                case 2 | 3:
-                    return f'You have unread messages from {", ".join(users)}.'
-                case _:
-                    return f'You have unread messages from {", ".join(users[:3])} and other leads.'
+    def create_title(self, user_ids: list[str], users: list):
+        title = ""
+        for user_id in user_ids[:3]:
+            user = [user for user in users if user_id == user['sender_id']][0]
+            photo = user.get('images', {}).get('image_72', '{{ IMAGE_PERSON.src }}')
+            item = self.name_html_item.replace('$$USER_NAME$$', user['real_name'])
+            item = item.replace('$$USER_IMAGE$$', photo)
+            title += item
+
+        if len(user_ids) > 3:
+            title += self.other_leads_text
+
+        return f"You have unread messages from {title}" if len(users) > 1 else f"You have unread message from {title}"
+
+    def create_unread_messages_list(self, messages: list):
+        unread_messages = ""
+        for message in messages[:3]:
+            name = message['user']['real_name']
+            photo = message['user'].get('images', {}).get('image_72', '{{ IMAGE_PERSON.src }}')
+            item = self.unread_message_html_item.replace('$$USER_NAME$$', name)
+            item = item.replace('$$USER_IMAGE$$', photo)
+            item = item.replace('$$MESSAGE_TEXT$$', message['text'])
+            view_message_button = ""
+            if len(messages) > 1:
+                view_message_button = (
+                    self.view_message_html_item.replace('$$VIEW_MESSAGE_URL$$',
+                                                        self.get_button_url(message['sender_id'],
+                                                                            message['bot']['source']['source_id'])))
+            item = item.replace('$$VIEW_MESSAGE_BUTTON$$', view_message_button)
+
+            unread_messages += item
+        return unread_messages
 
 
 class InboxNotification(Notification):

{leadguru_jobs-0.668.0 → leadguru_jobs-0.669.0}/lgt_jobs/lgt_data/mongo_repository.py

@@ -1340,7 +1340,15 @@ class ChatRepository(BaseMongoRepository):
                 }
             },
             {
-                '$addFields': {'user': {'$first': '$user'}}
+                '$lookup': {
+                    'from': 'dedicated_bots',
+                    'localField': 'bot_id',
+                    'foreignField': '_id',
+                    'as': 'bot'
+                }
+            },
+            {
+                '$addFields': {'user': {'$first': '$user'}, 'bot': {'$first': '$bot'}}
             },
             {
                 '$sort': {sort_by: 1}

{leadguru_jobs-0.668.0 → leadguru_jobs-0.669.0}/setup.py

@@ -13,9 +13,9 @@ def versions():
 
 
 try:
-    version_parts = versions()[0].split(".")
+    version_parts: list = versions()[0].split(".")
 except:
-    version_parts = "0.0.0".split(".")
+    version_parts: list = "0.0.0".split(".")
 
 version_parts[1] = f'{float(version_parts[1]) + 1}'
 last_version = ".".join(version_parts[0:-1])