leadguru-jobs 0.705.0__tar.gz → 0.706.0__tar.gz

{leadguru_jobs-0.705.0 → leadguru_jobs-0.706.0}/PKG-INFO

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

{leadguru_jobs-0.705.0 → leadguru_jobs-0.706.0}/leadguru_jobs.egg-info/PKG-INFO

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

{leadguru_jobs-0.705.0 → leadguru_jobs-0.706.0}/lgt_jobs/lgt_data/models/notifications/notification.py

@@ -54,6 +54,7 @@ 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"
@@ -176,33 +177,94 @@ class IncomingMessageNotification(Notification):
 
 
 class InboxNotification(Notification):
+    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% !important; font-size: 16px;" border="0">
+                        <span style="font-weight: 600;">$$USER_NAME$$</span>
+            </div>
+            '''
+    new_request_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="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% !important; font-size: 16px;"
+                                                                                 border="0">
+                                                                        </td>
+                                                                        <td align="center"
+                                                                            class="pr-text-dark"
+                                                                            style="white-space: nowrap; font-family: 'Outfit', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: 600; line-height: 20px; padding-left: 4px">
+                                                                            $$USER_NAME$$
+                                                                        </td>
+                                                                    </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 !important; background-color: #F6F6F8">
+                                                                            $$REQUEST_TEXT$$
+                                                                        </td>
+                                                                    </tr>
+                                                                </table>
+                                                            </td>
+                                                        </tr>
+                                                    </table>
+                                                </td>
+                                            </tr>
+        '''
     @staticmethod
-    def get_button_name():
-        return 'View message request'
+    def get_button_name(users: list):
+        return 'View message requests' if len(users) > 1 else 'View message request'
 
     @staticmethod
-    def get_button_url():
+    def get_chat_url():
         return f'{portal_url}/feed?requests=true'
 
-    def get_subject_text(self, users: list) -> str:
-        if self.type == NotificationType.INSTANTLY:
-            return 'New message request on Leadguru'
-        elif len(users) > 1:
-            return 'Message requests on Leadguru'
-        return 'Message request on Leadguru'
-
-    def get_notification_text(self, users: list):
-        if self.type == NotificationType.INSTANTLY:
-            return f'{users[0]} has just sent you message request.'
-        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 request from {users[0]}.'
-                case 2 | 3:
-                    return f'You have unread message request from {", ".join(users)}.'
-                case _:
-                    return f'You have unread message requests from {", ".join(users[:3])} and other leads.'
+    @staticmethod
+    def get_subject_text(users: list) -> str:
+        return 'New message requests on Leadguru' if len(users) > 1 else'New message request on Leadguru'
+
+    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
+
+        return f"New message requests from {title}" if len(users) > 1 else f"New message request from {title}"
+
+    def create_new_requests_list(self, requests: list):
+        new_requests = ""
+        for request in requests[:3]:
+            name = request['user']['real_name']
+            photo = request['user'].get('images', {}).get('image_72', '{{ IMAGE_PERSON.src }}')
+            item = self.new_request_html_item.replace('$$USER_NAME$$', name)
+            item = item.replace('$$USER_IMAGE$$', photo)
+            item = item.replace('$$REQUEST_TEXT$$', request['text'])
+            new_requests += item
+        return new_requests
 
 
 class SourceDeactivationNotification(Notification):

{leadguru_jobs-0.705.0 → leadguru_jobs-0.706.0}/lgt_jobs/lgt_data/mongo_repository.py

@@ -31,7 +31,7 @@ from lgt_jobs.lgt_data.models.user.verification import UserVerificationModel
 from lgt_jobs.lgt_data.models.user_leads.extended_user_lead import ExtendedUserLeadModel
 from lgt_jobs.lgt_data.models.user_leads.user_lead import UserLeadModel
 
-client = MongoClient(os.environ.get('MONGO_CONNECTION_STRING', 'mongodb://127.0.0.1:27017/'))
+client = MongoClient(os.environ.get('MONGO_CONNECTION_STRING', 'mongodb://127.0.0.1:27018/'))
 
 
 def to_object_id(oid):
@@ -1418,10 +1418,17 @@ class MessageRequestsRepository(BaseMongoRepository):
         self.collection().update_one({'user_id': to_object_id(user_id), 'sender_id': sender_id},
                                      {'$set': message_request.to_dic()}, upsert=True)
 
-    def get_many(self, user_id: str, viewed: bool = False):
+    def get_many(self, user_id: str, viewed: bool = False, **kwargs):
+        match_pipeline = {'user_id': to_object_id(user_id), 'viewed': viewed}
+        from_date = kwargs.get('from_date')
+
+        if from_date:
+            start = datetime(from_date.year, from_date.month, from_date.day, tzinfo=tz.tzutc())
+            match_pipeline['created_at']['$gte'] = start
+
         pipeline = [
             {
-                '$match': {'user_id': to_object_id(user_id), 'viewed': viewed}
+                '$match': match_pipeline
             },
             {
                 '$lookup': {
@@ -1432,7 +1439,15 @@ class MessageRequestsRepository(BaseMongoRepository):
                 }
             },
             {
-                '$addFields': {'user': {'$first': '$user'}}
+                '$lookup': {
+                    'from': 'dedicated_bots',
+                    'localField': 'bot_id',
+                    'foreignField': '_id',
+                    'as': 'bot'
+                }
+            },
+            {
+                '$addFields': {'user': {'$first': '$user'}, 'bot': {'$first': '$bot'}}
             },
             {
                 '$sort': {'created_at': 1}